Ticket #2100: boost_thread_hpp_BOOST_NO_EXCEPTIONS_20100507.diff

thread/pthread/thread_data.hpp

@@ -79 +79 @@
 
             void check_for_interruption()
             {
+#ifndef BOOST_NO_EXCEPTIONS
                 if(thread_info->interrupt_requested)
                 {
                     thread_info->interrupt_requested=false;
                     throw thread_interrupted();
                 }
+#endif
             }
             
             void operator=(interruption_checker&);

thread/win32/thread_heap_alloc.hpp

@@ -75 +75 @@
         inline T* heap_new()
         {
             void* const heap_memory=allocate_raw_heap_memory(sizeof(T));
+#ifndef BOOST_NO_EXCEPTIONS
             try
+#endif
             {
                 T* const data=new (heap_memory) T();
                 return data;
             }
+#ifndef BOOST_NO_EXCEPTIONS
             catch(...)
             {
                 free_raw_heap_memory(heap_memory);
                 throw;
             }
+#endif
         }
 
 #ifndef BOOST_NO_RVALUE_REFERENCES
@@ -171 +175 @@
         inline T* heap_new_impl(A1 a1,A2 a2)
         {
             void* const heap_memory=allocate_raw_heap_memory(sizeof(T));
+#ifndef BOOST_NO_EXCEPTIONS
             try
+#endif
             {
                 T* const data=new (heap_memory) T(a1,a2);
                 return data;
             }
+#ifndef BOOST_NO_EXCEPTIONS
             catch(...)
             {
                 free_raw_heap_memory(heap_memory);
                 throw;
             }
+#endif
         }
 
         template<typename T,typename A1,typename A2,typename A3>
@@ -203 +211 @@
         inline T* heap_new_impl(A1 a1,A2 a2,A3 a3,A4 a4)
         {
             void* const heap_memory=allocate_raw_heap_memory(sizeof(T));
+#ifndef BOOST_NO_EXCEPTIONS
             try
+#endif
             {
                 T* const data=new (heap_memory) T(a1,a2,a3,a4);
                 return data;
             }
+#ifndef BOOST_NO_EXCEPTIONS
             catch(...)
             {
                 free_raw_heap_memory(heap_memory);
                 throw;
             }
+#endif
         }
 
 

thread/win32/once.hpp

@@ -92 +92 @@
             status=BOOST_INTERLOCKED_COMPARE_EXCHANGE(&flag.status,running_value,0);
             if(!status)
             {
+#ifndef BOOST_NO_EXCEPTIONS
                 try
+#endif
                 {
                     if(!event_handle)
                     {
@@ -121 +123 @@
                     throw_count=::boost::detail::interlocked_read_acquire(&flag.throw_count);
                     break;
                 }
+#ifndef BOOST_NO_EXCEPTIONS
                 catch(...)
                 {
                     if(counted)
@@ -138 +141 @@
                     }
                     throw;
                 }
+#endif
             }
 
             if(!counted)

thread.hpp

@@ -21 +21 @@
 #include <boost/thread/locks.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/thread/barrier.hpp>
+
+// boost::thread::future requires exception handling
+// due to boost::exception::exception_ptr dependency
+
+#ifndef BOOST_NO_EXCEPTIONS
 #include <boost/thread/future.hpp>
+#endif
 
 #endif