Skip to content

GitLab

Commit 88cdca90 authored by Lynn Garren's avatar Lynn Garren
Browse files

remove check for <sstream> 

fix code that relied on that check
parent e0cd88ba
Hide whitespace changes
Inline Side-by-side
Cast/Cast/Makefile.am
View file @ 88cdca90
......@@ -10,7 +10,6 @@ COPY_P = @COPY_P@
pkginclude_HEADERS = \
itos.h \
StringStream.h \
defs.h
# Identify generated file(s) to be removed when 'make clean' is requested:
......
Cast/Cast/StringStream.h deleted 100755 → 0
View file @ e0cd88ba
/* This is part of libio/iostream, providing -*- C++ -*- input/output.
Copyright (C) 2000 Free Software Foundation
This file is part of the GNU IO Library. This library is free
software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, or (at your option)
any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this library; see the file COPYING. If not, write to the Free
Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
As a special exception, if you link this library with files
compiled with a GNU compiler to produce an executable, this does not cause
the resulting executable to be covered by the GNU General Public License.
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
/* Written by Magnus Fromreide (magfr@lysator.liu.se). */
#ifndef __SSTREAM__
#define __SSTREAM__
#include <string>
#include <iostream.h>
#include <streambuf.h>
namespace std
{
class stringbuf : public streambuf
{
public:
typedef char char_type;
typedef int int_type;
typedef streampos pos_type;
typedef streamoff off_type;
explicit stringbuf(int which=ios::in|ios::out) :
streambuf(which), buf(), mode(static_cast<ios::open_mode>(which)),
rpos(0), bufsize(1)
{ }
explicit stringbuf(const std::string &s, int which=ios::in|ios::out) :
streambuf(which), buf(s), mode(static_cast<ios::open_mode>(which)),
bufsize(1)
{
if(mode & ios::in)
{
setg(&defbuf, &defbuf + bufsize, &defbuf + bufsize);
}
if(mode & ios::out)
{
setp(&defbuf, &defbuf + bufsize);
}
rpos = (mode & ios::ate ? s.size() : 0);
}
std::string str() const
{
const_cast<stringbuf*>(this)->sync(); // Sigh, really ugly hack
return buf;
};
void str(const std::string& s)
{
buf = s;
if(mode & ios::in)
{
gbump(egptr() - gptr());
}
if(mode & ios::out)
{
pbump(pbase() - pptr());
}
rpos = (mode & ios::ate ? s.size() : 0);
}
protected:
inline virtual int sync();
inline virtual int overflow(int = EOF);
inline virtual int underflow();
private:
std::string buf;
ios::open_mode mode;
std::string::size_type rpos;
streamsize bufsize;
char defbuf;
};
class stringstreambase : virtual public ios {
protected:
stringbuf __my_sb;
public:
std::string str() const
{
return dynamic_cast<stringbuf*>(_strbuf)->str();
}
void str(const std::string& s)
{
clear();
dynamic_cast<stringbuf*>(_strbuf)->str(s);
}
stringbuf* rdbuf()
{
return &__my_sb;
}
protected:
stringstreambase(int which) :
__my_sb(which)
{
init (&__my_sb);
}
stringstreambase(const std::string& s, int which) :
__my_sb(s, which)
{
init (&__my_sb);
}
};
class istringstream : public stringstreambase, public istream {
public:
istringstream(int which=ios::in) :
stringstreambase(which)
{ }
istringstream(const std::string& s, int which=ios::in) :
stringstreambase(s, which)
{ }
};
class ostringstream : public stringstreambase, public ostream {
public:
ostringstream(int which=ios::out) :
stringstreambase(which)
{ }
ostringstream(const std::string& s, int which=ios::out) :
stringstreambase(s, which)
{ }
};
class stringstream : public stringstreambase, public iostream {
public:
stringstream(int which=ios::in|ios::out) :
stringstreambase(which)
{ }
stringstream(const std::string &s, int which=ios::in|ios::out) :
stringstreambase(s, which)
{ }
};
}
inline int std::stringbuf::sync()
{
if((mode & ios::out) == 0)
return EOF;
streamsize n = pptr() - pbase();
if(n)
{
buf.replace(rpos, std::string::npos, pbase(), n);
if(buf.size() - rpos != (std::string::size_type)n) // WEB: added cast
return EOF;
rpos += n;
pbump(-n);
gbump(egptr() - gptr());
}
return 0;
}
inline int std::stringbuf::overflow(int ch)
{
if((mode & ios::out) == 0)
return EOF;
streamsize n = pptr() - pbase();
if(n && sync())
return EOF;
if(ch != EOF)
{
std::string::size_type oldSize = buf.size();
buf.replace(rpos, std::string::npos, ch);
if(buf.size() - oldSize != 1)
return EOF;
++rpos;
}
return 0;
}
inline int std::stringbuf::underflow()
{
sync();
if((mode & ios::in) == 0)
{
return EOF;
}
if(rpos >= buf.size())
{
return EOF;
}
std::string::size_type n = egptr() - eback();
std::string::size_type s;
s = buf.copy(eback(), n, rpos);
pbump(pbase() - pptr());
gbump(eback() - gptr());
int res = (0377 & buf[rpos]);
rpos += s;
return res;
}
#endif /* not __STRSTREAM__ */
Cast/configure.in
View file @ 88cdca90
......@@ -295,8 +295,6 @@ AC_SUBST(ARFLAGS)
# Check for needed header files:
# ----------------------------------------------------------------------
AC_CHECK_HEADERS([sstream])
# ----------------------------------------------------------------------
# Check for needed typedefs, structures, and compiler characteristics:
# ----------------------------------------------------------------------
......
Cast/src/itos.cc
View file @ 88cdca90
......@@ -9,13 +9,9 @@
//
// ----------------------------------------------------------------------
#include <sstream>
#include "CLHEP/Cast/defs.h"
#if HAVE_SSTREAM
#include <sstream>
#else
#include "CLHEP/Cast/StringStream.h"
#endif
#include "CLHEP/Cast/itos.h"
......
ChangeLog
View file @ 88cdca90
==============================
14.11.05 Release CLHEP-1.9.2.2
==============================
2005-11-17 Lynn Garren <garren@fnal.gov>
* configure.in: Remove check for sstream so Windows will not generate
spurious complaint. Change code to always include <sstream>.
Remove HepPDT/StringStream.h.
Remove GenericFunctions/StringStream.h.
2005-11-14 Lynn Garren <garren@fnal.gov>
* Vector/RotationInterfaces.h: Instantiate private destructors so that
......
Evaluator/ChangeLog
View file @ 88cdca90
==============================
14.11.05 Release CLHEP-1.9.2.2
==============================
==============================
22.06.05 Release CLHEP-1.9.2.1
==============================
Wed Jun 22 2005 Andreas Pfeiffer <andreas.pfeiffer@cern.ch>
......
Exceptions/ChangeLog
View file @ 88cdca90
==============================
14.11.05 Release CLHEP-1.9.2.2
==============================
2005-11-17 Lynn Garren <garren@fnal.gov>
* configure.in: Remove check for sstream so Windows will not generate
spurious complaint. Change code to always include <sstream>.
==============================
22.06.05 Release CLHEP-1.9.2.1
==============================
......
Exceptions/Exceptions/ZMexception.h
View file @ 88cdca90
......@@ -90,6 +90,7 @@
// the look of the output when this path is taken, and
// when logging to an ErrorLog allows statistics to work.
// 031105 LG Get rid of all ZMutility references
// 051117 LG Always use <sstream>
//
// ----------------------------------------------------------------------
......@@ -118,11 +119,7 @@
#include "CLHEP/Exceptions/ZMexClassInfo.h"
#endif
#if HAVE_SSTREAM
#include <sstream>
#else
#include "CLHEP/Cast/StringStream.h"
#endif
#ifdef ZM_USE_NAMESPACES
......
Exceptions/configure.in
View file @ 88cdca90
......@@ -305,8 +305,6 @@ AC_SUBST(ARFLAGS)
# Check for needed header files:
# ----------------------------------------------------------------------
AC_CHECK_HEADERS([sstream])
# ----------------------------------------------------------------------
# Check for needed typedefs, structures, and compiler characteristics:
# ----------------------------------------------------------------------
......
Exceptions/src/ZMexception.cc
View file @ 88cdca90
......@@ -38,12 +38,7 @@
#include "CLHEP/Exceptions/ZMexLogger.h"
#include "CLHEP/Exceptions/ZMexLogResult.h"
#if HAVE_SSTREAM
#include <sstream>
#else
#include "CLHEP/Cast/StringStream.h"
#endif
#include <ctime>
......
Exceptions/test/testExceptions.cc
View file @ 88cdca90
......@@ -13,6 +13,7 @@
//
// ----------------------------------------------------------------------
#include <sstream>
#include <string>
using std::string;
......@@ -22,12 +23,6 @@
#include "CLHEP/Exceptions/ZMexception.h"
#include "CLHEP/Exceptions/ZMerrno.h"
#if HAVE_SSTREAM
#include <sstream>
#else
#include "CLHEP/Cast/StringStream.h"
#endif
using namespace zmex;
......
GenericFunctions/ChangeLog
View file @ 88cdca90
==============================
14.11.05 Release CLHEP-1.9.2.2
==============================
2005-11-17 Lynn Garren <garren@fnal.gov>
* configure.in: Remove check for sstream so Windows will not generate
spurious complaint. Change code to always include <sstream>.
Remove GenericFunctions/StringStream.h.
==============================
22.06.05 Release CLHEP-1.9.2.1
==============================
......
GenericFunctions/GenericFunctions/Makefile.am
View file @ 88cdca90
......@@ -93,7 +93,6 @@ pkginclude_HEADERS = \
SphericalNeumann.icc \
Sqrt.hh \
Square.hh \
StringStream.h \
Tan.hh \
TrivariateGaussian.hh \
Variable.hh \
......
GenericFunctions/GenericFunctions/StringStream.h deleted 100755 → 0
View file @ e0cd88ba
/* This is part of libio/iostream, providing -*- C++ -*- input/output.
Copyright (C) 2000 Free Software Foundation
This file is part of the GNU IO Library. This library is free
software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, or (at your option)
any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this library; see the file COPYING. If not, write to the Free
Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
As a special exception, if you link this library with files
compiled with a GNU compiler to produce an executable, this does not cause
the resulting executable to be covered by the GNU General Public License.
This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */
/* Written by Magnus Fromreide (magfr@lysator.liu.se). */
#ifndef __SSTREAM__
#define __SSTREAM__
#include <string>
#include <iostream.h>
#include <streambuf.h>
namespace std
{
class stringbuf : public streambuf
{
public:
typedef char char_type;
typedef int int_type;
typedef streampos pos_type;
typedef streamoff off_type;
explicit stringbuf(int which=ios::in|ios::out) :
streambuf(which), buf(), mode(static_cast<ios::open_mode>(which)),
rpos(0), bufsize(1)
{ }
explicit stringbuf(const std::string &s, int which=ios::in|ios::out) :
streambuf(which), buf(s), mode(static_cast<ios::open_mode>(which)),
bufsize(1)
{
if(mode & ios::in)
{
setg(&defbuf, &defbuf + bufsize, &defbuf + bufsize);
}
if(mode & ios::out)
{
setp(&defbuf, &defbuf + bufsize);
}
rpos = (mode & ios::ate ? s.size() : 0);
}
std::string str() const
{
const_cast<stringbuf*>(this)->sync(); // Sigh, really ugly hack
return buf;
};
void str(const std::string& s)
{
buf = s;
if(mode & ios::in)
{
gbump(egptr() - gptr());
}
if(mode & ios::out)
{
pbump(pbase() - pptr());
}
rpos = (mode & ios::ate ? s.size() : 0);
}
protected:
inline virtual int sync();
inline virtual int overflow(int = EOF);
inline virtual int underflow();
private:
std::string buf;
ios::open_mode mode;
std::string::size_type rpos;
streamsize bufsize;
char defbuf;
};
class stringstreambase : virtual public ios {
protected:
stringbuf __my_sb;
public:
std::string str() const
{
return dynamic_cast<stringbuf*>(_strbuf)->str();
}
void str(const std::string& s)
{
clear();
dynamic_cast<stringbuf*>(_strbuf)->str(s);
}
stringbuf* rdbuf()
{
return &__my_sb;
}
protected:
stringstreambase(int which) :
__my_sb(which)
{
init (&__my_sb);
}
stringstreambase(const std::string& s, int which) :
__my_sb(s, which)
{
init (&__my_sb);
}
};
class istringstream : public stringstreambase, public istream {
public:
istringstream(int which=ios::in) :
stringstreambase(which)
{ }
istringstream(const std::string& s, int which=ios::in) :
stringstreambase(s, which)
{ }
};
class ostringstream : public stringstreambase, public ostream {
public:
ostringstream(int which=ios::out) :
stringstreambase(which)
{ }
ostringstream(const std::string& s, int which=ios::out) :
stringstreambase(s, which)
{ }
};
class stringstream : public stringstreambase, public iostream {
public:
stringstream(int which=ios::in|ios::out) :
stringstreambase(which)
{ }
stringstream(const std::string &s, int which=ios::in|ios::out) :
stringstreambase(s, which)
{ }
};
}
inline int std::stringbuf::sync()
{
if((mode & ios::out) == 0)
return EOF;
streamsize n = pptr() - pbase();
if(n)
{
buf.replace(rpos, std::string::npos, pbase(), n);
if(buf.size() - rpos != (std::string::size_type)n) // WEB: added cast
return EOF;
rpos += n;
pbump(-n);
gbump(egptr() - gptr());
}
return 0;
}
inline int std::stringbuf::overflow(int ch)
{
if((mode & ios::out) == 0)
return EOF;
streamsize n = pptr() - pbase();
if(n && sync())
return EOF;
if(ch != EOF)
{
std::string::size_type oldSize = buf.size();
buf.replace(rpos, std::string::npos, ch);
if(buf.size() - oldSize != 1)
return EOF;
++rpos;
}
return 0;
}
inline int std::stringbuf::underflow()
{
sync();
if((mode & ios::in) == 0)
{
return EOF;
}
if(rpos >= buf.size())
{
return EOF;
}
std::string::size_type n = egptr() - eback();
std::string::size_type s;
s = buf.copy(eback(), n, rpos);
pbump(pbase() - pptr());
gbump(eback() - gptr());
int res = (0377 & buf[rpos]);
rpos += s;
return res;
}
#endif /* not __STRSTREAM__ */
GenericFunctions/configure.in
View file @ 88cdca90
......@@ -309,8 +309,6 @@ AC_SUBST(ARFLAGS)
# Check for needed header files:
# ----------------------------------------------------------------------
AC_CHECK_HEADERS([sstream])