diff --git a/Utils/impl/codecvt_specialisations.h b/Utils/impl/codecvt_specialisations.h
index 9557293b..f5623b35 100644
--- a/Utils/impl/codecvt_specialisations.h
+++ b/Utils/impl/codecvt_specialisations.h
@@ -10,7 +10,7 @@ template<>
 class codecvt<char, wchar_t, std::mbstate_t> 
 {
 protected:
-  virtual ~codecvt();
+  virtual ~codecvt() { }
 
   virtual codecvt_base::result do_out(mbstate_t&,
                                       const char* from,
@@ -18,7 +18,18 @@ protected:
                                       const char*& from_next,
                                       wchar_t* to,
                                       wchar_t* to_limit,
-		                                  wchar_t*& to_next) const;
+		                                  wchar_t*& to_next) const
+  {
+    int limit = std::max<int>(from_end - from, to_limit - to);
+    from_next = from;
+    to_next = to;
+
+    while(limit--)
+      *to_next++ = static_cast<wchar_t>(*from_next++);
+
+    return codecvt_base::ok;
+  } // do_out
+
 
   virtual codecvt_base::result do_in(mbstate_t&,
                                      const wchar_t* from,
@@ -26,23 +37,49 @@ protected:
                                      const wchar_t*& from_next,
                                      char* to,
                                      char* to_limit,
-                                     char*& to_next) const;
+                                     char*& to_next) const
+  {
+    int limit = std::max<int>(from_end - from, to_limit - to);
+    from_next = from;
+    to_next = to;
+
+    while(limit--)
+      *to_next++ = static_cast<char>(*from_next++);
+
+    return codecvt_base::ok;
+  } // do_in
 
   virtual codecvt_base::result do_unshift(mbstate_t&,
                                           wchar_t* to,
                                           wchar_t* to_limit,
-                                          wchar_t*& to_next) const;
+                                          wchar_t*& to_next) const
+  {
+    to_next = to;
+    return codecvt_base::noconv;
+  } // do_unshift
 
-  virtual int do_encoding() const throw();
+  virtual int do_encoding() const throw()
+  {
+    return 1;
+  } // do_encoding
 
-  virtual bool do_always_noconv() const throw();
+  virtual bool do_always_noconv() const throw()
+  {
+    return false;
+  } // do_always_noconv
 
   virtual int do_length(const mbstate_t&,
                         const wchar_t* from,
                         const wchar_t* end,
                         size_t max) const;
+  {
+    return std::min<int>(max, (end - from));
+  } // do_length
 
-  virtual int do_max_length() const throw();
+  virtual int do_max_length() const throw()
+  {
+    return 1;
+  } // do_max_length
 }; // class codecvt<char, wchar_t, std::mbstate_t> :