This is an automated email from the ASF dual-hosted git repository. rleigh pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/xerces-c.git
The following commit(s) were added to refs/heads/master by this push: new f6c5dab XERCESC-2209: Remove unused LSTRING feature test new 15b086b Merge pull request #20 from rleigh-codelibre/XERCESC-2209_Remove_LSTRING f6c5dab is described below commit f6c5dab017f92f746026dc3c6ebc485c9558cb2e Author: Roger Leigh <rle...@codelibre.net> AuthorDate: Wed Jun 10 20:26:12 2020 +0100 XERCESC-2209: Remove unused LSTRING feature test --- CMakeLists.txt | 1 - cmake/XercesLString.cmake | 31 ------------------------------- config.h.cmake.in | 3 --- configure.ac | 2 -- m4/cxx_have_lstring.m4 | 25 ------------------------- 5 files changed, 62 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a8e304d..7ecd6e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,7 +125,6 @@ include(XercesMsgLoaderSelection) include(XercesTranscoderSelection) include(XercesFileMgrSelection) include(XercesXMLCh) -include(XercesLString) include(XercesMFC) include(XercesSSE2) include(XercesPathMax) diff --git a/cmake/XercesLString.cmake b/cmake/XercesLString.cmake deleted file mode 100644 index 81975cb..0000000 --- a/cmake/XercesLString.cmake +++ /dev/null @@ -1,31 +0,0 @@ -# CMake build for xerces-c -# -# Written by Roger Leigh <rle...@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. - -# Wide string literals - -include(CheckCXXSourceCompiles) - -check_cxx_source_compiles(" -int main() { - const wchar_t* s=L\"wide string\"; - return 0; -}" - HAVE_LSTRING) - -set(XERCES_LSTRSUPPORT ${HAVE_LSTRING}) diff --git a/config.h.cmake.in b/config.h.cmake.in index 3f7066d..d8ce9cf 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -114,9 +114,6 @@ /* Define to 1 if you have the <locale.h> header file. */ #cmakedefine HAVE_LOCALE_H 1 -/* define if the compiler implements L"widestring" */ -#cmakedefine HAVE_LSTRING 1 - /* Define to 1 if you have the <machine/endian.h> header file. */ #cmakedefine HAVE_MACHINE_ENDIAN_H 1 diff --git a/configure.ac b/configure.ac index ccf4f66..b8dd7cb 100644 --- a/configure.ac +++ b/configure.ac @@ -157,8 +157,6 @@ AC_TYPE_SIZE_T XERCES_INT_TYPES -AC_CXX_HAVE_LSTRING - ACX_PTHREAD # Checks for library functions. diff --git a/m4/cxx_have_lstring.m4 b/m4/cxx_have_lstring.m4 deleted file mode 100644 index 3d35f70..0000000 --- a/m4/cxx_have_lstring.m4 +++ /dev/null @@ -1,25 +0,0 @@ -dnl @synopsis AC_CXX_HAVE_LSTRING -dnl -dnl If the compiler can prevent names clashes using namespaces, define -dnl HAVE_LSTRING. -dnl -dnl @category Cxx -dnl @author James Berry -dnl @version 2005-02-21 -dnl @license AllPermissive - -AC_DEFUN([AC_CXX_HAVE_LSTRING], -[AC_CACHE_CHECK([whether the compiler implements L"widestring"], -ac_cv_cxx_have_lstring, -[AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[const wchar_t* s=L"wide string";]])], - ac_cv_cxx_have_lstring=yes, ac_cv_cxx_have_lstring=no) - AC_LANG_RESTORE -]) -if test "$ac_cv_cxx_have_lstring" = yes; then - AC_DEFINE(HAVE_LSTRING,,[define if the compiler implements L"widestring"]) -fi -]) --------------------------------------------------------------------- To unsubscribe, e-mail: c-dev-unsubscr...@xerces.apache.org For additional commands, e-mail: c-dev-h...@xerces.apache.org