mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2025-02-05 04:06:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed issue #179 (Conflict with Boost.Asio) (by defining FMT_USE_WINDOWS_H=0 in format.h and preventing include of windows.h)

Browse Source
This commit is contained in:
gabime 2016-03-22 00:46:41 +02:00
parent c6f8f1d272
commit 79451368cf
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/spdlog/details/async_log_helper.h
View File

@ -18,7 +18,6 @@
#include <spdlog/sinks/sink.h> #include <spdlog/sinks/sink.h>
#include <spdlog/details/mpmc_bounded_q.h> #include <spdlog/details/mpmc_bounded_q.h>
#include <spdlog/details/log_msg.h> #include <spdlog/details/log_msg.h>
#include <spdlog/details/format.h>
#include <spdlog/details/os.h> #include <spdlog/details/os.h>
#include <spdlog/formatter.h> #include <spdlog/formatter.h>

10
include/spdlog/details/format.h
View File

@ -28,7 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef FMT_FORMAT_H_ #ifndef FMT_FORMAT_H_
#define FMT_FORMAT_H_ #define FMT_FORMAT_H_
#define FMT_HEADER_ONLY //Added by spdlog for header only usage //Added to spdlog version for header only usage
#define FMT_HEADER_ONLY
//Added to spdlog version in order to avoid including windows.h
#if !defined (FMT_USE_WINDOWS_H)
#define FMT_USE_WINDOWS_H 0
#endif
#if defined _MSC_VER && _MSC_VER <= 1500 #if defined _MSC_VER && _MSC_VER <= 1500
typedef unsigned int uint32_t; typedef unsigned int uint32_t;
@ -3155,7 +3161,7 @@ void BasicWriter<Char>::write_double(
// MSVC's printf doesn't support 'F'. // MSVC's printf doesn't support 'F'.
type = 'f'; type = 'f';
#endif #endif
// Fall through. // Fall through.
case 'E': case 'E':
case 'G': case 'G':
case 'A': case 'A':

2
include/spdlog/sinks/file_sinks.h
View File

@ -8,7 +8,7 @@
#include <spdlog/sinks/base_sink.h> #include <spdlog/sinks/base_sink.h>
#include <spdlog/details/null_mutex.h> #include <spdlog/details/null_mutex.h>
#include <spdlog/details/file_helper.h> #include <spdlog/details/file_helper.h>
#include <spdlog/details/format.h>
#include <algorithm> #include <algorithm>
#include <chrono> #include <chrono>