diff --git a/src/convert.cpp b/src/convert.cpp
index cd205a7..9be759e 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -43,7 +43,7 @@ namespace boost { namespace detail {
     {
         std::basic_string<ToChar> result;
         
-        std::mbstate_t state = {0};
+        std::mbstate_t state = std::mbstate_t();
 
         const FromChar* from = s.data();
         const FromChar* from_end = s.data() + s.size();
diff --git a/test/test_convert.cpp b/test/test_convert.cpp
index 9b9d460..f03a19e 100644
--- a/test/test_convert.cpp
+++ b/test/test_convert.cpp
@@ -39,8 +39,7 @@ std::wstring from_8_bit_2(const std::string& s,
     std::wstring result;
 
 
-    std::mbstate_t state;
-    memset(&state, 0, sizeof(std::mbstate_t));
+    std::mbstate_t state = std::mbstate_t();
     
     const char* from = s.data();
     const char* from_end = s.data() + s.size();