From e8a09d9833d67a40c43e4de1d578551cc9020cb7 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 15 Nov 2016 15:00:04 +0200
Subject: Various MSVC and C++11 fixes

---
 cutl/compiler/code-stream.txx  |  3 +--
 cutl/compiler/cxx-indenter.cxx |  4 ++--
 cutl/fs/path.hxx               |  1 +
 cutl/re.hxx                    |  2 ++
 cutl/re/re.cxx                 | 28 ++++++++++++++--------------
 5 files changed, 20 insertions(+), 18 deletions(-)

(limited to 'cutl')

diff --git a/cutl/compiler/code-stream.txx b/cutl/compiler/code-stream.txx
index 4b26f24..ff7b96d 100644
--- a/cutl/compiler/code-stream.txx
+++ b/cutl/compiler/code-stream.txx
@@ -77,7 +77,7 @@ namespace cutl
 
     template <template <typename> class S, typename C>
     ostream_filter<S, C>::
-    ~ostream_filter () /*noexcept (false)*/
+    ~ostream_filter ()
     {
       try
       {
@@ -86,7 +86,6 @@ namespace cutl
       catch (...)
       {
         os_.rdbuf (prev_);
-        throw;
       }
 
       os_.rdbuf (prev_);
diff --git a/cutl/compiler/cxx-indenter.cxx b/cutl/compiler/cxx-indenter.cxx
index dba9f09..3d5ee71 100644
--- a/cutl/compiler/cxx-indenter.cxx
+++ b/cutl/compiler/cxx-indenter.cxx
@@ -9,7 +9,7 @@ namespace cutl
   namespace compiler
   {
     template<>
-    char const* cxx_indenter<char>::
+    LIBCUTL_EXPORT char const* cxx_indenter<char>::
     keyword (cxx_indenter<char>::keyword_type t)
     {
       static char const* keywords[] =
@@ -28,7 +28,7 @@ namespace cutl
     }
 
     template<>
-    wchar_t const* cxx_indenter<wchar_t>::
+    LIBCUTL_EXPORT wchar_t const* cxx_indenter<wchar_t>::
     keyword (cxx_indenter<wchar_t>::keyword_type t)
     {
       static wchar_t const* keywords[] =
diff --git a/cutl/fs/path.hxx b/cutl/fs/path.hxx
index b1cf92d..2a88813 100644
--- a/cutl/fs/path.hxx
+++ b/cutl/fs/path.hxx
@@ -133,6 +133,7 @@ namespace cutl
 
       invalid_basic_path (C const* p): path_ (p) {}
       invalid_basic_path (string_type const& p): path_ (p) {}
+      ~invalid_basic_path () LIBCUTL_NOTHROW_NOEXCEPT {}
 
       string_type const&
       path () const
diff --git a/cutl/re.hxx b/cutl/re.hxx
index 176bd9d..62b65e0 100644
--- a/cutl/re.hxx
+++ b/cutl/re.hxx
@@ -20,6 +20,7 @@ namespace cutl
     struct LIBCUTL_EXPORT format_base: exception
     {
       format_base (std::string const& d): description_ (d) {}
+      ~format_base () LIBCUTL_NOTHROW_NOEXCEPT {}
 
       std::string const&
       description () const
@@ -39,6 +40,7 @@ namespace cutl
     {
       basic_format (std::basic_string<C> const& e, std::string const& d)
           : format_base (d), regex_ (e) {}
+      ~basic_format () LIBCUTL_NOTHROW_NOEXCEPT {}
 
       std::basic_string<C> const&
       regex () const
diff --git a/cutl/re/re.cxx b/cutl/re/re.cxx
index 5e1dc4a..2c835a2 100644
--- a/cutl/re/re.cxx
+++ b/cutl/re/re.cxx
@@ -70,35 +70,35 @@ namespace cutl
     };
 
     template <>
-    basic_regex<char>::
+    LIBCUTL_EXPORT basic_regex<char>::
     ~basic_regex ()
     {
       delete impl_;
     }
 
     template <>
-    basic_regex<wchar_t>::
+    LIBCUTL_EXPORT basic_regex<wchar_t>::
     ~basic_regex ()
     {
       delete impl_;
     }
 
     template <>
-    basic_regex<char>::
+    LIBCUTL_EXPORT basic_regex<char>::
     basic_regex (basic_regex const& r)
         : str_ (r.str_), impl_ (new impl (r.impl_->r))
     {
     }
 
     template <>
-    basic_regex<wchar_t>::
+    LIBCUTL_EXPORT basic_regex<wchar_t>::
     basic_regex (basic_regex const& r)
         : str_ (r.str_), impl_ (new impl (r.impl_->r))
     {
     }
 
     template <>
-    basic_regex<char>& basic_regex<char>::
+    LIBCUTL_EXPORT basic_regex<char>& basic_regex<char>::
     operator= (basic_regex const& r)
     {
       string_type tmp (r.str_);
@@ -108,7 +108,7 @@ namespace cutl
     }
 
     template <>
-    basic_regex<wchar_t>& basic_regex<wchar_t>::
+    LIBCUTL_EXPORT basic_regex<wchar_t>& basic_regex<wchar_t>::
     operator= (basic_regex const& r)
     {
       string_type tmp (r.str_);
@@ -118,7 +118,7 @@ namespace cutl
     }
 
     template <>
-    void basic_regex<char>::
+    LIBCUTL_EXPORT void basic_regex<char>::
     init (string_type const* s, bool icase)
     {
       string_type tmp (s == 0 ? string_type () : *s);
@@ -146,7 +146,7 @@ namespace cutl
     }
 
     template <>
-    void basic_regex<wchar_t>::
+    LIBCUTL_EXPORT void basic_regex<wchar_t>::
     init (string_type const* s, bool icase)
     {
       string_type tmp (s == 0 ? string_type () : *s);
@@ -174,35 +174,35 @@ namespace cutl
     }
 
     template <>
-    bool basic_regex<char>::
+    LIBCUTL_EXPORT bool basic_regex<char>::
     match (string_type const& s) const
     {
       return ire::regex_match (s, impl_->r);
     }
 
     template <>
-    bool basic_regex<wchar_t>::
+    LIBCUTL_EXPORT bool basic_regex<wchar_t>::
     match (string_type const& s) const
     {
       return ire::regex_match (s, impl_->r);
     }
 
     template <>
-    bool basic_regex<char>::
+    LIBCUTL_EXPORT bool basic_regex<char>::
     search (string_type const& s) const
     {
       return ire::regex_search (s, impl_->r);
     }
 
     template <>
-    bool basic_regex<wchar_t>::
+    LIBCUTL_EXPORT bool basic_regex<wchar_t>::
     search (string_type const& s) const
     {
       return ire::regex_search (s, impl_->r);
     }
 
     template <>
-    string basic_regex<char>::
+    LIBCUTL_EXPORT string basic_regex<char>::
     replace (string_type const& s,
              string_type const& sub,
              bool first_only) const
@@ -217,7 +217,7 @@ namespace cutl
     }
 
     template <>
-    wstring basic_regex<wchar_t>::
+    LIBCUTL_EXPORT wstring basic_regex<wchar_t>::
     replace (string_type const& s,
              string_type const& sub,
              bool first_only) const
-- 
cgit v1.1