Skip to content

S
spdlog
Commit fbd2a33b authored by Gabi Melman's avatar Gabi Melman
Browse files
Options

Merge pull request #18 from COMBINE-lab/master 

Fixes usage of spdlog in a project that also uses cppformat
parents e0089dbd 2bf6eeb0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
include/spdlog/details/format.h
View file @ fbd2a33b
...@@ -25,8 +25,8 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ...@@ -25,8 +25,8 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef FMT_FORMAT_H_ #ifndef SPDLOG_FMT_FORMAT_H_
#define FMT_FORMAT_H_ #define SPDLOG_FMT_FORMAT_H_
#include <stdint.h> #include <stdint.h>
...@@ -2879,4 +2879,4 @@ FMT_VARIADIC(int, fprintf, std::FILE *, StringRef) ...@@ -2879,4 +2879,4 @@ FMT_VARIADIC(int, fprintf, std::FILE *, StringRef)
# pragma GCC diagnostic pop //pop -Wshadow warnings ignore # pragma GCC diagnostic pop //pop -Wshadow warnings ignore
#endif #endif
#endif // FMT_FORMAT_H_ #endif // SPDLOG_FMT_FORMAT_H_
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