[Boost-commit] svn:boost r80496 - trunk/libs/thread/src/pthread

Subject: [Boost-commit] svn:boost r80496 - trunk/libs/thread/src/pthread
From: vicente.botet_at_[hidden]
Date: 2012-09-11 17:52:53

Author: viboes
Date: 2012-09-11 17:52:52 EDT (Tue, 11 Sep 2012)
New Revision: 80496
URL: http://svn.boost.org/trac/boost/changeset/80496

Log:
Thread: Apply patch for 7360
Text files modified: 
   trunk/libs/thread/src/pthread/thread.cpp |     6 +++---                                  
   1 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/libs/thread/src/pthread/thread.cpp
==============================================================================
--- trunk/libs/thread/src/pthread/thread.cpp	(original)
+++ trunk/libs/thread/src/pthread/thread.cpp	2012-09-11 17:52:52 EDT (Tue, 11 Sep 2012)
@@ -649,7 +649,7 @@
                     return &current_node->second;
                 }
             }
-            return NULL;
+            return 0;
         }
 
         void* get_tss_data(void const* key)
@@ -658,7 +658,7 @@
             {
                 return current_node->value;
             }
-            return NULL;
+            return 0;
         }
 
         void add_new_tss_node(void const* key,
@@ -695,7 +695,7 @@
                     erase_tss_node(key);
                 }
             }
-            else
+            else if(func || (tss_data!=0))
             {
                 add_new_tss_node(key,func,tss_data);
             }