Merge locale.h into format-inl.h

This commit is contained in:
Victor Zverovich
2018-05-20 17:16:34 -07:00
parent 6966db1dab
commit 6ebc1a967d
4 changed files with 12 additions and 29 deletions

View File

@@ -9,7 +9,6 @@
#define FMT_FORMAT_INL_H_
#include "format.h"
#include "locale.h"
#include <string.h>
@@ -19,6 +18,7 @@
#include <cmath>
#include <cstdarg>
#include <cstddef> // for std::ptrdiff_t
#include <locale>
#if defined(_WIN32) && defined(__MINGW32__)
# include <cstring>
@@ -205,6 +205,15 @@ void report_error(FormatFunc func, int error_code,
}
} // namespace
class locale {
private:
std::locale locale_;
public:
explicit locale(std::locale loc = std::locale()) : locale_(loc) {}
std::locale get() { return locale_; }
};
template <typename Char>
FMT_FUNC Char internal::thousands_sep(locale_provider *lp) {
std::locale loc = lp ? lp->locale().get() : std::locale();