Merge pull request #128 from zauguin/macrofix

Fix errors in pedantic mode

Author: zauguin

configure

@@ -2614,6 +2614,47 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
+	if test $cvd_conf_test = 1
+	then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+		ts_success=yes
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		CXXFLAGS="$save_CXXFLAGS"
+		ts_success=no
+	fi
+
+
+	if test "" == ""
+	then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler flag -pedantic works" >&5
+$as_echo_n "checking if compiler flag -pedantic works... " >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking " >&5
+$as_echo_n "checking ... " >&6; }
+	fi
+	save_CXXFLAGS="$CXXFLAGS"
+	CXXFLAGS="$CXXFLAGS -pedantic"
+
+
+
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int main(){}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  cvd_conf_test=1
+else
+  cvd_conf_test=0
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
+
+
 	if test $cvd_conf_test = 1
 	then
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

configure.ac

@@ -56,6 +56,7 @@ define([TEST_AND_SET_CXXFLAG],[
 
 TEST_AND_SET_CXXFLAG(-Wall)
 TEST_AND_SET_CXXFLAG(-Wextra)
+TEST_AND_SET_CXXFLAG(-pedantic)
 TEST_AND_SET_CXXFLAG(-W)
 TEST_AND_SET_CXXFLAG(-O3)
 TEST_AND_SET_CXXFLAG(-Werror)

hdr/sqlite_modern_cpp.h

@@ -374,7 +374,7 @@ namespace sqlite {
 	};
 	inline OpenFlags operator|(const OpenFlags& a, const OpenFlags& b) {
 		return static_cast<OpenFlags>(static_cast<int>(a) | static_cast<int>(b));
-	};
+	}
 	enum class Encoding {
 		ANY = SQLITE_ANY,
 		UTF8 = SQLITE_UTF8,
@@ -958,7 +958,7 @@ namespace sqlite {
 				Values&&...      values
 		) {
 			static_cast<Functions*>(sqlite3_user_data(db))->first(std::forward<Values>(values)...);
-		};
+		}
 
 		template<
 			typename    ContextType,

hdr/sqlite_modern_cpp/lists/error_codes.h

@@ -1,3 +1,8 @@
+#if SQLITE_VERSION_NUMBER < 3010000
+#define SQLITE_IOERR_VNODE (SQLITE_IOERR | (27<<8))
+#define SQLITE_IOERR_AUTH (SQLITE_IOERR | (28<<8))
+#define SQLITE_AUTH_USER (SQLITE_AUTH | (1<<8))
+#endif
 SQLITE_MODERN_CPP_ERROR_CODE(ERROR,error,)
 SQLITE_MODERN_CPP_ERROR_CODE(INTERNAL,internal,)
 SQLITE_MODERN_CPP_ERROR_CODE(PERM,perm,)
@@ -41,12 +46,8 @@ SQLITE_MODERN_CPP_ERROR_CODE(IOERR,ioerr,
   SQLITE_MODERN_CPP_ERROR_CODE_EXTENDED(IOERR,MMAP,ioerr,mmap)
   SQLITE_MODERN_CPP_ERROR_CODE_EXTENDED(IOERR,GETTEMPPATH,ioerr,gettemppath)
   SQLITE_MODERN_CPP_ERROR_CODE_EXTENDED(IOERR,CONVPATH,ioerr,convpath)
-#if SQLITE_VERSION_NUMBER >= 3009000
   SQLITE_MODERN_CPP_ERROR_CODE_EXTENDED(IOERR,VNODE,ioerr,vnode)
-#endif
-#if SQLITE_VERSION_NUMBER >= 3010000
   SQLITE_MODERN_CPP_ERROR_CODE_EXTENDED(IOERR,AUTH,ioerr,auth)
-#endif
 )
 SQLITE_MODERN_CPP_ERROR_CODE(CORRUPT,corrupt,
   SQLITE_MODERN_CPP_ERROR_CODE_EXTENDED(CORRUPT,VTAB,corrupt,vtab)
@@ -79,9 +80,6 @@ SQLITE_MODERN_CPP_ERROR_CODE(MISMATCH,mismatch,)
 SQLITE_MODERN_CPP_ERROR_CODE(MISUSE,misuse,)
 SQLITE_MODERN_CPP_ERROR_CODE(NOLFS,nolfs,)
 SQLITE_MODERN_CPP_ERROR_CODE(AUTH,auth,
-#if SQLITE_VERSION_NUMBER >= 3009000
-  SQLITE_MODERN_CPP_ERROR_CODE_EXTENDED(AUTH,USER,auth,user)
-#endif
 )
 SQLITE_MODERN_CPP_ERROR_CODE(FORMAT,format,)
 SQLITE_MODERN_CPP_ERROR_CODE(RANGE,range,)