Effectively the removal boost 1.65 as it breaks Vegastrike at the mom…

…ent. Some other minor warnings dealt with as well.
evertvorster · Aug 27, 2017 · 5e59d87 · 5e59d87
1 parent f17391f
commit 5e59d87
Show file tree

Hide file tree

Showing 26,197 changed files with 2,710,266 additions and 355,937 deletions.
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -548,10 +548,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 endif()
 
 # Debug target block.
-SET(CMAKE_CXX_FLAGS_DEBUG " ${CPU_OPTS} -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -g2 -Wall -Werror -O0 -fvisibility=hidden" CACHE STRING
+SET(CMAKE_CXX_FLAGS_DEBUG " ${CPU_OPTS} -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -g2 -std=c++11 -Wall -Werror -O0 -fvisibility=hidden" CACHE STRING
     "Flags used by the C++ compiler during debug builds."
      FORCE )
-SET( CMAKE_C_FLAGS_DEBUG "  ${CPU_OPTS} -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -g2 -Wall -Werror -Wno-unused-function -Wno-unused-variable -O0 -fvisibility=hidden" CACHE STRING
+SET( CMAKE_C_FLAGS_DEBUG "  ${CPU_OPTS} -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -g -Wall -Werror -Wno-unused-function -Wno-unused-variable -O0 -fvisibility=hidden" CACHE STRING
     "Flags used by the C compiler during debug builds."
      FORCE )
 MARK_AS_ADVANCED(
@@ -568,7 +568,7 @@ ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
 
 
 # Release Target block
-SET(CMAKE_CXX_FLAGS_RELEASE  "${CPU_OPTS} -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -O2 -Wall -fvisibility=hidden" CACHE STRING
+SET(CMAKE_CXX_FLAGS_RELEASE  "${CPU_OPTS} -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -O2 -std=c++11 -Wall -fvisibility=hidden " CACHE STRING
     "Flags used by the C++ compiler during release builds."
     FORCE)
 SET( CMAKE_C_FLAGS_RELEASE "${CPU_OPTS}  -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -O2 -Wall -Wno-unused-function -Wno-unused-variable -fvisibility=hidden" CACHE STRING
@@ -590,10 +590,10 @@ ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
 
 
 # Release with debugging symbols Target block
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "  ${CPU_OPTS}  -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -O2 -g2 -Wall -Wno-unused-function -Wno-unused-variable -fvisibility=hidden" CACHE STRING
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "  ${CPU_OPTS}  -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -O2 -g2  -std=c++1 -Wall -Wno-unused-function -Wno-unused-variable -fvisibility=hidden1" CACHE STRING
     "Flags used by the C++ compiler during release builds."
      FORCE )
-SET( CMAKE_C_FLAGS_RELWITHDEBINFO "  ${CPU_OPTS}  -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -O2 -g2 -Wall -Wno-unused-function -Wno-unused-variable -fvisibility=hidden" CACHE STRING
+SET( CMAKE_C_FLAGS_RELWITHDEBINFO "  ${CPU_OPTS}  -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -O2 -g2  -std=c++1 -Wall -Wno-unused-function -Wno-unused-variable -fvisibility=hidden" CACHE STRING
     "Flags used by the C compiler during release builds."
      FORCE )
     MARK_AS_ADVANCED(
@@ -610,7 +610,7 @@ ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
 
 
 # Maintainer Target block
-SET(CMAKE_CXX_FLAGS_MAINTAINER " -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -g2 -Wall -Wno-unused-function -Wno-unused-variable -O0 -fvisibility=hidden" CACHE STRING
+SET(CMAKE_CXX_FLAGS_MAINTAINER " -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -g2  -std=c++11 -Wall -Wno-unused-function -Wno-unused-variable -O0 -fvisibility=hidden" CACHE STRING
     "Flags used by the C++ compiler during maintainer builds."
     FORCE )
 SET( CMAKE_C_FLAGS_MAINTAINER " -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -g2 -Wall -Wno-unused-function -Wno-unused-variable -O0 -fvisibility=hidden" CACHE STRING
@@ -639,7 +639,7 @@ ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "Maintainer")
 
 
 # Profiler Target block
-SET(CMAKE_CXX_FLAGS_PROFILER " ${CPU_OPTS} -O2 -pg -g2 -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -Wall -Wno-unused-function -Wno-unused-variable -O3" CACHE STRING
+SET(CMAKE_CXX_FLAGS_PROFILER " ${CPU_OPTS} -O2 -pg -g2 -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -std=c++11 -Wall -Wno-unused-function -Wno-unused-variable -O3" CACHE STRING
     "Flags used by the C++ compiler during profiler builds."
      FORCE )
 SET( CMAKE_C_FLAGS_PROFILER " ${CPU_OPTS} -O2 -pg -g2 -DNV_CUBE_MAP -DBOOST_PYTHON_NO_PY_SIGNATURES -include config.h -pipe -Wall -Wno-unused-function -Wno-unused-variable -O3" CACHE STRING
@@ -728,10 +728,10 @@ IF(Boost_FOUND)
 ELSE(Boost_FOUND)
   message("++ Using Internal Boost")
   SET(BOOST_PYTHON_NO_PY_SIGNATURES 1)
-  SET(TST_INCLUDES ${TST_INCLUDES} ${vsUTCS_SOURCE_DIR}/boost/1_65)
+  SET(TST_INCLUDES ${TST_INCLUDES} ${vsUTCS_SOURCE_DIR}/boost/1_64)
   SET(TST_LIBS ${TST_LIBS} boost_python)
   include_directories(${TST_INCLUDES})
-  add_subdirectory(boost/1_65)
+  add_subdirectory(boost/1_64)
   IF(NOT DISABLE_CLIENT)
     add_dependencies(vegastrike boost_python)
   ENDIF(NOT DISABLE_CLIENT)

diff --git a/.../1_65/boost/accumulators/accumulators.hpp → .../1_63/boost/accumulators/accumulators.hpp b/.../1_65/boost/accumulators/accumulators.hpp → .../1_63/boost/accumulators/accumulators.hpp
diff --git a/...5/boost/accumulators/accumulators_fwd.hpp → ...3/boost/accumulators/accumulators_fwd.hpp b/...5/boost/accumulators/accumulators_fwd.hpp → ...3/boost/accumulators/accumulators_fwd.hpp
diff --git a/...cumulators/framework/accumulator_base.hpp → ...cumulators/framework/accumulator_base.hpp b/...cumulators/framework/accumulator_base.hpp → ...cumulators/framework/accumulator_base.hpp
diff --git a/...ulators/framework/accumulator_concept.hpp → ...ulators/framework/accumulator_concept.hpp b/...ulators/framework/accumulator_concept.hpp → ...ulators/framework/accumulator_concept.hpp
diff --git a/...ccumulators/framework/accumulator_set.hpp → ...ccumulators/framework/accumulator_set.hpp b/...ccumulators/framework/accumulator_set.hpp → ...ccumulators/framework/accumulator_set.hpp
diff --git a/...rk/accumulators/droppable_accumulator.hpp → ...rk/accumulators/droppable_accumulator.hpp b/...rk/accumulators/droppable_accumulator.hpp → ...rk/accumulators/droppable_accumulator.hpp
diff --git a/...ork/accumulators/external_accumulator.hpp → ...ork/accumulators/external_accumulator.hpp b/...ork/accumulators/external_accumulator.hpp → ...ork/accumulators/external_accumulator.hpp
diff --git a/...rk/accumulators/reference_accumulator.hpp → ...rk/accumulators/reference_accumulator.hpp b/...rk/accumulators/reference_accumulator.hpp → ...rk/accumulators/reference_accumulator.hpp
diff --git a/...mework/accumulators/value_accumulator.hpp → ...mework/accumulators/value_accumulator.hpp b/...mework/accumulators/value_accumulator.hpp → ...mework/accumulators/value_accumulator.hpp
diff --git a/...ost/accumulators/framework/depends_on.hpp → ...ost/accumulators/framework/depends_on.hpp b/...ost/accumulators/framework/depends_on.hpp → ...ost/accumulators/framework/depends_on.hpp
diff --git a/...boost/accumulators/framework/external.hpp → ...boost/accumulators/framework/external.hpp b/...boost/accumulators/framework/external.hpp → ...boost/accumulators/framework/external.hpp
diff --git a/...oost/accumulators/framework/extractor.hpp → ...oost/accumulators/framework/extractor.hpp b/...oost/accumulators/framework/extractor.hpp → ...oost/accumulators/framework/extractor.hpp
diff --git a/...boost/accumulators/framework/features.hpp → ...boost/accumulators/framework/features.hpp b/...boost/accumulators/framework/features.hpp → ...boost/accumulators/framework/features.hpp
diff --git a/...tors/framework/parameters/accumulator.hpp → ...tors/framework/parameters/accumulator.hpp b/...tors/framework/parameters/accumulator.hpp → ...tors/framework/parameters/accumulator.hpp
diff --git a/...umulators/framework/parameters/sample.hpp → ...umulators/framework/parameters/sample.hpp b/...umulators/framework/parameters/sample.hpp → ...umulators/framework/parameters/sample.hpp
diff --git a/...umulators/framework/parameters/weight.hpp → ...umulators/framework/parameters/weight.hpp b/...umulators/framework/parameters/weight.hpp → ...umulators/framework/parameters/weight.hpp
diff --git a/...mulators/framework/parameters/weights.hpp → ...mulators/framework/parameters/weights.hpp b/...mulators/framework/parameters/weights.hpp → ...mulators/framework/parameters/weights.hpp
diff --git a/...accumulators/numeric/detail/function1.hpp → ...accumulators/numeric/detail/function1.hpp b/...accumulators/numeric/detail/function1.hpp → ...accumulators/numeric/detail/function1.hpp
diff --git a/...accumulators/numeric/detail/function2.hpp → ...accumulators/numeric/detail/function2.hpp b/...accumulators/numeric/detail/function2.hpp → ...accumulators/numeric/detail/function2.hpp
diff --git a/...accumulators/numeric/detail/function3.hpp → ...accumulators/numeric/detail/function3.hpp b/...accumulators/numeric/detail/function3.hpp → ...accumulators/numeric/detail/function3.hpp
diff --git a/...accumulators/numeric/detail/function4.hpp → ...accumulators/numeric/detail/function4.hpp b/...accumulators/numeric/detail/function4.hpp → ...accumulators/numeric/detail/function4.hpp
diff --git a/...ccumulators/numeric/detail/function_n.hpp → ...ccumulators/numeric/detail/function_n.hpp b/...ccumulators/numeric/detail/function_n.hpp → ...ccumulators/numeric/detail/function_n.hpp
diff --git a/...mulators/numeric/detail/pod_singleton.hpp → ...mulators/numeric/detail/pod_singleton.hpp b/...mulators/numeric/detail/pod_singleton.hpp → ...mulators/numeric/detail/pod_singleton.hpp