sysutils/freefilesync: unbreak with boost 1.62 on 11.0+

In file included from algorithm.cpp:13:
In file included from ../../zen/guid.h:16:
In file included from /usr/local/include/boost/uuid/uuid_generators.hpp:17:
In file included from /usr/local/include/boost/uuid/random_generator.hpp:17:
In file included from /usr/local/include/boost/shared_ptr.hpp:17:
In file included from /usr/local/include/boost/smart_ptr/shared_ptr.hpp:28:
In file included from /usr/local/include/boost/smart_ptr/detail/shared_count.hpp:29:
In file included from /usr/local/include/boost/smart_ptr/detail/sp_counted_base.hpp:45:
In file included from /usr/local/include/boost/smart_ptr/detail/sp_counted_base_clang.hpp:18:
In file included from /usr/local/include/boost/detail/sp_typeinfo.hpp:20:
In file included from /usr/local/include/boost/core/typeinfo.hpp:119:
In file included from /usr/local/include/boost/core/demangle.hpp:32:
/usr/include/c++/v1/cxxabi.h:190:19: error: '__cxa_get_globals' is missing exception specification
      'noexcept'
__cxa_eh_globals *__cxa_get_globals(void);
                  ^
../../zen/scope_guard.h:31:30: note: previous declaration is here
extern "C" __cxa_eh_globals* __cxa_get_globals() noexcept;
                             ^

PR:		214485
Reported by:	antoine (via exp-run)
This commit is contained in:
Jan Beich 2016-11-21 03:52:38 +00:00
parent 7c32d86df1
commit 1b2f70532c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=426687
2 changed files with 12 additions and 0 deletions

View file

@ -3,6 +3,7 @@
PORTNAME= freefilesync
PORTVERSION= 8.3
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://www.freefilesync.org/download/ \
http://www.freefilesync.org/archive/

View file

@ -0,0 +1,11 @@
--- ../../zen/scope_guard.h.orig 2016-03-31 20:08:04 UTC
+++ ../../zen/scope_guard.h
@@ -14,7 +14,7 @@
//best of Zen, Loki and C++17
-#ifdef ZEN_WIN
+#if defined(ZEN_WIN) || (defined(_LIBCPP_VERSION) && _LIBCPP_VERSION >= 3700)
inline int getUncaughtExceptionCount() { return std::uncaught_exceptions(); }
#elif defined ZEN_LINUX || defined ZEN_MAC