From e0089dbdc03b3e8f7f9a39b6e3f037a7a48d17ff Mon Sep 17 00:00:00 2001 From: Gabi Melman Date: Tue, 9 Dec 2014 01:36:41 +0200 Subject: [PATCH 1/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a6174bfb..15643950 100644 --- a/README.md +++ b/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. From 2bf6eeb0db03dd1c30ddd160589cbd416e0128b7 Mon Sep 17 00:00:00 2001 From: Rob Patro Date: Wed, 10 Dec 2014 16:06:15 -0500 Subject: [PATCH 2/3] Changed header guard for format.h Previously, if spdlog was being used in a project that also uses cppformat, this file (with it's custom namespace) would not be included. This is because, while the definitions were added to the spdlog namespace, the include guard was left the same as in the actual cppformat library. This change modifies the include guard by prefixing it with SPDLOG_. --- include/spdlog/details/format.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/spdlog/details/format.h b/include/spdlog/details/format.h index 337b4ab8..b74da1f2 100644 --- a/include/spdlog/details/format.h +++ b/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 @@ -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_ From 5467cb35f3a796b11a3b4715e53dfc642fbe8ec4 Mon Sep 17 00:00:00 2001 From: gabime Date: Wed, 17 Dec 2014 07:10:46 +0200 Subject: [PATCH 3/3] fixed clang make --- example/Makefile.clang | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/Makefile.clang b/example/Makefile.clang index 9d68e796..78488446 100644 --- a/example/Makefile.clang +++ b/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