Merge branch 'iss-62' into develop

Author: Herbert Koelman

include/pthread/thread.hpp

@@ -202,7 +202,7 @@ namespace pthread {
    *       }
    *     } // end of critical section
    * 
-   *     pthread::this_thread::sleep(200);
+   *     pthread::this_thread::sleep_for(200);
    *   };
    * 
    * private:
@@ -342,7 +342,7 @@ namespace pthread {
      *
      * @param millis time to wait.
      */
-    void sleep(const int millis);
+    void sleep_for(const int millis);
 
     /** @return current thread id/reference */
     pthread_t get_id() ;

src/configure.ac

@@ -40,7 +40,7 @@ AC_SUBST(OBJECTS,$OBJECTS)
 AC_MSG_CHECKING([for specific $CXX compiler options])
 case "$CXX" in
   xlC_r | xlC)
-    CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences:rvaluereferences -qsourcetype=c++ $CPPFLAGS"
+    CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences -qsourcetype=c++ $CPPFLAGS"
     CFLAGS="-bh:5 -qmaxmem=-1 -q$BITS $CFLAGS"
     CXXFLAGS="-O"
     LDFLAGS="$LDFLAGS -brtl -bmaxdata:0x80000000"

src/thread.cpp

@@ -14,7 +14,7 @@ namespace pthread {
 
   namespace this_thread {
 
-    void sleep(const int millis){
+    void sleep_for(const int millis){
       usleep(millis * 1000); //NOSONAR this wil be replaced by the much better C++11 implementation std::this_thread::sleep_for
     }
 

tests/configure.ac

@@ -39,7 +39,7 @@ AC_SUBST(OBJECTS,$OBJECTS)
 AC_MSG_CHECKING([for specific $CXX compiler options])
 case "$CXX" in
   xlC_r | xlC)
-    CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences:rvaluereferences -qsourcetype=c++ -O $CPPFLAGS"
+    CPPFLAGS="-qlanglvl=extended0x:decltype:static_assert:rvaluereferences -qsourcetype=c++ -O $CPPFLAGS"
     CFLAGS="-bh:5 -qmaxmem=-1 -q$BITS $CFLAGS"
     CXXFLAGS="-O"
     LDFLAGS="$LDFLAGS -brtl -bmaxdata:0x80000000"

tests/without-cpp11-pthread-tests.cpp

@@ -67,7 +67,7 @@ class worker: public pthread::abstract_thread {
       }
 
       message("worker sleeping");
-      pthread::this_thread::sleep(200);
+      pthread::this_thread::sleep_for(200);
       message("worker class is ending");
 
     } catch ( pthread::pthread_exception &err ){
@@ -122,6 +122,6 @@ int main(int argc, const char * argv[]) {
     message("Unhandled exception was thrown in main");
   }
 
-  pthread::this_thread::sleep(5*1000); 
+  pthread::this_thread::sleep_for(5*1000); 
   message( "end reached");
 }