- cleanup config macros inconsistencies

- convert spaces to tabs
This commit is contained in:
Aleksandar Fabijanic 2012-09-12 00:20:07 +00:00
parent a264582df1
commit b7957f8cd0
3 changed files with 32 additions and 18 deletions

View File

@ -71,7 +71,7 @@
// Define to desired default thread stack size // Define to desired default thread stack size
// Zero means OS default // Zero means OS default
#ifndef POCO_THREAD_STACK_SIZE #ifndef POCO_THREAD_STACK_SIZE
#define POCO_THREAD_STACK_SIZE 0 #define POCO_THREAD_STACK_SIZE 0
#endif #endif

View File

@ -125,6 +125,20 @@
#endif #endif
//
// Cleanup inconsistencies
//
#ifdef POCO_OS_FAMILY_WINDOWS
#if defined(POCO_WIN32_UTF8) && defined(POCO_NO_WSTRING)
#error POCO_WIN32_UTF8 and POCO_NO_WSTRING are mutually exclusive.
#endif
#else
#ifdef POCO_WIN32_UTF8
#undef POCO_WIN32_UTF8
#endif
#endif
// //
// POCO_JOIN // POCO_JOIN
// //

View File

@ -57,28 +57,28 @@ namespace Poco {
std::string NumberFormatter::format(bool value, BoolFormat format) std::string NumberFormatter::format(bool value, BoolFormat format)
{ {
switch(format) switch(format)
{ {
default: default:
case FMT_TRUE_FALSE: case FMT_TRUE_FALSE:
if (value == true) if (value == true)
return "true"; return "true";
return "false"; return "false";
case FMT_YES_NO: case FMT_YES_NO:
if (value == true) if (value == true)
return "yes"; return "yes";
return "no"; return "no";
case FMT_ON_OFF: case FMT_ON_OFF:
if (value == true) if (value == true)
return "on"; return "on";
return "off"; return "off";
} }
} }
void NumberFormatter::append(std::string& str, int value) void NumberFormatter::append(std::string& str, int value)
{ {
char buffer[64]; char buffer[64];
std::sprintf(buffer, "%d", value); std::sprintf(buffer, "%d", value);
str.append(buffer); str.append(buffer);
} }