Author: sebor
Date: Wed Feb 1 14:00:26 2006
New Revision: 374189
URL: http://svn.apache.org/viewcvs?rev=374189&view=rev
Log:
2006-02-01 Martin Sebor <[EMAIL PROTECTED]>
* _algobase.h: Renamed file #include guards to include the name of
the directory. Guarded #include directives of files in include/_rw
for compilation efficiency. Removed the inclusion of from headers
that also #include other implementation-specific headers.
* iosfwd: Same.
* _algobase.h: Same.
* _allocator.h: Same.
* _array.h: Same.
* _autoptr.h: Same.
* _basic_ios.h: Same.
* _bitmask.h: Same.
* _config.h: Same.
* _defs.h: Same.
* _error.h: Same.
* _exception.h: Same.
* _file.h: Same.
* _funcbase.h: Same.
* _heap.h: Same.
* _ioinsert.h: Same.
* _ioiter.h: Same.
* _iosbase.h: Same.
* _iosfailure.h: Same.
* _iosfwd.h: Same.
* _iterator.h: Same.
* _iterbase.h: Same.
* _math.h: Same.
* _mbstate.h: Same.
* _mutex.h: Same.
* _new.h: Same.
* _pair.h: Same.
* _rawiter.h: Same.
* _relops.h: Same.
* _select.h: Same.
* _specialized.h: Same.
* _streamiter.h: Same.
* _strref.h: Same.
* _traits.h: Same.
* _tree.h: Same.
* _typetraits.h: Same.
Modified:
incubator/stdcxx/trunk/include/iosfwd
incubator/stdcxx/trunk/include/rw/_algobase.h
incubator/stdcxx/trunk/include/rw/_allocator.h
incubator/stdcxx/trunk/include/rw/_array.h
incubator/stdcxx/trunk/include/rw/_autoptr.h
incubator/stdcxx/trunk/include/rw/_basic_ios.h
incubator/stdcxx/trunk/include/rw/_bitmask.h
incubator/stdcxx/trunk/include/rw/_config.h
incubator/stdcxx/trunk/include/rw/_defs.h
incubator/stdcxx/trunk/include/rw/_error.h
incubator/stdcxx/trunk/include/rw/_exception.h
incubator/stdcxx/trunk/include/rw/_file.h
incubator/stdcxx/trunk/include/rw/_funcbase.h
incubator/stdcxx/trunk/include/rw/_heap.h
incubator/stdcxx/trunk/include/rw/_ioinsert.h
incubator/stdcxx/trunk/include/rw/_ioiter.h
incubator/stdcxx/trunk/include/rw/_iosbase.h
incubator/stdcxx/trunk/include/rw/_iosfailure.h
incubator/stdcxx/trunk/include/rw/_iosfwd.h
incubator/stdcxx/trunk/include/rw/_iterator.h
incubator/stdcxx/trunk/include/rw/_iterbase.h
incubator/stdcxx/trunk/include/rw/_math.h
incubator/stdcxx/trunk/include/rw/_mbstate.h
incubator/stdcxx/trunk/include/rw/_mutex.h
incubator/stdcxx/trunk/include/rw/_new.h
incubator/stdcxx/trunk/include/rw/_pair.h
incubator/stdcxx/trunk/include/rw/_rawiter.h
incubator/stdcxx/trunk/include/rw/_relops.h
incubator/stdcxx/trunk/include/rw/_select.h
incubator/stdcxx/trunk/include/rw/_specialized.h
incubator/stdcxx/trunk/include/rw/_streamiter.h
incubator/stdcxx/trunk/include/rw/_strref.h
incubator/stdcxx/trunk/include/rw/_traits.h
incubator/stdcxx/trunk/include/rw/_tree.h
incubator/stdcxx/trunk/include/rw/_typetraits.h
Modified: incubator/stdcxx/trunk/include/iosfwd
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/iosfwd?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/iosfwd (original)
+++ incubator/stdcxx/trunk/include/iosfwd Wed Feb 1 14:00:26 2006
@@ -23,7 +23,6 @@
#ifndef _RWSTD_IOSFWD_INCLUDED
#define _RWSTD_IOSFWD_INCLUDED
-#include <rw/_defs.h>
#include <rw/_iosfwd.h>
#include <rw/_mbstate.h> // for _RWSTD_MBSTATE_T
@@ -35,7 +34,7 @@
class allocator;
-#ifndef _RWSTD_BASIC_IOS_H_INCLUDED
+#ifndef _RWSTD_RW_BASIC_IOS_H_INCLUDED
_EXPORT
template<class _CharT,
@@ -49,7 +48,7 @@
typedef basic_ios<wchar_t, char_traits<wchar_t> > wios;
# endif // _RWSTD_NO_WCHAR_T
-#endif // _RWSTD_IOS_H_INCLUDED
+#endif // _RWSTD_RW_BASIC_IOS_H_INCLUDED
#ifndef _RWSTD_STREAMBUF_INCLUDED
@@ -195,7 +194,7 @@
#endif // _RWSTD_FSTREAM_INCLUDED
-#ifndef _RWSTD_IOITER_H_INCLUDED
+#ifndef _RWSTD_RW_IOITER_H_INCLUDED
template<class _CharT,
class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
@@ -205,7 +204,7 @@
class _Traits _RWSTD_COMPLEX_DEFAULT (char_traits<_CharT>) >
struct istreambuf_iterator;
-#endif // _RWSTD_IOITER_H_INCLUDED
+#endif // _RWSTD_RW_IOITER_H_INCLUDED
// 27.2, p8
Modified: incubator/stdcxx/trunk/include/rw/_algobase.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_algobase.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_algobase.h (original)
+++ incubator/stdcxx/trunk/include/rw/_algobase.h Wed Feb 1 14:00:26 2006
@@ -36,8 +36,8 @@
*
**************************************************************************/
-#ifndef _RWSTD_ALGOBASE_H_INCLUDED
-#define _RWSTD_ALGOBASE_H_INCLUDED
+#ifndef _RWSTD_RW_ALGOBASE_H_INCLUDED
+#define _RWSTD_RW_ALGOBASE_H_INCLUDED
#include <rw/_pair.h> // for pair
@@ -302,4 +302,4 @@
#endif // _RWSTD_NO_IMPLICIT_INCLUSION
-#endif // _RWSTD_ALGOBASE_H_INCLUDED
+#endif // _RWSTD_RW_ALGOBASE_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_allocator.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_allocator.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_allocator.h (original)
+++ incubator/stdcxx/trunk/include/rw/_allocator.h Wed Feb 1 14:00:26 2006
@@ -6,7 +6,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_allocator.h#8 $
+ * $Id$
*
***************************************************************************
*
@@ -36,12 +36,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_ALLOCATOR_H_INCLUDED
-#define _RWSTD_ALLOCATOR_H_INCLUDED
+#ifndef _RWSTD_RW_ALLOCATOR_H_INCLUDED
+#define _RWSTD_RW_ALLOCATOR_H_INCLUDED
-
-#include <rw/_specialized.h>
-#include <rw/_defs.h>
+#ifndef _RWSTD_SPECIALIZED_H_INCLUDED
+# include <rw/_specialized.h>
+#endif // _RWSTD_SPECIALIZED_H_INCLUDED
_RWSTD_NAMESPACE (__rw) {
@@ -392,4 +392,4 @@
} // namespace std
-#endif // _RWSTD_ALLOCATOR_H_INCLUDED
+#endif // _RWSTD_RW_ALLOCATOR_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_array.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_array.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_array.h (original)
+++ incubator/stdcxx/trunk/include/rw/_array.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_array.h#13 $
+ * $Id$
*
***************************************************************************
*
@@ -22,11 +22,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_ARRAY_H_INCLUDED
-#define _RWSTD_ARRAY_H_INCLUDED
+#ifndef _RWSTD_RW_ARRAY_H_INCLUDED
+#define _RWSTD_RW_ARRAY_H_INCLUDED
-#include <memory>
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_SPECIALIZED_H_INCLUDED
+# include <rw/_specialized.h>
+#endif // _RWSTD_RW_SPECIALIZED_H_INCLUDED
_RWSTD_NAMESPACE (__rw) {
@@ -209,4 +210,4 @@
} // namespace __rw
-#endif // _RWSTD_ARRAY_H_INCLUDED
+#endif // _RWSTD_RW_ARRAY_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_autoptr.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_autoptr.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_autoptr.h (original)
+++ incubator/stdcxx/trunk/include/rw/_autoptr.h Wed Feb 1 14:00:26 2006
@@ -6,7 +6,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_autoptr.h#7 $
+ * $Id$
*
***************************************************************************
*
@@ -23,10 +23,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_AUTOPTR_H_INCLUDED
-#define _RWSTD_AUTOPTR_H_INCLUDED
+#ifndef _RWSTD_RW_AUTOPTR_H_INCLUDED
+#define _RWSTD_RW_AUTOPTR_H_INCLUDED
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_DEFS_H_INCLUDED
+# include <rw/_defs.h>
+#endif // _RWSTD_RW_DEFS_H_INCLUDED
_RWSTD_NAMESPACE (std) {
@@ -177,4 +179,4 @@
} // namespace std
-#endif // _RWSTD_AUTOPTR_H_INCLUDED
+#endif // _RWSTD_RW_AUTOPTR_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_basic_ios.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_basic_ios.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_basic_ios.h (original)
+++ incubator/stdcxx/trunk/include/rw/_basic_ios.h Wed Feb 1 14:00:26 2006
@@ -3,7 +3,7 @@
*
* _basic_ios.h - definition of the class template basic_ios
*
- * $Id: //stdlib/dev/include/rw/_basic_ios.h#15 $
+ * $Id$
*
***************************************************************************
*
@@ -20,8 +20,8 @@
*
**************************************************************************/
-#ifndef _RWSTD_BASIC_IOS_H_INCLUDED
-#define _RWSTD_BASIC_IOS_H_INCLUDED
+#ifndef _RWSTD_RW_BASIC_IOS_H_INCLUDED
+#define _RWSTD_RW_BASIC_IOS_H_INCLUDED
#if __GNUG__ >= 3
@@ -35,9 +35,13 @@
#include <loc/_ctype.h> // for ctype
-#include <rw/_iosbase.h> // for ios_base
-#include <rw/_iosfwd.h> //
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_IOSBASE_H_INCLUDED
+# include <rw/_iosbase.h> // for ios_base
+#endif // _RWSTD_RW_IOSBASE_H_INCLUDED
+
+#ifndef _RWSTD_RW_IOSFWD_H_INCLUDED
+# include <rw/_iosfwd.h>
+#endif // _RWSTD_RW_IOSFWD_H_INCLUDED
_RWSTD_NAMESPACE (std) {
@@ -349,4 +353,4 @@
} // namespace std
-#endif // _RWSTD_BASIC_IOS_H_INCLUDED
+#endif // _RWSTD_RW_BASIC_IOS_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_bitmask.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_bitmask.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_bitmask.h (original)
+++ incubator/stdcxx/trunk/include/rw/_bitmask.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_bitmask.h#6 $
+ * $Id$
*
***************************************************************************
*
@@ -22,11 +22,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_BITMASK_H_INCLUDED
-#define _RWSTD_BITMASK_H_INCLUDED
+#ifndef _RWSTD_RW_BITMASK_H_INCLUDED
+#define _RWSTD_RW_BITMASK_H_INCLUDED
-
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_DEFS_H_INCLUDED
+# include <rw/_defs.h>
+#endif // _RWSTD_RW_DEFS_H_INCLUDED
#ifndef _RWSTD_NO_STATIC_CONST_MEMBER_INIT
@@ -72,4 +73,4 @@
#endif // _RWSTD_NO_STATIC_CONST_MEMBER_INIT
-#endif // _RWSTD_BITMASK_H_INCLUDED
+#endif // _RWSTD_RW_BITMASK_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_config.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_config.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_config.h (original)
+++ incubator/stdcxx/trunk/include/rw/_config.h Wed Feb 1 14:00:26 2006
@@ -22,8 +22,8 @@
*
**************************************************************************/
-#ifndef _RWSTD_CONFIG_H_INCLUDED
-#define _RWSTD_CONFIG_H_INCLUDED
+#ifndef _RWSTD_RW_CONFIG_H_INCLUDED
+#define _RWSTD_RW_CONFIG_H_INCLUDED
#ifdef _RWSTD_USE_CONFIG
# include <config.h>
@@ -1076,4 +1076,4 @@
#endif
-#endif // _RWSTD_CONFIG_H_INCLUDED
+#endif // _RWSTD_RW_CONFIG_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_defs.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_defs.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_defs.h (original)
+++ incubator/stdcxx/trunk/include/rw/_defs.h Wed Feb 1 14:00:26 2006
@@ -22,10 +22,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_DEFS_H_INCLUDED
-#define _RWSTD_DEFS_H_INCLUDED
+#ifndef _RWSTD_RW_DEFS_H_INCLUDED
+#define _RWSTD_RW_DEFS_H_INCLUDED
-#include <rw/_config.h>
+#ifndef _RWSTD_RW_CONFIG_H_INCLUDED
+# include <rw/_config.h>
+#endif //_RWSTD_RW_CONFIG_H_INCLUDED
#ifndef _RWSTD_NO_V3_LOCALE
@@ -1589,4 +1591,4 @@
__rw_insert_range (this, it, first, last, tag)
#endif // _RWSTD_NO_MEMBER_TEMPLATES
-#endif // _RWSTD_DEFS_H_INCLUDED
+#endif // _RWSTD_RW_DEFS_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_error.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_error.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_error.h (original)
+++ incubator/stdcxx/trunk/include/rw/_error.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_error.h#18 $
+ * $Id$
*
***************************************************************************
*
@@ -22,13 +22,16 @@
*
**************************************************************************/
-#ifndef _RWSTD_ERROR_H_INCLUDED
-#define _RWSTD_ERROR_H_INCLUDED
+#ifndef _RWSTD_RW_ERROR_H_INCLUDED
+#define _RWSTD_RW_ERROR_H_INCLUDED
#ifndef _RWSTD_NO_INCLUDES
-
// prevent inclusion if compiling a .rc file with MSVC
-# include <rw/_defs.h>
+
+# ifndef _RWSTD_RW_DEFS_H_INCLUDED
+# include <rw/_defs.h>
+# endif // _RWSTD_RW_DEFS_H_INCLUDED
+
_RWSTD_NAMESPACE (__rw) {
@@ -131,4 +134,4 @@
#define _RWSTD_ERROR_BAD_ALLOC "bad_alloc: out of memory"
-#endif // _RWSTD_ERROR_H_INCLUDED
+#endif // _RWSTD_RW_ERROR_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_exception.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_exception.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_exception.h (original)
+++ incubator/stdcxx/trunk/include/rw/_exception.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_exception.h#24 $
+ * $Id$
*
***************************************************************************
*
@@ -22,12 +22,15 @@
*
**************************************************************************/
-#ifndef _RWSTD_EXCEPTION_H_INCLUDED
-#define _RWSTD_EXCEPTION_H_INCLUDED
+#ifndef _RWSTD_RW_EXCEPTION_H_INCLUDED
+#define _RWSTD_RW_EXCEPTION_H_INCLUDED
#include <exception>
-#include <rw/_defs.h>
+
+#ifndef _RWSTD_RW_DEFS_H_INCLUDED
+# include <rw/_defs.h>
+#endif // _RWSTD_RW_DEFS_H_INCLUDED
_RWSTD_NAMESPACE (std) {
@@ -83,4 +86,4 @@
} // namespace __rw
-#endif // _RWSTD_EXCEPTION_H_INCLUDED
+#endif // _RWSTD_RW_EXCEPTION_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_file.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_file.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_file.h (original)
+++ incubator/stdcxx/trunk/include/rw/_file.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_file.h#23 $
+ * $Id$
*
***************************************************************************
*
@@ -22,11 +22,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_FILE_H_INCLUDED
-#define _RWSTD_FILE_H_INCLUDED
+#ifndef _RWSTD_RW_FILE_H_INCLUDED
+#define _RWSTD_RW_FILE_H_INCLUDED
-
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_DEFS_H_INCLUDED
+# include <rw/_defs.h>
+#endif // _RWSTD_RW_DEFS_H_INCLUDED
_RWSTD_NAMESPACE (__rw) {
@@ -50,4 +51,4 @@
} // namespace __rw
-#endif // _RWSTD_FILE_H_INCLUDED
+#endif // _RWSTD_RW_FILE_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_funcbase.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_funcbase.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_funcbase.h (original)
+++ incubator/stdcxx/trunk/include/rw/_funcbase.h Wed Feb 1 14:00:26 2006
@@ -3,7 +3,7 @@
*
* _funcbase.h - definitions of function objects base classes
*
- * $Id: //stdlib/dev/include/rw/_funcbase.h#6 $
+ * $Id$
*
***************************************************************************
*
@@ -33,11 +33,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_FUNCBASE_H_INCLUDED
-#define _RWSTD_FUNCBASE_H_INCLUDED
+#ifndef _RWSTD_RW_FUNCBASE_H_INCLUDED
+#define _RWSTD_RW_FUNCBASE_H_INCLUDED
-
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_DEFS_H_INCLUDED
+# include <rw/_defs.h>
+#endif // _RWSTD_RW_DEFS_H_INCLUDED
_RWSTD_NAMESPACE (std) {
@@ -91,4 +92,4 @@
} // namespace std
-#endif // _RWSTD_FUNCBASE_H_INCLUDED
+#endif // _RWSTD_RW_FUNCBASE_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_heap.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_heap.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_heap.h (original)
+++ incubator/stdcxx/trunk/include/rw/_heap.h Wed Feb 1 14:00:26 2006
@@ -7,7 +7,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_heap.h#3 $
+ * $Id$
*
***************************************************************************
*
@@ -37,13 +37,16 @@
*
**************************************************************************/
-#ifndef _RWSTD_HEAP_H_INCLUDED
-#define _RWSTD_HEAP_H_INCLUDED
+#ifndef _RWSTD_RW_HEAP_H_INCLUDED
+#define _RWSTD_RW_HEAP_H_INCLUDED
-
-#include <rw/_algobase.h>
-#include <rw/_iterbase.h>
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_ALGOBASE_H_INCLUDED
+# include <rw/_algobase.h>
+#endif // _RWSTD_RW_ALGOBASE_H_INCLUDED
+
+#ifndef _RWSTD_RW_ITERBASE_H_INCLUDED
+# include <rw/_iterbase.h>
+#endif // _RWSTD_RW_ITERBASE_H_INCLUDED
_RWSTD_NAMESPACE (std) {
@@ -181,4 +184,4 @@
#endif
-#endif // _RWSTD_HEAP_H_INCLUDED
+#endif // _RWSTD_RW_HEAP_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_ioinsert.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_ioinsert.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_ioinsert.h (original)
+++ incubator/stdcxx/trunk/include/rw/_ioinsert.h Wed Feb 1 14:00:26 2006
@@ -7,7 +7,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_ioinsert.h#12 $
+ * $Id$
*
***************************************************************************
*
@@ -24,23 +24,27 @@
*
**************************************************************************/
-#ifndef _RWSTD_IOINSERT_INCLUDED
-#define _RWSTD_IOINSERT_INCLUDED
+#ifndef _RWSTD_RW_IOINSERT_H_INCLUDED
+#define _RWSTD_RW_IOINSERT_H_INCLUDED
#if __GNUG__ >= 3
# pragma GCC system_header
#endif // gcc >= 3
#ifndef _RWSTD_NO_REDUNDANT_DEFINITIONS
-# include <rw/_ioiter.h>
+# ifndef _RWSTD_RW_IOITER_H_INCLUDED
+# include <rw/_ioiter.h>
+# endif // _RWSTD_RW_IOITER_H_INCLUDED
+
# include <streambuf>
#endif // _RWSTD_NO_REDUNDANT_DEFINITIONS
#include <loc/_num_get.h>
#include <loc/_num_put.h>
-#include <rw/_basic_ios.h>
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_BASIC_IOS_H_INCLUDED
+# include <rw/_basic_ios.h>
+#endif // _RWSTD_RW_BASIC_IOS_H_INCLUDED
_RWSTD_NAMESPACE (std) {
@@ -213,4 +217,4 @@
#endif // _RWSTD_DEFINE_TEMPLATE_LAST (_INSERTER)
-#endif // _RWSTD_IOINSERT_INCLUDED
+#endif // _RWSTD_RW_IOINSERT_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_ioiter.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_ioiter.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_ioiter.h (original)
+++ incubator/stdcxx/trunk/include/rw/_ioiter.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_ioiter.h#26 $
+ * $Id$
*
***************************************************************************
*
@@ -22,13 +22,16 @@
*
**************************************************************************/
-#ifndef _RWSTD_IOITER_H_INCLUDED
-#define _RWSTD_IOITER_H_INCLUDED
+#ifndef _RWSTD_RW_IOITER_H_INCLUDED
+#define _RWSTD_RW_IOITER_H_INCLUDED
-
-#include <rw/_iosfwd.h>
-#include <rw/_iterbase.h>
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_IOSFWD_H_INCLUDED
+# include <rw/_iosfwd.h>
+#endif // _RWSTD_RW_IOSFWD_H_INCLUDED
+
+#ifndef _RWSTD_RW_ITERBASE_H_INCLUDED
+# include <rw/_iterbase.h>
+#endif // _RWSTD_RW_ITERBASE_H_INCLUDED
_RWSTD_NAMESPACE (std) {
@@ -272,4 +275,4 @@
} // namespace std
-#endif // _RWSTD_IOITER_H_INCLUDED
+#endif // _RWSTD_RW_IOITER_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_iosbase.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_iosbase.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_iosbase.h (original)
+++ incubator/stdcxx/trunk/include/rw/_iosbase.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_iosbase.h#42 $
+ * $Id$
*
***************************************************************************
*
@@ -22,17 +22,23 @@
*
**************************************************************************/
-#ifndef _RWSTD_IOSBASE_H_INCLUDED
-#define _RWSTD_IOSBASE_H_INCLUDED
+#ifndef _RWSTD_RW_IOSBASE_H_INCLUDED
+#define _RWSTD_RW_IOSBASE_H_INCLUDED
#include <loc/_locale.h>
-#include <rw/_iosfailure.h>
-#include <rw/_iosfwd.h>
-#include <rw/_traits.h>
-
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_IOSFAILURE_H_INCLUDED
+# include <rw/_iosfailure.h>
+#endif // _RWSTD_RW_IOSFAILURE_H_INCLUDED
+
+#ifndef _RWSTD_RW_IOSFWD_H_INCLUDED
+# include <rw/_iosfwd.h>
+#endif // _RWSTD_RW_IOSFWD_H_INCLUDED
+
+#ifndef _RWSTD_RW_TRAITS_H_INCLUDED
+# include <rw/_traits.h>
+#endif // _RWSTD_RW_TRAITS_H_INCLUDED
_RWSTD_NAMESPACE (std) {
@@ -377,4 +383,4 @@
} // namespace std
-#endif // _RWSTD_IOSBASE_H_INCLUDED
+#endif // _RWSTD_RW_IOSBASE_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_iosfailure.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_iosfailure.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_iosfailure.h (original)
+++ incubator/stdcxx/trunk/include/rw/_iosfailure.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_iosfailure.h#7 $
+ * $Id$
*
***************************************************************************
*
@@ -22,12 +22,16 @@
*
**************************************************************************/
-#ifndef _RWSTD_IOSFAILURE_H_INCLUDED
-#define _RWSTD_IOSFAILURE_H_INCLUDED
+#ifndef _RWSTD_RW_IOSFAILURE_H_INCLUDED
+#define _RWSTD_RW_IOSFAILURE_H_INCLUDED
-#include <rw/_exception.h>
-#include <rw/_iosfwd.h>
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_EXCEPTION_H_INCLUDED
+# include <rw/_exception.h>
+#endif // _RWSTD_RW_EXCEPTION_H_INCLUDED
+
+#ifndef _RWSTD_RW_IOSFWD_H_INCLUDED
+# include <rw/_iosfwd.h>
+#endif // _RWSTD_RW_IOSFWD_H_INCLUDED
_RWSTD_NAMESPACE (__rw) {
@@ -54,4 +58,4 @@
} // namespace __rw
-#endif // _RWSTD_IOSFAILURE_H_INCLUDED
+#endif // _RWSTD_RW_IOSFAILURE_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_iosfwd.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_iosfwd.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_iosfwd.h (original)
+++ incubator/stdcxx/trunk/include/rw/_iosfwd.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_iosfwd.h#10 $
+ * $Id$
*
***************************************************************************
*
@@ -22,12 +22,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_IOSFWD_H_INCLUDED
-#define _RWSTD_IOSFWD_H_INCLUDED
+#ifndef _RWSTD_RW_IOSFWD_H_INCLUDED
+#define _RWSTD_RW_IOSFWD_H_INCLUDED
-
-#include <rw/_bitmask.h>
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_BITMASK_H_INCLUDED
+# include <rw/_bitmask.h>
+#endif // _RWSTD_RW_BITMASK_H_INCLUDED
_RWSTD_NAMESPACE (std) {
@@ -173,4 +173,4 @@
} // namespace __rw
-#endif // _RWSTD_IOSFWD_H_INCLUDED
+#endif // _RWSTD_RW_IOSFWD_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_iterator.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_iterator.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_iterator.h (original)
+++ incubator/stdcxx/trunk/include/rw/_iterator.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_iterator.h#19 $
+ * $Id$
*
***************************************************************************
*
@@ -35,11 +35,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_ITERATOR_H_INCLUDED
-#define _RWSTD_ITERATOR_H_INCLUDED
+#ifndef _RWSTD_RW_ITERATOR_H_INCLUDED
+#define _RWSTD_RW_ITERATOR_H_INCLUDED
-#include <rw/_iterbase.h>
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_ITERBASE_H_INCLUDED
+# include <rw/_iterbase.h>
+#endif // _RWSTD_RW_ITERBASE_H_INCLUDED
_RWSTD_NAMESPACE (std) {
@@ -524,4 +525,4 @@
} // namespace std
-#endif // _RWSTD_ITERATOR_H_INCLUDED
+#endif // _RWSTD_RW_ITERATOR_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_iterbase.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_iterbase.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_iterbase.h (original)
+++ incubator/stdcxx/trunk/include/rw/_iterbase.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_iterbase.h#19 $
+ * $Id$
*
***************************************************************************
*
@@ -35,10 +35,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_ITERBASE_H_INCLUDED
-#define _RWSTD_ITERBASE_H_INCLUDED
+#ifndef _RWSTD_RW_ITERBASE_H_INCLUDED
+#define _RWSTD_RW_ITERBASE_H_INCLUDED
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_DEFS_H_INCLUDED
+# include <rw/_defs.h>
+#endif // _RWSTD_RW_DEFS_H_INCLUDED
_RWSTD_NAMESPACE (std) {
@@ -740,4 +742,4 @@
#endif // _RWSTD_NO_DEBUG_ITER
-#endif // _RWSTD_ITERBASE_H_INCLUDED
+#endif // _RWSTD_RW_ITERBASE_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_math.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_math.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_math.h (original)
+++ incubator/stdcxx/trunk/include/rw/_math.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_math.h#9 $
+ * $Id$
*
***************************************************************************
*
@@ -22,10 +22,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_MATH_H_INCLUDED
-#define _RWSTD_MATH_H_INCLUDED
+#ifndef _RWSTD_RW_MATH_H_INCLUDED
+#define _RWSTD_RW_MATH_H_INCLUDED
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_DEFS_H_INCLUDED
+# include <rw/_defs.h>
+#endif // _RWSTD_RW_DEFS_H_INCLUDED
// avoid a conflicting exception structure on platforms where
// struct exception is defined unguarded in <math.h>
@@ -46,4 +48,4 @@
#endif
-#endif // _RWSTD_MATH_H_INCLUDED
+#endif // _RWSTD_RW_MATH_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_mbstate.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_mbstate.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_mbstate.h (original)
+++ incubator/stdcxx/trunk/include/rw/_mbstate.h Wed Feb 1 14:00:26 2006
@@ -22,11 +22,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_MBSTATE_H_INCLUDED
-#define _RWSTD_MBSTATE_H_INCLUDED
+#ifndef _RWSTD_RW_MBSTATE_H_INCLUDED
+#define _RWSTD_RW_MBSTATE_H_INCLUDED
-
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_DEFS_H_INCLUDED
+# include <rw/_defs.h>
+#endif // _RWSTD_RW_DEFS_H_INCLUDED
#if defined (_RWSTD_OS_AIX)
@@ -241,4 +242,4 @@
#endif // _RWSTD_NO_MBSTATE_T && !_RWSTD_MBSTATE_T_DEFINED
-#endif // _RWSTD_MBSTATE_H_INCLUDED
+#endif // _RWSTD_RW_MBSTATE_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_mutex.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_mutex.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_mutex.h (original)
+++ incubator/stdcxx/trunk/include/rw/_mutex.h Wed Feb 1 14:00:26 2006
@@ -23,8 +23,8 @@
*
**************************************************************************/
-#ifndef _RWSTD_MUTEX_H_INCLUDED
-#define _RWSTD_MUTEX_H_INCLUDED
+#ifndef _RWSTD_RW_MUTEX_H_INCLUDED
+#define _RWSTD_RW_MUTEX_H_INCLUDED
#if __GNUG__ >= 3
@@ -32,14 +32,21 @@
#endif // gcc >= 3
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_DEFS_H_INCLUDED
+# include <rw/_defs.h>
+#endif // _RWSTD_RW_DEFS_H_INCLUDED
#ifdef _RWSTD_REENTRANT
+#ifndef _RWSTD_RW_EXCEPTION_H_INCLUDED
+# include <rw/_exception.h>
+#endif // _RWSTD_RW_EXCEPTION_INCLUDED
+
+#ifndef _RWSTD_RW_ERROR_H_INCLUDED
+# include <rw/_error.h>
+#endif // _RWSTD_RW_ERROR_H_INCLUDED
-#include <rw/_exception.h>
-#include <rw/_error.h>
// work around SunOS 5.{8,9}/SunPro bug (see PR #26255)
#if defined (__SunOS_5_8) || defined (__SunOS_5_9)
@@ -1886,4 +1893,4 @@
} // namespace __rw
-#endif // _RWSTD_MUTEX_H_INCLUDED
+#endif // _RWSTD_RW_MUTEX_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_new.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_new.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_new.h (original)
+++ incubator/stdcxx/trunk/include/rw/_new.h Wed Feb 1 14:00:26 2006
@@ -6,7 +6,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_new.h#8 $
+ * $Id$
*
***************************************************************************
*
@@ -23,11 +23,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_NEW_H_INCLUDED
-#define _RWSTD_NEW_H_INCLUDED
+#ifndef _RWSTD_RW_NEW_H_INCLUDED
+#define _RWSTD_RW_NEW_H_INCLUDED
-
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_DEFS_H_INCLUDED
+# include <rw/_defs.h>
+#endif // _RWSTD_RW_DEFS_H_INCLUDED
#if defined (__SUNPRO_CC)
@@ -86,4 +87,4 @@
#endif // __SUNPRO_CC
-#endif // _RWSTD_NEW_H_INCLUDED
+#endif // _RWSTD_RW_NEW_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_pair.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_pair.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_pair.h (original)
+++ incubator/stdcxx/trunk/include/rw/_pair.h Wed Feb 1 14:00:26 2006
@@ -3,7 +3,7 @@
*
* _pair.h - definition of std::pair
*
- * $Id: //stdlib/dev/include/rw/_pair.h#7 $
+ * $Id$
*
***************************************************************************
*
@@ -33,12 +33,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_PAIR_H_INCLUDED
-#define _RWSTD_PAIR_H_INCLUDED
+#ifndef _RWSTD_RW_PAIR_H_INCLUDED
+#define _RWSTD_RW_PAIR_H_INCLUDED
-
-#include <rw/_funcbase.h> // for less
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_FUNCBASE_H_INCLUDED
+# include <rw/_funcbase.h> // for less
+#endif // _RWSTD_RW_FUNCBASE_H_INCLUDED
_RWSTD_NAMESPACE (std) {
@@ -152,4 +152,4 @@
} // namespace std
-#endif // _RWSTD_PAIR_H_INCLUDED
+#endif // _RWSTD_RW_PAIR_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_rawiter.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_rawiter.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_rawiter.h (original)
+++ incubator/stdcxx/trunk/include/rw/_rawiter.h Wed Feb 1 14:00:26 2006
@@ -3,7 +3,7 @@
*
* _rawiter - declarations for the C++ Standard Library raw_storage_iterator
*
- * $Id: //stdlib/dev/include/rw/_rawiter.h#11 $
+ * $Id$
*
***************************************************************************
*
@@ -33,13 +33,20 @@
*
**************************************************************************/
-#ifndef _RWSTD_RAWITER_H_INCLUDED
-#define _RWSTD_RAWITER_H_INCLUDED
+#ifndef _RWSTD_RW_RAWITER_H_INCLUDED
+#define _RWSTD_RW_RAWITER_H_INCLUDED
-#include <rw/_iterbase.h>
-#include <rw/_new.h>
-#include <rw/_pair.h>
-#include <rw/_defs.h>
+#ifndef _RWSTD_ITERBASE_H_INCLUDED
+# include <rw/_iterbase.h>
+#endif // _RWSTD_ITERBASE_H_INCLUDED
+
+#ifndef _RWSTD_RW_NEW_H_INCLUDED
+# include <rw/_new.h>
+#endif // _RWSTD_RW_NEW_H_INCLUDED
+
+#ifndef _RWSTD_RW_PAIR_H_INCLUDED
+# include <rw/_pair.h>
+#endif // _RWSTD_RW_PAIR_H_INCLUDED
_RWSTD_NAMESPACE (std) {
@@ -155,4 +162,4 @@
} // namespace std
-#endif // _RWSTD_MEMORY_INCLUDED
+#endif // _RWSTD_RW_RAWITER_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_relops.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_relops.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_relops.h (original)
+++ incubator/stdcxx/trunk/include/rw/_relops.h Wed Feb 1 14:00:26 2006
@@ -3,7 +3,7 @@
*
* _relops.h - definition of the std::rel_ops namespace and members
*
- * $Id: //stdlib/dev/include/rw/_relops.h#6 $
+ * $Id$
*
***************************************************************************
*
@@ -33,10 +33,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_RELOPS_H_INCLUDED
-#define _RWSTD_RELOPS_H_INCLUDED
+#ifndef _RWSTD_RW_RELOPS_H_INCLUDED
+#define _RWSTD_RW_RELOPS_H_INCLUDED
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_DEFS_H_INCLUDED
+# include <rw/_defs.h>
+#endif // _RWSTD_RW_DEFS_H_INCLUDED
_RWSTD_NAMESPACE (std) {
@@ -83,4 +85,4 @@
} // namespace std
-#endif // _RWSTD_RELOPS_H_INCLUDED
+#endif // _RWSTD_RW_RELOPS_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_select.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_select.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_select.h (original)
+++ incubator/stdcxx/trunk/include/rw/_select.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_select.h#8 $
+ * $Id$
*
***************************************************************************
*
@@ -22,11 +22,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_SELECT_H_INCLUDED
-#define _RWSTD_SELECT_H_INCLUDED
+#ifndef _RWSTD_RW_SELECT_H_INCLUDED
+#define _RWSTD_RW_SELECT_H_INCLUDED
-
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_DEFS_H_INCLUDED
+# include <rw/_defs.h>
+#endif // _RWSTD_RW_DEFS_H_INCLUDED
_RWSTD_NAMESPACE (__rw) {
@@ -138,4 +139,4 @@
# endif // VisualAge 5.0
-#endif // _RWSTD_SELECT_H_INCLUDED
+#endif // _RWSTD_RW_SELECT_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_specialized.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_specialized.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_specialized.h (original)
+++ incubator/stdcxx/trunk/include/rw/_specialized.h Wed Feb 1 14:00:26 2006
@@ -36,12 +36,13 @@
*
**************************************************************************/
-#ifndef _RWSTD_SPECIALIZED_H_INCLUDED
-#define _RWSTD_SPECIALIZED_H_INCLUDED
+#ifndef _RWSTD_RW_SPECIALIZED_H_INCLUDED
+#define _RWSTD_RW_SPECIALIZED_H_INCLUDED
-#include <rw/_new.h>
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_NEW_H_INCLUDED
+# include <rw/_new.h>
+#endif // _RWSTD_RW_NEW_H_INCLUDED
_RWSTD_NAMESPACE (__rw) {
@@ -276,4 +277,4 @@
} // namespace std
-#endif // _RWSTD_SPECIALIZED_H_INCLUDED
+#endif // _RWSTD_RW_SPECIALIZED_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_streamiter.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_streamiter.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_streamiter.h (original)
+++ incubator/stdcxx/trunk/include/rw/_streamiter.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_streamiter.h#6 $
+ * $Id$
*
***************************************************************************
*
@@ -22,12 +22,12 @@
*
**************************************************************************/
-#ifndef _RWSTD_STREAMITER_H_INCLUDED
-#define _RWSTD_STREAMITER_H_INCLUDED
+#ifndef _RWSTD_RW_STREAMITER_H_INCLUDED
+#define _RWSTD_RW_STREAMITER_H_INCLUDED
-
-#include <rw/_iterbase.h>
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_ITERBASE_H_INCLUDED
+# include <rw/_iterbase.h>
+#endif // _RWSTD_RW_ITERBASE_H_INCLUDED
#include <iosfwd>
@@ -175,4 +175,4 @@
} // namespace std
-#endif // _RWSTD_STREAMITER_H_INCLUDED
+#endif // _RWSTD_RW_STREAMITER_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_strref.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_strref.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_strref.h (original)
+++ incubator/stdcxx/trunk/include/rw/_strref.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_strref.h#35 $
+ * $Id$
*
***************************************************************************
*
@@ -22,14 +22,25 @@
*
**************************************************************************/
-#ifndef _RWSTD_STRREF_H_INCLUDED
-#define _RWSTD_STRREF_H_INCLUDED
+#ifndef _RWSTD_RW_STRREF_H_INCLUDED
+#define _RWSTD_RW_STRREF_H_INCLUDED
+
+#ifndef _RWSTD_RW_ALLOCATOR_H_INCLUDED
+# include <rw/_allocator.h>
+#endif // _RWSTD_RW_ALLOCATOR_H_INCLUDED
+
+#ifndef _RWSTD_RW_MUTEX_H_INCLUDED
+# include <rw/_mutex.h>
+#endif // _RWSTD_RW_MUTEX_H_INCLUDED
+
+#ifndef _RWSTD_RW_SPECIALIZED_H_INCLUDED
+# include <rw/_specialized.h>
+#endif // _RWSTD_RW_SPECIALIZED_H_INCLUDED
+
+#ifndef _RWSTD_RW_TRAITS_H_INCLUDED
+# include <rw/_traits.h>
+#endif // _RWSTD_RW_TRAITS_H_INCLUDED
-#include <rw/_allocator.h>
-#include <rw/_mutex.h>
-#include <rw/_specialized.h>
-#include <rw/_traits.h>
-#include <rw/_defs.h>
#if !defined(_RWSTD_STRING_REF_OFFSET)
# define _RWSTD_STRING_REF_OFFSET 1
@@ -244,4 +255,4 @@
} // namespace __rw
-#endif // _RWSTD_STRREF_H_INCLUDED
+#endif // _RWSTD_RW_STRREF_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_traits.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_traits.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_traits.h (original)
+++ incubator/stdcxx/trunk/include/rw/_traits.h Wed Feb 1 14:00:26 2006
@@ -22,12 +22,16 @@
*
**************************************************************************/
-#ifndef _RWSTD_TRAITS_H_INCLUDED
-#define _RWSTD_TRAITS_H_INCLUDED
+#ifndef _RWSTD_RW_TRAITS_H_INCLUDED
+#define _RWSTD_RW_TRAITS_H_INCLUDED
-#include <rw/_iosfwd.h>
-#include <rw/_mbstate.h> // for _RWSTD_MBSTATE_T
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_IOSFWD_H_INCLUDED
+# include <rw/_iosfwd.h>
+#endif // _RWSTD_RW_IOSFWD_H_INCLUDED
+
+#ifndef _RWSTD_RW_MBSTATE_H_INCLUDED
+# include <rw/_mbstate.h> // for _RWSTD_MBSTATE_T
+#endif // _RWSTD_RW_MBSTATE_H_INCLUDED
#if defined (_RWSTDDEBUG) || defined (_RWSTD_EDG_ECCP)
@@ -524,4 +528,4 @@
} // namespace std
-#endif // _RWSTD_TRAITS_H_INCLUDED
+#endif // _RWSTD_RW_TRAITS_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_tree.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_tree.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_tree.h (original)
+++ incubator/stdcxx/trunk/include/rw/_tree.h Wed Feb 1 14:00:26 2006
@@ -5,7 +5,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_tree.h#34 $
+ * $Id$
*
***************************************************************************
*
@@ -54,13 +54,16 @@
*
**************************************************************************/
-#ifndef _RWSTD_TREE_H_INCLUDED
-#define _RWSTD_TREE_H_INCLUDED
+#ifndef _RWSTD_RW_TREE_H_INCLUDED
+#define _RWSTD_RW_TREE_H_INCLUDED
-
-#include <rw/_algobase.h>
-#include <rw/_iterator.h>
-#include <rw/_defs.h>
+#ifndef _RWSTD_RW_ALGOBASE_H_INCLUDED
+# include <rw/_algobase.h>
+#endif // _RWSTD_RW_ALGOBASE_H_INCLUDED
+
+#ifndef _RWSTD_RW_ITERATOR_H_INCLUDED
+# include <rw/_iterator.h>
+#endif // _RWSTD_RW_ITERATOR_H_INCLUDED
_RWSTD_NAMESPACE (__rw) {
@@ -922,4 +925,4 @@
# include <rw/_tree.cc>
#endif
-#endif // _RWSTD_TREE_H_INCLUDED
+#endif // _RWSTD_RW_TREE_H_INCLUDED
Modified: incubator/stdcxx/trunk/include/rw/_typetraits.h
URL:
http://svn.apache.org/viewcvs/incubator/stdcxx/trunk/include/rw/_typetraits.h?rev=374189&r1=374188&r2=374189&view=diff
==============================================================================
--- incubator/stdcxx/trunk/include/rw/_typetraits.h (original)
+++ incubator/stdcxx/trunk/include/rw/_typetraits.h Wed Feb 1 14:00:26 2006
@@ -6,7 +6,7 @@
* This is an internal header file used to implement the C++ Standard
* Library. It should never be #included directly by a program.
*
- * $Id: //stdlib/dev/include/rw/_typetraits.h#13 $
+ * $Id$
*
***************************************************************************
*
