Merged changes from trunk: dealing with warnings, and a compile error on Win CE.

[SVN r79026]
2012-06-21 02:15:24 +00:00
parent b3b930b7f5
commit 7e116a36b9
3 changed files with 21 additions and 6 deletions
--- a/include/boost/exception/detail/exception_ptr.hpp
+++ b/include/boost/exception/detail/exception_ptr.hpp
@ -25,7 +25,7 @@
 #include <stdexcept>
 #include <new>
 #include <ios>
-#include <cstdlib>
+#include <stdlib.h>

 namespace
 boost
@ -457,7 +457,12 @@ boost
        BOOST_ASSERT(p);
        p.ptr_->rethrow();
        BOOST_ASSERT(0);
-        std::abort();
+        #if defined(UNDER_CE)
+            // some CE platforms don't define ::abort()
+            exit(-1);
+        #else
+            abort();
+        #endif
        }

    inline