From: ibs <ibs@opencascade.com>
Date: Mon, 9 Nov 2015 07:47:45 +0000 (+0300)
Subject: 0026867: Configuration - update any comparison including __cplusplus macro to remove one
X-Git-Tag: V7_0_0_beta~123
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=ad7795649887c02ce70d7e757691c1955b54fa8a;p=occt-copy.git

0026867: Configuration - update any comparison including __cplusplus macro to remove one

__cplusplus >= 201103L replaced with __QNX__ macro
---

diff --git a/src/ElCLib/ElCLib.cxx b/src/ElCLib/ElCLib.cxx
index 9d4f8f4a27..121ce56ac5 100644
--- a/src/ElCLib/ElCLib.cxx
+++ b/src/ElCLib/ElCLib.cxx
@@ -1343,7 +1343,7 @@ Standard_Real ElCLib::HyperbolaParameter (const gp_Ax2& Pos,
     gp_Vec(Pos.Location (), P).Dot
       (gp_Vec (Pos.YDirection())) / MinorRadius;
 
-#if __cplusplus >= 201103L
+#if __QNX__
   return std::asinh(sht);
 #else
   return asinh(sht);
@@ -1426,7 +1426,7 @@ Standard_Real ElCLib::HyperbolaParameter (const gp_Ax22d& Pos,
 {
   gp_Vec2d V (Pos.YDirection().XY());
   Standard_Real sht = gp_Vec2d(Pos.Location(),P).Dot(V) /MinorRadius;
-#if __cplusplus >= 201103L
+#if __QNX__
   return std::asinh(sht);
 #else
   return asinh(sht);
diff --git a/src/Standard/Standard_Real.cxx b/src/Standard/Standard_Real.cxx
index 53922fae31..8345a8117d 100644
--- a/src/Standard/Standard_Real.cxx
+++ b/src/Standard/Standard_Real.cxx
@@ -240,7 +240,7 @@ Standard_Real     ATanh(const Standard_Real Value)
     cout << "Illegal agument in ATanh" << endl ;
 #endif
   }
-#if __cplusplus >= 201103L
+#if __QNX__
   return std::atanh(Value);
 #else
   return atanh(Value);
@@ -258,7 +258,7 @@ Standard_Real     ACosh (const Standard_Real Value)
     cout << "Illegal agument in ACosh" << endl ;
 #endif
   }
-#if __cplusplus >= 201103L
+#if __QNX__
   return std::acosh(Value);
 #else
   return acosh(Value);
diff --git a/src/Standard/Standard_Real.hxx b/src/Standard/Standard_Real.hxx
index 4a2f39c2f1..6ce243eebd 100644
--- a/src/Standard/Standard_Real.hxx
+++ b/src/Standard/Standard_Real.hxx
@@ -294,8 +294,8 @@ inline Standard_Real     Sinh(const Standard_Real Value)
 //-------------------------------------------------------------------
 // ASinh : Returns the hyperbolic arc sine of a real
 //-------------------------------------------------------------------
-inline Standard_Real     ASinh(const Standard_Real Value) 
-#if __cplusplus >= 201103L
+inline Standard_Real     ASinh(const Standard_Real Value)
+#if __QNX__
 { return std::asinh(Value); }
 #else
 { return asinh(Value); }