Fixed warnings on VS 2019 (eProsima#489)

* Refs eProsima#5111. Fixed warning on vs2019. * Tabs
alsora · Apr 16, 2019 · a8691a4 · a8691a4
1 parent c776f0f
commit a8691a4
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/cpp/types/DynamicData.cpp b/src/cpp/types/DynamicData.cpp
@@ -23,6 +23,9 @@
 #include <fastrtps/log/Log.h>
 #include <fastcdr/Cdr.h>
 
+#include <locale>
+#include <codecvt>
+
 namespace eprosima {
 namespace fastrtps {
 namespace types {
@@ -1112,9 +1115,11 @@ void DynamicData::GetValue(std::string& sOutValue, MemberId id /*= MEMBER_ID_INV
     {
         wchar_t value(0);
         GetChar16Value(value, id);
+        using convert_type = std::codecvt_utf8<wchar_t>;
+        std::wstring_convert<convert_type, wchar_t> converter;
         std::wstring temp = L"";
         temp += value;
-        sOutValue = std::string(temp.begin(), temp.end());
+        sOutValue = converter.to_bytes(temp);
     }
     break;
     case TK_BOOLEAN:
@@ -1138,9 +1143,11 @@ void DynamicData::GetValue(std::string& sOutValue, MemberId id /*= MEMBER_ID_INV
     break;
     case TK_STRING16:
     {
+        using convert_type = std::codecvt_utf8<wchar_t>;
+        std::wstring_convert<convert_type, wchar_t> converter;
         std::wstring value;
         GetWstringValue(value, id);
-        sOutValue = std::string(value.begin(), value.end());
+        sOutValue = converter.to_bytes(value);
     }
     break;
     case TK_ENUM: