Merge pull request log4cplus#314 from wilx/2.0.x

Merge.
taotingjiang · May 26, 2018 · 3bf1032 · 3bf1032
2 parents 5c14bda + f7ee738
commit 3bf1032
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+# log4cplus 2.0.1
+
+  - Update to Automake 1.16.1.
+
+  - Adjust `spi::LoggerFactory` to allow custom `spi::LoggerImpl`. GitHub
+    issue #309.
+
+  - Fix MacOS X compilation. GitHub issue #312.
+
+
 # log4cplus 2.0
 
   - CMake improvements: Automate export of includes if building as Cmake

diff --git a/include/log4cplus/helpers/timehelper.h b/include/log4cplus/helpers/timehelper.h
@@ -110,7 +110,7 @@ inline
 long
 microseconds_part (Time const & the_time)
 {
-    static_assert (std::ratio_equal<Duration::period, std::micro>::value,
+    static_assert ((std::ratio_equal<Duration::period, std::micro>::value),
         "microseconds");
 
     // This is based on <http://stackoverflow.com/a/17395137/341065>