[med-svn] [spdlog] 02/03: Merge tag 'upstream/1.7'

[Michael Crusoe]

This is an automated email from the git hooks/post-receive script.

misterc-guest pushed a commit to branch master
in repository spdlog.

commit dc09a8fc3801dc6c30184584b4a80742075a3010
Merge: cf2e54e f484e8d
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Sat May 14 10:59:49 2016 -0700

    Merge tag 'upstream/1.7'
    
    Upstream version 1.7

 .travis.yml                                     |    2 +-
 CMakeLists.txt                                  |   62 +
 LICENSE                                         |   45 +-
 README.md                                       |   10 +-
 bench/Makefile                                  |   16 +-
 bench/boost-bench-mt.cpp                        |    5 +
 bench/boost-bench.cpp                           |    4 +
 bench/easylogging-bench-mt.cpp                  |    5 +
 bench/easylogging-bench.cpp                     |    6 +
 bench/g2log-async.cpp                           |    5 +
 bench/glog-bench-mt.cpp                         |    5 +
 bench/glog-bench.cpp                            |    4 +
 bench/run_all.sh                                |   13 +-
 bench/spdlog-async.cpp                          |    8 +-
 bench/spdlog-bench-mt.cpp                       |    9 +-
 bench/spdlog-bench.cpp                          |    4 +
 bench/zf_log-bench-mt.cpp                       |   56 +
 bench/zf_log-bench.cpp                          |   27 +
 cmake/Config.cmake.in                           |   24 +
 example/CMakeLists.txt                          |   49 +
 example/bench.cpp                               |   33 +-
 example/example.cpp                             |   42 +-
 example/example.sln                             |   22 +
 example/example.vcxproj                         |   90 +
 example/utils.h                                 |   27 +-
 include/spdlog/async_logger.h                   |   40 +-
 include/spdlog/common.h                         |   30 +-
 include/spdlog/details/async_log_helper.h       |  152 +-
 include/spdlog/details/async_logger_impl.h      |   52 +-
 include/spdlog/details/file_helper.h            |   62 +-
 include/spdlog/details/format.cc                | 1577 +++----
 include/spdlog/details/format.h                 | 5149 ++++++++++++++---------
 include/spdlog/details/line_logger.h            |  221 -
 include/spdlog/details/line_logger_fwd.h        |   78 +
 include/spdlog/details/line_logger_impl.h       |  185 +
 include/spdlog/details/log_msg.h                |   35 +-
 include/spdlog/details/logger_impl.h            |   43 +-
 include/spdlog/details/mpmc_bounded_q.h         |   28 +-
 include/spdlog/details/null_mutex.h             |   27 +-
 include/spdlog/details/os.h                     |   90 +-
 include/spdlog/details/pattern_formatter_impl.h |   52 +-
 include/spdlog/details/registry.h               |   79 +-
 include/spdlog/details/spdlog_impl.h            |   45 +-
 include/spdlog/formatter.h                      |   37 +-
 include/spdlog/logger.h                         |   50 +-
 include/spdlog/sinks/android_sink.h             |   92 +
 include/spdlog/sinks/base_sink.h                |   39 +-
 include/spdlog/sinks/dist_sink.h                |   72 +
 include/spdlog/sinks/file_sinks.h               |   43 +-
 include/spdlog/sinks/msvc_sink.h                |   50 +
 include/spdlog/sinks/null_sink.h                |   34 +-
 include/spdlog/sinks/ostream_sink.h             |   34 +-
 include/spdlog/sinks/sink.h                     |   30 +-
 include/spdlog/sinks/stdout_sinks.h             |   33 +-
 include/spdlog/sinks/syslog_sink.h              |   39 +-
 include/spdlog/spdlog.h                         |   47 +-
 include/spdlog/tweakme.h                        |   33 +-
 tests/Makefile                                  |    2 +-
 tests/file_helper.cpp                           |   77 +
 tests/file_log.cpp                              |   53 +-
 tests/includes.h                                |    3 +
 tests/tests.vcxproj                             |   17 +-
 tests/tests.vcxproj.filters                     |    9 +
 tests/utils.cpp                                 |   45 +
 tests/utils.h                                   |   15 +
 65 files changed, 5370 insertions(+), 4002 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/spdlog.git