Cleanup changes, everything is C++17 now.

connorjak · Oct 11, 2021 · d77ec04 · d77ec04
1 parent 914a3cf
commit d77ec04
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/Applications/Connectatron/CMakeLists.txt b/Applications/Connectatron/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(CMAKE_CXX_STANDARD 17)
-
 add_example(Connectatron
     Connectatron.cpp
 )

diff --git a/Applications/Connectatron/Connectatron.cpp b/Applications/Connectatron/Connectatron.cpp
@@ -1106,8 +1106,6 @@ void Application_Initialize()
     m_Editor = ed::CreateEditor(&config);
     ed::SetCurrentEditor(m_Editor);
 
-    Node* node;
-
     //NOTE: we can add example nodes here if needed
 
     ed::NavigateToContent();

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,12 +6,12 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 # Point CMake where to look for module files.
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/Support/CMakeModules)
 
-set(CMAKE_CXX_STANDARD            14)
+set(CMAKE_CXX_STANDARD            17)
 set(CMAKE_CXX_STANDARD_REQUIRED   YES)
 
 if (DEFINED MSVC_VERSION)
     if (MSVC_VERSION GREATER_EQUAL 1500)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++14")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17")
     endif()
     if (MSVC_VERSION GREATER_EQUAL 1910)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-")