generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-06-09 17:57:34 +02:00
Code Issues Projects Releases Wiki Activity

Replaced the template-based solution for avoiding calls to localeconv() with a macro-based one (fixes #527)

Browse Source
This commit is contained in:
Alexander Gazarov 2016-09-06 14:39:59 +03:00
parent a304d61a7b
commit 52cfe5ae88
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/lib_json/json_tool.h
View File

@ -5,7 +5,10 @@
#ifndef LIB_JSONCPP_JSON_TOOL_H_INCLUDED #ifndef LIB_JSONCPP_JSON_TOOL_H_INCLUDED
#define LIB_JSONCPP_JSON_TOOL_H_INCLUDED #define LIB_JSONCPP_JSON_TOOL_H_INCLUDED
#ifndef NO_LOCALE_SUPPORT
#include <clocale> #include <clocale>
#endif
/* This header provides common string manipulation support, such as UTF-8, /* This header provides common string manipulation support, such as UTF-8,
* portable conversion from/to string... * portable conversion from/to string...
@ -14,26 +17,14 @@
*/ */
namespace Json { namespace Json {
static char getDecimalPoint() {
/// Fallback for decimal_point on android, where the lconv is an empty struct. #ifdef NO_LOCALE_SUPPORT
template<typename Lconv, bool=(sizeof(Lconv) >= sizeof(char*))>
struct Locale {
static char decimalPoint() {
return '\0'; return '\0';
#else
struct lconv* lc = localeconv();
return lc ? *(lc->decimal_point) : '\0';
#endif
} }
};
/// Return decimal_point for the current locale.
template<typename Lconv>
struct Locale<Lconv, true> {
static char decimalPoint() {
Lconv* lc = localeconv();
if (lc == NULL) {
return '\0';
}
return *(lc->decimal_point);
}
};
/// Converts a unicode code-point to UTF-8. /// Converts a unicode code-point to UTF-8.
static inline JSONCPP_STRING codePointToUTF8(unsigned int cp) { static inline JSONCPP_STRING codePointToUTF8(unsigned int cp) {
@ -104,7 +95,7 @@ static inline void fixNumericLocale(char* begin, char* end) {
} }
static inline void fixNumericLocaleInput(char* begin, char* end) { static inline void fixNumericLocaleInput(char* begin, char* end) {
char decimalPoint = Locale<struct lconv>::decimalPoint(); char decimalPoint = getDecimalPoint();
if (decimalPoint != '\0' && decimalPoint != '.') { if (decimalPoint != '\0' && decimalPoint != '.') {
while (begin < end) { while (begin < end) {
if (*begin == '.') { if (*begin == '.') {