Merge branch 'develop'

Configuration option to allow Boost Exception to use std::shared_ptr instead of boost::shared_ptr.
2016-11-07 11:30:38 -08:00 · 2016-09-28 17:01:26 -07:00
1 changed files with 8 additions and 3 deletions
--- a/include/boost/exception/exception.hpp
+++ b/include/boost/exception/exception.hpp
@ -12,6 +12,14 @@
 #pragma warning(push,1)
 #endif

+#ifdef BOOST_EXCEPTION_MINI_BOOST
+#include  <memory>
+namespace boost { namespace exception_detail { using std::shared_ptr; } }
+#else
+namespace boost { template <class T> class shared_ptr; };
+namespace boost { namespace exception_detail { using boost::shared_ptr; } }
+#endif
+
 namespace
 boost
    {
@ -144,9 +152,6 @@ boost
 # endif
 #endif

-    template <class T>
-    class shared_ptr;
-
    namespace
    exception_detail
        {
Author	SHA1	Message	Date
Emil Dotchevski	c548923b32	Merge branch 'develop'	2016-11-07 11:30:38 -08:00
Emil Dotchevski	f94638e522	Configuration option to allow Boost Exception to use std::shared_ptr instead of boost::shared_ptr.	2016-09-28 17:01:26 -07:00