Merge branch 'iss-30' into develop

Author: HerbertKoelman

include/pthread/condition_variable.hpp

@@ -212,7 +212,8 @@ namespace pthread {
 
   template<class Lambda> bool condition_variable::wait( lock_guard<pthread::mutex> &lck, Lambda lambda){
 
-    return wait( *(lck.mutex()), lambda);
+    //return wait( *(lck.mutex()), lambda);
+    return wait( *(lck._mutex), lambda);
   };
 
   template<class Lambda> bool condition_variable::wait_for( mutex &mtx, int millis, Lambda lambda){
@@ -253,7 +254,8 @@ namespace pthread {
 
   template<class Lambda> bool condition_variable::wait_for( lock_guard<pthread::mutex> &lck, int millis, Lambda lambda){
 
-    return wait_for(*(lck.mutex()),millis, lambda);
+    // return wait_for(*(lck.mutex()),millis, lambda);
+    return wait_for(*(lck._mutex),millis, lambda);
   };
 
 } // namespace pthread

include/pthread/lock_guard.hpp

@@ -12,13 +12,14 @@
 #include <pthread.h>
 
 #include "pthread/config.h"
-
 #include "pthread/mutex.hpp"
 
 namespace pthread {
 
   using namespace std ;
 
+  class condition_variable ;
+
   /**
    This class was designed to encapsulate a mutex and automatically control the lock attribute.
 
@@ -29,7 +30,9 @@ namespace pthread {
    */
   template<class MutexType>
   class lock_guard {
-    
+
+    friend class condition_variable;
+
   public:
     /**
      * The constructor is forced to only accept a mutex object or any object of a subclass.
@@ -38,24 +41,26 @@ namespace pthread {
      *
      * @param m reference to a valid pthread::mutex
      */
-    explicit lock_guard(mutex &m) : _mutex(&m) {
-      _mutex->lock();
+    explicit lock_guard(MutexType &m): _mutex(&m) {
+        _mutex->lock();
     }
 
     /** release the guared mutex.
      */
-    ~lock_guard() {
+   virtual ~lock_guard() {
       _mutex->unlock();
+   }
+    
+    /** @return a const reference to the guarded mutex */
+    MutexType *internal_mutex() {
+      return _mutex ;
     }
 
     /*
      Desabling the = operator.
      */
     void operator=(lock_guard &) = delete;
 
-    /** @return a const reference to the guarded mutex */
-    MutexType *mutex() const { return _mutex ;};
-    
   private:
     MutexType *_mutex;
   };

include/pthread/thread.hpp

@@ -12,7 +12,7 @@
 #include <pthread.h>
 #include <string>
 #include <functional>
-#include <memory>
+#include <memory> // std::auto_ptr, std::unique_ptr
 #include <list>
 
 #include "pthread/config.h"

src/condition_variable.cpp

@@ -7,11 +7,13 @@ namespace pthread {
   }
 
   void condition_variable::wait(lock_guard<pthread::mutex> lck){
-    wait(*(lck.mutex()));
+    // wait(*(lck.mutex()));
+    wait(*(lck._mutex));
   }
 
   cv_status condition_variable::wait_for (lock_guard<pthread::mutex> &lck, int millis ){
-    return wait_for(*(lck.mutex()), millis);
+    // return wait_for(*(lck.mutex()), millis);
+    return wait_for(*(lck._mutex), millis);
   }
 
   /* Default millis is 0 */

src/configure

@@ -3937,6 +3937,7 @@ case "$CXX" in
 $as_echo "yes" >&6; }
   ;;
   g++ | gcc)
+	#CXXFLAGS="-x c++ -std=c++11 -frtti -fpermissive $CXXFLAGS "
 	CXXFLAGS="-x c++ -std=c++11 -frtti $CXXFLAGS "
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }

src/configure.ac

@@ -44,6 +44,7 @@ case "$CXX" in
   AC_MSG_RESULT([yes])
   ;;
   g++ | gcc)
+	#permissive is not required anymore - CXXFLAGS="-x c++ -std=c++11 -frtti -fpermissive $CXXFLAGS "
 	CXXFLAGS="-x c++ -std=c++11 -frtti $CXXFLAGS "
   AC_MSG_RESULT([yes])
   ;;

src/thread.cpp

@@ -123,7 +123,12 @@ namespace pthread {
 
   thread_group::~thread_group(){
     while(! _threads.empty()){
+#if __cplusplus < 201103L
       std::auto_ptr<pthread::abstract_thread> pat(_threads.front());
+#else
+      std::unique_ptr<pthread::abstract_thread> pat(_threads.front());
+#endif
+
       _threads.pop_front();
 
       if ( _destructor_joins_first ){

tests/Makefile.in

@@ -58,4 +58,4 @@ beautifull:
 	$(CCC) $(CCFLAGS) -c $<
 
 .cpp: 
-	$(CCC) $(CCFLAGS) $(LDFLAGS) $< -o $@
+	$(CCC) $(CCFLAGS) $< -o $@ $(LDFLAGS)

tests/configure

@@ -3904,11 +3904,13 @@ if test $ac_cv_sizeof_long == "8"
 then
   BITS="64"
 
+  #CXXFLAGS="-m$ac_cv_sizeof_long $CXXFLAGS -I ../include -I ./"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: using 32 bits (default)" >&5
 $as_echo "using 32 bits (default)" >&6; }
   BITS="32"
 
+  #CXXFLAGS="-m$ac_cv_sizeof_long $CXXFLAGS -I ../include -I ./"
 fi
 
 OBJECTS=""

tests/configure.ac

@@ -22,9 +22,11 @@ AC_CHECK_SIZEOF([long])
 if test $ac_cv_sizeof_long == "8" 
 then
   AC_SUBST(BITS,"64")
+  #CXXFLAGS="-m$ac_cv_sizeof_long $CXXFLAGS -I ../include -I ./"
 else
   AC_MSG_RESULT([using 32 bits (default)])
   AC_SUBST(BITS,"32")
+  #CXXFLAGS="-m$ac_cv_sizeof_long $CXXFLAGS -I ../include -I ./"
 fi
 
 OBJECTS=""