update version infos

handled SONAR issues

Author: Herbert Koelman

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for cpp-pthread v1.6.1.
+# Generated by GNU Autoconf 2.69 for cpp-pthread v1.7.0.
 #
 # Report bugs to <[email protected]>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='cpp-pthread'
 PACKAGE_TARNAME='cpp-pthread'
-PACKAGE_VERSION='v1.6.1'
-PACKAGE_STRING='cpp-pthread v1.6.1'
+PACKAGE_VERSION='v1.7.0'
+PACKAGE_STRING='cpp-pthread v1.7.0'
 PACKAGE_BUGREPORT='[email protected]'
 PACKAGE_URL='http://herbertkoelman.github.io/cpp-pthread/'
 
@@ -1191,7 +1191,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures cpp-pthread v1.6.1 to adapt to many kinds of systems.
+\`configure' configures cpp-pthread v1.7.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1255,7 +1255,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of cpp-pthread v1.6.1:";;
+     short | recursive ) echo "Configuration of cpp-pthread v1.7.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1338,7 +1338,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-cpp-pthread configure v1.6.1
+cpp-pthread configure v1.7.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1355,7 +1355,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by cpp-pthread $as_me v1.6.1, which was
+It was created by cpp-pthread $as_me v1.7.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2681,7 +2681,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by cpp-pthread $as_me v1.6.1, which was
+This file was extended by cpp-pthread $as_me v1.7.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2735,7 +2735,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-cpp-pthread config.status v1.6.1
+cpp-pthread config.status v1.7.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

include/pthread/condition_variable.hpp

@@ -34,11 +34,11 @@ namespace pthread {
     no_timeout, /*!< unblocked before a timeout occured */
     timedout    /*!< condition timedout */
   };
-  
+
   /** Condition variable.
    *
    * The condition_variable class is a synchronization primitive that can be used to block a thread, or multiple threads
-   * at the same time, until another thread both modifies a shared variable (the condition), and notifies the 
+   * at the same time, until another thread both modifies a shared variable (the condition), and notifies the
    * condition_variable.
    *
    * The thread that intends to modify the variable has to
@@ -55,7 +55,7 @@ namespace pthread {
    */
   class condition_variable {
   public:
-    
+
     /** Wait for condition to be signaled.
      *
      * This method atomically release mutex and cause the calling thread to block; atomically here means "atomically with respect to
@@ -68,11 +68,11 @@ namespace pthread {
      * @see notify_all
      */
     void wait ( mutex &mtx );
-    
-    /** @see wait
+
+    /** @see wai
      */
     void wait ( lock_guard<pthread::mutex> lck);
-    
+
     /** Wait for condition to be signaled.
      *
      * This method atomically release mutex and cause the calling thread to block; atomically here means "atomically with respect to
@@ -90,7 +90,7 @@ namespace pthread {
      * @see notify_all
      */
     template<class Lambda> bool wait( mutex &mtx, Lambda lambda);
-    
+
     /** Wait for condition to be signaled.
      *
      * This method atomically release mutex and cause the calling thread to block; atomically here means "atomically with respect to
@@ -108,15 +108,15 @@ namespace pthread {
      * @see notify_all
      */
     template<class Lambda> bool wait( lock_guard<pthread::mutex> &lck, Lambda lambda);
-    
+
     /** Wait for condition to be signaled within given time frame.
      *
      * This method atomically release mutex and cause the calling thread to block; atomically here means "atomically with respect to
      * access by another thread to the mutex and then the condition variable". Call notify_one or notify_all to signal the condition.
      *
      * Upon successful return, the mutex has been locked and is owned by the calling thread.
      *
-     * If this method is called with millis < 0 then the timeout time is not recalculated. This make it possible to handle spurious 
+     * If this method is called with millis < 0 then the timeout time is not recalculated. This make it possible to handle spurious
      * unblocking of condition variable without the need of a lambda expression. The call sequence is then: while(! check_condition() && wait_for(lck, 200) == no_tiemout );
      *
      * @param mtx ralated mutex, which must be locked by the current thread.
@@ -131,7 +131,7 @@ namespace pthread {
     /** @see #wait_for (mutex &, int)
      */
     cv_status wait_for (lock_guard<pthread::mutex> &lck, int millis );
-    
+
     /** Wait for condition to be signaled within a given time frame.
      *
      * This method atomically release mutex and cause the calling thread to block; atomically here means "atomically with respect to
@@ -150,7 +150,7 @@ namespace pthread {
      * @see notify_all
      */
     template<class Lambda> bool wait_for( mutex &mtx, int millis, Lambda lambda);
-    
+
     /** Wait for condition to be signaled within a given time frame.
      *
      * This method atomically release mutex and cause the calling thread to block; atomically here means "atomically with respect to
@@ -169,7 +169,7 @@ namespace pthread {
      * @see notify_all
      */
     template<class Lambda> bool wait_for( lock_guard<pthread::mutex> &lck, int millis, Lambda lambda);
-    
+
     /** Signal one waiting thread.
      *
      * The call unblocks at least one of the threads that are blocked on the specified condition variable cond (if any threads are blocked on cond).
@@ -179,7 +179,7 @@ namespace pthread {
 #else
     void notify_one () noexcept;
 #endif
-    
+
     /** Signal all waiting threads.
      *
      * The call unblocks all threads currently blocked on the specified condition variable cond.
@@ -189,32 +189,32 @@ namespace pthread {
 #else
     void notify_all () noexcept ;
 #endif
-    
+
     // constructor/destructor ------------------------------------------------
-    
+
     condition_variable ();
     virtual ~condition_variable();
-    
+
   private:
     void milliseconds( int milliseconds);
-    
+
     timespec timeout;
     pthread_cond_t _condition;
   };
-  
+
   /** @} */
-  
+
   // template implementation ----------------------
-  
+
   template<class Lambda> bool condition_variable::wait( mutex &mtx, Lambda lambda){
-    
+
     bool stop_waiting = lambda();
-    
+
     while(!stop_waiting){
       wait(mtx);
       stop_waiting = lambda(); // handling spurious wakeups
     }
-    
+
     return stop_waiting;
   };
 
@@ -223,50 +223,50 @@ namespace pthread {
     //return wait( *(lck.mutex()), lambda);
     return wait( *(lck._mutex), lambda);
   };
-  
+
   template<class Lambda> bool condition_variable::wait_for( mutex &mtx, int millis, Lambda lambda){
     int rc = 0;
     cv_status status = no_timeout;
-    
-    milliseconds(millis); // update timeout
+
+    milliseconds(millis); // update timeou
     bool stop_waiting = lambda(); // returns ​false if the waiting should be continued.
-    
+
     while((! stop_waiting) && (status == no_timeout)){
-      
+
       rc  = pthread_cond_timedwait ( &_condition, &mtx._mutex, &timeout );
-      
+
       switch (rc){
-          
+
         case ETIMEDOUT:
           status = timedout;
           break;
-          
+
         case EINVAL:
           throw condition_variable_exception("The value specified by abstime is invalid.", rc); // NOSONAR we use throw instead of return.
           break;
-          
+
         case EPERM:
           throw condition_variable_exception("The mutex was not owned by the current thread at the time of the call.", rc); // NOSONAR we use throw instead of return.
           break;
         default:
           status = no_timeout ;
           break;
       }
-      
+
       stop_waiting = lambda();
     }
-    
-    
+
+
     return stop_waiting ; //status == cv_status::no_timeout;
   };
-  
+
   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);
   };
 
-  
+
 } // namespace pthread
 
 

include/pthread/config.h.in

@@ -39,11 +39,11 @@
 #undef HAVE_CPP11_THREAD
 
 /* Define to empty if `const' does not conform to ANSI C. */
-#undef const
+#undef cons
 
 /*
  * Define to `__inline__' or `__inline' if that's what the C compiler
- * calls it, or to nothing if 'inline' is not supported under any name. 
+ * calls it, or to nothing if 'inline' is not supported under any name.
  */
 #ifndef __cplusplus
 #undef inline