uonedb-qt team mailing list archive

[Christian Dywan <christian@xxxxxxxxxxxx>]

Christian Dywan has proposed merging lp:~kalikiana/u1db-qt/lastWarning into lp:u1db-qt.

Commit message:
Sort out build warnings and make them always fatal

Requested reviews:
  U1DB Qt developers (uonedb-qt)

For more details, see:
https://code.launchpad.net/~kalikiana/u1db-qt/lastWarning/+merge/196302
-- 
https://code.launchpad.net/~kalikiana/u1db-qt/lastWarning/+merge/196302
Your team U1DB Qt developers is requested to review the proposed merge of lp:~kalikiana/u1db-qt/lastWarning into lp:u1db-qt.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-08-08 10:11:39 +0000
+++ CMakeLists.txt	2013-11-22 15:25:18 +0000
@@ -17,7 +17,7 @@
 set(QT_U1DB_PKGCONFIG_FILE lib${U1DB_QT_LIBNAME}.pc)
 
 # Build flags
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wundef -std=c++0x")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -Wall -Wundef -Werror -std=c++0x")
 add_definitions(-DQT_NO_KEYWORDS)
 # Disable building during install to avoid file permission chaos
 set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY 1)

=== modified file 'src/database.cpp'
--- src/database.cpp	2013-08-14 12:07:11 +0000
+++ src/database.cpp	2013-11-22 15:25:18 +0000
@@ -336,15 +336,6 @@
 }
 
 /*!
-    The increaseVectorClockRev(int oldRev) function is deprecated.
- */
-static int
-increaseVectorClockRev(int oldRev)
-{
-    return oldRev;
-}
-
-/*!
  * \internal
   This function creates a new revision number.
 

=== modified file 'src/synchronizer.h'
--- src/synchronizer.h	2013-08-12 08:58:02 +0000
+++ src/synchronizer.h	2013-11-22 15:25:18 +0000
@@ -125,8 +125,8 @@
 
 private:
     //Q_DISABLE_COPY(Synchronizer)
+    bool m_synchronize;
     Database* m_source;
-    bool m_synchronize;
     bool m_resolve_to_source;
     QVariant m_targets;
     QList<QVariant> m_sync_output;