summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2005-04-06 20:14:29 (GMT)
committerBrad King <brad.king@kitware.com>2005-04-06 20:14:29 (GMT)
commitf0b10ad061fdccc71ce16a199f4c8d81bb5be216 (patch)
treeec42448ac2af10372661a251ea28c19126141f32 /Source
parent1c4337d778bb726f7c32ecae29f79ffa39ba0a06 (diff)
downloadCMake-f0b10ad061fdccc71ce16a199f4c8d81bb5be216.zip
CMake-f0b10ad061fdccc71ce16a199f4c8d81bb5be216.tar.gz
CMake-f0b10ad061fdccc71ce16a199f4c8d81bb5be216.tar.bz2
ENH: Added proper namespaced version of KWSYS_STL_STRING_ISTREAM_DEFINED, KWSYS_STL_STRING_OSTREAM_DEFINED, and _STL_STRING_NEQ_CHAR_DEFINED macros.
Diffstat (limited to 'Source')
-rw-r--r--Source/kwsys/kwsys_stl_string.hxx.in15
1 files changed, 12 insertions, 3 deletions
diff --git a/Source/kwsys/kwsys_stl_string.hxx.in b/Source/kwsys/kwsys_stl_string.hxx.in
index 2061c18..32b22ba 100644
--- a/Source/kwsys/kwsys_stl_string.hxx.in
+++ b/Source/kwsys/kwsys_stl_string.hxx.in
@@ -21,11 +21,14 @@
// provided by the system or another copy of kwsys. Allow user code
// to block this definition by defining the macro
// @KWSYS_NAMESPACE@_STL_STRING_NO_ISTREAM
-// to avoid conflicts with other libraries.
+// to avoid conflicts with other libraries. User code can test for
+// this definition by checking the macro
+// @KWSYS_NAMESPACE@_STL_STRING_ISTREAM_DEFINED
#if !@KWSYS_NAMESPACE@_STL_STRING_HAVE_ISTREAM && \
!defined(@KWSYS_NAMESPACE@_STL_STRING_NO_ISTREAM) && \
!defined(KWSYS_STL_STRING_ISTREAM_DEFINED)
# define KWSYS_STL_STRING_ISTREAM_DEFINED
+# define @KWSYS_NAMESPACE@_STL_STRING_ISTREAM_DEFINED
# include <ctype.h> // isspace
# include <@KWSYS_NAMESPACE@/ios/iostream>
inline @KWSYS_NAMESPACE@_ios::istream&
@@ -77,11 +80,14 @@ operator>>(@KWSYS_NAMESPACE@_ios::istream& is,
// provided by the system or another copy of kwsys. Allow user code
// to block this definition by defining the macro
// @KWSYS_NAMESPACE@_STL_STRING_NO_OSTREAM
-// to avoid conflicts with other libraries.
+// to avoid conflicts with other libraries. User code can test for
+// this definition by checking the macro
+// @KWSYS_NAMESPACE@_STL_STRING_OSTREAM_DEFINED
#if !@KWSYS_NAMESPACE@_STL_STRING_HAVE_OSTREAM && \
!defined(@KWSYS_NAMESPACE@_STL_STRING_NO_OSTREAM) && \
!defined(KWSYS_STL_STRING_OSTREAM_DEFINED)
# define KWSYS_STL_STRING_OSTREAM_DEFINED
+# define @KWSYS_NAMESPACE@_STL_STRING_OSTREAM_DEFINED
# include <@KWSYS_NAMESPACE@/ios/iostream>
inline @KWSYS_NAMESPACE@_ios::ostream&
operator<<(@KWSYS_NAMESPACE@_ios::ostream& os,
@@ -95,11 +101,14 @@ operator<<(@KWSYS_NAMESPACE@_ios::ostream& os,
// provided by the system or another copy of kwsys. Allow user code
// to block this definition by defining the macro
// @KWSYS_NAMESPACE@_STL_STRING_NO_NEQ_CHAR
-// to avoid conflicts with other libraries.
+// to avoid conflicts with other libraries. User code can test for
+// this definition by checking the macro
+// @KWSYS_NAMESPACE@_STL_STRING_NEQ_CHAR_DEFINED
#if !@KWSYS_NAMESPACE@_STL_STRING_HAVE_NEQ_CHAR && \
!defined(@KWSYS_NAMESPACE@_STL_STRING_NO_NEQ_CHAR) && \
!defined(KWSYS_STL_STRING_NEQ_CHAR_DEFINED)
# define KWSYS_STL_STRING_NEQ_CHAR_DEFINED
+# define @KWSYS_NAMESPACE@_STL_STRING_NEQ_CHAR_DEFINED
inline bool operator!=(@KWSYS_NAMESPACE@_stl::string const& s, const char* c)
{
return !(s == c);