Merge pull request #48 from dxFeed/test/gcc9-gcc11

dxFeed · Apr 15, 2024 · afcc43e · afcc43e
2 parents 1494a60 + bef5fa4
commit afcc43e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,6 +31,18 @@ jobs:
             cores: 4
             cc: 'gcc-13'
             cxx: 'g++-13'
+#          - name: ubuntu-22.04-gcc-9
+#            image: ubuntu-22.04
+#            os: linux
+#            cores: 4
+#            cc: 'gcc-9'
+#            cxx: 'g++-9'
+          - name: ubuntu-22.04-gcc-11
+            image: ubuntu-22.04
+            os: linux
+            cores: 4
+            cc: 'gcc-11'
+            cxx: 'g++-11'
           - name: macos-14-xcode-15
             image: macos-14
             os: macos

diff --git a/include/dxfeed_graal_cpp_api/internal/Conf.hpp b/include/dxfeed_graal_cpp_api/internal/Conf.hpp
@@ -47,14 +47,6 @@
 #    define DXFCPP_EXPORT_TEMPLATE_DEFINE
 #endif
 
-#ifndef DXFCPP_CXX20_CONSTEXPR_STRING
-#    if defined(__cpp_lib_constexpr_string)
-#        define DXFCPP_CXX20_CONSTEXPR_STRING constexpr
-#    else
-#        define DXFCPP_CXX20_CONSTEXPR_STRING
-#    endif
-#endif
-
 #ifndef DXFCPP_BEGIN_NAMESPACE
 #    define DXFCPP_BEGIN_NAMESPACE                                                                                     \
         namespace dxfcpp {                                                                                             \
@@ -104,4 +96,12 @@ constexpr bool isMSSTL = false;
 constexpr bool isUnknownSTL = true;
 #endif
 
+#ifndef DXFCPP_CXX20_CONSTEXPR_STRING
+#    if defined(__cpp_lib_constexpr_string) && ((defined(__GNUC__) && __GNUC__ >= 12) || (defined(__clang_major__) && __clang_major__ >= 15) || (defined(_MSC_VER) && _MSC_VER >= 1929))
+#        define DXFCPP_CXX20_CONSTEXPR_STRING constexpr
+#    else
+#        define DXFCPP_CXX20_CONSTEXPR_STRING
+#    endif
+#endif
+
 DXFCPP_END_NAMESPACE