fix build error in linux.

aliyun · Nov 15, 2019 · e36869b · e36869b
1 parent 8f757be
commit e36869b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/sdk/src/ResumableBaseWorker.cc b/sdk/src/ResumableBaseWorker.cc
@@ -15,9 +15,10 @@
  */
 
 #include <string>
-#include <codecvt>
 #include <algorithm>
-
+#ifdef _WIN32
+#include <codecvt>
+#endif
 #include <alibabacloud/oss/Const.h>
 #include "ResumableBaseWorker.h"
 #include "utils/FileSystemUtils.h"

diff --git a/sdk/src/model/LifecycleRule.cc b/sdk/src/model/LifecycleRule.cc
@@ -65,6 +65,7 @@ void LifeCycleTransition::setStorageClass(AlibabaCloud::OSS::StorageClass storag
 }
 
 LifecycleRule::LifecycleRule() :
+    status_(RuleStatus::Enabled),
     expiredObjectDeleteMarker_(false)
 {
 }

diff --git a/test/src/MultipartUpload/ResumableObjectTest.cc b/test/src/MultipartUpload/ResumableObjectTest.cc
@@ -24,8 +24,9 @@
 #include "src/external/json/json.h"
 #include <fstream>
 #include <ctime>
+#ifdef _WIN32
 #include <codecvt>        // std::codecvt_utf8
-
+#endif
 
 namespace AlibabaCloud {
 namespace OSS {

diff --git a/test/src/Object/ObjectBasicOperationTest.cc b/test/src/Object/ObjectBasicOperationTest.cc
@@ -1682,7 +1682,7 @@ TEST_F(ObjectBasicOperationTest, DeleteObjectsWithSpecialCharsTest)
     delRequest.addKey(key);
     auto delOutcome = Client->DeleteObjects(delRequest);
     EXPECT_EQ(delOutcome.isSuccess(), true);
-    EXPECT_EQ(delOutcome.result().keyList().size(), 1);
+    EXPECT_EQ(delOutcome.result().keyList().size(), 1U);
     EXPECT_EQ(delOutcome.result().Quiet(), false);
 
     EXPECT_EQ(Client->DoesObjectExist(BucketName, key), false);

diff --git a/test/src/Utils.cc b/test/src/Utils.cc
@@ -23,6 +23,7 @@
 #include <fstream>
 #include <thread>
 #ifdef _WIN32
+#include <codecvt>
 #include <ws2tcpip.h>
 #pragma comment (lib, "Ws2_32.lib")
 #else
@@ -36,7 +37,6 @@
 #include <src/utils/Crc64.h>
 #include <src/http/Url.h>
 #include <cstring>
-#include <codecvt>
 
 #ifdef GetObject
 #undef GetObject
@@ -435,8 +435,9 @@ std::string TestUtils::GetExecutableDirectory()
 
 std::wstring TestUtils::GetExecutableDirectoryW()
 {
-    std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
-    return converter.from_bytes(GetExecutableDirectory());
+    return L"";
+    //std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
+    //return converter.from_bytes(GetExecutableDirectory());
 }
 
 #endif
-Original file line number
+Diff line change
@@ Expand Up @@
     }
     LifecycleRule::LifecycleRule() :
+        status_(RuleStatus::Enabled),
         expiredObjectDeleteMarker_(false)
     {
     }
@@ Expand Down @@