Merge branch 'inline_variable' of https://github.com/Lastique/config into develop

Fixed Conflicts: doc/macro_reference.qbk
2019-10-29 16:56:11 +00:00
parent 3ac79f29ba 38df8ca0d7
commit c85145a2a8
3 changed files with 28 additions and 3 deletions
@@ -994,6 +994,15 @@ namespace std{ using ::type_info; }
 #define BOOST_CXX14_CONSTEXPR constexpr
 #endif

+//
+// C++17 inline variables
+//
+#if !defined(BOOST_NO_CXX17_INLINE_VARIABLES)
+#define BOOST_INLINE_VARIABLE inline
+#else
+#define BOOST_INLINE_VARIABLE
+#endif
+
 //
 // Unused variable/typedef workarounds:
 //