modify str convert

Author: tigersk

openapi-cpp-sdk.vcxproj

@@ -170,7 +170,6 @@
     <ClInclude Include="include\tigerapi\utils.h" />
     <ClInclude Include="include\tigerapi\version.h" />
     <ClInclude Include="include\tigerapi\win32.h" />
-    <ClInclude Include="src\common\base64.h" />
     <ClInclude Include="src\common\sign_util.h" />
   </ItemGroup>
   <ItemGroup>

openapi-cpp-sdk.vcxproj.filters

@@ -54,9 +54,6 @@
     <ClInclude Include="src\common\sign_util.h">
       <Filter>src\common</Filter>
     </ClInclude>
-    <ClInclude Include="src\common\base64.h">
-      <Filter>src\common</Filter>
-    </ClInclude>
     <ClInclude Include="include\tigerapi\win32.h">
       <Filter>include\tigerapi</Filter>
     </ClInclude>

src/contract_util.cpp

@@ -35,11 +35,8 @@ Contract future_contract(const utility::string_t symbol, const utility::string_t
 
 
 std::tuple<utility::string_t , utility::string_t , utility::string_t , utility::string_t> extract_option_info(const utility::string_t  identifier) {
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
-    auto trans_identifier = utility::conversions::utf16_to_utf8(identifier);
-#else
-    auto trans_identifier = identifier;
-#endif
+    auto trans_identifier = str16to8(identifier);
+
     if (!trans_identifier.empty()) {
         std::regex pattern(R"((\w+(?:\.\w+)?)\s*(\d{6})([CP])(\d+))");
         std::smatch matches;
@@ -52,15 +49,8 @@ std::tuple<utility::string_t , utility::string_t , utility::string_t , utility::
                 expiry = expiry.substr(0, 4) + "-" + expiry.substr(4, 2) + "-" + expiry.substr(6);
             }
             right = (right == "C") ? "CALL" : "PUT";
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
-
-            return std::make_tuple(utility::conversions::utf8_to_utf16(underlying_symbol), 
-                utility::conversions::utf8_to_utf16(expiry), 
-                utility::conversions::utf8_to_utf16(right), 
+            return std::make_tuple(str8to16(underlying_symbol), str8to16(expiry), str8to16(right),
                 strike);
-#else
-            return std::make_tuple(underlying_symbol, expiry, right, strike);
-#endif
         }
     }
     return std::make_tuple(U(""), U(""), U(""), U(""));

src/utils.cpp

@@ -216,20 +216,16 @@ utility::string_t get_device_id() {
     rng.seed(std::random_device()());
     std::uniform_int_distribution<> dist(0, 255);
 
-    std::ostringstream macAddressString;
-    macAddressString << std::hex << std::setfill('0');
+    std::ostringstream mac_addr;
+    mac_addr << std::hex << std::setfill('0');
     for (int i = 0; i < 6; i++) {
         int n = dist(rng);
-        macAddressString << std::setw(2) << n;
+        mac_addr << std::setw(2) << n;
         if (i < 5) {
-            macAddressString << ':';
+            mac_addr << ':';
         }
     }
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
-    return utility::conversions::utf8_to_utf16(macAddressString.str());
-#else
-    return macAddressString.str();
-#endif
+    return str8to16(mac_addr.str());
 }
 
 
@@ -296,9 +292,5 @@ utility::string_t double_to_string(double num, int precision)
     std::ostringstream stream;
     stream << std::fixed << std::setprecision(precision) << num;
     std::string result = stream.str();
-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
-    return utility::conversions::utf8_to_utf16(result);
-#else
-    return result;
-#endif
+    return str8to16(result);
 }