kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Renamed KWSYS_IOS_HAVE_* macros to KWSYS_IOS_USE_* to be more readable in the C++ sources.

This commit is contained in:
Brad King 2003-12-30 17:15:51 -05:00
parent 1c8f885f9d
commit c14915697c
7 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Source/kwsys/CMakeLists.txt
View File

@ -117,35 +117,35 @@ KWSYS_PLATFORM_CXX_TEST(KWSYS_STL_HAVE_STD
"Checking whether STL classes are in std namespace" DIRECT) "Checking whether STL classes are in std namespace" DIRECT)
IF(KWSYS_IOS_FORCE_OLD) IF(KWSYS_IOS_FORCE_OLD)
SET(KWSYS_IOS_HAVE_ANSI 0) SET(KWSYS_IOS_USE_ANSI 0)
ELSE(KWSYS_IOS_FORCE_OLD) 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) "Checking whether ANSI stream headers are available" DIRECT)
ENDIF(KWSYS_IOS_FORCE_OLD) ENDIF(KWSYS_IOS_FORCE_OLD)
IF(KWSYS_IOS_HAVE_ANSI) IF(KWSYS_IOS_USE_ANSI)
KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAVE_STD KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAVE_STD
"Checking whether ANSI streams are in std namespace" DIRECT) "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) "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_STD 0)
SET(KWSYS_IOS_HAVE_SSTREAM 0) SET(KWSYS_IOS_USE_SSTREAM 0)
ENDIF(KWSYS_IOS_HAVE_ANSI) ENDIF(KWSYS_IOS_USE_ANSI)
IF(KWSYS_IOS_HAVE_SSTREAM) IF(KWSYS_IOS_USE_SSTREAM)
SET(KWSYS_IOS_HAVE_STRSTREAM_H 0) SET(KWSYS_IOS_USE_STRSTREAM_H 0)
SET(KWSYS_IOS_HAVE_STRSTREA_H 0) SET(KWSYS_IOS_USE_STRSTREA_H 0)
ELSE(KWSYS_IOS_HAVE_SSTREAM) ELSE(KWSYS_IOS_USE_SSTREAM)
KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAVE_STRSTREAM_H KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_USE_STRSTREAM_H
"Checking whether strstream.h is available" DIRECT) "Checking whether strstream.h is available" DIRECT)
IF(KWSYS_IOS_HAVE_STRSTREAM_H) IF(KWSYS_IOS_USE_STRSTREAM_H)
SET(KWSYS_IOS_HAVE_STRSTREA_H 0) SET(KWSYS_IOS_USE_STRSTREA_H 0)
ELSE(KWSYS_IOS_HAVE_STRSTREAM_H) ELSE(KWSYS_IOS_USE_STRSTREAM_H)
KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_HAVE_STRSTREA_H KWSYS_PLATFORM_CXX_TEST(KWSYS_IOS_USE_STRSTREA_H
"Checking whether strstrea.h is available" DIRECT) "Checking whether strstrea.h is available" DIRECT)
ENDIF(KWSYS_IOS_HAVE_STRSTREAM_H) ENDIF(KWSYS_IOS_USE_STRSTREAM_H)
ENDIF(KWSYS_IOS_HAVE_SSTREAM) ENDIF(KWSYS_IOS_USE_SSTREAM)
IF(KWSYS_NAMESPACE MATCHES "^kwsys$") IF(KWSYS_NAMESPACE MATCHES "^kwsys$")
SET(KWSYS_NAME_IS_KWSYS 1) SET(KWSYS_NAME_IS_KWSYS 1)

24
Source/kwsys/Configure.hxx.in
View File

@ -18,19 +18,19 @@
#define @KWSYS_NAMESPACE@_NAME_IS_KWSYS @KWSYS_NAME_IS_KWSYS@ #define @KWSYS_NAMESPACE@_NAME_IS_KWSYS @KWSYS_NAME_IS_KWSYS@
/* Whether ANSI C++ stream headers are to be used. */ /* 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. */ /* Whether ANSI C++ streams are in std namespace. */
#define @KWSYS_NAMESPACE@_IOS_HAVE_STD @KWSYS_IOS_HAVE_STD@ #define @KWSYS_NAMESPACE@_IOS_HAVE_STD @KWSYS_IOS_HAVE_STD@
/* Whether ANSI C++ <sstream> header is to be used. */ /* 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. */ /* 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. */ /* 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. */ /* Whether STL is in std namespace. */
#define @KWSYS_NAMESPACE@_STL_HAVE_STD @KWSYS_STL_HAVE_STD@ #define @KWSYS_NAMESPACE@_STL_HAVE_STD @KWSYS_STL_HAVE_STD@
@ -48,7 +48,7 @@
#else #else
# define @KWSYS_NAMESPACE@_ios_namespace # define @KWSYS_NAMESPACE@_ios_namespace
#endif #endif
#if @KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM #if @KWSYS_NAMESPACE@_IOS_USE_SSTREAM
# define @KWSYS_NAMESPACE@_ios @KWSYS_NAMESPACE@_ios_namespace # define @KWSYS_NAMESPACE@_ios @KWSYS_NAMESPACE@_ios_namespace
#else #else
# define @KWSYS_NAMESPACE@_ios @KWSYS_NAMESPACE@_ios # define @KWSYS_NAMESPACE@_ios @KWSYS_NAMESPACE@_ios
@ -61,13 +61,13 @@
# define kwsys_stl @KWSYS_NAMESPACE@_stl # define kwsys_stl @KWSYS_NAMESPACE@_stl
# define kwsys_ios @KWSYS_NAMESPACE@_ios # define kwsys_ios @KWSYS_NAMESPACE@_ios
# endif # endif
# define KWSYS_NAME_IS_KWSYS @KWSYS_NAMESPACE@_NAME_IS_KWSYS # define KWSYS_NAME_IS_KWSYS @KWSYS_NAMESPACE@_NAME_IS_KWSYS
# define KWSYS_IOS_HAVE_ANSI @KWSYS_NAMESPACE@_IOS_HAVE_ANSI # define KWSYS_STL_HAVE_STD @KWSYS_NAMESPACE@_STL_HAVE_STD
# define KWSYS_IOS_HAVE_STD @KWSYS_NAMESPACE@_IOS_HAVE_STD # define KWSYS_IOS_HAVE_STD @KWSYS_NAMESPACE@_IOS_HAVE_STD
# define KWSYS_IOS_HAVE_SSTREAM @KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM # define KWSYS_IOS_USE_ANSI @KWSYS_NAMESPACE@_IOS_USE_ANSI
# define KWSYS_IOS_HAVE_STRSTREAM_H @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREAM_H # define KWSYS_IOS_USE_SSTREAM @KWSYS_NAMESPACE@_IOS_USE_SSTREAM
# define KWSYS_IOS_HAVE_STRSTREA_H @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREA_H # define KWSYS_IOS_USE_STRSTREAM_H @KWSYS_NAMESPACE@_IOS_USE_STRSTREAM_H
# define KWSYS_STL_HAVE_STD @KWSYS_NAMESPACE@_STL_HAVE_STD # define KWSYS_IOS_USE_STRSTREA_H @KWSYS_NAMESPACE@_IOS_USE_STRSTREA_H
#endif #endif
#endif #endif

8
Source/kwsys/kwsysPlatformCxxTests.cxx
View File

@ -4,7 +4,7 @@ void f(std::list<int>*) {}
int main() { return 0; } int main() { return 0; }
#endif #endif
#ifdef TEST_KWSYS_IOS_HAVE_ANSI #ifdef TEST_KWSYS_IOS_USE_ANSI
#include <iosfwd> #include <iosfwd>
int main() { return 0; } int main() { return 0; }
#endif #endif
@ -15,17 +15,17 @@ void f(std::ostream*) {}
int main() { return 0; } int main() { return 0; }
#endif #endif
#ifdef TEST_KWSYS_IOS_HAVE_SSTREAM #ifdef TEST_KWSYS_IOS_USE_SSTREAM
#include <sstream> #include <sstream>
int main() { return 0; } int main() { return 0; }
#endif #endif
#ifdef TEST_KWSYS_IOS_HAVE_STRSTREAM_H #ifdef TEST_KWSYS_IOS_USE_STRSTREAM_H
#include <strstream.h> #include <strstream.h>
int main() { return 0; } int main() { return 0; }
#endif #endif
#ifdef TEST_KWSYS_IOS_HAVE_STRSTREA_H #ifdef TEST_KWSYS_IOS_USE_STRSTREA_H
#include <strstrea.h> #include <strstrea.h>
int main() { return 0; } int main() { return 0; }
#endif #endif

4
Source/kwsys/kwsys_ios_fstream.h.in
View File

@ -21,13 +21,13 @@
#pragma warning (disable: 4702) #pragma warning (disable: 4702)
#endif #endif
#if @KWSYS_NAMESPACE@_IOS_HAVE_ANSI #if @KWSYS_NAMESPACE@_IOS_USE_ANSI
# include <fstream> # include <fstream>
#else #else
# include <fstream.h> # include <fstream.h>
#endif #endif
#if !@KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM #if !@KWSYS_NAMESPACE@_IOS_USE_SSTREAM
namespace @KWSYS_NAMESPACE@_ios namespace @KWSYS_NAMESPACE@_ios
{ {
using @KWSYS_NAMESPACE@_ios_namespace::ostream; using @KWSYS_NAMESPACE@_ios_namespace::ostream;

4
Source/kwsys/kwsys_ios_iosfwd.h.in
View File

@ -21,7 +21,7 @@
#pragma warning (disable: 4702) #pragma warning (disable: 4702)
#endif #endif
#if @KWSYS_NAMESPACE@_IOS_HAVE_ANSI #if @KWSYS_NAMESPACE@_IOS_USE_ANSI
# include <iosfwd> # include <iosfwd>
# include <fstream> # include <fstream>
#else #else
@ -33,7 +33,7 @@ class ofstream;
class ostream; class ostream;
#endif #endif
#if !@KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM #if !@KWSYS_NAMESPACE@_IOS_USE_SSTREAM
namespace @KWSYS_NAMESPACE@_ios namespace @KWSYS_NAMESPACE@_ios
{ {
using @KWSYS_NAMESPACE@_ios_namespace::fstream; using @KWSYS_NAMESPACE@_ios_namespace::fstream;

4
Source/kwsys/kwsys_ios_iostream.h.in
View File

@ -21,13 +21,13 @@
#pragma warning (disable: 4702) #pragma warning (disable: 4702)
#endif #endif
#if @KWSYS_NAMESPACE@_IOS_HAVE_ANSI #if @KWSYS_NAMESPACE@_IOS_USE_ANSI
# include <iostream> # include <iostream>
#else #else
# include <iostream.h> # include <iostream.h>
#endif #endif
#if !@KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM #if !@KWSYS_NAMESPACE@_IOS_USE_SSTREAM
namespace @KWSYS_NAMESPACE@_ios namespace @KWSYS_NAMESPACE@_ios
{ {
using @KWSYS_NAMESPACE@_ios_namespace::ostream; using @KWSYS_NAMESPACE@_ios_namespace::ostream;

8
Source/kwsys/kwsys_ios_sstream.h.in
View File

@ -21,7 +21,7 @@
# define kwsys_stl @KWSYS_NAMESPACE@_stl # define kwsys_stl @KWSYS_NAMESPACE@_stl
#endif #endif
#if @KWSYS_NAMESPACE@_IOS_HAVE_SSTREAM #if @KWSYS_NAMESPACE@_IOS_USE_SSTREAM
# ifdef _MSC_VER # ifdef _MSC_VER
# pragma warning (push, 1) # pragma warning (push, 1)
# pragma warning (disable: 4702) # pragma warning (disable: 4702)
@ -35,11 +35,11 @@
# pragma warning (push, 1) # pragma warning (push, 1)
# pragma warning (disable: 4702) # pragma warning (disable: 4702)
# endif # endif
# if @KWSYS_NAMESPACE@_IOS_HAVE_ANSI # if @KWSYS_NAMESPACE@_IOS_USE_ANSI
# include <strstream> # include <strstream>
# elif @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREAM_H # elif @KWSYS_NAMESPACE@_IOS_USE_STRSTREAM_H
# include <strstream.h> # include <strstream.h>
# elif @KWSYS_NAMESPACE@_IOS_HAVE_STRSTREA_H # elif @KWSYS_NAMESPACE@_IOS_USE_STRSTREA_H
# include <strstrea.h> # include <strstrea.h>
# endif # endif
# ifdef _MSC_VER # ifdef _MSC_VER