svn commit: r682834 - /stdcxx/branches/4.2.x/tests/utilities/20.function.objects.cpp

[vitek]

Author: vitek
Date: Tue Aug  5 10:52:10 2008
New Revision: 682834

URL: http://svn.apache.org/viewvc?rev=682834&view=rev
Log:
2008-08-05  Travis Vitek  <[EMAIL PROTECTED]>

        * tests/utilities/20.function.objects.cpp [__GNUG__]: Enable
        gcc specific workaround only for gcc-2.95 to silence bogus
        HP aCC 6/cadvise warning #20035-D.


Modified:
    stdcxx/branches/4.2.x/tests/utilities/20.function.objects.cpp

Modified: stdcxx/branches/4.2.x/tests/utilities/20.function.objects.cpp
URL: 
http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/tests/utilities/20.function.objects.cpp?rev=682834&r1=682833&r2=682834&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/tests/utilities/20.function.objects.cpp (original)
+++ stdcxx/branches/4.2.x/tests/utilities/20.function.objects.cpp Tue Aug  5 
10:52:10 2008
@@ -505,12 +505,16 @@
 
 #undef CTOR_ARG_LIST
 
+#if defined __GNUG__ && __GNUG__ < 3 && __GNU_MINOR__ < 96
     // broken out of the macro definition to work around
     // a bug in g++ 2.95.2 parser
     std::minus<int> obj_minus;
 
-// use std::negate<> as an argument in negator ctors
-#define CTOR_ARG_LIST (obj_minus, 1)
+   // use std::negate<> as an argument in negator ctors
+#  define CTOR_ARG_LIST (obj_minus, 1)
+#else
+#  define CTOR_ARG_LIST (std::minus<int>(), 1)
+#endif
 
     // 20.3.6.1, p1 and p2
     TEST_UNARY_OP (binder1st<std::minus<int> >, 1 -, 0);