Commit 15a16826 authored by Brad King's avatar Brad King
Browse files

Remove include <kwsys/ios/*> and kwsys_ios:: compatibility layer

Use the standard headers and namespace instead.  We no longer support
compilers without them.

Change-Id: Iafb19d28462e9302df06eecc8ae42b48a9577a21
parent cdaf522c
...@@ -892,23 +892,6 @@ IF(KWSYS_INSTALL_INCLUDE_DIR) ...@@ -892,23 +892,6 @@ IF(KWSYS_INSTALL_INCLUDE_DIR)
${KWSYS_INSTALL_INCLUDE_OPTIONS}) ${KWSYS_INSTALL_INCLUDE_OPTIONS})
ENDIF() ENDIF()
#-----------------------------------------------------------------------------
# Create streams header wrappers to give standard names by which they
# may be included.
FOREACH(header iostream fstream sstream iosfwd)
# Configure the header wrapper.
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/kwsys_ios_${header}.h.in
${KWSYS_HEADER_DIR}/ios/${header}
@ONLY IMMEDIATE)
# Create an install target for the header wrapper.
IF(KWSYS_INSTALL_INCLUDE_DIR)
INSTALL(FILES ${KWSYS_HEADER_DIR}/ios/${header}
DESTINATION ${KWSYS_INSTALL_INCLUDE_DIR}/${KWSYS_NAMESPACE}/ios
${KWSYS_INSTALL_INCLUDE_OPTIONS})
ENDIF()
ENDFOREACH()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Build a list of classes and headers we need to implement the # Build a list of classes and headers we need to implement the
# selected components. Initialize with required components. # selected components. Initialize with required components.
......
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
#include KWSYS_HEADER(stl/vector) #include KWSYS_HEADER(stl/vector)
#include KWSYS_HEADER(stl/map) #include KWSYS_HEADER(stl/map)
#include KWSYS_HEADER(stl/set) #include KWSYS_HEADER(stl/set)
#include KWSYS_HEADER(ios/sstream)
#include KWSYS_HEADER(ios/iostream)
// Work-around CMake dependency scanning limitation. This must // Work-around CMake dependency scanning limitation. This must
// duplicate the above list of headers. // duplicate the above list of headers.
...@@ -27,10 +25,11 @@ ...@@ -27,10 +25,11 @@
# include "CommandLineArguments.hxx.in" # include "CommandLineArguments.hxx.in"
# include "Configure.hxx.in" # include "Configure.hxx.in"
# include "kwsys_stl.hxx.in" # include "kwsys_stl.hxx.in"
# include "kwsys_ios_sstream.h.in"
# include "kwsys_ios_iostream.h.in"
#endif #endif
#include <sstream>
#include <iostream>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
...@@ -45,7 +44,7 @@ ...@@ -45,7 +44,7 @@
#if 0 #if 0
# define CommandLineArguments_DEBUG(x) \ # define CommandLineArguments_DEBUG(x) \
kwsys_ios::cout << __LINE__ << " CLA: " << x << kwsys_ios::endl std::cout << __LINE__ << " CLA: " << x << std::endl
#else #else
# define CommandLineArguments_DEBUG(x) # define CommandLineArguments_DEBUG(x)
#endif #endif
...@@ -288,7 +287,7 @@ int CommandLineArguments::Parse() ...@@ -288,7 +287,7 @@ int CommandLineArguments::Parse()
} }
break; break;
default: default:
kwsys_ios::cerr << "Got unknown argument type: \"" << cs->ArgumentType << "\"" << kwsys_ios::endl; std::cerr << "Got unknown argument type: \"" << cs->ArgumentType << "\"" << std::endl;
this->Internals->LastArgument --; this->Internals->LastArgument --;
return 0; return 0;
} }
...@@ -313,7 +312,7 @@ int CommandLineArguments::Parse() ...@@ -313,7 +312,7 @@ int CommandLineArguments::Parse()
} }
else else
{ {
kwsys_ios::cerr << "Got unknown argument: \"" << arg << "\"" << kwsys_ios::endl; std::cerr << "Got unknown argument: \"" << arg << "\"" << std::endl;
this->Internals->LastArgument --; this->Internals->LastArgument --;
return 0; return 0;
} }
...@@ -518,7 +517,7 @@ unsigned int CommandLineArguments::GetLastArgument() ...@@ -518,7 +517,7 @@ unsigned int CommandLineArguments::GetLastArgument()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void CommandLineArguments::GenerateHelp() void CommandLineArguments::GenerateHelp()
{ {
kwsys_ios::ostringstream str; std::ostringstream str;
// Collapse all arguments into the map of vectors of all arguments that do // Collapse all arguments into the map of vectors of all arguments that do
// the same thing. // the same thing.
...@@ -604,7 +603,7 @@ void CommandLineArguments::GenerateHelp() ...@@ -604,7 +603,7 @@ void CommandLineArguments::GenerateHelp()
CommandLineArguments::Internal::SetOfStrings::iterator sit; CommandLineArguments::Internal::SetOfStrings::iterator sit;
for ( sit = mpit->second.begin(); sit != mpit->second.end(); sit++ ) for ( sit = mpit->second.begin(); sit != mpit->second.end(); sit++ )
{ {
str << kwsys_ios::endl; str << std::endl;
char argument[100]; char argument[100];
sprintf(argument, "%s", sit->c_str()); sprintf(argument, "%s", sit->c_str());
switch ( this->Internals->Callbacks[*sit].ArgumentType ) switch ( this->Internals->Callbacks[*sit].ArgumentType )
...@@ -658,8 +657,8 @@ void CommandLineArguments::GenerateHelp() ...@@ -658,8 +657,8 @@ void CommandLineArguments::GenerateHelp()
skip = cc; skip = cc;
} }
} }
str.write(ptr, static_cast<kwsys_ios::streamsize>(skip)); str.write(ptr, static_cast<std::streamsize>(skip));
str << kwsys_ios::endl; str << std::endl;
ptr += skip; ptr += skip;
len -= skip; len -= skip;
cnt ++; cnt ++;
...@@ -847,7 +846,7 @@ bool CommandLineArguments::PopulateVariable(CommandLineArgumentsCallbackStructur ...@@ -847,7 +846,7 @@ bool CommandLineArguments::PopulateVariable(CommandLineArgumentsCallbackStructur
this->PopulateVariable(static_cast<kwsys_stl::vector<kwsys_stl::string>*>(cs->Variable), var); this->PopulateVariable(static_cast<kwsys_stl::vector<kwsys_stl::string>*>(cs->Variable), var);
break; break;
default: default:
kwsys_ios::cerr << "Got unknown variable type: \"" << cs->VariableType << "\"" << kwsys_ios::endl; std::cerr << "Got unknown variable type: \"" << cs->VariableType << "\"" << std::endl;
this->Internals->LastArgument --; this->Internals->LastArgument --;
return 0; return 0;
} }
......
...@@ -64,7 +64,7 @@ struct CommandLineArgumentsCallbackStructure; ...@@ -64,7 +64,7 @@ struct CommandLineArgumentsCallbackStructure;
* "This is help string for --something"); * "This is help string for --something");
* if ( !arg.Parse() ) * if ( !arg.Parse() )
* { * {
* kwsys_ios::cerr << "Problem parsing arguments" << kwsys_ios::endl; * std::cerr << "Problem parsing arguments" << std::endl;
* res = 1; * res = 1;
* } * }
* *
......
...@@ -55,25 +55,6 @@ ...@@ -55,25 +55,6 @@
# define @KWSYS_NAMESPACE@_stl # define @KWSYS_NAMESPACE@_stl
#endif #endif
/* Define the ios namespace macro. */
#if @KWSYS_NAMESPACE@_IOS_HAVE_STD
# define @KWSYS_NAMESPACE@_ios_namespace std
#else
# define @KWSYS_NAMESPACE@_ios_namespace
#endif
#if @KWSYS_NAMESPACE@_IOS_USE_SSTREAM
# define @KWSYS_NAMESPACE@_ios @KWSYS_NAMESPACE@_ios_namespace
#else
# define @KWSYS_NAMESPACE@_ios @KWSYS_NAMESPACE@_ios
#endif
/* Define the ios::binary openmode macro. */
#if @KWSYS_NAMESPACE@_IOS_HAVE_BINARY
# define @KWSYS_NAMESPACE@_ios_binary @KWSYS_NAMESPACE@_ios::ios::binary
#else
# define @KWSYS_NAMESPACE@_ios_binary 0
#endif
/* Whether the cstddef header is available. */ /* Whether the cstddef header is available. */
#define @KWSYS_NAMESPACE@_CXX_HAS_CSTDDEF @KWSYS_CXX_HAS_CSTDDEF@ #define @KWSYS_NAMESPACE@_CXX_HAS_CSTDDEF @KWSYS_CXX_HAS_CSTDDEF@
...@@ -142,9 +123,7 @@ ...@@ -142,9 +123,7 @@
#if defined(KWSYS_NAMESPACE) #if defined(KWSYS_NAMESPACE)
# if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS # if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
# define kwsys_stl @KWSYS_NAMESPACE@_stl # define kwsys_stl @KWSYS_NAMESPACE@_stl
# define kwsys_ios @KWSYS_NAMESPACE@_ios
# define kwsys @KWSYS_NAMESPACE@ # define kwsys @KWSYS_NAMESPACE@
# define kwsys_ios_binary @KWSYS_NAMESPACE@_ios_binary
# endif # endif
# define KWSYS_NAME_IS_KWSYS @KWSYS_NAMESPACE@_NAME_IS_KWSYS # define KWSYS_NAME_IS_KWSYS @KWSYS_NAMESPACE@_NAME_IS_KWSYS
# define KWSYS_STL_HAVE_STD @KWSYS_NAMESPACE@_STL_HAVE_STD # define KWSYS_STL_HAVE_STD @KWSYS_NAMESPACE@_STL_HAVE_STD
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#ifndef @KWSYS_NAMESPACE@_FStream_hxx #ifndef @KWSYS_NAMESPACE@_FStream_hxx
#define @KWSYS_NAMESPACE@_FStream_hxx #define @KWSYS_NAMESPACE@_FStream_hxx
#include <@KWSYS_NAMESPACE@/ios/fstream>
#include <@KWSYS_NAMESPACE@/Encoding.hxx> #include <@KWSYS_NAMESPACE@/Encoding.hxx>
#include <fstream>
namespace @KWSYS_NAMESPACE@ namespace @KWSYS_NAMESPACE@
{ {
...@@ -167,8 +167,8 @@ class basic_ofstream : public std::basic_ostream<CharType,Traits> ...@@ -167,8 +167,8 @@ class basic_ofstream : public std::basic_ostream<CharType,Traits>
# undef @KWSYS_NAMESPACE@_FStream_NOEXCEPT # undef @KWSYS_NAMESPACE@_FStream_NOEXCEPT
#else #else
using @KWSYS_NAMESPACE@_ios_namespace::ofstream; using std::ofstream;
using @KWSYS_NAMESPACE@_ios_namespace::ifstream; using std::ifstream;
#endif #endif
namespace FStream namespace FStream
......
...@@ -341,7 +341,7 @@ bool Glob::RecurseDirectory(kwsys_stl::string::size_type start, ...@@ -341,7 +341,7 @@ bool Glob::RecurseDirectory(kwsys_stl::string::size_type start,
void Glob::ProcessDirectory(kwsys_stl::string::size_type start, void Glob::ProcessDirectory(kwsys_stl::string::size_type start,
const kwsys_stl::string& dir, GlobMessages* messages) const kwsys_stl::string& dir, GlobMessages* messages)
{ {
//kwsys_ios::cout << "ProcessDirectory: " << dir << kwsys_ios::endl; //std::cout << "ProcessDirectory: " << dir << std::endl;
bool last = ( start == this->Internals->Expressions.size()-1 ); bool last = ( start == this->Internals->Expressions.size()-1 );
if ( last && this->Recurse ) if ( last && this->Recurse )
{ {
...@@ -384,10 +384,10 @@ void Glob::ProcessDirectory(kwsys_stl::string::size_type start, ...@@ -384,10 +384,10 @@ void Glob::ProcessDirectory(kwsys_stl::string::size_type start,
fname = kwsys::SystemTools::LowerCase(fname); fname = kwsys::SystemTools::LowerCase(fname);
#endif #endif
//kwsys_ios::cout << "Look at file: " << fname << kwsys_ios::endl; //std::cout << "Look at file: " << fname << std::endl;
//kwsys_ios::cout << "Match: " //std::cout << "Match: "
// << this->Internals->TextExpressions[start].c_str() << kwsys_ios::endl; // << this->Internals->TextExpressions[start].c_str() << std::endl;
//kwsys_ios::cout << "Real name: " << realname << kwsys_ios::endl; //std::cout << "Real name: " << realname << std::endl;
if( (!last && !kwsys::SystemTools::FileIsDirectory(realname)) if( (!last && !kwsys::SystemTools::FileIsDirectory(realname))
|| (!this->ListDirs && last && || (!this->ListDirs && last &&
...@@ -444,8 +444,8 @@ bool Glob::FindFiles(const kwsys_stl::string& inexpr, GlobMessages* messages) ...@@ -444,8 +444,8 @@ bool Glob::FindFiles(const kwsys_stl::string& inexpr, GlobMessages* messages)
} }
if ( last_slash > 0 ) if ( last_slash > 0 )
{ {
//kwsys_ios::cout << "I can skip: " << fexpr.substr(0, last_slash) //std::cout << "I can skip: " << fexpr.substr(0, last_slash)
// << kwsys_ios::endl; // << std::endl;
skip = last_slash; skip = last_slash;
} }
if ( skip == 0 ) if ( skip == 0 )
......
...@@ -23,14 +23,13 @@ ...@@ -23,14 +23,13 @@
#endif #endif
// Include the streams library. // Include the streams library.
#include KWSYS_HEADER(ios/iostream) #include <iostream>
#include KWSYS_HEADER(IOStream.hxx) #include KWSYS_HEADER(IOStream.hxx)
// Work-around CMake dependency scanning limitation. This must // Work-around CMake dependency scanning limitation. This must
// duplicate the above list of headers. // duplicate the above list of headers.
#if 0 #if 0
# include "Configure.hxx.in" # include "Configure.hxx.in"
# include "kwsys_ios_iostream.hxx.in"
# include "IOStream.hxx.in" # include "IOStream.hxx.in"
#endif #endif
...@@ -50,7 +49,7 @@ namespace KWSYS_NAMESPACE ...@@ -50,7 +49,7 @@ namespace KWSYS_NAMESPACE
{ {
// Scan an input stream for an integer value. // Scan an input stream for an integer value.
static int IOStreamScanStream(kwsys_ios::istream& is, char* buffer) static int IOStreamScanStream(std::istream& is, char* buffer)
{ {
// Prepare to write to buffer. // Prepare to write to buffer.
char* out = buffer; char* out = buffer;
...@@ -64,10 +63,10 @@ static int IOStreamScanStream(kwsys_ios::istream& is, char* buffer) ...@@ -64,10 +63,10 @@ static int IOStreamScanStream(kwsys_ios::istream& is, char* buffer)
// detect it from the input. A leading 0x means hex, and a leading // detect it from the input. A leading 0x means hex, and a leading
// 0 alone means octal. // 0 alone means octal.
int base = 0; int base = 0;
int flags = is.flags() & kwsys_ios::ios_base::basefield; int flags = is.flags() & std::ios_base::basefield;
if(flags == kwsys_ios::ios_base::oct) { base = 8; } if(flags == std::ios_base::oct) { base = 8; }
else if(flags == kwsys_ios::ios_base::dec) { base = 10; } else if(flags == std::ios_base::dec) { base = 10; }
else if(flags == kwsys_ios::ios_base::hex) { base = 16; } else if(flags == std::ios_base::hex) { base = 16; }
bool foundDigit = false; bool foundDigit = false;
bool foundNonZero = false; bool foundNonZero = false;
if(is.peek() == '0') if(is.peek() == '0')
...@@ -134,17 +133,17 @@ static int IOStreamScanStream(kwsys_ios::istream& is, char* buffer) ...@@ -134,17 +133,17 @@ static int IOStreamScanStream(kwsys_ios::istream& is, char* buffer)
// Read an integer value from an input stream. // Read an integer value from an input stream.
template <class T> template <class T>
kwsys_ios::istream& std::istream&
IOStreamScanTemplate(kwsys_ios::istream& is, T& value, char type) IOStreamScanTemplate(std::istream& is, T& value, char type)
{ {
int state = kwsys_ios::ios_base::goodbit; int state = std::ios_base::goodbit;
// Skip leading whitespace. // Skip leading whitespace.
# if KWSYS_IOS_USE_ANSI # if KWSYS_IOS_USE_ANSI
kwsys_ios::istream::sentry okay(is); std::istream::sentry okay(is);
# else # else
is.eatwhite(); is.eatwhite();
kwsys_ios::istream& okay = is; std::istream& okay = is;
# endif # endif
if(okay) if(okay)
...@@ -174,16 +173,16 @@ IOStreamScanTemplate(kwsys_ios::istream& is, T& value, char type) ...@@ -174,16 +173,16 @@ IOStreamScanTemplate(kwsys_ios::istream& is, T& value, char type)
int success = (sscanf(buffer, format, &result) == 1)?1:0; int success = (sscanf(buffer, format, &result) == 1)?1:0;
// Set flags for resulting state. // Set flags for resulting state.
if(is.peek() == EOF) { state |= kwsys_ios::ios_base::eofbit; } if(is.peek() == EOF) { state |= std::ios_base::eofbit; }
if(!success) { state |= kwsys_ios::ios_base::failbit; } if(!success) { state |= std::ios_base::failbit; }
else { value = result; } else { value = result; }
# if KWSYS_IOS_USE_ANSI # if KWSYS_IOS_USE_ANSI
} catch(...) { state |= kwsys_ios::ios_base::badbit; } } catch(...) { state |= std::ios_base::badbit; }
# endif # endif
} }
# if KWSYS_IOS_USE_ANSI # if KWSYS_IOS_USE_ANSI
is.setstate(kwsys_ios::ios_base::iostate(state)); is.setstate(std::ios_base::iostate(state));
# else # else
is.clear(state); is.clear(state);
# endif # endif
...@@ -192,13 +191,13 @@ IOStreamScanTemplate(kwsys_ios::istream& is, T& value, char type) ...@@ -192,13 +191,13 @@ IOStreamScanTemplate(kwsys_ios::istream& is, T& value, char type)
// Print an integer value to an output stream. // Print an integer value to an output stream.
template <class T> template <class T>
kwsys_ios::ostream& std::ostream&
IOStreamPrintTemplate(kwsys_ios::ostream& os, T value, char type) IOStreamPrintTemplate(std::ostream& os, T value, char type)
{ {
# if KWSYS_IOS_USE_ANSI # if KWSYS_IOS_USE_ANSI
kwsys_ios::ostream::sentry okay(os); std::ostream::sentry okay(os);
# else # else
kwsys_ios::ostream& okay = os; std::ostream& okay = os;
# endif # endif
if(okay) if(okay)
{ {
...@@ -209,17 +208,17 @@ IOStreamPrintTemplate(kwsys_ios::ostream& os, T value, char type) ...@@ -209,17 +208,17 @@ IOStreamPrintTemplate(kwsys_ios::ostream& os, T value, char type)
char format[8]; char format[8];
char* f = format; char* f = format;
*f++ = '%'; *f++ = '%';
if(os.flags() & kwsys_ios::ios_base::showpos) { *f++ = '+'; } if(os.flags() & std::ios_base::showpos) { *f++ = '+'; }
if(os.flags() & kwsys_ios::ios_base::showbase) { *f++ = '#'; } if(os.flags() & std::ios_base::showbase) { *f++ = '#'; }
# if defined(_MSC_VER) # if defined(_MSC_VER)
*f++ = 'I'; *f++ = '6'; *f++ = '4'; *f++ = 'I'; *f++ = '6'; *f++ = '4';
# else # else
*f++ = 'l'; *f++ = 'l'; *f++ = 'l'; *f++ = 'l';
# endif # endif
long bflags = os.flags() & kwsys_ios::ios_base::basefield; long bflags = os.flags() & std::ios_base::basefield;
if(bflags == kwsys_ios::ios_base::oct) { *f++ = 'o'; } if(bflags == std::ios_base::oct) { *f++ = 'o'; }
else if(bflags != kwsys_ios::ios_base::hex) { *f++ = type; } else if(bflags != std::ios_base::hex) { *f++ = type; }
else if(os.flags() & kwsys_ios::ios_base::uppercase) { *f++ = 'X'; } else if(os.flags() & std::ios_base::uppercase) { *f++ = 'X'; }
else { *f++ = 'x'; } else { *f++ = 'x'; }
*f = '\0'; *f = '\0';
...@@ -229,7 +228,7 @@ IOStreamPrintTemplate(kwsys_ios::ostream& os, T value, char type) ...@@ -229,7 +228,7 @@ IOStreamPrintTemplate(kwsys_ios::ostream& os, T value, char type)
sprintf(buffer, format, value); sprintf(buffer, format, value);
os << buffer; os << buffer;
# if KWSYS_IOS_USE_ANSI # if KWSYS_IOS_USE_ANSI
} catch(...) { os.clear(os.rdstate() | kwsys_ios::ios_base::badbit); } } catch(...) { os.clear(os.rdstate() | std::ios_base::badbit); }
# endif # endif
} }
return os; return os;
...@@ -237,13 +236,13 @@ IOStreamPrintTemplate(kwsys_ios::ostream& os, T value, char type) ...@@ -237,13 +236,13 @@ IOStreamPrintTemplate(kwsys_ios::ostream& os, T value, char type)
# if !KWSYS_IOS_HAS_ISTREAM_LONG_LONG # if !KWSYS_IOS_HAS_ISTREAM_LONG_LONG
// Implement input stream operator for IOStreamSLL. // Implement input stream operator for IOStreamSLL.
kwsys_ios::istream& IOStreamScan(kwsys_ios::istream& is, IOStreamSLL& value) std::istream& IOStreamScan(std::istream& is, IOStreamSLL& value)
{ {
return IOStreamScanTemplate(is, value, 'd'); return IOStreamScanTemplate(is, value, 'd');
} }
// Implement input stream operator for IOStreamULL. // Implement input stream operator for IOStreamULL.
kwsys_ios::istream& IOStreamScan(kwsys_ios::istream& is, IOStreamULL& value) std::istream& IOStreamScan(std::istream& is, IOStreamULL& value)
{ {
return IOStreamScanTemplate(is, value, 'u'); return IOStreamScanTemplate(is, value, 'u');
} }
...@@ -251,13 +250,13 @@ kwsys_ios::istream& IOStreamScan(kwsys_ios::istream& is, IOStreamULL& value) ...@@ -251,13 +250,13 @@ kwsys_ios::istream& IOStreamScan(kwsys_ios::istream& is, IOStreamULL& value)
# if !KWSYS_IOS_HAS_OSTREAM_LONG_LONG # if !KWSYS_IOS_HAS_OSTREAM_LONG_LONG
// Implement output stream operator for IOStreamSLL. // Implement output stream operator for IOStreamSLL.
kwsys_ios::ostream& IOStreamPrint(kwsys_ios::ostream& os, IOStreamSLL value) std::ostream& IOStreamPrint(std::ostream& os, IOStreamSLL value)
{ {
return IOStreamPrintTemplate(os, value, 'd'); return IOStreamPrintTemplate(os, value, 'd');
} }
// Implement output stream operator for IOStreamULL. // Implement output stream operator for IOStreamULL.
kwsys_ios::ostream& IOStreamPrint(kwsys_ios::ostream& os, IOStreamULL value) std::ostream& IOStreamPrint(std::ostream& os, IOStreamULL value)
{ {
return IOStreamPrintTemplate(os, value, 'u'); return IOStreamPrintTemplate(os, value, 'u');
} }
......
...@@ -12,12 +12,11 @@ ...@@ -12,12 +12,11 @@
#ifndef @KWSYS_NAMESPACE@_IOStream_hxx #ifndef @KWSYS_NAMESPACE@_IOStream_hxx
#define @KWSYS_NAMESPACE@_IOStream_hxx #define @KWSYS_NAMESPACE@_IOStream_hxx
#include <@KWSYS_NAMESPACE@/ios/iosfwd> #include <iosfwd>
/* Define these macros temporarily to keep the code readable. */ /* Define these macros temporarily to keep the code readable. */
#if !defined (KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE@_NAME_IS_KWSYS #if !defined (KWSYS_NAMESPACE) && !@KWSYS_NAMESPACE@_NAME_IS_KWSYS
# define kwsysEXPORT @KWSYS_NAMESPACE@_EXPORT # define kwsysEXPORT @KWSYS_NAMESPACE@_EXPORT
# define kwsys_ios @KWSYS_NAMESPACE@_ios
#endif #endif
/* Whether istream supports long long. */ /* Whether istream supports long long. */
...@@ -56,10 +55,8 @@ ...@@ -56,10 +55,8 @@
/* Input stream operator implementation functions. */ /* Input stream operator implementation functions. */
namespace @KWSYS_NAMESPACE@ namespace @KWSYS_NAMESPACE@
{ {
kwsysEXPORT kwsys_ios::istream& IOStreamScan(kwsys_ios::istream&, kwsysEXPORT std::istream& IOStreamScan(std::istream&, IOStreamSLL&);
IOStreamSLL&); kwsysEXPORT std::istream& IOStreamScan(std::istream&, IOStreamULL&);
kwsysEXPORT kwsys_ios::istream& IOStreamScan(kwsys_ios::istream&,
IOStreamULL&);
} }
/* Provide input stream operator for long long. */ /* Provide input stream operator for long long. */
...@@ -67,8 +64,8 @@ kwsysEXPORT kwsys_ios::istream& IOStreamScan(kwsys_ios::istream&, ...@@ -67,8 +64,8 @@ kwsysEXPORT kwsys_ios::istream& IOStreamScan(kwsys_ios::istream&,
!defined(KWSYS_IOS_ISTREAM_LONG_LONG_DEFINED) !defined(KWSYS_IOS_ISTREAM_LONG_LONG_DEFINED)
# define KWSYS_IOS_ISTREAM_LONG_LONG_DEFINED # define KWSYS_IOS_ISTREAM_LONG_LONG_DEFINED
# define @KWSYS_NAMESPACE@_IOS_ISTREAM_LONG_LONG_DEFINED # define @KWSYS_NAMESPACE@_IOS_ISTREAM_LONG_LONG_DEFINED
inline kwsys_ios::istream& inline std::istream&
operator>>(kwsys_ios::istream& is, @KWSYS_NAMESPACE@::IOStreamSLL& value) operator>>(std::istream& is, @KWSYS_NAMESPACE@::IOStreamSLL& value)
{ {
return @KWSYS_NAMESPACE@::IOStreamScan(is, value); return @KWSYS_NAMESPACE@::IOStreamScan(is, value);
} }
...@@ -79,8 +76,8 @@ operator>>(kwsys_ios::istream& is, @KWSYS_NAMESPACE@::IOStreamSLL& value) ...@@ -79,8 +76,8 @@ operator>>(kwsys_ios::istream& is, @KWSYS_NAMESPACE@::IOStreamSLL& value)
!defined(KWSYS_IOS_ISTREAM_UNSIGNED_LONG_LONG_DEFINED) !defined(KWSYS_IOS_ISTREAM_UNSIGNED_LONG_LONG_DEFINED)
# define KWSYS_IOS_ISTREAM_UNSIGNED_LONG_LONG_DEFINED # define KWSYS_IOS_ISTREAM_UNSIGNED_LONG_LONG_DEFINED
# define @KWSYS_NAMESPACE@_IOS_ISTREAM_UNSIGNED_LONG_LONG_DEFINED # define @KWSYS_NAMESPACE@_IOS_ISTREAM_UNSIGNED_LONG_LONG_DEFINED
inline kwsys_ios::istream& inline std::istream&
operator>>(kwsys_ios::istream& is, @KWSYS_NAMESPACE@::IOStreamULL& value) operator>>(std::istream& is, @KWSYS_NAMESPACE@::IOStreamULL& value)
{ {
return @KWSYS_NAMESPACE@::IOStreamScan(is, value); return @KWSYS_NAMESPACE@::IOStreamScan(is, value);
} }
...@@ -92,10 +89,8 @@ operator>>(kwsys_ios::istream& is, @KWSYS_NAMESPACE@::IOStreamULL& value) ...@@ -92,10 +89,8 @@ operator>>(kwsys_ios::istream& is, @KWSYS_NAMESPACE@::IOStreamULL& value)
/* Output stream operator implementation functions. */ /* Output stream operator implementation functions. */
namespace @KWSYS_NAMESPACE@ namespace @KWSYS_NAMESPACE@
{ {
kwsysEXPORT kwsys_ios::ostream& IOStreamPrint(kwsys_ios::ostream&, kwsysEXPORT std::ostream& IOStreamPrint(std::ostream&, IOStreamSLL);
IOStreamSLL); kwsysEXPORT std::ostream& IOStreamPrint(std::ostream&, IOStreamULL);
kwsysEXPORT kwsys_ios::ostream& IOStreamPrint(kwsys_ios::ostream&,
IOStreamULL);
} }
/* Provide output stream operator for long long. */ /* Provide output stream operator for long long. */
...@@ -103,8 +98,8 @@ kwsysEXPORT kwsys_ios::ostream& IOStreamPrint(kwsys_ios::ostream&, ...@@ -103,8 +98,8 @@ kwsysEXPORT kwsys_ios::ostream& IOStreamPrint(kwsys_ios::ostream&,
!defined(KWSYS_IOS_OSTREAM_LONG_LONG_DEFINED) !defined(KWSYS_IOS_OSTREAM_LONG_LONG_DEFINED)
# define KWSYS_IOS_OSTREAM_LONG_LONG_DEFINED # define KWSYS_IOS_OSTREAM_LONG_LONG_DEFINED
# define @KWSYS_NAMESPACE@_IOS_OSTREAM_LONG_LONG_DEFINED # define @KWSYS_NAMESPACE@_IOS_OSTREAM_LONG_LONG_DEFINED
inline kwsys_ios::ostream&