fix msvc build

qgis · Apr 21, 2021 · e3f1629 · e3f1629
1 parent b31e01b
commit e3f1629
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -681,8 +681,8 @@ else()
 endif()
 
 if(MSVC)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8 /std:c++17")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /utf-8 /std:c++17")
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
   # disable macros that offend std::numeric_limits<T>::min()/max()

diff --git a/src/core/settings/qgssettingsentry.h b/src/core/settings/qgssettingsentry.h
@@ -857,7 +857,7 @@ class CORE_EXPORT QgsSettingsEntryDouble : public QgsSettingsEntryBase
   * \since QGIS 3.20
  */
 template <typename T>
-class CORE_EXPORT QgsSettingsEntryEnumFlagBase : public QgsSettingsEntryBase
+class QgsSettingsEntryEnumFlagBase : public QgsSettingsEntryBase
 {
   public:
 
@@ -1014,7 +1014,7 @@ class CORE_EXPORT QgsSettingsEntryEnumFlagBase : public QgsSettingsEntryBase
   * \since QGIS 3.20
  */
 template <typename T>
-class CORE_EXPORT QgsSettingsEntryEnum : public QgsSettingsEntryEnumFlagBase<T>
+class QgsSettingsEntryEnum : public QgsSettingsEntryEnumFlagBase<T>
 {
   public:
 
@@ -1058,7 +1058,7 @@ class CORE_EXPORT QgsSettingsEntryEnum : public QgsSettingsEntryEnumFlagBase<T>
   * \since QGIS 3.20
  */
 template <typename T>
-class CORE_EXPORT QgsSettingsEntryFlag : public QgsSettingsEntryEnumFlagBase<T>
+class QgsSettingsEntryFlag : public QgsSettingsEntryEnumFlagBase<T>
 {
   public: