ENH: Added proper namespaced version of KWSYS_STL_STRING_ISTREAM_DEFINED, KWSYS_STL_STRING_OSTREAM_DEFINED, and _STL_STRING_NEQ_CHAR_DEFINED macros.

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);