From 69352206b6557282d16927415a87500f152e4ff6 Mon Sep 17 00:00:00 2001 From: Peter Tissen Date: Tue, 1 Apr 2014 19:44:38 +0200 Subject: [PATCH] blantant test code removal well this is embarassing, VS didn't recompile it, so I didn't notice the mistake --- Utilities/StrFmt.cpp | 3 +++ Utilities/StrFmt.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Utilities/StrFmt.cpp b/Utilities/StrFmt.cpp index 51ed10c3e6..58ed16f145 100644 --- a/Utilities/StrFmt.cpp +++ b/Utilities/StrFmt.cpp @@ -1,6 +1,9 @@ #include "stdafx.h" #include "StrFmt.h" +static const std::string fmt::placeholder = "???"; + + //wrapper to deal with advance sprintf formating options with automatic length finding //can't take strings by reference because of "va_start", so overload it with char * std::string fmt::FormatV(const char *fmt, va_list args) diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h index 2338ea7d07..5f98262268 100644 --- a/Utilities/StrFmt.h +++ b/Utilities/StrFmt.h @@ -15,7 +15,7 @@ namespace fmt{ struct empty_t{}; - //static const string placeholder = "???"; + extern const string placeholder; // write `fmt` from `pos` to the first occurence of `fmt::placeholder` to // the stream `os`. Then write `arg` to to the stream. If there's no @@ -24,7 +24,7 @@ namespace fmt{ template empty_t write(const string &fmt, ostream &os, string::size_type &pos, T &&arg) { - string::size_type ins = fmt.find(/*placeholder*/"???", pos); + string::size_type ins = fmt.find(placeholder, pos); if (ins == string::npos) {