Fix issue #300

example/example.vcxproj

@@ -56,13 +56,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

include/spdlog/fmt/bundled/format.cc

 /*
- Formatting library for C++
-
- Copyright (c) 2012 - 2016, Victor Zverovich
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// Commented out by spdlog to use header only
-// #include "fmt/format.h"
-// #include "fmt/printf.h"
+Formatting library for C++
+
+Copyright (c) 2012 - 2016, Victor Zverovich
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+// commented out by spdlog
+// #include "format.h"
+// #include "printf.h"
 
 #include <string.h>
 
@@ -109,7 +109,7 @@ inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...) {
 
 const char RESET_COLOR[] = "\x1b[0m";
 
-typedef void (*FormatFunc)(Writer &, int, StringRef);
+typedef void(*FormatFunc)(Writer &, int, StringRef);
 
 // Portable thread-safe version of strerror.
 // Sets buffer to point to a string describing the error code.
@@ -121,7 +121,7 @@ typedef void (*FormatFunc)(Writer &, int, StringRef);
 //   other  - failure
 // Buffer should be at least of size 1.
 int safe_strerror(
-    int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT {
+    int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT{
     FMT_ASSERT(buffer != 0 && buffer_size != 0, "invalid buffer");
 
     class StrError {
@@ -180,7 +180,7 @@ int safe_strerror(
 }
 
 void format_error_code(Writer &out, int error_code,
-                       StringRef message) FMT_NOEXCEPT {
+                       StringRef message) FMT_NOEXCEPT{
     // Report error code making sure that the output fits into
     // INLINE_BUFFER_SIZE to avoid dynamic memory allocation and potential
     // bad_alloc.
@@ -203,7 +203,7 @@ void format_error_code(Writer &out, int error_code,
 }
 
 void report_error(FormatFunc func, int error_code,
-                  StringRef message) FMT_NOEXCEPT {
+                  StringRef message) FMT_NOEXCEPT{
     MemoryWriter full_message;
     func(full_message, error_code, message);
     // Use Writer::data instead of Writer::c_str to avoid potential memory
@@ -218,7 +218,7 @@ namespace internal {
 // This method is used to preserve binary compatibility with fmt 3.0.
 // It can be removed in 4.0.
 FMT_FUNC void format_system_error(
-  Writer &out, int error_code, StringRef message) FMT_NOEXCEPT {
+    Writer &out, int error_code, StringRef message) FMT_NOEXCEPT{
     fmt::format_system_error(out, error_code, message);
 }
 }  // namespace internal
@@ -357,8 +357,8 @@ FMT_FUNC void WindowsError::init(
 }
 
 FMT_FUNC void internal::format_windows_error(
-    Writer &out, int error_code, StringRef message) FMT_NOEXCEPT {
-  FMT_TRY {
+    Writer &out, int error_code, StringRef message) FMT_NOEXCEPT{
+    FMT_TRY{
         MemoryBuffer<wchar_t, INLINE_BUFFER_SIZE> buffer;
         buffer.resize(INLINE_BUFFER_SIZE);
         for (;;) {
@@ -385,8 +385,8 @@ FMT_FUNC void internal::format_windows_error(
 #endif  // FMT_USE_WINDOWS_H
 
 FMT_FUNC void format_system_error(
-    Writer &out, int error_code, StringRef message) FMT_NOEXCEPT {
-  FMT_TRY {
+    Writer &out, int error_code, StringRef message) FMT_NOEXCEPT{
+    FMT_TRY{
         internal::MemoryBuffer<char, internal::INLINE_BUFFER_SIZE> buffer;
         buffer.resize(internal::INLINE_BUFFER_SIZE);
         for (;;) {
@@ -423,7 +423,8 @@ void internal::ArgMap<Char>::init(const ArgList &args) {
                 map_.push_back(Pair(named_arg->name, *named_arg));
                 break;
             default:
-        /*nothing*/;
+                /*nothing*/
+                ;
             }
         }
         return;
@@ -444,7 +445,8 @@ void internal::ArgMap<Char>::init(const ArgList &args) {
             map_.push_back(Pair(named_arg->name, *named_arg));
             break;
         default:
-      /*nothing*/;
+            /*nothing*/
+            ;
         }
     }
 }
@@ -465,20 +467,21 @@ FMT_FUNC Arg internal::FormatterBase::do_get_arg(
         arg = *static_cast<const internal::Arg*>(arg.pointer);
         break;
     default:
-    /*nothing*/;
+        /*nothing*/
+        ;
     }
     return arg;
 }
 
 FMT_FUNC void report_system_error(
-    int error_code, fmt::StringRef message) FMT_NOEXCEPT {
+    int error_code, fmt::StringRef message) FMT_NOEXCEPT{
     // 'fmt::' is for bcc32.
     report_error(format_system_error, error_code, message);
 }
 
 #if FMT_USE_WINDOWS_H
 FMT_FUNC void report_windows_error(
-    int error_code, fmt::StringRef message) FMT_NOEXCEPT {
+    int error_code, fmt::StringRef message) FMT_NOEXCEPT{
     // 'fmt::' is for bcc32.
     report_error(internal::format_windows_error, error_code, message);
 }

include/spdlog/fmt/bundled/ostream.cc

 /*
- Formatting library for C++ - std::ostream support
+Formatting library for C++ - std::ostream support
 
- Copyright (c) 2012 - 2016, Victor Zverovich
- All rights reserved.
+Copyright (c) 2012 - 2016, Victor Zverovich
+All rights reserved.
 
- For the license information refer to format.h.
- */
+For the license information refer to format.h.
+*/
 
-// Commented out by spdlog to use header only
-// #include "fmt/ostream.h"
+#include "ostream.h"
 
 namespace fmt {
 

include/spdlog/fmt/bundled/ostream.h

 /*
- Formatting library for C++ - std::ostream support
+Formatting library for C++ - std::ostream support
 
- Copyright (c) 2012 - 2016, Victor Zverovich
- All rights reserved.
+Copyright (c) 2012 - 2016, Victor Zverovich
+All rights reserved.
 
- For the license information refer to format.h.
- */
+For the license information refer to format.h.
+*/
 
 #ifndef FMT_OSTREAM_H_
 #define FMT_OSTREAM_H_
 
-// Commented out by spdlog to use header only
-// #include "fmt/format.h"
+// commented out by spdlog
+//#include "format.h"
 #include <ostream>
 
-namespace fmt
-{
+namespace fmt {
 
-namespace internal
-{
+namespace internal {
 
 template <class Char>
-class FormatBuf : public std::basic_streambuf<Char>
-{
+class FormatBuf : public std::basic_streambuf<Char> {
 private:
     typedef typename std::basic_streambuf<Char>::int_type int_type;
     typedef typename std::basic_streambuf<Char>::traits_type traits_type;
@@ -31,36 +28,31 @@ private:
     Char *start_;
 
 public:
-    FormatBuf(Buffer<Char> &buffer) : buffer_(buffer), start_(&buffer[0])
-    {
+    FormatBuf(Buffer<Char> &buffer) : buffer_(buffer), start_(&buffer[0]) {
         this->setp(start_, start_ + buffer_.capacity());
     }
 
-    int_type overflow(int_type ch = traits_type::eof())
-    {
-        if (!traits_type::eq_int_type(ch, traits_type::eof()))
-        {
+    int_type overflow(int_type ch = traits_type::eof()) {
+        if (!traits_type::eq_int_type(ch, traits_type::eof())) {
             size_t buf_size = size();
             buffer_.resize(buf_size);
             buffer_.reserve(buf_size * 2);
 
             start_ = &buffer_[0];
             start_[buf_size] = traits_type::to_char_type(ch);
-            this->setp(start_+ buf_size + 1, start_ + buf_size * 2);
+            this->setp(start_ + buf_size + 1, start_ + buf_size * 2);
         }
         return ch;
     }
 
-    size_t size() const
-    {
+    size_t size() const {
         return to_unsigned(this->pptr() - start_);
     }
 };
 
 Yes &convert(std::ostream &);
 
-struct DummyStream : std::ostream
-{
+struct DummyStream : std::ostream {
     DummyStream();  // Suppress a bogus warning in MSVC.
     // Hide all operator<< overloads from std::ostream.
     void operator<<(Null<>);
@@ -69,11 +61,9 @@ struct DummyStream : std::ostream
 No &operator<<(std::ostream &, int);
 
 template<typename T>
-struct ConvertToIntImpl<T, true>
-{
+struct ConvertToIntImpl<T, true> {
     // Convert to int only if T doesn't have an overloaded operator<<.
-    enum
-    {
+    enum {
         value = sizeof(convert(get<DummyStream>() << get<T>())) == sizeof(No)
     };
 };
@@ -85,8 +75,7 @@ void write(std::ostream &os, Writer &w);
 // Formats a value.
 template <typename Char, typename ArgFormatter, typename T>
 void format_arg(BasicFormatter<Char, ArgFormatter> &f,
-                const Char *&format_str, const T &value)
-{
+                const Char *&format_str, const T &value) {
     internal::MemoryBuffer<Char, internal::INLINE_BUFFER_SIZE> buffer;
 
     internal::FormatBuf<Char> format_buf(buffer);
@@ -99,14 +88,14 @@ void format_arg(BasicFormatter<Char, ArgFormatter> &f,
 }
 
 /**
-  \rst
-  Prints formatted data to the stream *os*.
+\rst
+Prints formatted data to the stream *os*.
 
-  **Example**::
+**Example**::
 
-    print(cerr, "Don't {}!", "panic");
-  \endrst
- */
+print(cerr, "Don't {}!", "panic");
+\endrst
+*/
 FMT_API void print(std::ostream &os, CStringRef format_str, ArgList args);
 FMT_VARIADIC(void, print, std::ostream &, CStringRef)
 }  // namespace fmt