stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r620132 - in /stdcxx/trunk: include/exception src/exception.cpp
Date Sat, 09 Feb 2008 15:00:03 GMT
Author: faridz
Date: Sat Feb  9 07:00:02 2008
New Revision: 620132

URL: http://svn.apache.org/viewvc?rev=620132&view=rev
Log:
2008-02-09  Farid Zaripov  <farid_zaripov@epam.com>

	Merged r620131 from branches/4.2.x
	* include/exception: Swapped member declarations for ICC/Linux
	and MSVC | ICC/Windows to simplify the preprocessor condition.
	* src/exception.cpp: Ditto. Use MSVC code on ICC/Windows.

Modified:
    stdcxx/trunk/include/exception
    stdcxx/trunk/src/exception.cpp

Modified: stdcxx/trunk/include/exception
URL: http://svn.apache.org/viewvc/stdcxx/trunk/include/exception?rev=620132&r1=620131&r2=620132&view=diff
==============================================================================
--- stdcxx/trunk/include/exception (original)
+++ stdcxx/trunk/include/exception Sat Feb  9 07:00:02 2008
@@ -68,18 +68,18 @@
     // 18.6.1, p8
     virtual const char* what () const _THROWS (());
 
-#if defined (__INTEL_COMPILER) && !defined (_MSC_VER)
+#if defined (_MSC_VER)
 
 private:
 
     const char *_C_name;
+    int         _C_flag;
 
-#elif defined (_MSC_VER)
+#elif defined (__INTEL_COMPILER)
 
 private:
 
     const char *_C_name;
-    int         _C_flag;
 
 #endif   // _MSC_VER
 };

Modified: stdcxx/trunk/src/exception.cpp
URL: http://svn.apache.org/viewvc/stdcxx/trunk/src/exception.cpp?rev=620132&r1=620131&r2=620132&view=diff
==============================================================================
--- stdcxx/trunk/src/exception.cpp (original)
+++ stdcxx/trunk/src/exception.cpp Sat Feb  9 07:00:02 2008
@@ -286,14 +286,14 @@
 
 exception::exception () _THROWS (())
 {
-#if defined (__INTEL_COMPILER)
-
-    _C_name = "";
-
-#elif defined (_MSC_VER)
+#if defined (_MSC_VER)
 
     _C_name = 0;
     _C_flag = 0;
+
+#elif defined (__INTEL_COMPILER)
+
+    _C_name = "";
 
 #endif   // _MSC_VER
 }



Mime
View raw message