mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-12-25 10:01:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gabime 2015-07-08 23:46:49 +03:00
commit 08b6b0beed
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -107,7 +107,7 @@ before_install:
- which $CXX - which $CXX
- which $CC - which $CC
- which valgrind - which valgrind
- if [ -n "$CLANG_VERSION" ]; then sudo CXX=$CXX CC=$CC .tests/install_libcxx.sh; fi - if [ -n "$CLANG_VERSION" ]; then sudo CXX=$CXX CC=$CC ./tests/install_libcxx.sh; fi
install: install:
- cd $CHECKOUT_PATH - cd $CHECKOUT_PATH
@ -136,7 +136,7 @@ install:
script: script:
- ./"${BIN}" - ./"${BIN}"
- valgrind --trace-children=yes --leak-check=full ./"${BIN}" - valgrind --trace-children=yes --leak-check=full ./"${BIN}"
- cd tests; make rebuild; ./tests - cd $CHECKOUT_PATH/tests; make rebuild; ./tests
notifications: notifications:
email: false email: false

5
include/spdlog/details/line_logger.h
View File

@ -206,6 +206,11 @@ public:
_enabled = false; _enabled = false;
} }
bool is_enabled() const
{
return _enabled;
}
private: private:
logger* _callback_logger; logger* _callback_logger;

9
tests/Makefile
View File

@ -1,6 +1,6 @@
CXX ?= g++ CXX ?= g++
CXXFLAGS = -Wall -pedantic -std=c++11 -pthread -Wl,--no-as-needed -O2 CXXFLAGS = -Wall -pedantic -std=c++11 -pthread -O2
LDPFALGS = -pthread -flto LDPFALGS = -pthread
CPP_FILES := $(wildcard *.cpp) CPP_FILES := $(wildcard *.cpp)
OBJ_FILES := $(addprefix ./,$(notdir $(CPP_FILES:.cpp=.o))) OBJ_FILES := $(addprefix ./,$(notdir $(CPP_FILES:.cpp=.o)))
@ -8,12 +8,13 @@ OBJ_FILES := $(addprefix ./,$(notdir $(CPP_FILES:.cpp=.o)))
tests: $(OBJ_FILES) tests: $(OBJ_FILES)
$(CXX) $(CXXFLAGS) $(LDPFALGS) -o $@ $^ $(CXX) $(CXXFLAGS) $(LDPFALGS) -o $@ $^
mkdir -p logs
%.o: %.cpp %.o: %.cpp
g++ $(CXXFLAGS) -c -o $@ $< $(CXX) $(CXXFLAGS) -c -o $@ $<
clean: clean:
rm -f tests *.o logs/* rm -f tests *.o logs/*.txt
rebuild: clean tests rebuild: clean tests