Merge pull request #978 from G10h4ck/cxx11_comp

Introduce C++11 compatibility macro for gcc < 4.6
RetroShare · Jul 31, 2017 · 7d5f601 · 7d5f601
2 parents a041584 + 541b1ea
commit 7d5f601
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/libretroshare/src/util/cxx11retrocompat.h b/libretroshare/src/util/cxx11retrocompat.h
@@ -18,8 +18,12 @@
  */
 
 #ifdef __GNUC__
-#	if __GNUC__*100 + __GNUC_MINOR__ < 40700
+#	define GCC_VERSION (__GNUC__*10000+__GNUC_MINOR__*100+__GNUC_PATCHLEVEL__)
+#	if GCC_VERSION < 40700
 #		define override
 #		define final
-#	endif //GCC version
+#	endif // GCC version < 40700
+#	if GCC_VERSION < 40600
+#		define nullptr NULL
+#	endif // GCC_VERSION < 40600
 #endif //defined GNUC