You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2007/10/16 01:09:20 UTC
svn commit: r584965 - in /incubator/stdcxx/branches/4.2.0/include: exception
new
Author: sebor
Date: Mon Oct 15 16:09:19 2007
New Revision: 584965
URL: http://svn.apache.org/viewvc?rev=584965&view=rev
Log:
2007-10-15 Martin Sebor <se...@roguewave.com>
* exception: Merged from trunk at rev 583667.
* new: Same.
Modified:
incubator/stdcxx/branches/4.2.0/include/exception
incubator/stdcxx/branches/4.2.0/include/new
Modified: incubator/stdcxx/branches/4.2.0/include/exception
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/exception?rev=584965&r1=584964&r2=584965&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/exception (original)
+++ incubator/stdcxx/branches/4.2.0/include/exception Mon Oct 15 16:09:19 2007
@@ -62,12 +62,11 @@
// 18.6.1, p4
exception& operator= (const exception&) _THROWS (());
- // 18.6.1, p6
- virtual ~exception () _THROWS (());
-
// 18.6.1, p8
virtual const char* what () const _THROWS (());
+ // 18.6.1, p6
+ virtual ~exception () _THROWS (());
#if defined (__INTEL_COMPILER) && !defined (_MSC_VER)
@@ -129,10 +128,10 @@
// 18.6.2.1, p4
bad_exception& operator= (const bad_exception&) _THROWS (());
+ virtual ~bad_exception () _THROWS (());
+
// 18.6.2.1, p5
virtual const char* what () const _THROWS (());
-
- virtual ~bad_exception () _THROWS (());
};
#if !defined (_RWSTD_NO_STD_BAD_EXCEPTION) \
Modified: incubator/stdcxx/branches/4.2.0/include/new
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/include/new?rev=584965&r1=584964&r2=584965&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.0/include/new (original)
+++ incubator/stdcxx/branches/4.2.0/include/new Mon Oct 15 16:09:19 2007
@@ -145,10 +145,10 @@
// prevent ld error when replacing operator new:
// multiple definition of `operator new(unsigned long)'
+ ~bad_alloc () _THROWS (());
+
// 18.4.2.1, p5
virtual const char* what () const _THROWS (());
-
- ~bad_alloc () _THROWS (());
#endif // Intel C++ > 8.0