Changeset 1026

Timestamp:

11/26/20 01:10:49 (4 years ago)

Author:

Maciej Komosinski

Message:

Workarounds for Embarcadero 10.3u3 compiler bug and incompatibility

Location:

cpp

Files:

• common/nonstd_math.cpp (modified) (1 diff)
• frams/model/geometry/geometryutils.cpp (modified) (1 diff)

cpp/common/nonstd_math.cpp

@@ -26 +26 @@
                 ss << x;
                 str = ss.str();
-                char *s = str.data(); //now we will be operating directly on the internal std::string buffer            
+                char *s =
+#ifdef __BORLANDC__ //embarcadero 10.3u3 compiler does not support char* str.data() even in C++17 mode?
+                (char*)
+#endif
+                str.data(); //now we will be operating directly on the internal std::string buffer
                 for (int i = str.length() - 1, end = str.length(); i >= 0; i--) //remove trailing zeros, and maybe also '.'
                 {

cpp/frams/model/geometry/geometryutils.cpp

@@ -340 +340 @@
                 y = b * sqrt(sqrt_arg);
         else
+#ifdef __BORLANDC__ //compiler bug: embarcadero 10.3u3 raises "invalid fp operation exception" even when the execution does not enter the "signaling_NaN()" branch of "if" (i.e. when sqrt_arg >= 0) so we avoid using signaling_NaN().
+                y = std::numeric_limits<double>::max();
+#else
                 y = std::numeric_limits<double>::signaling_NaN();
-        //This function is called from MeshBuilder::EllipsoidSurface::findNextAreaEdgeAndPhase(). 
+#endif
+        //This function is called from MeshBuilder::EllipsoidSurface::findNextAreaEdgeAndPhase().
         //y=NaN set above co-occurs with the value of x that doesn't meet the condition tested in findNextAreaEdgeAndPhase().
         //If the condition is true (i.e., x exceeds the allowed range), entirely new values of x and y are set in the next step anyway.