Merge branch 'iss-22' into develop

Author: HerbertKoelman

cpp-pthread.xcodeproj/project.pbxproj

@@ -14,6 +14,7 @@
 		E54543411CAD23690051A313 /* mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5EC5B7B1C9C2C6B00E21131 /* mutex.cpp */; };
 		E54543421CAD23690051A313 /* lock_guard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E519A0E41C9C4B4F00ED113D /* lock_guard.cpp */; };
 		E54543431CAD23690051A313 /* thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E519A0FF1C9C7CAB00ED113D /* thread.cpp */; };
+		E580F99C1CB3174F00A7CE3A /* pthread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E580F99B1CB3174F00A7CE3A /* pthread.cpp */; };
 		E5BF2B651CB13C8100B158E3 /* without-cpp11-pthread-tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E5BF2B631CB13C7700B158E3 /* without-cpp11-pthread-tests.cpp */; };
 		E5BF2B661CB13C8900B158E3 /* libcpp-pthread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5EC5B711C9C2C3000E21131 /* libcpp-pthread.a */; };
 		E5C4D71D1C9DC8C700D0E18C /* pthread in Headers */ = {isa = PBXBuildFile; fileRef = E5EC5B811C9C2C8B00E21131 /* pthread */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -63,6 +64,7 @@
 		E519A0E41C9C4B4F00ED113D /* lock_guard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = lock_guard.cpp; path = src/lock_guard.cpp; sourceTree = "<group>"; };
 		E519A0FF1C9C7CAB00ED113D /* thread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = thread.cpp; path = src/thread.cpp; sourceTree = "<group>"; };
 		E54543351CAD21A30051A313 /* cpp11-pthread-tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "cpp11-pthread-tests"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E580F99B1CB3174F00A7CE3A /* pthread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pthread.cpp; path = src/pthread.cpp; sourceTree = "<group>"; };
 		E5BF2B5A1CB13C3D00B158E3 /* without-cpp11-pthread-tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "without-cpp11-pthread-tests"; sourceTree = BUILT_PRODUCTS_DIR; };
 		E5BF2B631CB13C7700B158E3 /* without-cpp11-pthread-tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "without-cpp11-pthread-tests.cpp"; sourceTree = "<group>"; };
 		E5EC5B711C9C2C3000E21131 /* libcpp-pthread.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcpp-pthread.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -130,6 +132,7 @@
 		E5EC5B801C9C2C7100E21131 /* src */ = {
 			isa = PBXGroup;
 			children = (
+				E580F99B1CB3174F00A7CE3A /* pthread.cpp */,
 				E5EC5B791C9C2C6B00E21131 /* condition_variable.cpp */,
 				E5EC5B7B1C9C2C6B00E21131 /* mutex.cpp */,
 				E519A0E41C9C4B4F00ED113D /* lock_guard.cpp */,
@@ -278,6 +281,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				E519A0E51C9C4B4F00ED113D /* lock_guard.cpp in Sources */,
+				E580F99C1CB3174F00A7CE3A /* pthread.cpp in Sources */,
 				E5EC5B7D1C9C2C6B00E21131 /* condition_variable.cpp in Sources */,
 				E5EC5B7F1C9C2C6B00E21131 /* mutex.cpp in Sources */,
 				E519A1011C9C7CAB00ED113D /* thread.cpp in Sources */,
@@ -464,6 +468,7 @@
 				E5BF2B601CB13C3D00B158E3 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 		E5EC5B6C1C9C2C3000E21131 /* Build configuration list for PBXProject "cpp-pthread" */ = {
 			isa = XCConfigurationList;

include/pthread/pthread.hpp

@@ -31,5 +31,7 @@
 */
 namespace pthread {
 
+  extern "C" const char *cpp_pthread_version();
+  
 }
 #endif /* pthread_pthread_hpp */

src/pthread.cpp

@@ -12,14 +12,16 @@
 #include "pthread/pthread.hpp"
 #include "pthread/config.h"
 
+
 namespace pthread {
 
-  extern "C" const char *cpp_pthread_version(){
+extern "C" const char *cpp_pthread_version(){
 #ifndef CPP_PTHREAD_VERSION
-    return "missing CPP_PTHREAD_VERSION define. Re-run configure" ;
+  return "missing CPP_PTHREAD_VERSION define. Re-run configure" ;
 #else
-    return CPP_PTHREAD_VERSION ;
+  return CPP_PTHREAD_VERSION ;
 #endif
-  }
+}
+
 }
 #endif /* pthread_pthread_hpp */

tests/without-cpp11-pthread-tests.cpp

@@ -66,6 +66,8 @@ class worker: public pthread::abstract_thread {
 
 int main(int argc, const char * argv[]) {
 
+  std::cout << "version: " << pthread::cpp_pthread_version() << std::endl;
+
   pthread::string dummy;
 
   {