Fixup conflicts after merge

Author: alesapin

src/aws-cpp-sdk-core/source/internal/AWSHttpResourceClient.cpp

@@ -477,14 +477,6 @@ namespace Aws
             return ec2MetadataServiceEndpoint;
         }
 
-        #ifdef _MSC_VER
-            // VS2015 compiler's bug, warning s_ec2metadataClient: symbol will be dynamically initialized (implementation limitation)
-            AWS_SUPPRESS_WARNING(4592,
-                static std::shared_ptr<EC2MetadataClient> s_ec2metadataClient(nullptr);
-            )
-        #else
-            static std::shared_ptr<EC2MetadataClient> s_ec2metadataClient(nullptr);
-        #endif
 
         void InitEC2MetadataClient(const Aws::Client::ClientConfiguration::CredentialProviderConfiguration& credentialConfig)
         {
@@ -509,6 +501,15 @@ namespace Aws
             #endif
         }
 
+        #ifdef _MSC_VER
+            // VS2015 compiler's bug, warning s_ec2metadataClient: symbol will be dynamically initialized (implementation limitation)
+            AWS_SUPPRESS_WARNING(4592,
+                static std::shared_ptr<EC2MetadataClient> s_ec2metadataClient(nullptr);
+            )
+        #else
+            static std::shared_ptr<EC2MetadataClient> s_ec2metadataClient(nullptr);
+        #endif
+
         void CleanupEC2MetadataClient()
         {
             if (!s_ec2metadataClient)