Branch to work on filename handling without disturbing trunk.

[SVN r68345]

include/boost/thread/pthread/condition_variable.hpp

@@ -53,8 +53,8 @@ namespace boost
             detail::interruption_checker check_for_interruption(&internal_mutex,&cond);
             guard.activate(m);
             res=pthread_cond_wait(&cond,&internal_mutex);
+            this_thread::interruption_point();
         }
-        this_thread::interruption_point();
         if(res)
         {
             boost::throw_exception(condition_error());
@@ -64,13 +64,10 @@ namespace boost
     inline bool condition_variable::timed_wait(unique_lock<mutex>& m,boost::system_time const& wait_until)
     {
         thread_cv_detail::lock_on_exit<unique_lock<mutex> > guard;
-        int cond_res;
-        {
-            detail::interruption_checker check_for_interruption(&internal_mutex,&cond);
-            guard.activate(m);
-            struct timespec const timeout=detail::get_timespec(wait_until);
-            cond_res=pthread_cond_timedwait(&cond,&internal_mutex,&timeout);
-        }
+        detail::interruption_checker check_for_interruption(&internal_mutex,&cond);
+        guard.activate(m);
+        struct timespec const timeout=detail::get_timespec(wait_until);
+        int const cond_res=pthread_cond_timedwait(&cond,&internal_mutex,&timeout);
         this_thread::interruption_point();
         if(cond_res==ETIMEDOUT)
         {
@@ -133,8 +130,8 @@ namespace boost
                 detail::interruption_checker check_for_interruption(&internal_mutex,&cond);
                 guard.activate(m);
                 res=pthread_cond_wait(&cond,&internal_mutex);
+                this_thread::interruption_point();
             }
-            this_thread::interruption_point();
             if(res)
             {
                 boost::throw_exception(condition_error());
@@ -157,8 +154,8 @@ namespace boost
                 detail::interruption_checker check_for_interruption(&internal_mutex,&cond);
                 guard.activate(m);
                 res=pthread_cond_timedwait(&cond,&internal_mutex,&timeout);
+                this_thread::interruption_point();
             }
-            this_thread::interruption_point();
             if(res==ETIMEDOUT)
             {
                 return false;

include/boost/thread/win32/thread_data.hpp

@@ -145,9 +145,9 @@ namespace boost
             {}
         };
 
-        inline uintmax_t pin_to_zero(intmax_t value)
+        inline unsigned long pin_to_zero(long value)
         {
-            return (value<0)?0u:(uintmax_t)value;
+            return (value<0)?0u:(unsigned long)value;
         }
     }
 
@@ -156,7 +156,7 @@ namespace boost
         void BOOST_THREAD_DECL yield();
 
         bool BOOST_THREAD_DECL interruptible_wait(detail::win32::handle handle_to_wait_for,detail::timeout target_time);
-        inline void interruptible_wait(uintmax_t milliseconds)
+        inline void interruptible_wait(unsigned long milliseconds)
         {
             interruptible_wait(detail::win32::invalid_handle_value,milliseconds);
         }

src/pthread/once.cpp

@@ -22,18 +22,16 @@ namespace boost
             pthread_key_t epoch_tss_key;
             pthread_once_t epoch_tss_key_flag=PTHREAD_ONCE_INIT;
             
-            extern "C"
+            extern "C" void delete_epoch_tss_data(void* data)
             {
-                static void delete_epoch_tss_data(void* data)
-                {
-                    free(data);
-                }
-
-                static void create_epoch_tss_key()
-                {
-                    BOOST_VERIFY(!pthread_key_create(&epoch_tss_key,delete_epoch_tss_data));
-                }
+                free(data);
             }
+
+            extern "C" void create_epoch_tss_key()
+            {
+                BOOST_VERIFY(!pthread_key_create(&epoch_tss_key,delete_epoch_tss_data));
+            }
+            
         }
         
         boost::uintmax_t& get_once_per_thread_epoch()

src/pthread/thread.cpp

@@ -50,7 +50,7 @@ namespace boost
 
             extern "C"
             {
-                static void tls_destructor(void* data)
+                void tls_destructor(void* data)
                 {
                     boost::detail::thread_data_base* thread_info=static_cast<boost::detail::thread_data_base*>(data);
                     if(thread_info)
@@ -111,7 +111,7 @@ namespace boost
     {
         extern "C"
         {
-            static void* thread_proxy(void* param)
+            void* thread_proxy(void* param)
             {
                 boost::detail::thread_data_ptr thread_info = static_cast<boost::detail::thread_data_base*>(param)->self;
                 thread_info->self.reset();

src/win32/thread.cpp

@@ -9,6 +9,7 @@
 
 #include <boost/thread/thread.hpp>
 #include <algorithm>
+#include <windows.h>
 #ifndef UNDER_CE
 #include <process.h>
 #endif
@@ -19,7 +20,6 @@
 #include <boost/throw_exception.hpp>
 #include <boost/thread/detail/tss_hooks.hpp>
 #include <boost/date_time/posix_time/conversion.hpp>
-#include <windows.h>
 
 namespace boost
 {
@@ -32,12 +32,7 @@ namespace boost
         {
             tss_cleanup_implemented(); // if anyone uses TSS, we need the cleanup linked in
             current_thread_tls_key=TlsAlloc();
-			#if defined(UNDER_CE)
-				// Windows CE does not define the TLS_OUT_OF_INDEXES constant.
-				BOOST_ASSERT(current_thread_tls_key!=0xFFFFFFFF);
-			#else
-				BOOST_ASSERT(current_thread_tls_key!=TLS_OUT_OF_INDEXES);
-			#endif
+            BOOST_ASSERT(current_thread_tls_key!=TLS_OUT_OF_INDEXES);
         }
 
         void cleanup_tls_key()
@@ -67,7 +62,7 @@ namespace boost
                 boost::throw_exception(thread_resource_error());
         }
 
-#ifndef BOOST_HAS_THREADEX
+#ifdef BOOST_NO_THREADEX
 // Windows CE doesn't define _beginthreadex
 
         struct ThreadProxyData

src/win32/tss_pe.cpp

@@ -11,7 +11,7 @@
 
 #if defined(BOOST_HAS_WINTHREADS) && defined(BOOST_THREAD_BUILD_LIB) 
 
-#if (defined(__MINGW32__) && !defined(_WIN64)) || defined(__MINGW64__)
+#if defined(__MINGW32__) && !defined(_WIN64)
 
 #include <boost/thread/detail/tss_hooks.hpp>
 
@@ -38,8 +38,7 @@ namespace {
     }
 }
 
-#if defined(__MINGW64__) || (__MINGW32_MAJOR_VERSION >3) ||             \
-    ((__MINGW32_MAJOR_VERSION==3) && (__MINGW32_MINOR_VERSION>=18))
+#if (__MINGW32_MAJOR_VERSION >3) || ((__MINGW32_MAJOR_VERSION==3) && (__MINGW32_MINOR_VERSION>=18))
 extern "C"
 {
     PIMAGE_TLS_CALLBACK __crt_xl_tls_callback__ __attribute__ ((section(".CRT$XLB"))) = on_tls_callback;