Merge pull request log4cplus#263 from wilx/1.2.x

Merge.
taotingjiang · Jul 11, 2017 · a822b31 · a822b31
2 parents 41265e3 + 20ca0f9
commit a822b31
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -18,6 +18,10 @@ log4cplus 1.2.1-RC2
   - `SocketBuffer` now throws an exception on overflow and `SocketAppender`
     handles it and does not send overlong messages.
 
+  - Fixed SF#343. Avoid using C++11 `std::mutex` and other synchronization
+    primitives in Visual Studio earlier than 2015.
+
+
 log4cplus 1.2.1-RC1
 -------------------
 

diff --git a/configure b/configure
@@ -4470,7 +4470,7 @@ esac
 #  ? :+1 : ?   == just some internal changes, nothing breaks but might work
 #                 better
 # CURRENT : REVISION : AGE
-LT_VERSION=6:5:1
+LT_VERSION=6:6:1
 LT_RELEASE=1.2
 
 

diff --git a/configure.ac b/configure.ac
@@ -20,7 +20,7 @@ AM_PROG_AR
 #  ? :+1 : ?   == just some internal changes, nothing breaks but might work
 #                 better
 # CURRENT : REVISION : AGE
-LT_VERSION=6:5:1
+LT_VERSION=6:6:1
 LT_RELEASE=1.2
 AC_SUBST([LT_VERSION])
 AC_SUBST([LT_RELEASE])

diff --git a/include/log4cplus/config/win32.h b/include/log4cplus/config/win32.h
@@ -43,7 +43,7 @@
 #define LOG4CPLUS_HAVE_TIME_H
 #define LOG4CPLUS_HAVE_SYS_TIMEB_H
 #define LOG4CPLUS_HAVE_FTIME
-#if defined (_MSC_VER) || defined (__BORLANDC__) 
+#if defined (_MSC_VER) || defined (__BORLANDC__)
 #define LOG4CPLUS_HAVE_GMTIME_S
 #endif
 
@@ -162,6 +162,12 @@
 #  endif
 #  if _MSC_VER >= 1700
 #    define LOG4CPLUS_HAVE_CXX11_ATOMICS
+#  endif
+#  if _MSC_VER >= 1900
+// C++11 threading facilities and synchronization primitives are available
+// already in earlier versions of Visual Studio compiler, however, there are
+// issues with the way mutexes are implemented and using them during process
+// shutdown. This appears to be fixed in Visual Studio 2015 and later.
 #    define LOG4CPLUS_WITH_CXX11_THREADS
 #  endif
 #endif