Skip to content

Commit 8cec72e

Browse files
committed
Fixed VS2010 warning about unknown -std=c++0x option.
Removed C++0x CMake code completely, since it wasn't used properly.
1 parent 8cb6d16 commit 8cec72e

9 files changed

+0
-146
lines changed

CMake/mitkFunctionCheckC++0xHashSizeT.cmake

Lines changed: 0 additions & 13 deletions
This file was deleted.

CMake/mitkFunctionCheckC++0xHashString.cmake

Lines changed: 0 additions & 14 deletions
This file was deleted.

CMake/mitkFunctionCheckC++0xUnorderedMap.cmake

Lines changed: 0 additions & 13 deletions
This file was deleted.

CMake/mitkFunctionCheckC++0xUnorderedSet.cmake

Lines changed: 0 additions & 13 deletions
This file was deleted.

CMake/mitkFunctionCheckItkHashSizeT.cmake

Lines changed: 0 additions & 13 deletions
This file was deleted.

CMake/mitkFunctionCheckItkHashString.cmake

Lines changed: 0 additions & 14 deletions
This file was deleted.

CMake/mitkSetupC++0xVariables.cmake

Lines changed: 0 additions & 55 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -505,8 +505,6 @@ set(MITK_CXX_FLAGS_RELEASE )
505505
set(MITK_EXE_LINKER_FLAGS )
506506
set(MITK_SHARED_LINKER_FLAGS )
507507

508-
include(mitkSetupC++0xVariables)
509-
510508
if(WIN32)
511509
set(MITK_CXX_FLAGS "${MITK_CXX_FLAGS} -D_WIN32_WINNT=0x0501 -DPOCO_NO_UNWINDOWS -DWIN32_LEAN_AND_MEAN")
512510
set(MITK_CXX_FLAGS "${MITK_CXX_FLAGS} /wd4231") # warning C4231: nonstandard extension used : 'extern' before template explicit instantiation
@@ -543,10 +541,6 @@ endif()
543541
mitkFunctionCheckCompilerFlags("-Wl,--no-undefined" MITK_SHARED_LINKER_FLAGS)
544542
mitkFunctionCheckCompilerFlags("-Wl,--as-needed" MITK_SHARED_LINKER_FLAGS)
545543

546-
if(MITK_USE_C++0x)
547-
mitkFunctionCheckCompilerFlags("-std=c++0x" MITK_CXX_FLAGS)
548-
endif()
549-
550544
if(CMAKE_COMPILER_IS_GNUCXX)
551545

552546
mitkFunctionGetGccVersion(${CMAKE_CXX_COMPILER} GCC_VERSION)

mitkConfig.h.in

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212
#cmakedefine MITK_CHILI_PLUGIN
1313
#cmakedefine MITK_USE_TD_MOUSE
1414

15-
#cmakedefine MITK_HAS_UNORDERED_MAP_H
16-
#cmakedefine MITK_HAS_UNORDERED_SET_H
17-
#cmakedefine MITK_HAS_HASH_STRING
18-
#cmakedefine MITK_HAS_HASH_SIZE_T
19-
2015
#define MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES @MITK_ACCESSBYITK_INTEGRAL_PIXEL_TYPES@
2116
#define MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES @MITK_ACCESSBYITK_FLOATING_PIXEL_TYPES@
2217
#define MITK_ACCESSBYITK_COMPOSITE_PIXEL_TYPES @MITK_ACCESSBYITK_COMPOSITE_PIXEL_TYPES@

0 commit comments

Comments
 (0)