Merge branch 'master' of https://github.com/gabime/spdlog

README.md

@@ -17,7 +17,7 @@ Just copy the files to your build tree and use a C++11 compiler
 * No dependencies - just copy and use.
 * Cross platform - Linux / Windows on 32/64 bits.
 * **new!** Feature rich [call style](#usage-example) using the excellent [cppformat](http://cppformat.github.io/) library.
-* Optional ostream call style.
+* ostream call style is supported too.
 * Extremely fast asynchronous mode (optional) - use of lockfree queues and other tricks to reach millions  of calls per second from multiple threads.
 * [Custom](https://github.com/gabime/spdlog/wiki/Custom-formatting) formatting.
 * Multi/Single threaded loggers.

example/Makefile.clang

@@ -1,6 +1,6 @@
 CXX	= clang++
-CXXFLAGS	= -march=native -Wall -Wextra -Wshadow -pedantic -std=c++11 -pthread -I../include -B/usr/lib/gold-ld/
-CXX_RELEASE_FLAGS = -O3 -flto
+CXXFLAGS	= -march=native -Wall -Wextra -Wshadow -pedantic -std=c++11 -pthread -I../include
+CXX_RELEASE_FLAGS = -O2
 CXX_DEBUG_FLAGS= -g 
 
 

include/spdlog/details/format.h

@@ -25,8 +25,8 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#ifndef FMT_FORMAT_H_
-#define FMT_FORMAT_H_
+#ifndef SPDLOG_FMT_FORMAT_H_
+#define SPDLOG_FMT_FORMAT_H_
 
 #include <stdint.h>
 
@@ -2879,4 +2879,4 @@ FMT_VARIADIC(int, fprintf, std::FILE *, StringRef)
 # pragma GCC diagnostic pop //pop -Wshadow warnings ignore
 #endif
 
-#endif  // FMT_FORMAT_H_
+#endif  // SPDLOG_FMT_FORMAT_H_