From de93e6b2cac055d94c11035777f9cd50e26d3b65 Mon Sep 17 00:00:00 2001 From: Daniel Aarno Date: Tue, 2 Jan 2018 16:21:29 +0100 Subject: [PATCH 1/2] Remove some unused code related to sstream fixes. --- include/tclap/Arg.h | 10 ---------- include/tclap/ValuesConstraint.h | 8 -------- 2 files changed, 18 deletions(-) diff --git a/include/tclap/Arg.h b/include/tclap/Arg.h index 3ad3e77..31e8381 100644 --- a/include/tclap/Arg.h +++ b/include/tclap/Arg.h @@ -39,16 +39,6 @@ #include -#if defined(HAVE_SSTREAM) -#include -typedef std::istringstream istringstream; -#elif defined(HAVE_STRSTREAM) -#include -typedef std::istrstream istringstream; -#else -#error "Need a stringstream (sstream or strstream) to compile!" -#endif - #include #include #include diff --git a/include/tclap/ValuesConstraint.h b/include/tclap/ValuesConstraint.h index d1c1df7..cff90be 100644 --- a/include/tclap/ValuesConstraint.h +++ b/include/tclap/ValuesConstraint.h @@ -93,15 +93,7 @@ ValuesConstraint::ValuesConstraint(std::vector& allowed) { for ( unsigned int i = 0; i < _allowed.size(); i++ ) { - -#if defined(HAVE_SSTREAM) std::ostringstream os; -#elif defined(HAVE_STRSTREAM) - std::ostrstream os; -#else -#error "Need a stringstream (sstream or strstream) to compile!" -#endif - os << _allowed[i]; std::string temp( os.str() ); From c6fedbbe9d68fb378ccdb53405be5dfa07b506ba Mon Sep 17 00:00:00 2001 From: Daniel Aarno Date: Tue, 2 Jan 2018 16:23:45 +0100 Subject: [PATCH 2/2] Add .gitignore file to 1.2 branch --- .gitignore | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..81ef64a --- /dev/null +++ b/.gitignore @@ -0,0 +1,24 @@ +*.gcno +*.gcda +*.o +*~ +*# +*.in +cov/ +aclocal.m4 +autom4te.cache/ +config.log +config.status +config/Makefile +config/Makefile.in +config/config.h* +config/stamp-h1 +configure +docs/Doxyfile +docs/html/ +examples/.deps/ +examples/test[0-9][0-9] +examples/test[0-9] +Makefile +tclap.pc +tests/tmp.out