|
Line 0
Link Here
|
|
|
1 |
--- uppsrc/Core/Core.h.orig 2015-11-29 14:17:07 UTC |
| 2 |
+++ uppsrc/Core/Core.h |
| 3 |
@@ -342,12 +342,12 @@ static const MemDiagCls sMemDiagHelper__ |
| 4 |
|
| 5 |
//some global definitions |
| 6 |
|
| 7 |
-#if !defined(STLPORT) && _MSC_VER < 1600 |
| 8 |
+#if !defined(STLPORT) && _MSC_VER < 1600 && !defined(_LIBCPP_VERSION) |
| 9 |
inline UPP::int64 abs(UPP::int64 x) { return x < 0 ? -x : x; } |
| 10 |
#endif |
| 11 |
|
| 12 |
-#ifdef COMPILER_GCC |
| 13 |
-inline double abs(double x) { return fabs(x); } |
| 14 |
+#if defined(COMPILER_GCC) && !defined(_LIBCPP_VERSION) |
| 15 |
+inline double abs(double x) throw() { return fabs(x); } |
| 16 |
#endif |
| 17 |
|
| 18 |
void RegisterTopic__(const char *topicfile, const char *topic, const char *title, const UPP::byte *data, int len); |