XERCESC-2138: Drop XERCES_STD_NAMESPACE check
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 346f1a2..9f21fd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,7 +133,6 @@
include(XercesLString)
include(XercesMFC)
include(XercesStdLibs)
-include(XercesStdNamespace)
include(XercesSSE2)
include(XercesPathMax)
include(XercesWChar)
diff --git a/cmake/XercesStdNamespace.cmake b/cmake/XercesStdNamespace.cmake
deleted file mode 100644
index fc68fb3..0000000
--- a/cmake/XercesStdNamespace.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-# CMake build for xerces-c
-#
-# Written by Roger Leigh <rleigh@codelibre.net>
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# C++ standard library std:: namespace
-
-include(CheckCXXSourceCompiles)
-
-check_cxx_source_compiles("
-#include <iostream>
-std::istream& is = std::cin;
-
-int main() {
- return 0;
-}"
- HAVE_STD_NAMESPACE)
-
-set(XERCES_STD_NAMESPACE ${HAVE_STD_NAMESPACE})
diff --git a/config.h.cmake.in b/config.h.cmake.in
index 8c80a52..daf8eda 100644
--- a/config.h.cmake.in
+++ b/config.h.cmake.in
@@ -192,9 +192,6 @@
/* define if the compiler supports ISO C++ standard library */
#cmakedefine HAVE_STD_LIBS 1
-/* define if the compiler supports the std namespace */
-#cmakedefine HAVE_STD_NAMESPACE 1
-
/* Define to 1 if you have the `strcasecmp' function. */
#cmakedefine HAVE_STRCASECMP 1
@@ -412,9 +409,6 @@
/* Define if building a static library */
#cmakedefine XERCES_STATIC_LIBRARY 1
-/* Define if the std namespace is supported */
-#cmakedefine XERCES_STD_NAMESPACE 1
-
/* An appropriate unsigned 16 bit integer type */
#define XERCES_U16BIT_INT @XERCES_U16BIT_INT@
diff --git a/configure.ac b/configure.ac
index 7738cad..aba3d75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,7 +153,6 @@
XERCES_INT_TYPES
AC_CXX_HAVE_BOOL
-AC_CXX_HAVE_STD_NAMESPACE
AC_CXX_HAVE_STD_LIBS
AC_CXX_HAVE_LSTRING
@@ -522,9 +521,6 @@
AC_DEFINE([XERCES_SSIZE_T], [long], [Define as the appropriate ssize_t type])
AC_DEFINE([XERCES_SSIZE_MAX], [LONG_MAX], [Define as the appropriate SSIZE_MAX macro]))
-AS_IF([test x$ac_cv_cxx_have_std_namespace = xyes],
- AC_DEFINE([XERCES_STD_NAMESPACE], 1, [Define if the std namespace is supported]))
-
AS_IF([test x$ac_cv_cxx_have_std_libs = xyes],
AC_DEFINE([XERCES_NEW_IOSTREAMS], 1, [Define if the isstream library can be included as <iostream>]))
diff --git a/m4/cxx_have_std_namespace.m4 b/m4/cxx_have_std_namespace.m4
deleted file mode 100644
index 35be1cd..0000000
--- a/m4/cxx_have_std_namespace.m4
+++ /dev/null
@@ -1,26 +0,0 @@
-dnl @synopsis AC_CXX_HAVE_STD_NAMESPACE
-dnl
-dnl If the compiler supports the std namespace, define
-dnl HAVE_STD_NAMESPACE.
-dnl
-dnl @category Cxx
-dnl @author Todd Veldhuizen
-dnl @author Luc Maisonobe <luc@spaceroots.org>
-dnl @version 2004-02-04
-dnl @license AllPermissive
-
-AC_DEFUN([AC_CXX_HAVE_STD_NAMESPACE],
-[AC_CACHE_CHECK(whether the compiler supports the std namespace,
-ac_cv_cxx_have_std_namespace,
-[AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
- AC_TRY_COMPILE([#include <iostream>
- std::istream& is = std::cin;
- ],[return 0;],
- ac_cv_cxx_have_std_namespace=yes, ac_cv_cxx_have_std_namespace=no)
- AC_LANG_RESTORE
-])
-if test "$ac_cv_cxx_have_std_namespace" = yes; then
- AC_DEFINE(HAVE_STD_NAMESPACE,,[define if the compiler supports the std namespace])
-fi
-])
diff --git a/src/xercesc/util/XercesDefs.hpp b/src/xercesc/util/XercesDefs.hpp
index e6cb776..44e12e2 100644
--- a/src/xercesc/util/XercesDefs.hpp
+++ b/src/xercesc/util/XercesDefs.hpp
@@ -108,13 +108,8 @@
namespace XERCES_CPP_NAMESPACE { }
namespace xercesc = XERCES_CPP_NAMESPACE;
-#if defined(XERCES_STD_NAMESPACE)
- #define XERCES_USING_STD(NAME) using std :: NAME;
- #define XERCES_STD_QUALIFIER std ::
-#else
- #define XERCES_USING_STD(NAME)
- #define XERCES_STD_QUALIFIER
-#endif
+#define XERCES_USING_STD(NAME) using std :: NAME;
+#define XERCES_STD_QUALIFIER std ::
// ---------------------------------------------------------------------------
diff --git a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
index e6aa7be..cf05c73 100644
--- a/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
+++ b/src/xercesc/util/Xerces_autoconf_config.hpp.cmake.in
@@ -67,7 +67,6 @@
#define XERCES_SIZE_T @XERCES_SIZE_T@
#define XERCES_SSIZE_T @XERCES_SSIZE_T@
-#cmakedefine XERCES_STD_NAMESPACE 1
#cmakedefine XERCES_NEW_IOSTREAMS 1
#cmakedefine XERCES_NO_NATIVE_BOOL 1
#cmakedefine XERCES_LSTRSUPPORT 1
diff --git a/src/xercesc/util/Xerces_autoconf_config.hpp.in b/src/xercesc/util/Xerces_autoconf_config.hpp.in
index 6f777ea..540ed18 100644
--- a/src/xercesc/util/Xerces_autoconf_config.hpp.in
+++ b/src/xercesc/util/Xerces_autoconf_config.hpp.in
@@ -68,7 +68,6 @@
#undef XERCES_SIZE_T
#undef XERCES_SSIZE_T
-#undef XERCES_STD_NAMESPACE
#undef XERCES_NEW_IOSTREAMS
#undef XERCES_NO_NATIVE_BOOL
#undef XERCES_LSTRSUPPORT
