miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Boost headers

Browse Source
This commit is contained in:
pelya
2011-06-07 13:24:38 +03:00
parent 0970661c21
commit b8e71daa73
5 changed files with 11 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/jni/boost/include/boost/interprocess/detail/atomic.hpp
View File

@@ -265,7 +265,7 @@ inline void atomic_write32(volatile boost::uint32_t *mem, boost::uint32_t val)
} //namespace interprocess{
} //namespace boost{
#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 )
#elif defined(__GNUC__) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 401 ) && !defined(ANDROID)
namespace boost {
namespace interprocess {

7
project/jni/boost/include/boost/interprocess/sync/posix/interprocess_condition.hpp
View File

@@ -18,6 +18,7 @@ namespace interprocess {
inline interprocess_condition::interprocess_condition()
{
#if !defined(ANDROID)
int res;
pthread_condattr_t cond_attr;
res = pthread_condattr_init(&cond_attr);
@@ -34,6 +35,12 @@ inline interprocess_condition::interprocess_condition()
if(res != 0){
throw interprocess_exception(res);
}
#else
int res = pthread_cond_init(&m_condition, NULL);
if(res != 0){
throw interprocess_exception(res);
}
#endif
}
inline interprocess_condition::~interprocess_condition()

2
project/jni/boost/include/boost/interprocess/sync/posix/pthread_helpers.hpp
View File

@@ -50,6 +50,7 @@ namespace detail{
pthread_mutexattr_t m_attr;
};
#if !defined(ANDROID)
//!Makes pthread_condattr_t cleanup easy when using exceptions
struct condattr_wrapper
{
@@ -69,6 +70,7 @@ namespace detail{
pthread_condattr_t m_attr;
};
#endif
//!Makes initialized pthread_mutex_t cleanup easy when using exceptions
class mutex_initializer