[Pkg-owncloud-commits] [owncloud-client] 425/484: SyncJournalFileRecord: Fix comparison operator

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 1ad8e539aa06b3dc3c6d594c9b8554a0a3352f5a
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Wed Nov 25 21:11:58 2015 +0100

    SyncJournalFileRecord: Fix comparison operator
    
    Compare only full seconds, as milliseconds can disappear during storage
    of the database.
    
    This is needed to fix the syncjournaldb test reliably. And maybe
    elsewhere.
    
    Also see
    http://www.qtcentre.org/threads/13618-Problem-with-comparing-two-QDateTime-objects
---
 src/libsync/syncjournalfilerecord.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libsync/syncjournalfilerecord.cpp b/src/libsync/syncjournalfilerecord.cpp
index 9d1a59c..96f9007 100644
--- a/src/libsync/syncjournalfilerecord.cpp
+++ b/src/libsync/syncjournalfilerecord.cpp
@@ -174,7 +174,7 @@ bool operator==(const SyncJournalFileRecord & lhs,
 {
     return     lhs._path == rhs._path
             && lhs._inode == rhs._inode
-            && lhs._modtime == rhs._modtime
+            && lhs._modtime.toTime_t() == rhs._modtime.toTime_t()
             && lhs._type == rhs._type
             && lhs._etag == rhs._etag
             && lhs._fileId == rhs._fileId

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git