Commit 79451368 authored by gabime's avatar gabime

Fixed issue #179 (Conflict with Boost.Asio) (by defining FMT_USE_WINDOWS_H=0...

Fixed issue #179 (Conflict with Boost.Asio) (by defining FMT_USE_WINDOWS_H=0 in format.h and preventing include of windows.h)
parent c6f8f1d2
......@@ -18,7 +18,6 @@
#include <spdlog/sinks/sink.h>
#include <spdlog/details/mpmc_bounded_q.h>
#include <spdlog/details/log_msg.h>
#include <spdlog/details/format.h>
#include <spdlog/details/os.h>
#include <spdlog/formatter.h>
......
......@@ -28,7 +28,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef 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
typedef unsigned int uint32_t;
......@@ -3155,7 +3161,7 @@ void BasicWriter<Char>::write_double(
// MSVC's printf doesn't support 'F'.
type = 'f';
#endif
// Fall through.
// Fall through.
case 'E':
case 'G':
case 'A':
......
......@@ -8,7 +8,7 @@
#include <spdlog/sinks/base_sink.h>
#include <spdlog/details/null_mutex.h>
#include <spdlog/details/file_helper.h>
#include <spdlog/details/format.h>
#include <algorithm>
#include <chrono>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment