stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r596356 - /incubator/stdcxx/branches/4.2.x/tests/utilities/20.auto.ptr.cpp
Date Mon, 19 Nov 2007 16:23:22 GMT
Author: faridz
Date: Mon Nov 19 08:23:21 2007
New Revision: 596356

URL: http://svn.apache.org/viewvc?rev=596356&view=rev
Log:
2007-11-19 Farid Zaripov <farid_zaripov@epam.com>

	Merged r596354 from trunk.
	* 20.auto.ptr.cpp (test_auto_ptr): Worked around bug in MSVC 7.x.

Modified:
    incubator/stdcxx/branches/4.2.x/tests/utilities/20.auto.ptr.cpp

Modified: incubator/stdcxx/branches/4.2.x/tests/utilities/20.auto.ptr.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.x/tests/utilities/20.auto.ptr.cpp?rev=596356&r1=596355&r2=596356&view=diff
==============================================================================
--- incubator/stdcxx/branches/4.2.x/tests/utilities/20.auto.ptr.cpp (original)
+++ incubator/stdcxx/branches/4.2.x/tests/utilities/20.auto.ptr.cpp Mon Nov 19 08:23:21 2007
@@ -208,11 +208,14 @@
        // and a conversion operator (see PR #24476)
 #      if !defined (__SUNPRO_CC) || __SUNPRO_CC > 0x540
 
+#        if !defined (_MSC_VER) || _MSC_VER > 1310 || defined (__INTEL_COMPILER)
     FUN (std::auto_ptr_ref<Base>, Derived,
          operator std::auto_ptr_ref<Base>, () _PTR_THROWS (()));
 
     FUN (std::auto_ptr<Base>, Derived,
          operator std::auto_ptr<Base>, () _PTR_THROWS (()));
+
+#        endif   // MSVC > 7.1
 
 #      endif   // SunPro > 5.4
 



Mime
View raw message