solaris_pow_int_overload should use __cplusplus

	* inclhack.def (solaris_pow_int_overload): Update comment.
	Change guard to match <cmath>.
	* fixincl.x: Regenerate.
	* tests/base/iso/math_iso.h [SOLARIS_POW_INT_OVERLOAD_CHECK]:
	Matching change.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199003 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index ff84ee6..f38c0b1 100644 (file)
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,11 @@
+2013-05-17  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * inclhack.def (solaris_pow_int_overload): Update comment.
+       Change guard to match <cmath>.
+       * fixincl.x: Regenerate.
+       * tests/base/iso/math_iso.h [SOLARIS_POW_INT_OVERLOAD_CHECK]:
+       Matching change.
+
 2013-05-04  David Edelsohn  <dje.gcc@gmail.com>
 
        * inclhack.def (aix_null): New.

diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 871ca29..1695bcd 100644 (file)
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -2,11 +2,11 @@
  * 
  * DO NOT EDIT THIS FILE   (fixincl.x)
  * 
- * It has been AutoGen-ed  May  3, 2013 at 11:45:43 AM by AutoGen 5.12
+ * It has been AutoGen-ed  Thursday May 16, 2013 at 01:20:52 PM MEST
  * From the definitions    inclhack.def
  * and the template file   fixincl
  */
-/* DO NOT SVN-MERGE THIS FILE, EITHER Fri May  3 11:45:44 PDT 2013
+/* DO NOT SVN-MERGE THIS FILE, EITHER Thu May 16 13:20:52 MEST 2013
  *
  * You must regenerate it.  Use the ./genfixes script.
  *
@@ -6717,7 +6717,7 @@ static tTestDesc aSolaris_Pow_Int_OverloadTests[] = {
  */
 static const char* apzSolaris_Pow_Int_OverloadPatch[] = {
     "format",
-    "#ifndef __GXX_EXPERIMENTAL_CXX0X__\n\
+    "#if __cplusplus < 201103L\n\
 %0\n\
 #endif",
     (char*)NULL };

diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 253df68..d912ccc 100644 (file)
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -3474,7 +3474,7 @@ fix = {
 
 
 /*
- *  The pow overloads with int were removed in C++ 2011.
+ *  The pow overloads with int were removed in C++ 2011 DR 550.
  */
 fix = {
     hackname  = solaris_pow_int_overload;
@@ -3483,7 +3483,7 @@ fix = {
     select    = "^[ \t]*inline [a-z ]* pow\\([^()]*, int [^()]*\\)"
                " *\\{[^{}]*\n[^{}]*\\}";
     c_fix     = format;
-    c_fix_arg = "#ifndef __GXX_EXPERIMENTAL_CXX0X__\n%0\n#endif";
+    c_fix_arg = "#if __cplusplus < 201103L\n%0\n#endif";
 
     test_text =
     "  inline long double pow(long double __X, int __Y) { return\n"

diff --git a/fixincludes/tests/base/iso/math_iso.h b/fixincludes/tests/base/iso/math_iso.h
index 6c08a94..a1313a7 100644 (file)
--- a/fixincludes/tests/base/iso/math_iso.h
+++ b/fixincludes/tests/base/iso/math_iso.h
@@ -10,7 +10,7 @@
 
 
 #if defined( SOLARIS_POW_INT_OVERLOAD_CHECK )
-#ifndef __GXX_EXPERIMENTAL_CXX0X__
+#if __cplusplus < 201103L
        inline long double pow(long double __X, int __Y) { return
                __powl(__X, (long double) (__Y)); }
 #endif