diff options
Diffstat (limited to 'Source/kwsys')
| -rw-r--r-- | Source/kwsys/hashtable.hxx.in | 3 | ||||
| -rw-r--r-- | Source/kwsys/kwsys_stl_string.hxx.in | 12 |
2 files changed, 4 insertions, 11 deletions
diff --git a/Source/kwsys/hashtable.hxx.in b/Source/kwsys/hashtable.hxx.in index 52b1975..da71257 100644 --- a/Source/kwsys/hashtable.hxx.in +++ b/Source/kwsys/hashtable.hxx.in @@ -615,8 +615,7 @@ public: @KWSYS_NAMESPACE@_stl::__iterator_category( I ) #endif -#if @KWSYS_NAMESPACE@_CXX_HAS_MEMBER_TEMPLATES && \ - defined(@KWSYS_NAMESPACE@_HASH_ITERATOR_CATEGORY) +#if @KWSYS_NAMESPACE@_CXX_HAS_MEMBER_TEMPLATES && defined(@KWSYS_NAMESPACE@_HASH_ITERATOR_CATEGORY) template <class _InputIterator> void insert_unique(_InputIterator __f, _InputIterator __l) { diff --git a/Source/kwsys/kwsys_stl_string.hxx.in b/Source/kwsys/kwsys_stl_string.hxx.in index 32b22ba..3124c11 100644 --- a/Source/kwsys/kwsys_stl_string.hxx.in +++ b/Source/kwsys/kwsys_stl_string.hxx.in @@ -24,9 +24,7 @@ // 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) +#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 @@ -83,9 +81,7 @@ operator>>(@KWSYS_NAMESPACE@_ios::istream& is, // 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) +#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> @@ -104,9 +100,7 @@ operator<<(@KWSYS_NAMESPACE@_ios::ostream& os, // 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) +#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) |