Browse Source

Move strprintf define to tinyformat.h

This avoids a dependency on util.h if just tinyformat is needed.
pull/1/head
Wladimir J. van der Laan 8 years ago
parent
commit
9b6d4c5cdc
  1. 2
      src/core.cpp
  2. 2
      src/tinyformat.h
  3. 1
      src/util.h

2
src/core.cpp

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
#include "core.h"
#include "util.h"
#include "tinyformat.h"
std::string COutPoint::ToString() const
{

2
src/tinyformat.h

@ -1007,4 +1007,6 @@ TINYFORMAT_WRAP_FORMAT_N(16, returnType, funcName, funcDeclSuffix, bodyPrefix, s @@ -1007,4 +1007,6 @@ TINYFORMAT_WRAP_FORMAT_N(16, returnType, funcName, funcDeclSuffix, bodyPrefix, s
} // namespace tinyformat
#define strprintf tfm::format
#endif // TINYFORMAT_H_INCLUDED

1
src/util.h

@ -108,7 +108,6 @@ bool LogAcceptCategory(const char* category); @@ -108,7 +108,6 @@ bool LogAcceptCategory(const char* category);
/* Send a string to the log output */
int LogPrintStr(const std::string &str);
#define strprintf tfm::format
#define LogPrintf(...) LogPrint(NULL, __VA_ARGS__)
/* When we switch to C++11, this can be switched to variadic templates instead

Loading…
Cancel
Save