updated submodules

This commit is contained in:
Jack Andersen 2015-06-24 10:56:52 -10:00
parent 76056b37e7
commit a1275ac351
3 changed files with 28 additions and 2 deletions

2
hecl/extern/Athena vendored

@ -1 +1 @@
Subproject commit 7785983093f77e1f967580685f8d155364a7d965
Subproject commit 49937cba50b6c33c0dbb0f5bdbebc8fdac466936

@ -1 +1 @@
Subproject commit de29d08623c8807c85e996f81b71e9339466067c
Subproject commit da98329eb437aac5ad1a7ae380ae013196013030

View File

@ -198,6 +198,32 @@ static inline void FPrintf(FILE* fp, const SystemChar* format, ...)
va_end(va);
}
#define FORMAT_BUF_SZ 1024
static inline SystemString SysFormat(const SystemChar* format, ...)
{
SystemChar resultBuf[FORMAT_BUF_SZ];
va_list va;
va_start(va, format);
#if HECL_UCS2
int printSz = vswprintf(resultBuf, FORMAT_BUF_SZ, format, va);
#else
int printSz = vsnprintf(resultBuf, FORMAT_BUF_SZ, format, va);
#endif
va_end(va);
return SystemString(resultBuf, printSz);
}
static inline std::string Format(const char* format, ...)
{
char resultBuf[FORMAT_BUF_SZ];
va_list va;
va_start(va, format);
int printSz = vsnprintf(resultBuf, FORMAT_BUF_SZ, format, va);
va_end(va);
return std::string(resultBuf, printSz);
}
typedef std::basic_regex<SystemChar> SystemRegex;
typedef std::regex_token_iterator<SystemString::const_iterator> SystemRegexTokenIterator;
typedef std::match_results<SystemString::const_iterator> SystemRegexMatch;