From 52c51e5485cf9c8e01a32962372a57fd53b3c742 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Mon, 24 May 2010 15:17:08 +0000 Subject: [PATCH] msvc10 work around: use complete std:numpunct implementation otherwise it crashes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34488 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/support/numpunct_lyx_char_type.h | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/src/support/numpunct_lyx_char_type.h b/src/support/numpunct_lyx_char_type.h index 9dbdeb2c16..d5b339b7ce 100644 --- a/src/support/numpunct_lyx_char_type.h +++ b/src/support/numpunct_lyx_char_type.h @@ -20,42 +20,37 @@ namespace std { template<> - class numpunct : public locale::facet + class numpunct : public numpunct { public: typedef lyx::char_type char_type; typedef basic_string string_type; + static locale::id id; - static locale::id id; - - explicit numpunct(size_t __refs = 0) : chared(__refs) + explicit numpunct(size_t __refs = 0) : numpunct(__refs) {} char_type decimal_point() const - { return chared.decimal_point(); } + { return numpunct::decimal_point(); } char_type thousands_sep() const - { return chared.thousands_sep(); } + { return numpunct::thousands_sep(); } string grouping() const - { return chared.grouping(); } + { return numpunct::grouping(); } string_type truename() const - { return lyx::from_ascii(chared.truename()); } + { return lyx::from_ascii(numpunct::truename()); } string_type falsename() const - { return lyx::from_ascii(chared.falsename()); } + { return lyx::from_ascii(numpunct::falsename()); } protected: virtual ~numpunct(); - - private: - numpunct chared; - }; -- 2.39.2