diff options
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 38 | ||||
| -rw-r--r-- | Source/kwsys/Configure.hxx.in | 24 | ||||
| -rw-r--r-- | Source/kwsys/kwsysPlatformCxxTests.cxx | 8 | ||||
| -rw-r--r-- | Source/kwsys/kwsys_ios_fstream.h.in | 4 | ||||
| -rw-r--r-- | Source/kwsys/kwsys_ios_iosfwd.h.in | 4 | ||||
| -rw-r--r-- | Source/kwsys/kwsys_ios_iostream.h.in | 4 | ||||
| -rw-r--r-- | Source/kwsys/kwsys_ios_sstream.h.in | 8 |
7 files changed, 45 insertions, 45 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 3953b6b..609a44b 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -117,35 +117,35 @@ KWSYS_PLATFORM_CXX_TEST(KWSYS_STL_HAVE_STD "Checking whether STL classes are in std namespace" DIRECT) IF(KWSYS_IOS_FORCE_OLD) - SET(KWSYS_IOS_HAVE_ANSI 0) + SET(KWSYS_IOS_USE_ANSI 0) ELSE(KWSYS_IOS_FORCE_OLD) - KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAVE_ANSI + KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_USE_ANSI "Checking whether ANSI stream headers are available" DIRECT) ENDIF(KWSYS_IOS_FORCE_OLD) -IF(KWSYS_IOS_HAVE_ANSI) +IF(KWSYS_IOS_USE_ANSI) KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAVE_STD "Checking whether ANSI streams are in std namespace" DIRECT) - KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAVE_SSTREAM + KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_USE_SSTREAM "Checking whether ANSI string stream is available" DIRECT) -ELSE(KWSYS_IOS_HAVE_ANSI) +ELSE(KWSYS_IOS_USE_ANSI) SET(KWSYS_IOS_HAVE_STD 0) - SET(KWSYS_IOS_HAVE_SSTREAM 0) -ENDIF(KWSYS_IOS_HAVE_ANSI) - -IF(KWSYS_IOS_HAVE_SSTREAM) - SET(KWSYS_IOS_HAVE_STRSTREAM_H 0) - SET(KWSYS_IOS_HAVE_STRSTREA_H 0) -ELSE(KWSYS_IOS_HAVE_SSTREAM) - KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAVE_STRSTREAM_H + SET(KWSYS_IOS_USE_SSTREAM 0) +ENDIF(KWSYS_IOS_USE_ANSI) + +IF(KWSYS_IOS_USE_SSTREAM) + SET(KWSYS_IOS_USE_STRSTREAM_H 0) + SET(KWSYS_IOS_USE_STRSTREA_H 0) +ELSE(KWSYS_IOS_USE_SSTREAM) + KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_USE_STRSTREAM_H "Checking whether strstream.h is available" DIRECT) - IF(KWSYS_IOS_HAVE_STRSTREAM_H) - SET(KWSYS_IOS_HAVE_STRSTREA_H 0) - ELSE(KWSYS_IOS_HAVE_STRSTREAM_H) - KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAVE_STRSTREA_H + IF(KWSYS_IOS_USE_STRSTREAM_H) + SET(KWSYS_IOS_USE_STRSTREA_H 0) + ELSE(KWSYS_IOS_USE_STRSTREAM_H) + KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_USE_STRSTREA_H "Checking whether strstrea.h is available" DIRECT) - ENDIF(KWSYS_IOS_HAVE_STRSTREAM_H) -ENDIF(KWSYS_IOS_HAVE_SSTREAM) + ENDIF(KWSYS_IOS_USE_STRSTREAM_H) +ENDIF(KWSYS_IOS_USE_SSTREAM) IF(KWSYS_NAMESPACE MATCHES "^kwsys$") SET(KWSYS_NAME_IS_KWSYS 1) diff --git a/Source/kwsys/Configure.hxx.in b/Source/kwsys/Configure.hxx.in index 21627bd..5a6c75e 100644 --- a/Source/kwsys/Configure.hxx.in +++ b/Source/kwsys/Configure.hxx.in @@ -18,19 +18,19 @@ #define @KWSYS_NAMESPACE@_NAME_IS_KWSYS @KWSYS_NAME_IS_KWSYS@ /* Whether ANSI C++ stream headers are to be used. */ -#define @KWSYS_NAMESPACE@_IOS_HAVE_ANSI @KWSYS_IOS_HAVE_ANSI@ +#define @KWSYS_NAMESPACE@_IOS_USE_ANSI @KWSYS_IOS_USE_ANSI@ /* Whether ANSI C++ streams are in std namespace. */ #define @KWSYS_NAMESPACE@_IOS_HAVE_STD @KWSYS_IOS_HAVE_STD@ /* Whether ANSI C++ <sstream> header is to be used. */ -#define @KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM @KWSYS_IOS_HAVE_SSTREAM@ +#define @KWSYS_NAMESPACE@_IOS_USE_SSTREAM @KWSYS_IOS_USE_SSTREAM@ /* Whether old C++ <strstream.h> header is to be used. */ -#define @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREAM_H @KWSYS_IOS_HAVE_STRSTREAM_H@ +#define @KWSYS_NAMESPACE@_IOS_USE_STRSTREAM_H @KWSYS_IOS_USE_STRSTREAM_H@ /* Whether old C++ <strstrea.h> header is to be used. */ -#define @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREA_H @KWSYS_IOS_HAVE_STRSTREA_H@ +#define @KWSYS_NAMESPACE@_IOS_USE_STRSTREA_H @KWSYS_IOS_USE_STRSTREA_H@ /* Whether STL is in std namespace. */ #define @KWSYS_NAMESPACE@_STL_HAVE_STD @KWSYS_STL_HAVE_STD@ @@ -48,7 +48,7 @@ #else # define @KWSYS_NAMESPACE@_ios_namespace #endif -#if @KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM +#if @KWSYS_NAMESPACE@_IOS_USE_SSTREAM # define @KWSYS_NAMESPACE@_ios @KWSYS_NAMESPACE@_ios_namespace #else # define @KWSYS_NAMESPACE@_ios @KWSYS_NAMESPACE@_ios @@ -61,13 +61,13 @@ # define kwsys_stl @KWSYS_NAMESPACE@_stl # define kwsys_ios @KWSYS_NAMESPACE@_ios # endif -# define KWSYS_NAME_IS_KWSYS @KWSYS_NAMESPACE@_NAME_IS_KWSYS -# define KWSYS_IOS_HAVE_ANSI @KWSYS_NAMESPACE@_IOS_HAVE_ANSI -# define KWSYS_IOS_HAVE_STD @KWSYS_NAMESPACE@_IOS_HAVE_STD -# define KWSYS_IOS_HAVE_SSTREAM @KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM -# define KWSYS_IOS_HAVE_STRSTREAM_H @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREAM_H -# define KWSYS_IOS_HAVE_STRSTREA_H @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREA_H -# define KWSYS_STL_HAVE_STD @KWSYS_NAMESPACE@_STL_HAVE_STD +# define KWSYS_NAME_IS_KWSYS @KWSYS_NAMESPACE@_NAME_IS_KWSYS +# define KWSYS_STL_HAVE_STD @KWSYS_NAMESPACE@_STL_HAVE_STD +# define KWSYS_IOS_HAVE_STD @KWSYS_NAMESPACE@_IOS_HAVE_STD +# define KWSYS_IOS_USE_ANSI @KWSYS_NAMESPACE@_IOS_USE_ANSI +# define KWSYS_IOS_USE_SSTREAM @KWSYS_NAMESPACE@_IOS_USE_SSTREAM +# define KWSYS_IOS_USE_STRSTREAM_H @KWSYS_NAMESPACE@_IOS_USE_STRSTREAM_H +# define KWSYS_IOS_USE_STRSTREA_H @KWSYS_NAMESPACE@_IOS_USE_STRSTREA_H #endif #endif diff --git a/Source/kwsys/kwsysPlatformCxxTests.cxx b/Source/kwsys/kwsysPlatformCxxTests.cxx index b2c016b..e43bde5 100644 --- a/Source/kwsys/kwsysPlatformCxxTests.cxx +++ b/Source/kwsys/kwsysPlatformCxxTests.cxx @@ -4,7 +4,7 @@ void f(std::list<int>*) {} int main() { return 0; } #endif -#ifdef TEST_KWSYS_IOS_HAVE_ANSI +#ifdef TEST_KWSYS_IOS_USE_ANSI #include <iosfwd> int main() { return 0; } #endif @@ -15,17 +15,17 @@ void f(std::ostream*) {} int main() { return 0; } #endif -#ifdef TEST_KWSYS_IOS_HAVE_SSTREAM +#ifdef TEST_KWSYS_IOS_USE_SSTREAM #include <sstream> int main() { return 0; } #endif -#ifdef TEST_KWSYS_IOS_HAVE_STRSTREAM_H +#ifdef TEST_KWSYS_IOS_USE_STRSTREAM_H #include <strstream.h> int main() { return 0; } #endif -#ifdef TEST_KWSYS_IOS_HAVE_STRSTREA_H +#ifdef TEST_KWSYS_IOS_USE_STRSTREA_H #include <strstrea.h> int main() { return 0; } #endif diff --git a/Source/kwsys/kwsys_ios_fstream.h.in b/Source/kwsys/kwsys_ios_fstream.h.in index f97e619..6d2690c 100644 --- a/Source/kwsys/kwsys_ios_fstream.h.in +++ b/Source/kwsys/kwsys_ios_fstream.h.in @@ -21,13 +21,13 @@ #pragma warning (disable: 4702) #endif -#if @KWSYS_NAMESPACE@_IOS_HAVE_ANSI +#if @KWSYS_NAMESPACE@_IOS_USE_ANSI # include <fstream> #else # include <fstream.h> #endif -#if !@KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM +#if !@KWSYS_NAMESPACE@_IOS_USE_SSTREAM namespace @KWSYS_NAMESPACE@_ios { using @KWSYS_NAMESPACE@_ios_namespace::ostream; diff --git a/Source/kwsys/kwsys_ios_iosfwd.h.in b/Source/kwsys/kwsys_ios_iosfwd.h.in index d94d51a..1df5c72 100644 --- a/Source/kwsys/kwsys_ios_iosfwd.h.in +++ b/Source/kwsys/kwsys_ios_iosfwd.h.in @@ -21,7 +21,7 @@ #pragma warning (disable: 4702) #endif -#if @KWSYS_NAMESPACE@_IOS_HAVE_ANSI +#if @KWSYS_NAMESPACE@_IOS_USE_ANSI # include <iosfwd> # include <fstream> #else @@ -33,7 +33,7 @@ class ofstream; class ostream; #endif -#if !@KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM +#if !@KWSYS_NAMESPACE@_IOS_USE_SSTREAM namespace @KWSYS_NAMESPACE@_ios { using @KWSYS_NAMESPACE@_ios_namespace::fstream; diff --git a/Source/kwsys/kwsys_ios_iostream.h.in b/Source/kwsys/kwsys_ios_iostream.h.in index 08411cd..f44891c 100644 --- a/Source/kwsys/kwsys_ios_iostream.h.in +++ b/Source/kwsys/kwsys_ios_iostream.h.in @@ -21,13 +21,13 @@ #pragma warning (disable: 4702) #endif -#if @KWSYS_NAMESPACE@_IOS_HAVE_ANSI +#if @KWSYS_NAMESPACE@_IOS_USE_ANSI # include <iostream> #else # include <iostream.h> #endif -#if !@KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM +#if !@KWSYS_NAMESPACE@_IOS_USE_SSTREAM namespace @KWSYS_NAMESPACE@_ios { using @KWSYS_NAMESPACE@_ios_namespace::ostream; diff --git a/Source/kwsys/kwsys_ios_sstream.h.in b/Source/kwsys/kwsys_ios_sstream.h.in index 876259d..e4aad8c 100644 --- a/Source/kwsys/kwsys_ios_sstream.h.in +++ b/Source/kwsys/kwsys_ios_sstream.h.in @@ -21,7 +21,7 @@ # define kwsys_stl @KWSYS_NAMESPACE@_stl #endif -#if @KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM +#if @KWSYS_NAMESPACE@_IOS_USE_SSTREAM # ifdef _MSC_VER # pragma warning (push, 1) # pragma warning (disable: 4702) @@ -35,11 +35,11 @@ # pragma warning (push, 1) # pragma warning (disable: 4702) # endif -# if @KWSYS_NAMESPACE@_IOS_HAVE_ANSI +# if @KWSYS_NAMESPACE@_IOS_USE_ANSI # include <strstream> -# elif @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREAM_H +# elif @KWSYS_NAMESPACE@_IOS_USE_STRSTREAM_H # include <strstream.h> -# elif @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREA_H +# elif @KWSYS_NAMESPACE@_IOS_USE_STRSTREA_H # include <strstrea.h> # endif # ifdef _MSC_VER |