Browse Source

base: avoid confusion between versions of String::Printf().

undefined
Sam Hocevar 11 years ago
parent
commit
c27c3279ed
2 changed files with 3 additions and 3 deletions
  1. +2
    -2
      src/base/string.cpp
  2. +1
    -1
      src/lol/base/string.h

+ 2
- 2
src/base/string.cpp View File

@@ -32,13 +32,13 @@ String String::Printf(char const *format, ...)


va_list ap; va_list ap;
va_start(ap, format); va_start(ap, format);
ret = String::Printf(format, ap);
ret = String::VPrintf(format, ap);
va_end(ap); va_end(ap);


return ret; return ret;
} }


String String::Printf(char const *format, va_list ap)
String String::VPrintf(char const *format, va_list ap)
{ {
#if defined __CELLOS_LV2__ #if defined __CELLOS_LV2__
using std::vsnprintf; using std::vsnprintf;


+ 1
- 1
src/lol/base/string.h View File

@@ -268,7 +268,7 @@ public:
#endif #endif
static String Printf(char const *format, ...) LOL_FMT_ATTR(1, 2); static String Printf(char const *format, ...) LOL_FMT_ATTR(1, 2);
#undef LOL_FMT_ATTR #undef LOL_FMT_ATTR
static String Printf(char const *format, va_list ap);
static String VPrintf(char const *format, va_list ap);
}; };


inline bool operator ==(char const* sz, String const &s) inline bool operator ==(char const* sz, String const &s)


Loading…
Cancel
Save