diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/S3Client.h b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/S3Client.h
index fd9318b92f8dbaf905cef767dbecc68ca1e95b2d..9d34c085ae4a7137842f53fde046e07bf2b43f8b 100644
--- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/S3Client.h
+++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/S3Client.h
@@ -14,8 +14,8 @@
 #include <aws/core/utils/xml/XmlSerializer.h>
 #include <aws/core/utils/DNS.h>
 #include <aws/s3/model/AbortMultipartUploadResult.h>
+#include <aws/s3/model/CompleteMultipartUploadOriginResult.h>
 #include <aws/s3/model/CompleteMultipartUploadResult.h>
-#include <aws/s3/model/CompleteMultipartUploadWithCallBackResult.h>
 #include <aws/s3/model/CopyObjectResult.h>
 #include <aws/s3/model/CreateBucketResult.h>
 #include <aws/s3/model/CreateMultipartUploadResult.h>
@@ -255,8 +255,10 @@ namespace Aws
         class WriteGetObjectResponseRequest;
 
         typedef Aws::Utils::Outcome<AbortMultipartUploadResult, S3Error> AbortMultipartUploadOutcome;
-        typedef Aws::Utils::Outcome<CompleteMultipartUploadResult, S3Error> CompleteMultipartUploadOutcome;
-		typedef Aws::Utils::Outcome<CompleteMultipartUploadWithCallBackResult, S3Error> CompleteMultipartUploadWithCallBackOutcome;	
+		
+        typedef Aws::Utils::Outcome<CompleteMultipartUploadOriginResult, S3Error> CompleteMultipartUploadOriginOutcome;
+       
+		typedef Aws::Utils::Outcome<CompleteMultipartUploadResult, S3Error> CompleteMultipartUploadOutcome;	
         typedef Aws::Utils::Outcome<CopyObjectResult, S3Error> CopyObjectOutcome;
         typedef Aws::Utils::Outcome<CreateBucketResult, S3Error> CreateBucketOutcome;
         typedef Aws::Utils::Outcome<CreateMultipartUploadResult, S3Error> CreateMultipartUploadOutcome;
@@ -375,8 +377,8 @@ namespace Aws
         typedef Aws::Utils::Outcome<Aws::NoResult, S3Error> WriteGetObjectResponseOutcome;
 
         typedef std::future<AbortMultipartUploadOutcome> AbortMultipartUploadOutcomeCallable;
-        typedef std::future<CompleteMultipartUploadOutcome> CompleteMultipartUploadOutcomeCallable;
-		typedef std::future<CompleteMultipartUploadWithCallBackOutcome> CompleteMultipartUploadWithCallBackOutcomeCallable;
+        typedef std::future<CompleteMultipartUploadOriginOutcome> CompleteMultipartUploadOriginOutcomeCallable;
+		typedef std::future<CompleteMultipartUploadOutcome> CompleteMultipartUploadOutcomeCallable;
         typedef std::future<CopyObjectOutcome> CopyObjectOutcomeCallable;
         typedef std::future<CreateBucketOutcome> CreateBucketOutcomeCallable;
         typedef std::future<CreateMultipartUploadOutcome> CreateMultipartUploadOutcomeCallable;
@@ -514,8 +516,8 @@ namespace Aws
     class S3Client;
 
     typedef std::function<void(const S3Client*, const Model::AbortMultipartUploadRequest&, const Model::AbortMultipartUploadOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > AbortMultipartUploadResponseReceivedHandler;
-    typedef std::function<void(const S3Client*, const Model::CompleteMultipartUploadRequest&, const Model::CompleteMultipartUploadOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > CompleteMultipartUploadResponseReceivedHandler;
-	typedef std::function<void(const S3Client*, const Model::CompleteMultipartUploadRequest&, const Model::CompleteMultipartUploadWithCallBackOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > CompleteMultipartUploadWithCallBackResponseReceivedHandler;
+    typedef std::function<void(const S3Client*, const Model::CompleteMultipartUploadRequest&, const Model::CompleteMultipartUploadOriginOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > CompleteMultipartUploadOriginResponseReceivedHandler;
+	typedef std::function<void(const S3Client*, const Model::CompleteMultipartUploadRequest&, const Model::CompleteMultipartUploadOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > CompleteMultipartUploadResponseReceivedHandler;
 	typedef std::function<void(const S3Client*, const Model::CopyObjectRequest&, const Model::CopyObjectOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > CopyObjectResponseReceivedHandler;
     typedef std::function<void(const S3Client*, const Model::CreateBucketRequest&, const Model::CreateBucketOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > CreateBucketResponseReceivedHandler;
     typedef std::function<void(const S3Client*, const Model::CreateMultipartUploadRequest&, const Model::CreateMultipartUploadOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > CreateMultipartUploadResponseReceivedHandler;
@@ -866,8 +868,8 @@ namespace Aws
          * href="http://docs.aws.amazon.com/goto/WebAPI/s3-2006-03-01/CompleteMultipartUpload">AWS
          * API Reference</a></p>
          */
-        virtual Model::CompleteMultipartUploadOutcome CompleteMultipartUpload(const Model::CompleteMultipartUploadRequest& request) const;
-		virtual Model::CompleteMultipartUploadWithCallBackOutcome CompleteMultipartUploadWithCallBack(const Model::CompleteMultipartUploadRequest& request) const;
+        virtual Model::CompleteMultipartUploadOriginOutcome CompleteMultipartUploadOrigin(const Model::CompleteMultipartUploadRequest& request) const;
+		virtual Model::CompleteMultipartUploadOutcome CompleteMultipartUpload(const Model::CompleteMultipartUploadRequest& request) const;
 
         /**
          * <p>Completes a multipart upload by assembling previously uploaded parts.</p>
@@ -929,8 +931,8 @@ namespace Aws
          *
          * returns a future to the operation so that it can be executed in parallel to other requests.
          */
-        virtual Model::CompleteMultipartUploadOutcomeCallable CompleteMultipartUploadCallable(const Model::CompleteMultipartUploadRequest& request) const;
-		virtual Model::CompleteMultipartUploadWithCallBackOutcomeCallable CompleteMultipartUploadWithCallBackCallable(const Model::CompleteMultipartUploadRequest& request) const;
+        virtual Model::CompleteMultipartUploadOriginOutcomeCallable CompleteMultipartUploadOriginCallable(const Model::CompleteMultipartUploadRequest& request) const;
+		virtual Model::CompleteMultipartUploadOutcomeCallable CompleteMultipartUploadCallable(const Model::CompleteMultipartUploadRequest& request) const;
 
         /**
          * <p>Completes a multipart upload by assembling previously uploaded parts.</p>
@@ -992,8 +994,8 @@ namespace Aws
          *
          * Queues the request into a thread executor and triggers associated callback when operation has finished.
          */
-        virtual void CompleteMultipartUploadAsync(const Model::CompleteMultipartUploadRequest& request, const CompleteMultipartUploadResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
-		virtual void CompleteMultipartUploadWithCallBackAsync(const Model::CompleteMultipartUploadRequest& request, const CompleteMultipartUploadWithCallBackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
+        virtual void CompleteMultipartUploadOriginAsync(const Model::CompleteMultipartUploadRequest& request, const CompleteMultipartUploadOriginResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
+		virtual void CompleteMultipartUploadAsync(const Model::CompleteMultipartUploadRequest& request, const CompleteMultipartUploadResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr) const;
 
         /**
          * <p>Creates a copy of an object that is already stored in Amazon S3.</p> 
@@ -11368,8 +11370,8 @@ namespace Aws
         ComputeEndpointOutcome ComputeEndpointStringWithServiceName(const Aws::String& serviceNameOverride = "") const;
 
         void AbortMultipartUploadAsyncHelper(const Model::AbortMultipartUploadRequest& request, const AbortMultipartUploadResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
-        void CompleteMultipartUploadAsyncHelper(const Model::CompleteMultipartUploadRequest& request, const CompleteMultipartUploadResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
-		void CompleteMultipartUploadWithCallBackAsyncHelper(const Model::CompleteMultipartUploadRequest& request, const CompleteMultipartUploadWithCallBackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
+        void CompleteMultipartUploadOriginAsyncHelper(const Model::CompleteMultipartUploadRequest& request, const CompleteMultipartUploadOriginResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
+		void CompleteMultipartUploadAsyncHelper(const Model::CompleteMultipartUploadRequest& request, const CompleteMultipartUploadResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
 		void CopyObjectAsyncHelper(const Model::CopyObjectRequest& request, const CopyObjectResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void CreateBucketAsyncHelper(const Model::CreateBucketRequest& request, const CreateBucketResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
         void CreateMultipartUploadAsyncHelper(const Model::CreateMultipartUploadRequest& request, const CreateMultipartUploadResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const;
diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/CompleteMultipartUploadWithCallBackResult.h b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/CompleteMultipartUploadOriginResult.h
similarity index 83%
rename from aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/CompleteMultipartUploadWithCallBackResult.h
rename to aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/CompleteMultipartUploadOriginResult.h
index 58809dc1d7715e62ade700651e63994a40d9d9b6..4522008ab9d7c6b6b5ed4c2a60cde1c7f06dc271 100644
--- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/CompleteMultipartUploadWithCallBackResult.h
+++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/CompleteMultipartUploadOriginResult.h
@@ -5,43 +5,36 @@
 
 #pragma once
 #include <aws/s3/S3_EXPORTS.h>
-#include <aws/core/utils/stream/ResponseStream.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/s3/model/ServerSideEncryption.h>
 #include <aws/s3/model/RequestCharged.h>
 #include <utility>
 
-
 namespace Aws
 {
 template<typename RESULT_TYPE>
 class AmazonWebServiceResult;
 
+namespace Utils
+{
+namespace Xml
+{
+  class XmlDocument;
+} // namespace Xml
+} // namespace Utils
 namespace S3
 {
 namespace Model
 {
-  class AWS_S3_API CompleteMultipartUploadWithCallBackResult
+  class AWS_S3_API CompleteMultipartUploadOriginResult
   {
   public:
-    CompleteMultipartUploadWithCallBackResult();
-    //We have to define these because Microsoft doesn't auto generate them
-    CompleteMultipartUploadWithCallBackResult(CompleteMultipartUploadWithCallBackResult&&);
-    CompleteMultipartUploadWithCallBackResult& operator=(CompleteMultipartUploadWithCallBackResult&&);
-    //we delete these because Microsoft doesn't handle move generation correctly
-    //and we therefore don't trust them to get it right here either.
-    CompleteMultipartUploadWithCallBackResult(const CompleteMultipartUploadWithCallBackResult&) = delete;
-    CompleteMultipartUploadWithCallBackResult& operator=(const CompleteMultipartUploadWithCallBackResult&) = delete;
-
+    CompleteMultipartUploadOriginResult();
+    CompleteMultipartUploadOriginResult(const Aws::AmazonWebServiceResult<Aws::Utils::Xml::XmlDocument>& result);
+    CompleteMultipartUploadOriginResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Xml::XmlDocument>& result);
 
-    CompleteMultipartUploadWithCallBackResult(Aws::AmazonWebServiceResult<Aws::Utils::Stream::ResponseStream>&& result);
-    CompleteMultipartUploadWithCallBackResult& operator=(Aws::AmazonWebServiceResult<Aws::Utils::Stream::ResponseStream>&& result);
 
-
-    inline Aws::IOStream& GetPolicy() { return m_policy.GetUnderlyingStream(); }   
-
-	
-	/**
+    /**
      * <p>The URI that identifies the newly created object.</p>
      */
     inline const Aws::String& GetLocation() const{ return m_location; }
@@ -64,17 +57,17 @@ namespace Model
     /**
      * <p>The URI that identifies the newly created object.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithLocation(const Aws::String& value) { SetLocation(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithLocation(const Aws::String& value) { SetLocation(value); return *this;}
 
     /**
      * <p>The URI that identifies the newly created object.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithLocation(Aws::String&& value) { SetLocation(std::move(value)); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithLocation(Aws::String&& value) { SetLocation(std::move(value)); return *this;}
 
     /**
      * <p>The URI that identifies the newly created object.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithLocation(const char* value) { SetLocation(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithLocation(const char* value) { SetLocation(value); return *this;}
 
 
     /**
@@ -180,7 +173,7 @@ namespace Model
      * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">Using
      * S3 on Outposts</a> in the <i>Amazon S3 User Guide</i>.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithBucket(const Aws::String& value) { SetBucket(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithBucket(const Aws::String& value) { SetBucket(value); return *this;}
 
     /**
      * <p>The name of the bucket that contains the newly created object.</p> <p>When
@@ -201,7 +194,7 @@ namespace Model
      * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">Using
      * S3 on Outposts</a> in the <i>Amazon S3 User Guide</i>.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithBucket(Aws::String&& value) { SetBucket(std::move(value)); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithBucket(Aws::String&& value) { SetBucket(std::move(value)); return *this;}
 
     /**
      * <p>The name of the bucket that contains the newly created object.</p> <p>When
@@ -222,7 +215,7 @@ namespace Model
      * href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/S3onOutposts.html">Using
      * S3 on Outposts</a> in the <i>Amazon S3 User Guide</i>.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithBucket(const char* value) { SetBucket(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithBucket(const char* value) { SetBucket(value); return *this;}
 
 
     /**
@@ -248,17 +241,17 @@ namespace Model
     /**
      * <p>The object key of the newly created object.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithKey(const Aws::String& value) { SetKey(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithKey(const Aws::String& value) { SetKey(value); return *this;}
 
     /**
      * <p>The object key of the newly created object.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithKey(Aws::String&& value) { SetKey(std::move(value)); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithKey(Aws::String&& value) { SetKey(std::move(value)); return *this;}
 
     /**
      * <p>The object key of the newly created object.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithKey(const char* value) { SetKey(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithKey(const char* value) { SetKey(value); return *this;}
 
 
     /**
@@ -289,19 +282,19 @@ namespace Model
      * <p>If the object expiration is configured, this will contain the expiration date
      * (expiry-date) and rule ID (rule-id). The value of rule-id is URL encoded.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithExpiration(const Aws::String& value) { SetExpiration(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithExpiration(const Aws::String& value) { SetExpiration(value); return *this;}
 
     /**
      * <p>If the object expiration is configured, this will contain the expiration date
      * (expiry-date) and rule ID (rule-id). The value of rule-id is URL encoded.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithExpiration(Aws::String&& value) { SetExpiration(std::move(value)); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithExpiration(Aws::String&& value) { SetExpiration(std::move(value)); return *this;}
 
     /**
      * <p>If the object expiration is configured, this will contain the expiration date
      * (expiry-date) and rule ID (rule-id). The value of rule-id is URL encoded.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithExpiration(const char* value) { SetExpiration(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithExpiration(const char* value) { SetExpiration(value); return *this;}
 
 
     /**
@@ -352,7 +345,7 @@ namespace Model
      * one or more nonhexadecimal characters and/or will consist of less than 32 or
      * more than 32 hexadecimal digits.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithETag(const Aws::String& value) { SetETag(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithETag(const Aws::String& value) { SetETag(value); return *this;}
 
     /**
      * <p>Entity tag that identifies the newly created object's data. Objects with
@@ -362,7 +355,7 @@ namespace Model
      * one or more nonhexadecimal characters and/or will consist of less than 32 or
      * more than 32 hexadecimal digits.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithETag(Aws::String&& value) { SetETag(std::move(value)); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithETag(Aws::String&& value) { SetETag(std::move(value)); return *this;}
 
     /**
      * <p>Entity tag that identifies the newly created object's data. Objects with
@@ -372,7 +365,7 @@ namespace Model
      * one or more nonhexadecimal characters and/or will consist of less than 32 or
      * more than 32 hexadecimal digits.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithETag(const char* value) { SetETag(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithETag(const char* value) { SetETag(value); return *this;}
 
 
     /**
@@ -405,7 +398,7 @@ namespace Model
      * multipart upload request, the response includes this header. It confirms the
      * encryption algorithm that Amazon S3 used to encrypt the object.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithServerSideEncryption(const ServerSideEncryption& value) { SetServerSideEncryption(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithServerSideEncryption(const ServerSideEncryption& value) { SetServerSideEncryption(value); return *this;}
 
     /**
      * <p>If you specified server-side encryption either with an Amazon S3-managed
@@ -413,7 +406,7 @@ namespace Model
      * multipart upload request, the response includes this header. It confirms the
      * encryption algorithm that Amazon S3 used to encrypt the object.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithServerSideEncryption(ServerSideEncryption&& value) { SetServerSideEncryption(std::move(value)); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithServerSideEncryption(ServerSideEncryption&& value) { SetServerSideEncryption(std::move(value)); return *this;}
 
 
     /**
@@ -444,19 +437,19 @@ namespace Model
      * <p>Version ID of the newly created object, in case the bucket has versioning
      * turned on.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithVersionId(const Aws::String& value) { SetVersionId(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithVersionId(const Aws::String& value) { SetVersionId(value); return *this;}
 
     /**
      * <p>Version ID of the newly created object, in case the bucket has versioning
      * turned on.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithVersionId(Aws::String&& value) { SetVersionId(std::move(value)); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithVersionId(Aws::String&& value) { SetVersionId(std::move(value)); return *this;}
 
     /**
      * <p>Version ID of the newly created object, in case the bucket has versioning
      * turned on.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithVersionId(const char* value) { SetVersionId(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithVersionId(const char* value) { SetVersionId(value); return *this;}
 
 
     /**
@@ -492,21 +485,21 @@ namespace Model
      * symmetric customer managed customer master key (CMK) that was used for the
      * object.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithSSEKMSKeyId(const Aws::String& value) { SetSSEKMSKeyId(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithSSEKMSKeyId(const Aws::String& value) { SetSSEKMSKeyId(value); return *this;}
 
     /**
      * <p>If present, specifies the ID of the AWS Key Management Service (AWS KMS)
      * symmetric customer managed customer master key (CMK) that was used for the
      * object.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithSSEKMSKeyId(Aws::String&& value) { SetSSEKMSKeyId(std::move(value)); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithSSEKMSKeyId(Aws::String&& value) { SetSSEKMSKeyId(std::move(value)); return *this;}
 
     /**
      * <p>If present, specifies the ID of the AWS Key Management Service (AWS KMS)
      * symmetric customer managed customer master key (CMK) that was used for the
      * object.</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithSSEKMSKeyId(const char* value) { SetSSEKMSKeyId(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithSSEKMSKeyId(const char* value) { SetSSEKMSKeyId(value); return *this;}
 
 
     /**
@@ -525,7 +518,7 @@ namespace Model
      * <p>Indicates whether the multipart upload uses an S3 Bucket Key for server-side
      * encryption with AWS KMS (SSE-KMS).</p>
      */
-    inline CompleteMultipartUploadWithCallBackResult& WithBucketKeyEnabled(bool value) { SetBucketKeyEnabled(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithBucketKeyEnabled(bool value) { SetBucketKeyEnabled(value); return *this;}
 
 
     
@@ -538,14 +531,14 @@ namespace Model
     inline void SetRequestCharged(RequestCharged&& value) { m_requestCharged = std::move(value); }
 
     
-    inline CompleteMultipartUploadWithCallBackResult& WithRequestCharged(const RequestCharged& value) { SetRequestCharged(value); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithRequestCharged(const RequestCharged& value) { SetRequestCharged(value); return *this;}
 
     
-    inline CompleteMultipartUploadWithCallBackResult& WithRequestCharged(RequestCharged&& value) { SetRequestCharged(std::move(value)); return *this;}
+    inline CompleteMultipartUploadOriginResult& WithRequestCharged(RequestCharged&& value) { SetRequestCharged(std::move(value)); return *this;}
 
   private:
 
-  	Aws::String m_location;
+    Aws::String m_location;
 
     Aws::String m_bucket;
 
@@ -564,8 +557,6 @@ namespace Model
     bool m_bucketKeyEnabled;
 
     RequestCharged m_requestCharged;
-
-    Aws::Utils::Stream::ResponseStream m_policy;
   };
 
 } // namespace Model
diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/CompleteMultipartUploadResult.h b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/CompleteMultipartUploadResult.h
index dcd8c30f84da6be7c91b32a5dd82bf8933567cd6..3c336f97fd79add74128271e047fade55bdea035 100644
--- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/CompleteMultipartUploadResult.h
+++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/include/aws/s3/model/CompleteMultipartUploadResult.h
@@ -5,23 +5,18 @@
 
 #pragma once
 #include <aws/s3/S3_EXPORTS.h>
+#include <aws/core/utils/stream/ResponseStream.h>
 #include <aws/core/utils/memory/stl/AWSString.h>
 #include <aws/s3/model/ServerSideEncryption.h>
 #include <aws/s3/model/RequestCharged.h>
 #include <utility>
 
+
 namespace Aws
 {
 template<typename RESULT_TYPE>
 class AmazonWebServiceResult;
 
-namespace Utils
-{
-namespace Xml
-{
-  class XmlDocument;
-} // namespace Xml
-} // namespace Utils
 namespace S3
 {
 namespace Model
@@ -30,11 +25,23 @@ namespace Model
   {
   public:
     CompleteMultipartUploadResult();
-    CompleteMultipartUploadResult(const Aws::AmazonWebServiceResult<Aws::Utils::Xml::XmlDocument>& result);
-    CompleteMultipartUploadResult& operator=(const Aws::AmazonWebServiceResult<Aws::Utils::Xml::XmlDocument>& result);
+    //We have to define these because Microsoft doesn't auto generate them
+    CompleteMultipartUploadResult(CompleteMultipartUploadResult&&);
+    CompleteMultipartUploadResult& operator=(CompleteMultipartUploadResult&&);
+    //we delete these because Microsoft doesn't handle move generation correctly
+    //and we therefore don't trust them to get it right here either.
+    CompleteMultipartUploadResult(const CompleteMultipartUploadResult&) = delete;
+    CompleteMultipartUploadResult& operator=(const CompleteMultipartUploadResult&) = delete;
 
 
-    /**
+    CompleteMultipartUploadResult(Aws::AmazonWebServiceResult<Aws::Utils::Stream::ResponseStream>&& result);
+    CompleteMultipartUploadResult& operator=(Aws::AmazonWebServiceResult<Aws::Utils::Stream::ResponseStream>&& result);
+
+
+    inline Aws::IOStream& GetPolicy() { return m_policy.GetUnderlyingStream(); }   
+
+	
+	/**
      * <p>The URI that identifies the newly created object.</p>
      */
     inline const Aws::String& GetLocation() const{ return m_location; }
@@ -538,7 +545,7 @@ namespace Model
 
   private:
 
-    Aws::String m_location;
+  	Aws::String m_location;
 
     Aws::String m_bucket;
 
@@ -557,6 +564,8 @@ namespace Model
     bool m_bucketKeyEnabled;
 
     RequestCharged m_requestCharged;
+
+    Aws::Utils::Stream::ResponseStream m_policy;
   };
 
 } // namespace Model
diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/S3Client.cpp b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/S3Client.cpp
index fda2f6398687ba9d34b3018527c2206e6e736f5f..4c680884f722cc5ddea4ecfd8e34bdc464f0992c 100644
--- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/S3Client.cpp
+++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/S3Client.cpp
@@ -288,103 +288,103 @@ void S3Client::AbortMultipartUploadAsyncHelper(const AbortMultipartUploadRequest
 
 
 
-CompleteMultipartUploadOutcome S3Client::CompleteMultipartUpload(const CompleteMultipartUploadRequest& request) const
+CompleteMultipartUploadOriginOutcome S3Client::CompleteMultipartUploadOrigin(const CompleteMultipartUploadRequest& request) const
 {
   if (!request.BucketHasBeenSet())
   {
     AWS_LOGSTREAM_ERROR("CompleteMultipartUpload", "Required field: Bucket, is not set");
-    return CompleteMultipartUploadOutcome(Aws::Client::AWSError<S3Errors>(S3Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [Bucket]", false));
+    return CompleteMultipartUploadOriginOutcome(Aws::Client::AWSError<S3Errors>(S3Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [Bucket]", false));
   }
   if (!request.KeyHasBeenSet())
   {
     AWS_LOGSTREAM_ERROR("CompleteMultipartUpload", "Required field: Key, is not set");
-    return CompleteMultipartUploadOutcome(Aws::Client::AWSError<S3Errors>(S3Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [Key]", false));
+    return CompleteMultipartUploadOriginOutcome(Aws::Client::AWSError<S3Errors>(S3Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [Key]", false));
   }
   if (!request.UploadIdHasBeenSet())
   {
     AWS_LOGSTREAM_ERROR("CompleteMultipartUpload", "Required field: UploadId, is not set");
-    return CompleteMultipartUploadOutcome(Aws::Client::AWSError<S3Errors>(S3Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [UploadId]", false));
+    return CompleteMultipartUploadOriginOutcome(Aws::Client::AWSError<S3Errors>(S3Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [UploadId]", false));
   }
   ComputeEndpointOutcome computeEndpointOutcome = ComputeEndpointString(request.GetBucket());
   if (!computeEndpointOutcome.IsSuccess())
   {
-    return CompleteMultipartUploadOutcome(computeEndpointOutcome.GetError());
+    return CompleteMultipartUploadOriginOutcome(computeEndpointOutcome.GetError());
   }
   Aws::Http::URI uri = computeEndpointOutcome.GetResult().endpoint;
   Aws::StringStream ss;
   ss << "/";
   ss << request.GetKey();
   uri.SetPath(uri.GetPath() + ss.str());
-  return CompleteMultipartUploadOutcome(MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER, computeEndpointOutcome.GetResult().signerRegion.c_str() /*signerRegionOverride*/, computeEndpointOutcome.GetResult().signerServiceName.c_str() /*signerServiceNameOverride*/));
+  return CompleteMultipartUploadOriginOutcome(MakeRequest(uri, request, Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER, computeEndpointOutcome.GetResult().signerRegion.c_str() /*signerRegionOverride*/, computeEndpointOutcome.GetResult().signerServiceName.c_str() /*signerServiceNameOverride*/));
 }
 
-CompleteMultipartUploadOutcomeCallable S3Client::CompleteMultipartUploadCallable(const CompleteMultipartUploadRequest& request) const
+CompleteMultipartUploadOriginOutcomeCallable S3Client::CompleteMultipartUploadOriginCallable(const CompleteMultipartUploadRequest& request) const
 {
-  auto task = Aws::MakeShared< std::packaged_task< CompleteMultipartUploadOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->CompleteMultipartUpload(request); } );
+  auto task = Aws::MakeShared< std::packaged_task< CompleteMultipartUploadOriginOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->CompleteMultipartUploadOrigin(request); } );
   auto packagedFunction = [task]() { (*task)(); };
   m_executor->Submit(packagedFunction);
   return task->get_future();
 }
 
-void S3Client::CompleteMultipartUploadAsync(const CompleteMultipartUploadRequest& request, const CompleteMultipartUploadResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+void S3Client::CompleteMultipartUploadOriginAsync(const CompleteMultipartUploadRequest& request, const CompleteMultipartUploadOriginResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
 {
-  m_executor->Submit( [this, request, handler, context](){ this->CompleteMultipartUploadAsyncHelper( request, handler, context ); } );
+  m_executor->Submit( [this, request, handler, context](){ this->CompleteMultipartUploadOriginAsyncHelper( request, handler, context ); } );
 }
 
-void S3Client::CompleteMultipartUploadAsyncHelper(const CompleteMultipartUploadRequest& request, const CompleteMultipartUploadResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+void S3Client::CompleteMultipartUploadOriginAsyncHelper(const CompleteMultipartUploadRequest& request, const CompleteMultipartUploadOriginResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
 {
-  handler(this, request, CompleteMultipartUpload(request), context);
+  handler(this, request, CompleteMultipartUploadOrigin(request), context);
 }
 
 
 
 
-CompleteMultipartUploadWithCallBackOutcome S3Client::CompleteMultipartUploadWithCallBack(const CompleteMultipartUploadRequest& request) const
+CompleteMultipartUploadOutcome S3Client::CompleteMultipartUpload(const CompleteMultipartUploadRequest& request) const
 {
   if (!request.BucketHasBeenSet())
   {
-    AWS_LOGSTREAM_ERROR("CompleteMultipartUploadWithCallBack", "Required field: Bucket, is not set");
-    return CompleteMultipartUploadWithCallBackOutcome(Aws::Client::AWSError<S3Errors>(S3Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [Bucket]", false));
+    AWS_LOGSTREAM_ERROR("CompleteMultipartUpload", "Required field: Bucket, is not set");
+    return CompleteMultipartUploadOutcome(Aws::Client::AWSError<S3Errors>(S3Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [Bucket]", false));
   }
   if (!request.KeyHasBeenSet())
   {
-    AWS_LOGSTREAM_ERROR("CompleteMultipartUploadWithCallBack", "Required field: Key, is not set");
-    return CompleteMultipartUploadWithCallBackOutcome(Aws::Client::AWSError<S3Errors>(S3Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [Key]", false));
+    AWS_LOGSTREAM_ERROR("CompleteMultipartUpload", "Required field: Key, is not set");
+    return CompleteMultipartUploadOutcome(Aws::Client::AWSError<S3Errors>(S3Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [Key]", false));
   }
   if (!request.UploadIdHasBeenSet())
   {
     AWS_LOGSTREAM_ERROR("CompleteMultipartUpload", "Required field: UploadId, is not set");
-    return CompleteMultipartUploadWithCallBackOutcome(Aws::Client::AWSError<S3Errors>(S3Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [UploadId]", false));
+    return CompleteMultipartUploadOutcome(Aws::Client::AWSError<S3Errors>(S3Errors::MISSING_PARAMETER, "MISSING_PARAMETER", "Missing required field [UploadId]", false));
   }
   ComputeEndpointOutcome computeEndpointOutcome = ComputeEndpointString(request.GetBucket());
   if (!computeEndpointOutcome.IsSuccess())
   {
-    return CompleteMultipartUploadWithCallBackOutcome(computeEndpointOutcome.GetError());
+    return CompleteMultipartUploadOutcome(computeEndpointOutcome.GetError());
   }
   Aws::Http::URI uri = computeEndpointOutcome.GetResult().endpoint;
   Aws::StringStream ss;
   ss << "/";
   ss << request.GetKey();
   uri.SetPath(uri.GetPath() + ss.str());
-  return CompleteMultipartUploadWithCallBackOutcome(MakeRequestWithUnparsedResponse(uri, request, Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER, computeEndpointOutcome.GetResult().signerRegion.c_str() /*signerRegionOverride*/, computeEndpointOutcome.GetResult().signerServiceName.c_str() /*signerServiceNameOverride*/));
+  return CompleteMultipartUploadOutcome(MakeRequestWithUnparsedResponse(uri, request, Aws::Http::HttpMethod::HTTP_POST, Aws::Auth::SIGV4_SIGNER, computeEndpointOutcome.GetResult().signerRegion.c_str() /*signerRegionOverride*/, computeEndpointOutcome.GetResult().signerServiceName.c_str() /*signerServiceNameOverride*/));
 }
 
-CompleteMultipartUploadWithCallBackOutcomeCallable S3Client::CompleteMultipartUploadWithCallBackCallable(const CompleteMultipartUploadRequest& request) const
+CompleteMultipartUploadOutcomeCallable S3Client::CompleteMultipartUploadCallable(const CompleteMultipartUploadRequest& request) const
 {
-  auto task = Aws::MakeShared< std::packaged_task< CompleteMultipartUploadWithCallBackOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->CompleteMultipartUploadWithCallBack(request); } );
+  auto task = Aws::MakeShared< std::packaged_task< CompleteMultipartUploadOutcome() > >(ALLOCATION_TAG, [this, request](){ return this->CompleteMultipartUpload(request); } );
   auto packagedFunction = [task]() { (*task)(); };
   m_executor->Submit(packagedFunction);
   return task->get_future();
 }
 
-void S3Client::CompleteMultipartUploadWithCallBackAsync(const CompleteMultipartUploadRequest& request, const CompleteMultipartUploadWithCallBackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+void S3Client::CompleteMultipartUploadAsync(const CompleteMultipartUploadRequest& request, const CompleteMultipartUploadResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
 {
-  m_executor->Submit( [this, request, handler, context](){ this->CompleteMultipartUploadWithCallBackAsyncHelper( request, handler, context ); } );
+  m_executor->Submit( [this, request, handler, context](){ this->CompleteMultipartUploadAsyncHelper( request, handler, context ); } );
 }
 
-void S3Client::CompleteMultipartUploadWithCallBackAsyncHelper(const CompleteMultipartUploadRequest& request, const CompleteMultipartUploadWithCallBackResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
+void S3Client::CompleteMultipartUploadAsyncHelper(const CompleteMultipartUploadRequest& request, const CompleteMultipartUploadResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
 {
-  handler(this, request, CompleteMultipartUploadWithCallBack(request), context);
+  handler(this, request, CompleteMultipartUpload(request), context);
 }
 
 
diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadWithCallBackResult.cpp b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadOriginResult.cpp
similarity index 55%
rename from aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadWithCallBackResult.cpp
rename to aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadOriginResult.cpp
index 5aea7e2c08db8499e94e55f643ed01a8e90eccdc..1e6cee12bb059f102aa3c5c90c100830d2f053ff 100644
--- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadWithCallBackResult.cpp
+++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadOriginResult.cpp
@@ -3,54 +3,62 @@
  * SPDX-License-Identifier: Apache-2.0.
  */
 
-#include <aws/s3/model/CompleteMultipartUploadWithCallBackResult.h>
+#include <aws/s3/model/CompleteMultipartUploadOriginResult.h>
+#include <aws/core/utils/xml/XmlSerializer.h>
 #include <aws/core/AmazonWebServiceResult.h>
 #include <aws/core/utils/StringUtils.h>
-#include<iostream>
+#include <aws/core/utils/memory/stl/AWSStringStream.h>
+
 #include <utility>
-#include<typeinfo>
 
 using namespace Aws::S3::Model;
-using namespace Aws::Utils::Stream;
+using namespace Aws::Utils::Xml;
 using namespace Aws::Utils;
 using namespace Aws;
 
-CompleteMultipartUploadWithCallBackResult::CompleteMultipartUploadWithCallBackResult() : 
+CompleteMultipartUploadOriginResult::CompleteMultipartUploadOriginResult() : 
     m_serverSideEncryption(ServerSideEncryption::NOT_SET),
     m_bucketKeyEnabled(false),
     m_requestCharged(RequestCharged::NOT_SET)
 {
 }
 
-CompleteMultipartUploadWithCallBackResult::CompleteMultipartUploadWithCallBackResult(CompleteMultipartUploadWithCallBackResult&& toMove) : 
-    m_policy(std::move(toMove.m_policy)),
-	m_serverSideEncryption(ServerSideEncryption::NOT_SET),
+CompleteMultipartUploadOriginResult::CompleteMultipartUploadOriginResult(const Aws::AmazonWebServiceResult<XmlDocument>& result) : 
+    m_serverSideEncryption(ServerSideEncryption::NOT_SET),
     m_bucketKeyEnabled(false),
     m_requestCharged(RequestCharged::NOT_SET)
 {
+  *this = result;
 }
 
-CompleteMultipartUploadWithCallBackResult& CompleteMultipartUploadWithCallBackResult::operator=(CompleteMultipartUploadWithCallBackResult&& toMove)
-{
-   if(this == &toMove)
-   {
-      return *this;
-   }
-
-   m_policy = std::move(toMove.m_policy);
-
-   return *this;
-}
-
-CompleteMultipartUploadWithCallBackResult::CompleteMultipartUploadWithCallBackResult(Aws::AmazonWebServiceResult<ResponseStream>&& result)
+CompleteMultipartUploadOriginResult& CompleteMultipartUploadOriginResult::operator =(const Aws::AmazonWebServiceResult<XmlDocument>& result)
 {
-  *this = std::move(result);
-}
+  const XmlDocument& xmlDocument = result.GetPayload();
+  XmlNode resultNode = xmlDocument.GetRootElement();
+  if(!resultNode.IsNull())
+  {
+    XmlNode locationNode = resultNode.FirstChild("Location");
+    if(!locationNode.IsNull())
+    {
+      m_location = Aws::Utils::Xml::DecodeEscapedXmlText(locationNode.GetText());
+    }
+    XmlNode bucketNode = resultNode.FirstChild("Bucket");
+    if(!bucketNode.IsNull())
+    {
+      m_bucket = Aws::Utils::Xml::DecodeEscapedXmlText(bucketNode.GetText());
+    }
+    XmlNode keyNode = resultNode.FirstChild("Key");
+    if(!keyNode.IsNull())
+    {
+      m_key = Aws::Utils::Xml::DecodeEscapedXmlText(keyNode.GetText());
+    }
+    XmlNode eTagNode = resultNode.FirstChild("ETag");
+    if(!eTagNode.IsNull())
+    {
+      m_eTag = Aws::Utils::Xml::DecodeEscapedXmlText(eTagNode.GetText());
+    }
+  }
 
-CompleteMultipartUploadWithCallBackResult& CompleteMultipartUploadWithCallBackResult::operator =(Aws::AmazonWebServiceResult<ResponseStream>&& result)
-{
-  m_policy = result.TakeOwnershipOfPayload();
-  
   const auto& headers = result.GetHeaderValueCollection();
   const auto& expirationIter = headers.find("x-amz-expiration");
   if(expirationIter != headers.end())
@@ -87,5 +95,6 @@ CompleteMultipartUploadWithCallBackResult& CompleteMultipartUploadWithCallBackRe
   {
     m_requestCharged = RequestChargedMapper::GetRequestChargedForName(requestChargedIter->second);
   }
-   return *this;
+
+  return *this;
 }
diff --git a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadResult.cpp b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadResult.cpp
index 6d77f09c0948ccc5f66056d988124ff6c38da928..da81793a96b1e650ab111f24b61beca85daee056 100644
--- a/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadResult.cpp
+++ b/aws-sdk-cpp-1.8.183/aws-sdk-cpp-1.8.183/aws-cpp-sdk-s3/source/model/CompleteMultipartUploadResult.cpp
@@ -4,15 +4,14 @@
  */
 
 #include <aws/s3/model/CompleteMultipartUploadResult.h>
-#include <aws/core/utils/xml/XmlSerializer.h>
 #include <aws/core/AmazonWebServiceResult.h>
 #include <aws/core/utils/StringUtils.h>
-#include <aws/core/utils/memory/stl/AWSStringStream.h>
-
+#include<iostream>
 #include <utility>
+#include<typeinfo>
 
 using namespace Aws::S3::Model;
-using namespace Aws::Utils::Xml;
+using namespace Aws::Utils::Stream;
 using namespace Aws::Utils;
 using namespace Aws;
 
@@ -23,42 +22,35 @@ CompleteMultipartUploadResult::CompleteMultipartUploadResult() :
 {
 }
 
-CompleteMultipartUploadResult::CompleteMultipartUploadResult(const Aws::AmazonWebServiceResult<XmlDocument>& result) : 
-    m_serverSideEncryption(ServerSideEncryption::NOT_SET),
+CompleteMultipartUploadResult::CompleteMultipartUploadResult(CompleteMultipartUploadResult&& toMove) : 
+    m_policy(std::move(toMove.m_policy)),
+	m_serverSideEncryption(ServerSideEncryption::NOT_SET),
     m_bucketKeyEnabled(false),
     m_requestCharged(RequestCharged::NOT_SET)
 {
-  *this = result;
 }
 
-CompleteMultipartUploadResult& CompleteMultipartUploadResult::operator =(const Aws::AmazonWebServiceResult<XmlDocument>& result)
+CompleteMultipartUploadResult& CompleteMultipartUploadResult::operator=(CompleteMultipartUploadResult&& toMove)
 {
-  const XmlDocument& xmlDocument = result.GetPayload();
-  XmlNode resultNode = xmlDocument.GetRootElement();
-  if(!resultNode.IsNull())
-  {
-    XmlNode locationNode = resultNode.FirstChild("Location");
-    if(!locationNode.IsNull())
-    {
-      m_location = Aws::Utils::Xml::DecodeEscapedXmlText(locationNode.GetText());
-    }
-    XmlNode bucketNode = resultNode.FirstChild("Bucket");
-    if(!bucketNode.IsNull())
-    {
-      m_bucket = Aws::Utils::Xml::DecodeEscapedXmlText(bucketNode.GetText());
-    }
-    XmlNode keyNode = resultNode.FirstChild("Key");
-    if(!keyNode.IsNull())
-    {
-      m_key = Aws::Utils::Xml::DecodeEscapedXmlText(keyNode.GetText());
-    }
-    XmlNode eTagNode = resultNode.FirstChild("ETag");
-    if(!eTagNode.IsNull())
-    {
-      m_eTag = Aws::Utils::Xml::DecodeEscapedXmlText(eTagNode.GetText());
-    }
-  }
+   if(this == &toMove)
+   {
+      return *this;
+   }
+
+   m_policy = std::move(toMove.m_policy);
+
+   return *this;
+}
+
+CompleteMultipartUploadResult::CompleteMultipartUploadResult(Aws::AmazonWebServiceResult<ResponseStream>&& result)
+{
+  *this = std::move(result);
+}
 
+CompleteMultipartUploadResult& CompleteMultipartUploadResult::operator =(Aws::AmazonWebServiceResult<ResponseStream>&& result)
+{
+  m_policy = result.TakeOwnershipOfPayload();
+  
   const auto& headers = result.GetHeaderValueCollection();
   const auto& expirationIter = headers.find("x-amz-expiration");
   if(expirationIter != headers.end())
@@ -95,6 +87,5 @@ CompleteMultipartUploadResult& CompleteMultipartUploadResult::operator =(const A
   {
     m_requestCharged = RequestChargedMapper::GetRequestChargedForName(requestChargedIter->second);
   }
-
-  return *this;
+   return *this;
 }