|
 |
c5c0a9d |
diff -up syncevolution-1.5.1/src/syncevo/Logging.h.gcc6 syncevolution-1.5.1/src/syncevo/Logging.h
|
|
|
c5c0a9d |
--- syncevolution-1.5.1/src/syncevo/Logging.h.gcc6 2014-04-25 09:55:47.000000000 +0200
|
|
|
c5c0a9d |
+++ syncevolution-1.5.1/src/syncevo/Logging.h 2016-02-08 16:23:54.988845287 +0100
|
|
|
c5c0a9d |
@@ -255,7 +255,7 @@ class Logger
|
|
|
c5c0a9d |
Handle &operator = (const Handle &other) throw ();
|
|
|
c5c0a9d |
~Handle() throw ();
|
|
|
c5c0a9d |
|
|
|
c5c0a9d |
- operator bool () const { return m_logger; }
|
|
|
c5c0a9d |
+ operator bool () const { return m_logger.get() != 0; }
|
|
|
c5c0a9d |
bool operator == (Logger *logger) const { return m_logger.get() == logger; }
|
|
|
c5c0a9d |
Logger *get() const { return m_logger.get(); }
|
|
|
c5c0a9d |
|
|
|
c5c0a9d |
@@ -398,7 +398,7 @@ template<class L> class PushLogger : boo
|
|
|
c5c0a9d |
}
|
|
|
c5c0a9d |
}
|
|
|
c5c0a9d |
|
|
|
c5c0a9d |
- operator bool () const { return m_logger; }
|
|
|
c5c0a9d |
+ operator bool () const { return m_logger.get() != 0; }
|
|
|
c5c0a9d |
|
|
|
c5c0a9d |
void reset(const Logger::Handle &logger)
|
|
|
c5c0a9d |
{
|
|
|
c5c0a9d |
diff -up syncevolution-1.5.1/src/syncevo/StringDataBlob.h.gcc6 syncevolution-1.5.1/src/syncevo/StringDataBlob.h
|
|
|
c5c0a9d |
--- syncevolution-1.5.1/src/syncevo/StringDataBlob.h.gcc6 2014-04-25 09:55:47.000000000 +0200
|
|
|
c5c0a9d |
+++ syncevolution-1.5.1/src/syncevo/StringDataBlob.h 2016-02-08 16:23:54.988845287 +0100
|
|
|
c5c0a9d |
@@ -53,7 +53,7 @@ class StringDataBlob : public DataBlob
|
|
|
c5c0a9d |
|
|
|
c5c0a9d |
virtual boost::shared_ptr<std::string> getData() { return m_data; }
|
|
|
c5c0a9d |
virtual std::string getName() const { return m_name; }
|
|
|
c5c0a9d |
- virtual bool exists() const { return m_data; }
|
|
|
c5c0a9d |
+ virtual bool exists() const { return m_data.get() != 0; }
|
|
|
c5c0a9d |
virtual bool isReadonly() const { return m_readonly; }
|
|
|
c5c0a9d |
};
|
|
|
c5c0a9d |
|
|
|
c5c0a9d |
diff -up syncevolution-1.5.1/src/synthesis/src/sysync/itemfield.cpp.gcc6 syncevolution-1.5.1/src/synthesis/src/sysync/itemfield.cpp
|
|
|
c5c0a9d |
--- syncevolution-1.5.1/src/synthesis/src/sysync/itemfield.cpp.gcc6 2015-03-03 09:06:40.000000000 +0100
|
|
|
c5c0a9d |
+++ syncevolution-1.5.1/src/synthesis/src/sysync/itemfield.cpp 2016-02-08 16:23:54.989845287 +0100
|
|
|
c5c0a9d |
@@ -1488,7 +1488,7 @@ void TTimestampField::getAsRFC822date(st
|
|
|
c5c0a9d |
" %c%02hd%02hd",
|
|
|
c5c0a9d |
moffs>=0 ? '+' : '-',
|
|
|
c5c0a9d |
(uInt16)(abs(moffs) / MinsPerHour),
|
|
|
c5c0a9d |
- (uInt16)(abs(moffs) % MinsPerHour)
|
|
|
c5c0a9d |
+ (uInt16)(((uInt16)abs(moffs)) % MinsPerHour)
|
|
|
c5c0a9d |
);
|
|
|
c5c0a9d |
}
|
|
|
c5c0a9d |
} // TTimestampField::getAsRFC822date
|