Merge branch 'develop' of mut-mut-scmv1.dev.parimutuel.local:p094212/cpp-pthread into develop

Author: Herbert KOELMAN

include/pthread/condition_variable.hpp

@@ -155,12 +155,21 @@ namespace pthread {
      * The pthread_cond_signal() call unblocks at least one of the threads that are blocked
      * on the specified condition variable cond (if any threads are blocked on cond).
      */
-    void notify_one () __NOEXCEPT__;
+#if __cplusplus < 201103L
+    void notify_one () throw() ;
+#else
+    void notify_one () noexcept;
+#endif
+
 
     /** signal all waiting threads
      * The pthread_cond_broadcast() call unblocks all threads currently blocked on the specified condition variable cond.
      */
-    void notify_all () __NOEXCEPT__;
+#if __cplusplus < 201103L
+    void notify_all () throw() ;
+#else
+    void notify_all () noexcept ;
+#endif
 
     // constructor/destructor ------------------------------------------------
 

include/pthread/config.h.in

@@ -25,12 +25,6 @@
 #ifndef pthread_config_h
 #define pthread_config_h
 
-#ifdef __IBMCPP__
-
-#else
-
-#endif
-
 #undef CPP_PTHREAD_VERSION
 
 /* Define DEBUG. */
@@ -44,17 +38,6 @@
 #undef HAVE_CPP11_CHRONO
 #undef HAVE_CPP11_THREAD
 
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 

include/pthread/pthread_exception.hpp

@@ -12,6 +12,7 @@
 #include "pthread/config.h"
 
 #include <errno.h>
+#include <cstring>
 
 namespace pthread {
 

src/condition_variable.cpp

@@ -1,7 +1,3 @@
-  /*
- $Id: condition_variable.C 28 2007-08-06 22:29:28Z hkoelman $
- */
-
 #include "pthread/condition_variable.hpp"
 
 namespace pthread {
@@ -101,11 +97,7 @@ namespace pthread {
 
   // excpetions -------
 
-#ifdef __IBMCPP__
   condition_variable_exception::condition_variable_exception( const string message, const int pthread_error): pthread_exception(message, pthread_error){
-#else
-  condition_variable_exception::condition_variable_exception( const string message, const int pthread_error): pthread_exception{message, pthread_error}{
-#endif
   };
 
 

src/configure

@@ -4156,7 +4156,7 @@ done
 
 LDFLAGS="$LDFLAGS $LIBS"
 
-ac_config_files="$ac_config_files Makefile"
+ac_config_files="$ac_config_files Makefile pthread.cpp"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4850,6 +4850,7 @@ do
   case $ac_config_target in
     "../include/pthread/config.h") CONFIG_HEADERS="$CONFIG_HEADERS ../include/pthread/config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "pthread.cpp") CONFIG_FILES="$CONFIG_FILES pthread.cpp" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

src/configure.ac

@@ -83,6 +83,6 @@ AC_CHECK_FUNCS([gettimeofday])
 
 LDFLAGS="$LDFLAGS $LIBS"
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile pthread.cpp])
 AC_OUTPUT
 

src/pthread.cpp

@@ -12,6 +12,16 @@
 #include "pthread/pthread.hpp"
 #include "pthread/config.h"
 
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
 
 namespace pthread {
 

src/pthread.cpp.in

@@ -0,0 +1,37 @@
+//
+//  cpp_pthread.hpp
+//  cpp_pthread
+//
+//  Created by herbert koelman on 18/03/2016.
+//
+//
+
+#ifndef pthread_pthread_hpp
+#define pthread_pthread_hpp
+
+#include "pthread/pthread.hpp"
+#include "pthread/config.h"
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+namespace pthread {
+
+extern "C" const char *cpp_pthread_version(){
+#ifndef CPP_PTHREAD_VERSION
+  return "missing CPP_PTHREAD_VERSION define. Re-run configure" ;
+#else
+  return CPP_PTHREAD_VERSION ;
+#endif
+}
+
+}
+#endif /* pthread_pthread_hpp */

tests/without-cpp11-pthread-tests.cpp

@@ -71,7 +71,7 @@ int main(int argc, const char * argv[]) {
 
   std::cout << "version: " << pthread::cpp_pthread_version() << std::endl;
 
-  pthread::string dummy;
+//  std::string dummy;
 
   pthread::thread_group threads(true);
   for (auto x = 10 ; x > 0 ; x--){