You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by fa...@apache.org on 2007/12/19 14:43:11 UTC
svn commit: r605537 -
/incubator/stdcxx/branches/4.2.x/etc/config/src/BAD_ALLOC_ASSIGNMENT.cpp
Author: faridz
Date: Wed Dec 19 05:43:10 2007
New Revision: 605537
URL: http://svn.apache.org/viewvc?rev=605537&view=rev
Log:
2007-12-19 Farid Zaripov <fa...@epam.com>
STDCXX-585
* etc/config/src/BAD_ALLOC_ASSIGNMENT.cpp: Don't define ~bad_alloc()
when testing the presence of the other members to avoid multiply
defined sybmol linker errors.
Modified:
incubator/stdcxx/branches/4.2.x/etc/config/src/BAD_ALLOC_ASSIGNMENT.cpp
Modified: incubator/stdcxx/branches/4.2.x/etc/config/src/BAD_ALLOC_ASSIGNMENT.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/etc/config/src/BAD_ALLOC_ASSIGNMENT.cpp?rev=605537&r1=605536&r2=605537&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/etc/config/src/BAD_ALLOC_ASSIGNMENT.cpp (original)
+++ incubator/stdcxx/branches/4.2.x/etc/config/src/BAD_ALLOC_ASSIGNMENT.cpp Wed Dec 19 05:43:10 2007
@@ -100,34 +100,29 @@
virtual ~bad_alloc ();
-# else // if !defined (TEST_DTOR)
-
- ~bad_alloc () { }
-
-# if defined (TEST_COPY_CTOR)
+# elif defined (TEST_COPY_CTOR)
bad_alloc (const bad_alloc&);
-# elif defined (TEST_WHAT)
+# elif defined (TEST_WHAT)
virtual const char* what () const;
-# else // test assignment
+# else // test assignment
+
+# if !defined (TEST_ASSIGNMENT)
+# define TEST_ASSIGNMENT
+# endif
+
+ bad_alloc& operator= (const bad_alloc&);
+
+ bad_alloc& assign (const bad_alloc &rhs) {
+ ++nassignments;
+ return *this = rhs;
+ }
-# if !defined (TEST_ASSIGNMENT)
-# define TEST_ASSIGNMENT
-# endif
-
- bad_alloc& operator= (const bad_alloc&);
-
- bad_alloc& assign (const bad_alloc &rhs) {
- ++nassignments;
- return *this = rhs;
- }
-
-# endif // TEXT_...
-# endif // !TEST_DTOR
-#endif // !TEST_DEFAULT_COR
+# endif // TEST_...
+#endif // !TEST_DEFAULT_CTOR
};