Commit e56a7eb9 authored by Brad King's avatar Brad King
Browse files

Drop workaround for no std:: namespace

We no longer support compilers that do not have std:: for STL.

Change-Id: I0a2873bfcada84a9e0b9093a92d12839df1d086d
parent ff74963a
......@@ -501,7 +501,6 @@ ADD_DEFINITIONS(-DVTK_IN_VTK)
# Platform configuration tests.
INCLUDE(CMakeBackwardCompatibilityC)
INCLUDE(TestForANSIStreamHeaders)
INCLUDE(TestForSTDNamespace)
# Simulate old CMakeBackwardCompatibilityCXX test.
INCLUDE(TestForSSTREAM)
......@@ -536,7 +535,6 @@ VTK_PREPARE_CMAKEDEFINE("" CMAKE_USE_SPROC VTK_USE_SPROC)
VTK_PREPARE_CMAKEDEFINE("" CMAKE_HP_PTHREADS VTK_HP_PTHREADS)
VTK_PREPARE_CMAKEDEFINE("" CMAKE_USE_WIN32_THREADS VTK_USE_WIN32_THREADS)
VTK_PREPARE_CMAKEDEFINE("" CMAKE_NO_ANSI_STRING_STREAM VTK_NO_ANSI_STRING_STREAM)
VTK_PREPARE_CMAKEDEFINE("" CMAKE_NO_STD_NAMESPACE VTK_NO_STD_NAMESPACE)
VTK_PREPARE_CMAKEDEFINE(NOT VTK_EXPLICIT_TEMPLATES
VTK_NO_EXPLICIT_TEMPLATE_INSTANTIATION)
VTK_PREPARE_CMAKEDEFINE(NOT VTK_COMPILER_HAS_FULL_SPECIALIZATION
......
......@@ -19,10 +19,6 @@ ELSE(VTK_SOURCE_DIR)
SET(DICOM_ANSI_STDLIB 1)
ENDIF(VTK_SOURCE_DIR)
INCLUDE(${CMAKE_ROOT}/Modules/TestForSTDNamespace.cmake)
SET(DICOM_NO_STD_NAMESPACE ${CMAKE_NO_STD_NAMESPACE})
CONFIGURE_FILE(${DICOMParser_SOURCE_DIR}/DICOMCMakeConfig.h.in
${DICOMParser_BINARY_DIR}/DICOMCMakeConfig.h)
......
......@@ -5,7 +5,6 @@
#cmakedefine DICOM_DLL
#cmakedefine DICOM_STATIC
#cmakedefine DICOM_ANSI_STDLIB
#cmakedefine DICOM_NO_STD_NAMESPACE
#include <vtksys/Configure.hxx>
......
......@@ -33,11 +33,7 @@
//
// END toolkit (ITK, VTK, etc) specific
//
#ifdef DICOM_NO_STD_NAMESPACE
#define dicom_stl
#else
#define dicom_stl std
#endif
#define dicom_stl std
#ifdef DICOM_ANSI_STDLIB
#define dicom_stream std
......
......@@ -96,7 +96,6 @@
#cmakedefine VTK_NO_EXPLICIT_TEMPLATE_INSTANTIATION
#cmakedefine VTK_NO_FULL_TEMPLATE_SPECIALIZATION
#cmakedefine VTK_NO_ANSI_STRING_STREAM
#cmakedefine VTK_NO_STD_NAMESPACE
#cmakedefine VTK_COMPILER_HAS_BOOL
#cmakedefine VTK_ISTREAM_SUPPORTS_LONG_LONG
#cmakedefine VTK_OSTREAM_SUPPORTS_LONG_LONG
......@@ -177,11 +176,7 @@
/* Setup vtkstd, a portable namespace for std. */
#ifndef VTK_LEGACY_REMOVE
# ifndef VTK_NO_STD_NAMESPACE
# define vtkstd std
# else
# define vtkstd
# endif
# define vtkstd std
#endif
/* Define a "vtkstd_bool" type. This should be used as the
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment