fixes

boostorg · Jul 31, 2022 · 6d6942c · 6d6942c
1 parent 0bddea8
commit 6d6942c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 27 deletions.
diff --git a/include/boost/locale/numpunct.hpp b/include/boost/locale/numpunct.hpp
@@ -9,18 +9,14 @@
 #ifndef BOOST_LOCALE_NUMPUNCT_HPP_INCLUDED
 #define BOOST_LOCALE_NUMPUNCT_HPP_INCLUDED
 #include <boost/locale/config.hpp>
-#ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable : 4275 4251 4231 4660)
-#endif
 #include <locale>
 #include <string>
 
 namespace boost {
     namespace locale {
 
         template<typename CharType>
-        class BOOST_LOCALE_DECL numpunct_base : public std::numpunct<CharType>
+        class numpunct_base : public std::numpunct<CharType>
         {
             typedef std::basic_string<CharType> string_type;
         public:
@@ -35,7 +31,7 @@ namespace boost {
             }
 
         protected:
-            virtual CharType do_decimal_point() const {
+            CharType do_decimal_point() const BOOST_OVERRIDE {
                 string_type dec = do_decimal_point_str();
                 if (dec.size() > 1) {
                     return '.';
@@ -49,7 +45,7 @@ namespace boost {
                 return string_type(t, t + sizeof(t) - 1);
             }
 
-            virtual CharType do_thousands_sep() const {
+            CharType do_thousands_sep() const BOOST_OVERRIDE {
                 string_type thous = do_thousands_sep_str();
                 if (thous.size() > 1) {
                     return ',';
@@ -63,18 +59,18 @@ namespace boost {
                 return string_type(t, t + sizeof(t) - 1);
             }
 
-            virtual string_type do_truename() const {
+            virtual string_type do_truename() const BOOST_OVERRIDE {
                 static const char t[] = "true";
                 return string_type(t, t + sizeof(t) - 1);
             }
 
-            virtual string_type do_falsename() const {
+            virtual string_type do_falsename() const BOOST_OVERRIDE {
                 static const char t[] = "false";
                 return string_type(t, t + sizeof(t) - 1);
             }
         };
 
-        template<typename CharType> struct numpunct {};
+        template<typename CharType> struct numpunct;
 
         template<> struct numpunct<char> : numpunct_base<char> {
             numpunct (size_t refs = 0) : numpunct_base<char>(refs) {}

diff --git a/src/boost/locale/icu/numeric.cpp b/src/boost/locale/icu/numeric.cpp
@@ -381,13 +381,13 @@ struct icu_numpunct : public numpunct<CharType> {
         }
     }
 protected:
-    virtual string_type do_decimal_point_str() const {
+    string_type do_decimal_point_str() const BOOST_OVERRIDE {
         return decimal_point_;
     }
-    virtual string_type do_thousands_sep_str() const {
+    string_type do_thousands_sep_str() const BOOST_OVERRIDE {
         return thousands_sep_;
     }
-    virtual std::string do_grouping() const {
+    std::string do_grouping() const BOOST_OVERRIDE {
         return grouping_;
     }
 

diff --git a/src/boost/locale/posix/numeric.cpp b/src/boost/locale/posix/numeric.cpp
@@ -423,28 +423,18 @@ class num_punct_posix : public numpunct<CharType> {
     {
         s2=conv::to_utf<wchar_t>(s1,nl_langinfo_l(CODESET,lc));
     }
-    virtual string_type do_decimal_point_str() const
+    string_type do_decimal_point_str() const BOOST_OVERRIDE
     {
         return decimal_point_;
     }
-    virtual string_type do_thousands_sep_str() const
+    string_type do_thousands_sep_str() const BOOST_OVERRIDE
     {
         return thousands_sep_;
     }
     std::string do_grouping() const BOOST_OVERRIDE
     {
         return grouping_;
     }
-    string_type do_truename() const BOOST_OVERRIDE
-    {
-        static const char t[]="true";
-        return string_type(t,t+sizeof(t)-1);
-    }
-    string_type do_falsename() const BOOST_OVERRIDE
-    {
-        static const char t[]="false";
-        return string_type(t,t+sizeof(t)-1);
-    }
 private:
     string_type decimal_point_;
     string_type thousands_sep_;

diff --git a/src/boost/locale/win32/numeric.cpp b/src/boost/locale/win32/numeric.cpp
@@ -141,11 +141,11 @@ BOOST_LOCALE_END_CONST_CONDITION
     {
         s2=conv::from_utf(s1,"UTF-8");
     }
-    virtual string_type do_decimal_point_str() const
+    string_type do_decimal_point_str() const BOOST_OVERRIDE
     {
         return decimal_point_;
     }
-    virtual string_type do_thousands_sep_str() const
+    string_type do_thousands_sep_str() const BOOST_OVERRIDE
     {
         return thousands_sep_;
     }