cmStandardIncludes: Remove obsolete cmOStringStream.
This commit is contained in:
parent
931e055d8c
commit
15e42bb27c
|
@ -153,7 +153,6 @@ endif()
|
|||
# Sources for CMakeLib
|
||||
#
|
||||
set(SRCS
|
||||
cmStandardIncludes.cxx
|
||||
cmArchiveWrite.cxx
|
||||
cmBootstrapCommands1.cxx
|
||||
cmBootstrapCommands2.cxx
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
/*============================================================================
|
||||
CMake - Cross Platform Makefile Generator
|
||||
Copyright 2000-2010 Kitware, Inc., Insight Software Consortium
|
||||
|
||||
Distributed under the OSI-approved BSD License (the "License");
|
||||
see accompanying file Copyright.txt for details.
|
||||
|
||||
This software is distributed WITHOUT ANY WARRANTY; without even the
|
||||
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
See the License for more information.
|
||||
============================================================================*/
|
||||
#include "cmStandardIncludes.h"
|
||||
#if !defined(CMAKE_NO_ANSI_STRING_STREAM)
|
||||
std::ostringstream::cmOStringStream() {}
|
||||
std::ostringstream::~cmOStringStream() {}
|
||||
#endif
|
|
@ -16,8 +16,6 @@
|
|||
#ifndef cmStandardIncludes_h
|
||||
#define cmStandardIncludes_h
|
||||
|
||||
// include configure generated header to define CMAKE_NO_ANSI_STREAM_HEADERS,
|
||||
// CMAKE_NO_STD_NAMESPACE, and other macros.
|
||||
#include <cmConfigure.h>
|
||||
#include <cmsys/Configure.hxx>
|
||||
|
||||
|
@ -49,23 +47,10 @@
|
|||
# pragma warning (push,1)
|
||||
#endif
|
||||
|
||||
#ifndef CMAKE_NO_ANSI_STREAM_HEADERS
|
||||
# include <fstream>
|
||||
# include <iostream>
|
||||
# include <iomanip>
|
||||
#else
|
||||
# include <fstream.h>
|
||||
# include <iostream.h>
|
||||
# include <iomanip.h>
|
||||
#endif
|
||||
|
||||
#if !defined(CMAKE_NO_ANSI_STRING_STREAM)
|
||||
# include <sstream>
|
||||
#elif !defined(CMAKE_NO_ANSI_STREAM_HEADERS)
|
||||
# include <strstream>
|
||||
#else
|
||||
# include <strstream.h>
|
||||
#endif
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
#include <sstream>
|
||||
|
||||
// we must have stl with the standard include style
|
||||
#include <vector>
|
||||
|
@ -97,48 +82,6 @@ typedef unsigned short mode_t;
|
|||
#include <cmsys/String.hxx>
|
||||
//typedef cmsys::String std::string;
|
||||
|
||||
// Define cmOStringStream and cmIStringStream wrappers to hide
|
||||
// differences between std::stringstream and the old strstream.
|
||||
#if !defined(CMAKE_NO_ANSI_STRING_STREAM)
|
||||
class cmOStringStream: public std::ostringstream
|
||||
{
|
||||
public:
|
||||
cmOStringStream();
|
||||
~cmOStringStream();
|
||||
private:
|
||||
cmOStringStream(const cmOStringStream&);
|
||||
void operator=(const cmOStringStream&);
|
||||
};
|
||||
#else
|
||||
class cmOStrStreamCleanup
|
||||
{
|
||||
public:
|
||||
cmOStrStreamCleanup(std::ostrstream& ostr): OStrStream(ostr) {}
|
||||
~cmOStrStreamCleanup() { this->OStrStream.rdbuf()->freeze(0); }
|
||||
static void IgnoreUnusedVariable(const cmOStrStreamCleanup&) {}
|
||||
protected:
|
||||
std::ostrstream& OStrStream;
|
||||
};
|
||||
|
||||
class cmOStringStream: public std::ostrstream
|
||||
{
|
||||
public:
|
||||
typedef std::ostrstream Superclass;
|
||||
cmOStringStream() {}
|
||||
std::string str()
|
||||
{
|
||||
cmOStrStreamCleanup cleanup(*this);
|
||||
cmOStrStreamCleanup::IgnoreUnusedVariable(cleanup);
|
||||
int pcount = this->pcount();
|
||||
const char* ptr = this->Superclass::str();
|
||||
return std::string(ptr?ptr:"", pcount);
|
||||
}
|
||||
private:
|
||||
cmOStringStream(const cmOStringStream&);
|
||||
void operator=(const cmOStringStream&);
|
||||
};
|
||||
#endif
|
||||
|
||||
/* Poison this operator to avoid common mistakes. */
|
||||
extern void operator << (std::ostream&, const std::ostringstream&);
|
||||
|
||||
|
|
Loading…
Reference in New Issue