Mercurial > octave

changeset 27577:f90564fb99e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Mon, 28 Oct 2019 20:03:04 +0900
parents d0fe6e344c41 (current diff) 3b50efa29be4 (diff)
children 5aad387784aa
files libinterp/corefcn/sysdep.cc
diffstat 1 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/sysdep.cc	Sun Oct 27 14:19:34 2019 -0700
+++ b/libinterp/corefcn/sysdep.cc	Mon Oct 28 20:03:04 2019 +0900
@@ -270,6 +270,9 @@
   {
 #if defined (OCTAVE_USE_WINDOWS_API)
 
+    // FIXME: When Octave switches to C++17, consider replacing this function
+    //        by https://en.cppreference.com/w/cpp/filesystem/equivalent.
+
     bool retval = false;
 
     std::wstring file1w = sys::u8_to_wstring (file1);
@@ -305,7 +308,13 @@
               {
                 retval = (hfi1.dwVolumeSerialNumber == hfi2.dwVolumeSerialNumber
                           && hfi1.nFileIndexHigh == hfi2.nFileIndexHigh
-                          && hfi1.nFileIndexLow == hfi2.nFileIndexLow);
+                          && hfi1.nFileIndexLow == hfi2.nFileIndexLow
+                          && hfi1.nFileSizeHigh == hfi2.nFileSizeHigh
+                          && hfi1.nFileSizeLow == hfi2.nFileSizeLow
+                          && hfi1.ftLastWriteTime.dwLowDateTime
+                             == hfi2.ftLastWriteTime.dwLowDateTime
+                          && hfi1.ftLastWriteTime.dwHighDateTime
+                             == hfi2.ftLastWriteTime.dwHighDateTime);
               }
 
             CloseHandle (hfile2);