Merge pull request #469 from greenozon/master

Fix for Centos6/7 compilation issues
zrax · Mar 12, 2024 · 6467c2c · 6467c2c
2 parents 1f30136 + 8367a8e
commit 6467c2c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ASTNode.cpp b/ASTNode.cpp
@@ -11,7 +11,7 @@ void ASTNodeList::removeLast()
 
 void ASTNodeList::removeFirst()
 {
-    m_nodes.erase(m_nodes.cbegin());
+    m_nodes.erase(m_nodes.begin());
 }
 
 

diff --git a/ASTree.cpp b/ASTree.cpp
@@ -34,7 +34,7 @@ static bool printClassDocstring = true;
 // shortcut for all top/pop calls
 static PycRef<ASTNode> StackPopTop(FastStack& stack)
 {
-    const auto node{ stack.top() };
+    const auto node(stack.top());
     stack.pop();
     return node;
 }

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@ if (ENABLE_STACK_DEBUG)
 endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wshadow -Werror ${CMAKE_CXX_FLAGS}")
+    set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-error=shadow -Werror ${CMAKE_CXX_FLAGS}")
 elseif(MSVC)
     set(CMAKE_CXX_FLAGS "/WX ${CMAKE_CXX_FLAGS}")
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ void ASTNodeList::removeLast() @@
     void ASTNodeList::removeFirst()
     {
-        m_nodes.erase(m_nodes.cbegin());
+        m_nodes.erase(m_nodes.begin());
     }
@@ Expand Down @@