diff options
| author | Martin v. Löwis <loewis@informatik.hu-berlin.de> | 1998-05-07 22:06:26 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-05-07 22:06:26 -0400 |
| commit | 2c73f9f57ac31b4c79c8e9282c748e3294cd7e95 (patch) | |
| tree | b63320f941aa58f44dbdc20a5d48fb3384cb73c1 /gcc/cp/inc | |
| parent | 0d33d22e9ff0d6cba03b7ef6f099f215b260c7e1 (diff) | |
| download | gcc-2c73f9f57ac31b4c79c8e9282c748e3294cd7e95.zip gcc-2c73f9f57ac31b4c79c8e9282c748e3294cd7e95.tar.gz gcc-2c73f9f57ac31b4c79c8e9282c748e3294cd7e95.tar.bz2 | |
massive namespace patch
From-SVN: r19631
Diffstat (limited to 'gcc/cp/inc')
| -rw-r--r-- | gcc/cp/inc/exception | 4 | ||||
| -rw-r--r-- | gcc/cp/inc/new | 12 | ||||
| -rw-r--r-- | gcc/cp/inc/new.h | 2 | ||||
| -rw-r--r-- | gcc/cp/inc/typeinfo | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/gcc/cp/inc/exception b/gcc/cp/inc/exception index 1c4fda2..c684b7e 100644 --- a/gcc/cp/inc/exception +++ b/gcc/cp/inc/exception @@ -8,7 +8,7 @@ extern "C++" { -#if 0 +#ifdef __HONOR_STD namespace std { #endif @@ -34,7 +34,7 @@ unexpected_handler set_unexpected (unexpected_handler); void unexpected (void) __attribute__ ((__noreturn__)); bool uncaught_exception (); -#if 0 +#ifdef __HONOR_STD } // namespace std #endif diff --git a/gcc/cp/inc/new b/gcc/cp/inc/new index 23fe6eb..0f25a5c 100644 --- a/gcc/cp/inc/new +++ b/gcc/cp/inc/new @@ -10,7 +10,7 @@ extern "C++" { -#if 0 +#ifdef __HONOR_STD namespace std { #endif @@ -24,7 +24,7 @@ namespace std { typedef void (*new_handler)(); new_handler set_new_handler (new_handler); -#if 0 +#ifdef __HONOR_STD } // namespace std #endif @@ -33,10 +33,10 @@ void *operator new (size_t) throw (std::bad_alloc); void *operator new[] (size_t) throw (std::bad_alloc); void operator delete (void *) throw(); void operator delete[] (void *) throw(); -void *operator new (size_t, const nothrow_t&) throw(); -void *operator new[] (size_t, const nothrow_t&) throw(); -void operator delete (void *, const nothrow_t&) throw(); -void operator delete[] (void *, const nothrow_t&) throw(); +void *operator new (size_t, const std::nothrow_t&) throw(); +void *operator new[] (size_t, const std::nothrow_t&) throw(); +void operator delete (void *, const std::nothrow_t&) throw(); +void operator delete[] (void *, const std::nothrow_t&) throw(); // default placement versions of operator new inline void *operator new(size_t, void *place) throw() { return place; } diff --git a/gcc/cp/inc/new.h b/gcc/cp/inc/new.h index eed0910..799db7e 100644 --- a/gcc/cp/inc/new.h +++ b/gcc/cp/inc/new.h @@ -5,7 +5,7 @@ #include <new> -#if 0 +#ifdef __HONOR_STD using std::new_handler; using std::set_new_handler; #endif diff --git a/gcc/cp/inc/typeinfo b/gcc/cp/inc/typeinfo index 2652659..64b2a81 100644 --- a/gcc/cp/inc/typeinfo +++ b/gcc/cp/inc/typeinfo @@ -8,7 +8,7 @@ extern "C++" { -#if 0 +#ifdef __HONOR_STD namespace std { #endif @@ -63,7 +63,7 @@ class bad_typeid : public exception { virtual ~bad_typeid () { } }; -#if 0 +#ifdef __HONOR_STD } // namespace std #endif |