diff options
author | 2013-12-05 13:42:01 -0700 | |
---|---|---|
committer | 2013-12-05 13:42:01 -0700 | |
commit | 6a5a3b55ba80173cfe48c2008f262da6da5cf10b (patch) | |
tree | 6a4bd8f5e5a2ca806de9fee478274164a0c397e5 /src/core/basetypes/MCData.cc | |
parent | b069569fdf1d86039d5c476052f177dfe4b3699e (diff) | |
parent | baef8a77d30a9844eb63886624a1e04761d88a4a (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/core/basetypes/MCData.cc')
-rw-r--r-- | src/core/basetypes/MCData.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/basetypes/MCData.cc b/src/core/basetypes/MCData.cc index 580fd803..4ad2a524 100644 --- a/src/core/basetypes/MCData.cc +++ b/src/core/basetypes/MCData.cc @@ -182,7 +182,6 @@ String * Data::stringWithCharset(const char * charset) static bool isHintCharsetValid(String * hintCharset) { - return true; static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; static Set * knownCharset = NULL; |