Index: tests/regress/26.valarray.members.stdcxx-318.cpp =================================================================== --- tests/regress/26.valarray.members.stdcxx-318.cpp (revision 1371259) +++ tests/regress/26.valarray.members.stdcxx-318.cpp (working copy) @@ -4,7 +4,7 @@ * * http://issues.apache.org/jira/browse/STDCXX-318 * - * $Id:$ + * $Id$ * *************************************************************************** * Index: tests/regress/26.valarray.unary.stdcxx-314.cpp =================================================================== --- tests/regress/26.valarray.unary.stdcxx-314.cpp (revision 1371259) +++ tests/regress/26.valarray.unary.stdcxx-314.cpp (working copy) @@ -4,7 +4,7 @@ * * http://issues.apache.org/jira/browse/STDCXX-314 * - * $Id:$ + * $Id$ * *************************************************************************** * Index: tests/regress/26.valarray.sub.stdcxx-448.cpp =================================================================== --- tests/regress/26.valarray.sub.stdcxx-448.cpp (revision 1371259) +++ tests/regress/26.valarray.sub.stdcxx-448.cpp (working copy) @@ -3,7 +3,7 @@ * 26.valarray.sub.stdcxx-448.cpp - regression test for STDCXX-448 * https://issues.apache.org/jira/browse/STDCXX-448 * - * $Id:$ + * $Id$ * *************************************************************************** * Index: tests/regress/26.valarray.members.stdcxx-313.cpp =================================================================== --- tests/regress/26.valarray.members.stdcxx-313.cpp (revision 1371259) +++ tests/regress/26.valarray.members.stdcxx-313.cpp (working copy) @@ -4,7 +4,7 @@ * * http://issues.apache.org/jira/browse/STDCXX-313 * - * $Id:$ + * $Id$ * *************************************************************************** * Index: etc/config/src/WCTRANS_T.cpp =================================================================== --- etc/config/src/WCTRANS_T.cpp (revision 1371259) +++ etc/config/src/WCTRANS_T.cpp (working copy) @@ -82,11 +82,11 @@ #endif // _RWSTD_NO_WINT_T template -const char* foo (const T*) +const char* foo (const T*x) { static char name [256]; - const char *nm = foo (T ()); + const char *nm = foo (x); strcpy (name, nm); strcat (name, "*"); Index: etc/config/src/OFFSETOF.cpp =================================================================== --- etc/config/src/OFFSETOF.cpp (revision 1371259) +++ etc/config/src/OFFSETOF.cpp (working copy) @@ -31,5 +31,5 @@ int main () { - return !(offsetof (S, S::i [0][1]) != offsetof (S, S::i [1][0])); + return !(offsetof (S, i [0][1]) != offsetof (S, i [1][0])); } Index: etc/config/src/THREAD_SAFE_EXCEPTIONS.cpp =================================================================== --- etc/config/src/THREAD_SAFE_EXCEPTIONS.cpp (revision 1371259) +++ etc/config/src/THREAD_SAFE_EXCEPTIONS.cpp (working copy) @@ -58,8 +58,6 @@ const unsigned N = sizeof tid / sizeof *tid; - set_concurrency (N); - unsigned i; for (i = 0; i != N; ++i) Index: include/istream.cc =================================================================== --- include/istream.cc (revision 1371259) +++ include/istream.cc (working copy) @@ -209,12 +209,12 @@ ios_base::iostate __err = ios_base::goodbit; + _C_gcount = 0; + const sentry __ipfx (*this, true /* noskipws */); if (__ipfx) { - _C_gcount = 0; - _TRY { for ( ; ; ) { int_type __c (this->rdbuf ()->sgetc ()); @@ -296,14 +296,14 @@ if (__getline) traits_type::assign (*__s, __eos); + _C_gcount = 0; + // read and getline are unformatted (noskipws), others are formatted const sentry __ipfx (*this, !(_C_skipws & __flags)); // 27.6.1.2.1, p1 and 27.6.1.3, p1: proceed iff sentry is okay if (__ipfx) { - _C_gcount = 0; - // read at most n - 1 characters when null-terminating while (__n) { @@ -367,14 +367,14 @@ _RWSTD_ASSERT (0 <= __n); _RWSTD_ASSERT (0 != this->rdbuf ()); + _C_gcount = 0; + // 27.6.1.3, p28: sets ios_base::failbit if !this->good() const sentry __ipfx (*this, true /* noskipws */); // 27.6.1.2.1, p1 and 27.6.1.3, p1: proceed iff sentry is okay if (__ipfx) { - _C_gcount = 0; - streamsize __nread = 0; _TRY { @@ -404,12 +404,12 @@ _RWSTD_ASSERT (0 <= __n); _RWSTD_ASSERT (0 != this->rdbuf()); + _C_gcount = 0; + const sentry __ipfx (*this, true /* noskipws */); if (__ipfx) { - _C_gcount = 0; - streamsize __nread = 0; _TRY { @@ -562,14 +562,14 @@ traits_type::assign (__s [0], char_type ()); } + _C_gcount = 0; + const sentry __ipfx (*this, true /* noskipws */); ios_base::iostate __err = ios_base::goodbit; if (__ipfx) { - _C_gcount = 0; - _TRY { basic_streambuf* const __rdbuf = @@ -666,14 +666,14 @@ __size = 0; } + _C_gcount = 0; + const sentry __ipfx (*this, true /* noskipws */); ios_base::iostate __err = ios_base::goodbit; if (__ipfx) { - _C_gcount = 0; - basic_streambuf* const __rdbuf = this->rdbuf (); Index: include/ansi/cstdlib =================================================================== --- include/ansi/cstdlib (revision 1371259) +++ include/ansi/cstdlib (working copy) @@ -48,6 +48,10 @@ #ifndef _RWSTD_CSTDLIB_INCLUDED #define _RWSTD_CSTDLIB_INCLUDED +inline int abs (int __x) +{ + return __x < 0 ? -__x : __x; +} #ifdef _RWSTD_NO_ABS_LONG @@ -94,6 +98,7 @@ namespace std { +using ::abs; #ifdef _RWSTD_NO_ABS_UINT @@ -195,32 +200,6 @@ #endif // _RWSTD_NO_LDIV using ::abort; - -#if defined (_RWSTD_NO_ABS) && defined (_RWSTD_NO_ABS_INT) \ - || defined (__HP_aCC) \ - && defined (_MATH_INCLUDED) && !defined (__MATH_INCLUDED) - -// hacking around an HP aCC quirk when using system headers -// in /usr/include without the compiler's wrappers (i.e., -// when -I/usr/include is on the command line) - -} // namespace std - -extern "C" { - -inline int abs (int __x) -{ - return __x < 0 ? -__x : __x; -} - -} // extern "C" - -namespace std { - -#endif // _RWSTD_NO_ABS && _RWSTD_NO_ABS_INT ... - - using ::abs; - using ::atexit; using ::atof; using ::atoi; Index: include/ostream =================================================================== --- include/ostream (revision 1371259) +++ include/ostream (working copy) @@ -584,7 +584,12 @@ } // namespace std +#include +#if _RWSTD_DEFINE_TEMPLATE_FIRST (_INSERTER) +# include +#endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_INSERTER) + #if _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_OSTREAM) # include #endif // _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_OSTREAM) Index: include/iostream =================================================================== --- include/iostream (revision 1371259) +++ include/iostream (working copy) @@ -30,6 +30,8 @@ #ifndef _RWSTD_IOSTREAM_INCLUDED #define _RWSTD_IOSTREAM_INCLUDED +#include +#include #include #include Index: include/exception =================================================================== --- include/exception (revision 1371259) +++ include/exception (working copy) @@ -34,21 +34,8 @@ #include -#if 0 // def __HP_aCC -// HP aCC on HP-UX has whose contents HP prefers to ours -// # include -# include -#else // if defined (__HP_aCC) - - -#if !defined (_RWSTD_NO_STD_EXCEPTION) \ - || !defined (_RWSTD_NO_RUNTIME_IN_STD) - _RWSTD_NAMESPACE (std) { -#endif // _RWSTD_NO_STD_EXCEPTION || !_RWSTD_NO_RUNTIME_IN_STD - - // 18.6.1 class _RWSTD_EXPORT exception { @@ -85,36 +72,11 @@ }; -#if !defined (_RWSTD_NO_STD_EXCEPTION) \ - || !defined (_RWSTD_NO_RUNTIME_IN_STD) - } // namespace std -#else // if _RWSTD_NO_STD_EXCEPTION && _RWSTD_NO_RUNTIME_IN_STD -# ifndef _RWSTD_NO_NAMESPACE - -namespace std { - -using ::exception; - - -} // namespace std - -# endif // _RWSTD_NO_NAMESPACE - -#endif // _RWSTD_NO_STD_EXCEPTION, _RWSTD_NO_RUNTIME_IN_STD - - - -#if !defined (_RWSTD_NO_STD_BAD_EXCEPTION) \ - || !defined (_RWSTD_NO_RUNTIME_IN_STD) - _RWSTD_NAMESPACE (std) { -#endif // _RWSTD_NO_STD_BAD_EXCEPTION || _RWSTD_NO_RUNTIME_IN_STD - - // 18.6.2.1 class _RWSTD_EXPORT bad_exception: public _STD::exception { @@ -134,27 +96,9 @@ virtual const char* what () const _THROWS (()); }; -#if !defined (_RWSTD_NO_STD_BAD_EXCEPTION) \ - || !defined (_RWSTD_NO_RUNTIME_IN_STD) - } // namespace std -#else // if _RWSTD_NO_STD_BAD_EXCEPTION && _RWSTD_NO_RUNTIME_IN_STD -# ifndef _RWSTD_NO_NAMESPACE - -namespace std { - -using ::bad_exception; - - -} // namespace std - -# endif // _RWSTD_NO_NAMESPACE - -#endif // _RWSTD_NO_STD_BAD_EXCEPTION, _RWSTD_NO_RUNTIME_IN_STD - - _RWSTD_NAMESPACE (std) { // 18.6.2.2 @@ -185,6 +129,4 @@ } // namespace std -#endif // __HP_aCC - -#endif // _RWSTD_EXCEPTION_INCLUDED +#endif Index: include/rw/_config.h =================================================================== --- include/rw/_config.h (revision 1371259) +++ include/rw/_config.h (working copy) @@ -33,7 +33,7 @@ #define _RWSTD_RW_CONFIG_H_INCLUDED // include generated configuration header -#include +#include "config.h" /*** library version numbers and ids **************************************/ Index: include/rw/_ioinsert.h =================================================================== --- include/rw/_ioinsert.h (revision 1371259) +++ include/rw/_ioinsert.h (working copy) @@ -93,12 +93,6 @@ } // namespace __rw - -#if _RWSTD_DEFINE_TEMPLATE_FIRST (_INSERTER) -# include -#endif // _RWSTD_DEFINE_TEMPLATE_FIRST (_INSERTER) - - #ifdef _RWSTD_MSVC # pragma warning (push) # pragma warning (disable: 4231) Index: src/exception.cpp =================================================================== --- src/exception.cpp (revision 1371259) +++ src/exception.cpp (working copy) @@ -355,48 +355,29 @@ # endif // !_RWSTD_NO_STD_EXCEPTION || !_RWSTD_NO_RUNTIME_IN_STD ... +#endif // _RWSTD_EXCEPTION_INCLUDED + //************************************************************************** // class bad_exception members -# if !defined (_RWSTD_NO_STD_BAD_EXCEPTION) \ - || !defined (_RWSTD_NO_RUNTIME_IN_STD) \ - || 2 == __GNUG__ && !defined (_RWSTD_NO_HONOR_STD) - _RWSTD_NAMESPACE (std) { -# endif // !_RWSTD_NO_STD_BAD_EXCEPTION || !_RWSTD_NO_RUNTIME_IN_STD ... - - -#ifdef _RWSTD_NO_BAD_EXCEPTION_DEFAULT_CTOR - bad_exception::bad_exception () _THROWS (()) : exception () { } -#endif // _RWSTD_NO_BAD_EXCEPTION_DEFAULT_CTOR - -#ifdef _RWSTD_NO_BAD_EXCEPTION_COPY_CTOR - bad_exception::bad_exception (const bad_exception &rhs) _THROWS (()) : exception (rhs) { } -#endif // _RWSTD_NO_BAD_EXCEPTION_COPY_CTOR - -#ifdef _RWSTD_NO_BAD_EXCEPTION_DTOR - bad_exception::~bad_exception () _THROWS (()) { // empty } -#endif // _RWSTD_NO_BAD_EXCEPTION_DTOR - -#ifdef _RWSTD_NO_BAD_EXCEPTION_ASSIGNMENT - bad_exception& bad_exception::operator= (const bad_exception &rhs) _THROWS (()) { @@ -405,28 +386,13 @@ return *this; } -#endif // _RWSTD_NO_BAD_EXCEPTION_ASSIGNMENT - -#ifdef _RWSTD_NO_BAD_EXCEPTION_WHAT - const char* bad_exception::what () const _THROWS (()) { return _RWSTD_ERROR_BAD_EXCEPTION; } -#endif // _RWSTD_NO_BAD_EXCEPTION_WHAT - - -# if !defined (_RWSTD_NO_STD_BAD_EXCEPTION) \ - || !defined (_RWSTD_NO_RUNTIME_IN_STD) \ - || 2 == __GNUG__ && !defined (_RWSTD_NO_HONOR_STD) - } // namespace std -# endif // !_RWSTD_NO_STD_BAD_EXCEPTION || !_RWSTD_NO_RUNTIME_IN_STD ... - -#endif // _RWSTD_EXCEPTION_INCLUDED - /**************************************************************************/ _RWSTD_NAMESPACE (__rw) { Index: src/rwstderr.rc =================================================================== --- src/rwstderr.rc (revision 1371259) +++ src/rwstderr.rc (working copy) @@ -2,7 +2,7 @@ * * rwsterr.rc - Apache C++ Standard Library Error Messages * - * $Id:$ + * $Id$ * *********************************************************************** * Index: src/time_put.cpp =================================================================== --- src/time_put.cpp (revision 1371259) +++ src/time_put.cpp (working copy) @@ -499,8 +499,8 @@ #undef ENTRY #define ENTRY(item, mem1, mem2) { \ item, \ - { OFF (__rw_time_t, __rw_time_t::mem1) / sizeof (_RWSTD_UINT32_T), \ - OFF (__rw_time_t, __rw_time_t::mem2) / sizeof (_RWSTD_UINT32_T) } \ + { OFF (__rw_time_t, mem1) / sizeof (_RWSTD_UINT32_T), \ + OFF (__rw_time_t, mem2) / sizeof (_RWSTD_UINT32_T) } \ } // each entry contains an `nl_item' value followed by the offset