Index: branches/2016Q3/devel/upp/files/patch-uppsrc_Core_Core.h
===================================================================
--- branches/2016Q3/devel/upp/files/patch-uppsrc_Core_Core.h	(nonexistent)
+++ branches/2016Q3/devel/upp/files/patch-uppsrc_Core_Core.h	(revision 418966)
@@ -0,0 +1,18 @@
+--- uppsrc/Core/Core.h.orig	2015-11-29 14:17:07 UTC
++++ uppsrc/Core/Core.h
+@@ -342,12 +342,12 @@ static const MemDiagCls sMemDiagHelper__
+ 
+ //some global definitions
+ 
+-#if !defined(STLPORT) && _MSC_VER < 1600
++#if !defined(STLPORT) && _MSC_VER < 1600 && !defined(_LIBCPP_VERSION)
+ inline UPP::int64  abs(UPP::int64 x)          { return x < 0 ? -x : x; }
+ #endif
+ 
+-#ifdef COMPILER_GCC
+-inline double abs(double x)                   { return fabs(x); }
++#if defined(COMPILER_GCC) && !defined(_LIBCPP_VERSION)
++inline double abs(double x) throw()           { return fabs(x); }
+ #endif
+ 
+ void      RegisterTopic__(const char *topicfile, const char *topic, const char *title, const UPP::byte *data, int len);

Property changes on: branches/2016Q3/devel/upp/files/patch-uppsrc_Core_Core.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2016Q3
===================================================================
--- branches/2016Q3	(revision 418965)
+++ branches/2016Q3	(revision 418966)

Property changes on: branches/2016Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r418965