From 5bd66f895d4c031655896c01c0bfc55b8ac7dcaa Mon Sep 17 00:00:00 2001 From: "Jonathan M. Henson" Date: Fri, 6 May 2016 12:59:30 -0700 Subject: [PATCH] Android build 1.0; Unity build --- .gitignore | 6 +- CMakeLists.txt | 1459 +++++++---------- README.md | 12 + android-build/build_and_test_android.py | 50 +- .../cmakefiles/openssl-cmake/CMakeLists.txt | 8 +- .../openssl-cmake/apps/CMakeLists.txt | 1 - android-build/configure_openssl_cmake.py | 9 +- android-tests/android-tests.iml | 8 +- android-tests/app/app.iml | 15 +- .../main/java/aws/coretests/TestActivity.java | 11 +- android-tests/gradlew | 0 android-unified-tests/CMakeLists.txt | 41 +- android-unified-tests/RunTests.cpp | 5 +- aws-cpp-sdk-acm/CMakeLists.txt | 14 +- aws-cpp-sdk-acm/source/ACMErrors.cpp | 41 +- .../source/model/CertificateDetail.cpp | 14 +- .../source/model/CertificateStatus.cpp | 15 +- .../source/model/CertificateSummary.cpp | 14 +- .../source/model/DomainValidation.cpp | 14 +- .../source/model/DomainValidationOption.cpp | 14 +- aws-cpp-sdk-acm/source/model/KeyAlgorithm.cpp | 5 +- .../source/model/RevocationReason.cpp | 21 +- aws-cpp-sdk-apigateway/CMakeLists.txt | 14 +- .../source/APIGatewayErrors.cpp | 13 +- .../source/model/ApiKey.cpp | 14 +- .../source/model/Authorizer.cpp | 14 +- .../source/model/AuthorizerType.cpp | 3 +- .../source/model/BasePathMapping.cpp | 14 +- .../source/model/CacheClusterSize.cpp | 17 +- .../source/model/CacheClusterStatus.cpp | 11 +- .../source/model/ClientCertificate.cpp | 14 +- .../source/model/Deployment.cpp | 14 +- .../source/model/DomainName.cpp | 14 +- .../source/model/Integration.cpp | 14 +- .../source/model/IntegrationResponse.cpp | 14 +- .../source/model/IntegrationType.cpp | 7 +- .../source/model/Method.cpp | 14 +- .../source/model/MethodResponse.cpp | 14 +- .../source/model/MethodSetting.cpp | 14 +- .../source/model/MethodSnapshot.cpp | 14 +- aws-cpp-sdk-apigateway/source/model/Model.cpp | 14 +- aws-cpp-sdk-apigateway/source/model/Op.cpp | 13 +- .../source/model/PatchOperation.cpp | 14 +- .../source/model/Resource.cpp | 14 +- .../source/model/RestApi.cpp | 14 +- aws-cpp-sdk-apigateway/source/model/Stage.cpp | 14 +- .../source/model/StageKey.cpp | 14 +- .../source/model/ThrottleSettings.cpp | 14 +- aws-cpp-sdk-autoscaling/CMakeLists.txt | 14 +- .../source/AutoScalingErrors.cpp | 13 +- .../source/model/Activity.cpp | 12 +- .../source/model/AdjustmentType.cpp | 12 +- .../source/model/Alarm.cpp | 12 +- .../source/model/AutoScalingGroup.cpp | 12 +- .../model/AutoScalingInstanceDetails.cpp | 12 +- .../source/model/BlockDeviceMapping.cpp | 12 +- aws-cpp-sdk-autoscaling/source/model/Ebs.cpp | 12 +- .../source/model/EnabledMetric.cpp | 12 +- .../source/model/Filter.cpp | 12 +- .../source/model/Instance.cpp | 12 +- .../source/model/InstanceMonitoring.cpp | 12 +- .../source/model/LaunchConfiguration.cpp | 12 +- .../source/model/LifecycleHook.cpp | 12 +- .../source/model/LifecycleState.cpp | 27 +- .../source/model/LoadBalancerState.cpp | 12 +- .../source/model/MetricCollectionType.cpp | 12 +- .../source/model/MetricGranularityType.cpp | 12 +- .../model/NotificationConfiguration.cpp | 12 +- .../source/model/ProcessType.cpp | 12 +- .../source/model/ResponseMetadata.cpp | 12 +- .../model/ScalingActivityStatusCode.cpp | 25 +- .../source/model/ScalingPolicy.cpp | 12 +- .../model/ScheduledUpdateGroupAction.cpp | 12 +- .../source/model/StepAdjustment.cpp | 12 +- .../source/model/SuspendedProcess.cpp | 12 +- aws-cpp-sdk-autoscaling/source/model/Tag.cpp | 12 +- .../source/model/TagDescription.cpp | 12 +- aws-cpp-sdk-cloudformation/CMakeLists.txt | 14 +- .../source/CloudFormationErrors.cpp | 21 +- .../source/model/AccountLimit.cpp | 12 +- .../source/model/Capability.cpp | 3 +- .../source/model/OnFailure.cpp | 7 +- .../source/model/Output.cpp | 12 +- .../source/model/Parameter.cpp | 12 +- .../source/model/ParameterConstraints.cpp | 12 +- .../source/model/ParameterDeclaration.cpp | 12 +- .../source/model/ResourceSignalStatus.cpp | 5 +- .../source/model/ResourceStatus.cpp | 21 +- .../source/model/ResponseMetadata.cpp | 12 +- .../source/model/Stack.cpp | 12 +- .../source/model/StackEvent.cpp | 12 +- .../source/model/StackResource.cpp | 12 +- .../source/model/StackResourceDetail.cpp | 12 +- .../source/model/StackResourceSummary.cpp | 12 +- .../source/model/StackStatus.cpp | 33 +- .../source/model/StackSummary.cpp | 12 +- .../source/model/Tag.cpp | 12 +- .../source/model/TemplateParameter.cpp | 12 +- aws-cpp-sdk-cloudfront/CMakeLists.txt | 14 +- .../source/CloudFrontErrors.cpp | 13 +- .../source/model/ActiveTrustedSigners.cpp | 12 +- .../source/model/Aliases.cpp | 12 +- .../source/model/AllowedMethods.cpp | 12 +- .../source/model/CacheBehavior.cpp | 12 +- .../source/model/CacheBehaviors.cpp | 12 +- .../source/model/CachedMethods.cpp | 12 +- .../model/CloudFrontOriginAccessIdentity.cpp | 12 +- .../CloudFrontOriginAccessIdentityConfig.cpp | 12 +- .../CloudFrontOriginAccessIdentityList.cpp | 12 +- .../CloudFrontOriginAccessIdentitySummary.cpp | 12 +- .../source/model/CookieNames.cpp | 12 +- .../source/model/CookiePreference.cpp | 12 +- .../source/model/CustomErrorResponse.cpp | 12 +- .../source/model/CustomErrorResponses.cpp | 12 +- .../source/model/CustomHeaders.cpp | 12 +- .../source/model/CustomOriginConfig.cpp | 12 +- .../source/model/DefaultCacheBehavior.cpp | 12 +- .../source/model/Distribution.cpp | 12 +- .../source/model/DistributionConfig.cpp | 12 +- .../source/model/DistributionList.cpp | 12 +- .../source/model/DistributionSummary.cpp | 12 +- .../source/model/ForwardedValues.cpp | 12 +- .../source/model/GeoRestriction.cpp | 12 +- .../source/model/GeoRestrictionType.cpp | 7 +- .../source/model/Headers.cpp | 12 +- .../source/model/Invalidation.cpp | 12 +- .../source/model/InvalidationBatch.cpp | 12 +- .../source/model/InvalidationList.cpp | 12 +- .../source/model/InvalidationSummary.cpp | 12 +- .../source/model/ItemSelection.cpp | 7 +- .../source/model/KeyPairIds.cpp | 12 +- .../source/model/LoggingConfig.cpp | 12 +- .../source/model/Method.cpp | 15 +- .../source/model/MinimumProtocolVersion.cpp | 5 +- .../source/model/Origin.cpp | 12 +- .../source/model/OriginCustomHeader.cpp | 12 +- .../source/model/OriginProtocolPolicy.cpp | 7 +- .../source/model/OriginSslProtocols.cpp | 12 +- .../source/model/Origins.cpp | 12 +- aws-cpp-sdk-cloudfront/source/model/Paths.cpp | 12 +- .../source/model/PriceClass.cpp | 7 +- .../source/model/Restrictions.cpp | 12 +- .../source/model/S3Origin.cpp | 12 +- .../source/model/S3OriginConfig.cpp | 12 +- .../source/model/SSLSupportMethod.cpp | 5 +- .../source/model/Signer.cpp | 12 +- .../source/model/SslProtocol.cpp | 9 +- .../source/model/StreamingDistribution.cpp | 12 +- .../model/StreamingDistributionConfig.cpp | 12 +- .../model/StreamingDistributionList.cpp | 12 +- .../model/StreamingDistributionSummary.cpp | 12 +- .../source/model/StreamingLoggingConfig.cpp | 12 +- .../source/model/TrustedSigners.cpp | 12 +- .../source/model/ViewerCertificate.cpp | 12 +- .../source/model/ViewerProtocolPolicy.cpp | 7 +- aws-cpp-sdk-cloudhsm/CMakeLists.txt | 14 +- .../source/CloudHSMErrors.cpp | 9 +- .../source/model/ClientVersion.cpp | 5 +- .../source/model/CloudHsmObjectState.cpp | 7 +- .../source/model/HsmStatus.cpp | 15 +- .../source/model/SubscriptionType.cpp | 3 +- aws-cpp-sdk-cloudsearch/CMakeLists.txt | 14 +- .../source/CloudSearchErrors.cpp | 13 +- .../source/model/AccessPoliciesStatus.cpp | 12 +- .../source/model/AlgorithmicStemming.cpp | 9 +- .../source/model/AnalysisOptions.cpp | 12 +- .../source/model/AnalysisScheme.cpp | 12 +- .../source/model/AnalysisSchemeLanguage.cpp | 71 +- .../source/model/AnalysisSchemeStatus.cpp | 12 +- .../model/AvailabilityOptionsStatus.cpp | 12 +- .../source/model/DateArrayOptions.cpp | 12 +- .../source/model/DateOptions.cpp | 12 +- .../source/model/DocumentSuggesterOptions.cpp | 12 +- .../source/model/DomainStatus.cpp | 12 +- .../source/model/DoubleArrayOptions.cpp | 12 +- .../source/model/DoubleOptions.cpp | 12 +- .../source/model/Expression.cpp | 12 +- .../source/model/ExpressionStatus.cpp | 12 +- .../source/model/IndexField.cpp | 12 +- .../source/model/IndexFieldStatus.cpp | 12 +- .../source/model/IndexFieldType.cpp | 23 +- .../source/model/IntArrayOptions.cpp | 12 +- .../source/model/IntOptions.cpp | 12 +- .../source/model/LatLonOptions.cpp | 12 +- .../source/model/Limits.cpp | 12 +- .../source/model/LiteralArrayOptions.cpp | 12 +- .../source/model/LiteralOptions.cpp | 12 +- .../source/model/OptionState.cpp | 9 +- .../source/model/OptionStatus.cpp | 12 +- .../source/model/PartitionInstanceType.cpp | 17 +- .../source/model/ResponseMetadata.cpp | 12 +- .../source/model/ScalingParameters.cpp | 12 +- .../source/model/ScalingParametersStatus.cpp | 12 +- .../source/model/ServiceEndpoint.cpp | 12 +- .../source/model/Suggester.cpp | 12 +- .../source/model/SuggesterFuzzyMatching.cpp | 7 +- .../source/model/SuggesterStatus.cpp | 12 +- .../source/model/TextArrayOptions.cpp | 12 +- .../source/model/TextOptions.cpp | 12 +- aws-cpp-sdk-cloudsearchdomain/CMakeLists.txt | 14 +- .../source/CloudSearchDomainErrors.cpp | 7 +- .../source/model/Bucket.cpp | 14 +- .../source/model/BucketInfo.cpp | 14 +- .../source/model/ContentType.cpp | 5 +- .../source/model/DocumentServiceWarning.cpp | 14 +- .../source/model/Hit.cpp | 14 +- .../source/model/Hits.cpp | 14 +- .../source/model/QueryParser.cpp | 9 +- .../source/model/SearchStatus.cpp | 14 +- .../source/model/SuggestModel.cpp | 14 +- .../source/model/SuggestStatus.cpp | 14 +- .../source/model/SuggestionMatch.cpp | 14 +- aws-cpp-sdk-cloudtrail/CMakeLists.txt | 14 +- .../source/CloudTrailErrors.cpp | 13 +- aws-cpp-sdk-cloudtrail/source/model/Event.cpp | 14 +- .../source/model/LookupAttribute.cpp | 14 +- .../source/model/LookupAttributeKey.cpp | 11 +- .../source/model/PublicKey.cpp | 14 +- .../source/model/Resource.cpp | 14 +- .../source/model/ResourceTag.cpp | 14 +- aws-cpp-sdk-cloudtrail/source/model/Tag.cpp | 14 +- aws-cpp-sdk-cloudtrail/source/model/Trail.cpp | 14 +- aws-cpp-sdk-codecommit/CMakeLists.txt | 14 +- .../source/CodeCommitErrors.cpp | 185 +-- .../source/model/BranchInfo.cpp | 14 +- .../source/model/OrderEnum.cpp | 5 +- .../source/model/RepositoryMetadata.cpp | 14 +- .../source/model/RepositoryNameIdPair.cpp | 14 +- .../source/model/SortByEnum.cpp | 5 +- aws-cpp-sdk-codedeploy/CMakeLists.txt | 14 +- .../source/CodeDeployErrors.cpp | 13 +- .../source/model/ApplicationInfo.cpp | 14 +- .../model/ApplicationRevisionSortBy.cpp | 7 +- .../source/model/AutoScalingGroup.cpp | 14 +- .../source/model/BundleType.cpp | 7 +- .../source/model/DeploymentConfigInfo.cpp | 14 +- .../source/model/DeploymentCreator.cpp | 5 +- .../source/model/DeploymentGroupInfo.cpp | 14 +- .../source/model/DeploymentInfo.cpp | 14 +- .../source/model/DeploymentOverview.cpp | 14 +- .../source/model/DeploymentStatus.cpp | 13 +- .../source/model/Diagnostics.cpp | 14 +- .../source/model/EC2TagFilter.cpp | 14 +- .../source/model/EC2TagFilterType.cpp | 7 +- .../source/model/ErrorCode.cpp | 27 +- .../source/model/ErrorInformation.cpp | 14 +- .../source/model/GenericRevisionInfo.cpp | 14 +- .../source/model/GitHubLocation.cpp | 14 +- .../source/model/InstanceInfo.cpp | 14 +- .../source/model/InstanceStatus.cpp | 13 +- .../source/model/InstanceSummary.cpp | 14 +- .../source/model/LifecycleErrorCode.cpp | 13 +- .../source/model/LifecycleEvent.cpp | 14 +- .../source/model/LifecycleEventStatus.cpp | 13 +- .../source/model/ListStateFilterAction.cpp | 7 +- .../source/model/MinimumHealthyHosts.cpp | 14 +- .../source/model/MinimumHealthyHostsType.cpp | 5 +- .../source/model/RegistrationStatus.cpp | 5 +- .../source/model/RevisionInfo.cpp | 14 +- .../source/model/RevisionLocation.cpp | 14 +- .../source/model/RevisionLocationType.cpp | 5 +- .../source/model/S3Location.cpp | 14 +- .../source/model/SortOrder.cpp | 5 +- .../source/model/StopStatus.cpp | 5 +- aws-cpp-sdk-codedeploy/source/model/Tag.cpp | 14 +- .../source/model/TagFilter.cpp | 14 +- .../source/model/TagFilterType.cpp | 7 +- .../source/model/TimeRange.cpp | 14 +- .../source/model/TriggerConfig.cpp | 14 +- .../source/model/TriggerEventType.cpp | 15 +- aws-cpp-sdk-codepipeline/CMakeLists.txt | 14 +- .../source/CodePipelineErrors.cpp | 99 +- .../source/model/AWSSessionCredentials.cpp | 14 +- .../source/model/ActionCategory.cpp | 11 +- .../source/model/ActionConfiguration.cpp | 14 +- .../model/ActionConfigurationProperty.cpp | 14 +- .../model/ActionConfigurationPropertyType.cpp | 7 +- .../source/model/ActionContext.cpp | 14 +- .../source/model/ActionDeclaration.cpp | 14 +- .../source/model/ActionExecution.cpp | 14 +- .../source/model/ActionExecutionStatus.cpp | 7 +- .../source/model/ActionOwner.cpp | 7 +- .../source/model/ActionRevision.cpp | 14 +- .../source/model/ActionState.cpp | 14 +- .../source/model/ActionType.cpp | 14 +- .../source/model/ActionTypeId.cpp | 14 +- .../source/model/ActionTypeSettings.cpp | 14 +- .../source/model/Artifact.cpp | 14 +- .../source/model/ArtifactDetails.cpp | 14 +- .../source/model/ArtifactLocation.cpp | 14 +- .../source/model/ArtifactLocationType.cpp | 3 +- .../source/model/ArtifactStore.cpp | 14 +- .../source/model/ArtifactStoreType.cpp | 3 +- .../source/model/BlockerDeclaration.cpp | 14 +- .../source/model/BlockerType.cpp | 3 +- .../source/model/CurrentRevision.cpp | 14 +- .../source/model/EncryptionKey.cpp | 14 +- .../source/model/EncryptionKeyType.cpp | 3 +- .../source/model/ErrorDetails.cpp | 14 +- .../source/model/ExecutionDetails.cpp | 14 +- .../source/model/FailureDetails.cpp | 14 +- .../source/model/FailureType.cpp | 13 +- .../source/model/InputArtifact.cpp | 14 +- aws-cpp-sdk-codepipeline/source/model/Job.cpp | 14 +- .../source/model/JobData.cpp | 14 +- .../source/model/JobDetails.cpp | 14 +- .../source/model/JobStatus.cpp | 15 +- .../source/model/OutputArtifact.cpp | 14 +- .../source/model/PipelineContext.cpp | 14 +- .../source/model/PipelineDeclaration.cpp | 14 +- .../source/model/PipelineSummary.cpp | 14 +- .../source/model/S3ArtifactLocation.cpp | 14 +- .../source/model/StageContext.cpp | 14 +- .../source/model/StageDeclaration.cpp | 14 +- .../source/model/StageState.cpp | 14 +- .../source/model/StageTransitionType.cpp | 5 +- .../source/model/ThirdPartyJob.cpp | 14 +- .../source/model/ThirdPartyJobData.cpp | 14 +- .../source/model/ThirdPartyJobDetails.cpp | 14 +- .../source/model/TransitionState.cpp | 14 +- aws-cpp-sdk-cognito-identity/CMakeLists.txt | 14 +- .../source/CognitoIdentityErrors.cpp | 13 +- .../source/model/Credentials.cpp | 14 +- .../source/model/ErrorCode.cpp | 5 +- .../source/model/IdentityDescription.cpp | 14 +- .../model/IdentityPoolShortDescription.cpp | 14 +- .../source/model/UnprocessedIdentityId.cpp | 14 +- aws-cpp-sdk-cognito-sync/CMakeLists.txt | 14 +- .../source/CognitoSyncErrors.cpp | 13 +- .../source/model/BulkPublishStatus.cpp | 9 +- .../source/model/CognitoStreams.cpp | 14 +- .../source/model/Dataset.cpp | 14 +- .../source/model/IdentityPoolUsage.cpp | 14 +- .../source/model/IdentityUsage.cpp | 14 +- .../source/model/Operation.cpp | 5 +- .../source/model/Platform.cpp | 9 +- .../source/model/PushSync.cpp | 14 +- .../source/model/Record.cpp | 14 +- .../source/model/RecordPatch.cpp | 14 +- .../source/model/StreamingStatus.cpp | 5 +- aws-cpp-sdk-config/CMakeLists.txt | 14 +- .../source/ConfigServiceErrors.cpp | 13 +- .../source/model/ChronologicalOrder.cpp | 5 +- .../source/model/Compliance.cpp | 14 +- .../source/model/ComplianceByConfigRule.cpp | 14 +- .../source/model/ComplianceByResource.cpp | 14 +- .../model/ComplianceContributorCount.cpp | 14 +- .../source/model/ComplianceSummary.cpp | 14 +- .../model/ComplianceSummaryByResourceType.cpp | 14 +- .../source/model/ComplianceType.cpp | 9 +- .../source/model/ConfigExportDeliveryInfo.cpp | 14 +- .../source/model/ConfigRule.cpp | 14 +- .../model/ConfigRuleEvaluationStatus.cpp | 14 +- .../source/model/ConfigRuleState.cpp | 5 +- .../ConfigSnapshotDeliveryProperties.cpp | 14 +- .../source/model/ConfigStreamDeliveryInfo.cpp | 14 +- .../source/model/ConfigurationItem.cpp | 14 +- .../source/model/ConfigurationItemStatus.cpp | 9 +- .../source/model/ConfigurationRecorder.cpp | 14 +- .../model/ConfigurationRecorderStatus.cpp | 14 +- .../source/model/DeliveryChannel.cpp | 14 +- .../source/model/DeliveryChannelStatus.cpp | 14 +- .../source/model/DeliveryStatus.cpp | 7 +- .../source/model/Evaluation.cpp | 14 +- .../source/model/EvaluationResult.cpp | 14 +- .../model/EvaluationResultIdentifier.cpp | 14 +- .../model/EvaluationResultQualifier.cpp | 14 +- .../source/model/EventSource.cpp | 3 +- .../model/MaximumExecutionFrequency.cpp | 11 +- .../source/model/MessageType.cpp | 5 +- aws-cpp-sdk-config/source/model/Owner.cpp | 5 +- .../source/model/RecorderStatus.cpp | 7 +- .../source/model/RecordingGroup.cpp | 14 +- .../source/model/Relationship.cpp | 14 +- .../source/model/ResourceIdentifier.cpp | 14 +- .../source/model/ResourceType.cpp | 39 +- aws-cpp-sdk-config/source/model/Scope.cpp | 14 +- aws-cpp-sdk-config/source/model/Source.cpp | 14 +- .../source/model/SourceDetail.cpp | 14 +- .../aws/auth/AWSCredentialsProviderTest.cpp | 746 ++++----- .../utils/FileSystemUtilsTest.cpp | 49 + .../utils/OSVersionInfoTest.cpp | 3 +- .../utils/logging/LoggingTest.cpp | 23 +- aws-cpp-sdk-core/CMakeLists.txt | 154 +- .../include/aws/core/AmazonWebServiceResult.h | 3 + .../include/aws/core/SDKConfig.h.in | 17 + .../include/aws/core/platform/Platform.h | 19 + .../aws/core/platform/PlatformAndroid.h | 39 + .../include/aws/core/utils/DateTime.h | 5 + .../include/aws/core/utils/FileSystemUtils.h | 6 + .../include/aws/core/utils/OSVersionInfo.h | 20 +- .../aws/core/utils/crypto/bcrypt/CryptoImpl.h | 8 +- .../aws/core/utils/logging/AWSLogging.h | 14 + .../aws/core/utils/memory/stl/AWSAllocator.h | 11 +- .../aws/core/utils/memory/stl/AWSString.h | 10 +- .../source/auth/AWSCredentialsProvider.cpp | 4 - aws-cpp-sdk-core/source/client/AWSClient.cpp | 43 +- .../source/client/AWSErrorMarshaller.cpp | 6 +- .../source/client/ClientConfiguration.cpp | 9 +- .../source/external/json-cpp/jsoncpp.cpp | 18 +- .../source/http/HttpClientFactory.cpp | 10 +- .../source/http/curl/CurlHandleContainer.cpp | 41 +- .../source/http/curl/CurlHttpClient.cpp | 803 ++++----- .../source/internal/EC2MetadataClient.cpp | 20 +- .../platform/android/FileSystemUtils.cpp | 80 + .../android/LogcatLogSystem.cpp | 0 .../source/platform/android/OSVersionInfo.cpp | 45 + .../source/platform/android/Platform.cpp | 71 + .../platform/linux-shared/FileSystemUtils.cpp | 135 ++ .../platform/linux-shared/OSVersionInfo.cpp | 37 + .../platform/windows/FileSystemUtils.cpp | 142 ++ .../source/platform/windows/OSVersionInfo.cpp | 67 + aws-cpp-sdk-core/source/utils/DateTime.cpp | 87 +- .../source/utils/OSVersionInfo.cpp | 125 -- .../source/utils/OSVersionInfoCommon.cpp | 55 + .../source/utils/base64/Base64.cpp | 11 + .../source/utils/crypto/bcrypt/CryptoImpl.cpp | 30 +- .../utils/crypto/{ => factory}/Factories.cpp | 0 .../source/utils/logging/AWSLogging.cpp | 31 +- .../source/utils/logging/DefaultLogSystem.cpp | 11 +- .../source/utils/unix/FileSystemUtils.cpp | 93 -- .../source/utils/windows/FileSystemUtils.cpp | 115 -- .../source/utils/xml/XmlSerializer.cpp | 4 +- aws-cpp-sdk-datapipeline/CMakeLists.txt | 14 +- .../source/DataPipelineErrors.cpp | 13 +- .../source/model/Field.cpp | 14 +- .../source/model/InstanceIdentity.cpp | 14 +- .../source/model/Operator.cpp | 14 +- .../source/model/OperatorType.cpp | 11 +- .../source/model/ParameterAttribute.cpp | 14 +- .../source/model/ParameterObject.cpp | 14 +- .../source/model/ParameterValue.cpp | 14 +- .../source/model/PipelineDescription.cpp | 14 +- .../source/model/PipelineIdName.cpp | 14 +- .../source/model/PipelineObject.cpp | 14 +- .../source/model/Query.cpp | 14 +- .../source/model/Selector.cpp | 14 +- aws-cpp-sdk-datapipeline/source/model/Tag.cpp | 14 +- .../source/model/TaskObject.cpp | 14 +- .../source/model/TaskStatus.cpp | 7 +- .../source/model/ValidationError.cpp | 14 +- .../source/model/ValidationWarning.cpp | 14 +- aws-cpp-sdk-devicefarm/CMakeLists.txt | 14 +- .../aws/devicefarm/model/DevicePlatform.h | 2 +- .../source/DeviceFarmErrors.cpp | 18 +- .../source/model/AccountSettings.cpp | 14 +- .../source/model/Artifact.cpp | 14 +- .../source/model/ArtifactCategory.cpp | 7 +- .../source/model/ArtifactType.cpp | 57 +- .../source/model/BillingMethod.cpp | 5 +- aws-cpp-sdk-devicefarm/source/model/CPU.cpp | 14 +- .../source/model/Counters.cpp | 14 +- .../source/model/Device.cpp | 14 +- .../source/model/DeviceAttribute.cpp | 9 +- .../source/model/DeviceFormFactor.cpp | 5 +- .../source/model/DeviceMinutes.cpp | 14 +- .../source/model/DevicePlatform.cpp | 11 +- .../source/model/DevicePool.cpp | 14 +- .../model/DevicePoolCompatibilityResult.cpp | 14 +- .../source/model/DevicePoolType.cpp | 5 +- .../source/model/ExecutionResult.cpp | 15 +- .../source/model/ExecutionStatus.cpp | 23 +- .../source/model/IncompatibilityMessage.cpp | 14 +- aws-cpp-sdk-devicefarm/source/model/Job.cpp | 14 +- .../source/model/Location.cpp | 14 +- .../source/model/Problem.cpp | 14 +- .../source/model/ProblemDetail.cpp | 14 +- .../source/model/Project.cpp | 14 +- .../source/model/Radios.cpp | 14 +- .../source/model/Resolution.cpp | 14 +- aws-cpp-sdk-devicefarm/source/model/Rule.cpp | 14 +- .../source/model/RuleOperator.cpp | 11 +- aws-cpp-sdk-devicefarm/source/model/Run.cpp | 14 +- .../source/model/Sample.cpp | 14 +- .../source/model/SampleType.cpp | 35 +- .../source/model/ScheduleRunConfiguration.cpp | 14 +- .../source/model/ScheduleRunTest.cpp | 14 +- aws-cpp-sdk-devicefarm/source/model/Suite.cpp | 14 +- aws-cpp-sdk-devicefarm/source/model/Test.cpp | 14 +- .../source/model/TestType.cpp | 39 +- .../source/model/UniqueProblem.cpp | 14 +- .../source/model/Upload.cpp | 14 +- .../source/model/UploadStatus.cpp | 9 +- .../source/model/UploadType.cpp | 43 +- aws-cpp-sdk-directconnect/CMakeLists.txt | 14 +- .../source/DirectConnectErrors.cpp | 7 +- .../source/model/Connection.cpp | 14 +- .../source/model/ConnectionState.cpp | 17 +- .../source/model/Interconnect.cpp | 14 +- .../source/model/InterconnectState.cpp | 13 +- .../source/model/Location.cpp | 14 +- .../model/NewPrivateVirtualInterface.cpp | 14 +- .../NewPrivateVirtualInterfaceAllocation.cpp | 14 +- .../model/NewPublicVirtualInterface.cpp | 14 +- .../NewPublicVirtualInterfaceAllocation.cpp | 14 +- .../source/model/RouteFilterPrefix.cpp | 14 +- .../source/model/VirtualGateway.cpp | 14 +- .../source/model/VirtualInterface.cpp | 14 +- .../source/model/VirtualInterfaceState.cpp | 15 +- aws-cpp-sdk-ds/CMakeLists.txt | 14 +- .../source/DirectoryServiceErrors.cpp | 13 +- aws-cpp-sdk-ds/source/model/Attribute.cpp | 14 +- aws-cpp-sdk-ds/source/model/Computer.cpp | 14 +- .../source/model/DirectoryConnectSettings.cpp | 14 +- .../DirectoryConnectSettingsDescription.cpp | 14 +- .../source/model/DirectoryDescription.cpp | 14 +- .../source/model/DirectoryLimits.cpp | 14 +- aws-cpp-sdk-ds/source/model/DirectorySize.cpp | 5 +- .../source/model/DirectoryStage.cpp | 23 +- aws-cpp-sdk-ds/source/model/DirectoryType.cpp | 7 +- .../source/model/DirectoryVpcSettings.cpp | 14 +- .../model/DirectoryVpcSettingsDescription.cpp | 14 +- .../model/RadiusAuthenticationProtocol.cpp | 9 +- .../source/model/RadiusSettings.cpp | 14 +- aws-cpp-sdk-ds/source/model/RadiusStatus.cpp | 7 +- aws-cpp-sdk-ds/source/model/Snapshot.cpp | 14 +- .../source/model/SnapshotLimits.cpp | 14 +- .../source/model/SnapshotStatus.cpp | 7 +- aws-cpp-sdk-ds/source/model/SnapshotType.cpp | 5 +- aws-cpp-sdk-ds/source/model/Trust.cpp | 14 +- .../source/model/TrustDirection.cpp | 7 +- aws-cpp-sdk-ds/source/model/TrustState.cpp | 17 +- aws-cpp-sdk-ds/source/model/TrustType.cpp | 3 +- .../TableOperationTest.cpp | 19 + aws-cpp-sdk-dynamodb/CMakeLists.txt | 14 +- .../source/DynamoDBErrors.cpp | 31 +- .../source/model/AttributeAction.cpp | 7 +- .../source/model/AttributeDefinition.cpp | 14 +- .../source/model/AttributeValueUpdate.cpp | 14 +- .../source/model/Capacity.cpp | 14 +- .../source/model/ComparisonOperator.cpp | 27 +- .../source/model/Condition.cpp | 14 +- .../source/model/ConditionalOperator.cpp | 5 +- .../source/model/ConsumedCapacity.cpp | 14 +- .../CreateGlobalSecondaryIndexAction.cpp | 14 +- .../DeleteGlobalSecondaryIndexAction.cpp | 14 +- .../source/model/DeleteRequest.cpp | 14 +- .../source/model/ExpectedAttributeValue.cpp | 14 +- .../source/model/GlobalSecondaryIndex.cpp | 14 +- .../model/GlobalSecondaryIndexDescription.cpp | 14 +- .../model/GlobalSecondaryIndexUpdate.cpp | 14 +- .../source/model/IndexStatus.cpp | 9 +- .../source/model/ItemCollectionMetrics.cpp | 14 +- .../source/model/KeySchemaElement.cpp | 14 +- aws-cpp-sdk-dynamodb/source/model/KeyType.cpp | 5 +- .../source/model/KeysAndAttributes.cpp | 14 +- .../source/model/LocalSecondaryIndex.cpp | 14 +- .../model/LocalSecondaryIndexDescription.cpp | 14 +- .../source/model/Projection.cpp | 14 +- .../source/model/ProjectionType.cpp | 7 +- .../source/model/ProvisionedThroughput.cpp | 14 +- .../ProvisionedThroughputDescription.cpp | 14 +- .../source/model/PutRequest.cpp | 14 +- .../source/model/ReturnConsumedCapacity.cpp | 7 +- .../model/ReturnItemCollectionMetrics.cpp | 5 +- .../source/model/ReturnValue.cpp | 11 +- .../source/model/ScalarAttributeType.cpp | 7 +- aws-cpp-sdk-dynamodb/source/model/Select.cpp | 9 +- .../source/model/StreamSpecification.cpp | 14 +- .../source/model/StreamViewType.cpp | 9 +- .../source/model/TableDescription.cpp | 14 +- .../source/model/TableStatus.cpp | 9 +- .../UpdateGlobalSecondaryIndexAction.cpp | 14 +- .../source/model/WriteRequest.cpp | 14 +- aws-cpp-sdk-ec2/CMakeLists.txt | 14 +- aws-cpp-sdk-ec2/source/EC2Errors.cpp | 13 +- .../source/model/AccountAttribute.cpp | 12 +- .../source/model/AccountAttributeName.cpp | 5 +- .../source/model/AccountAttributeValue.cpp | 12 +- .../source/model/ActiveInstance.cpp | 12 +- aws-cpp-sdk-ec2/source/model/Address.cpp | 12 +- aws-cpp-sdk-ec2/source/model/Affinity.cpp | 5 +- .../source/model/AllocationState.cpp | 11 +- .../source/model/AllocationStrategy.cpp | 5 +- .../source/model/ArchitectureValues.cpp | 5 +- .../source/model/AttachmentStatus.cpp | 9 +- .../source/model/AttributeBooleanValue.cpp | 12 +- .../source/model/AttributeValue.cpp | 12 +- .../source/model/AutoPlacement.cpp | 5 +- .../source/model/AvailabilityZone.cpp | 12 +- .../source/model/AvailabilityZoneMessage.cpp | 12 +- .../source/model/AvailabilityZoneState.cpp | 9 +- .../source/model/AvailableCapacity.cpp | 12 +- aws-cpp-sdk-ec2/source/model/BatchState.cpp | 15 +- .../source/model/BlobAttributeValue.cpp | 12 +- .../source/model/BlockDeviceMapping.cpp | 12 +- aws-cpp-sdk-ec2/source/model/BundleTask.cpp | 12 +- .../source/model/BundleTaskError.cpp | 12 +- .../source/model/BundleTaskState.cpp | 15 +- .../source/model/CancelBatchErrorCode.cpp | 9 +- .../model/CancelSpotFleetRequestsError.cpp | 12 +- .../CancelSpotFleetRequestsErrorItem.cpp | 12 +- .../CancelSpotFleetRequestsSuccessItem.cpp | 12 +- .../model/CancelSpotInstanceRequestState.cpp | 11 +- .../model/CancelledSpotInstanceRequest.cpp | 12 +- .../source/model/ClassicLinkDnsSupport.cpp | 12 +- .../source/model/ClassicLinkInstance.cpp | 12 +- aws-cpp-sdk-ec2/source/model/ClientData.cpp | 12 +- .../source/model/ContainerFormat.cpp | 3 +- .../source/model/ConversionTask.cpp | 12 +- .../source/model/ConversionTaskState.cpp | 9 +- .../source/model/CreateVolumePermission.cpp | 12 +- .../CreateVolumePermissionModifications.cpp | 12 +- .../source/model/CurrencyCodeValues.cpp | 3 +- .../source/model/CustomerGateway.cpp | 12 +- .../model/DatafeedSubscriptionState.cpp | 5 +- aws-cpp-sdk-ec2/source/model/DeviceType.cpp | 5 +- .../source/model/DhcpConfiguration.cpp | 12 +- aws-cpp-sdk-ec2/source/model/DhcpOptions.cpp | 12 +- aws-cpp-sdk-ec2/source/model/DiskImage.cpp | 12 +- .../source/model/DiskImageDescription.cpp | 12 +- .../source/model/DiskImageDetail.cpp | 12 +- .../source/model/DiskImageFormat.cpp | 7 +- .../model/DiskImageVolumeDescription.cpp | 12 +- aws-cpp-sdk-ec2/source/model/DomainType.cpp | 5 +- .../source/model/EbsBlockDevice.cpp | 12 +- .../source/model/EbsInstanceBlockDevice.cpp | 12 +- .../EbsInstanceBlockDeviceSpecification.cpp | 12 +- aws-cpp-sdk-ec2/source/model/EventCode.cpp | 11 +- .../source/model/EventInformation.cpp | 12 +- aws-cpp-sdk-ec2/source/model/EventType.cpp | 7 +- .../model/ExcessCapacityTerminationPolicy.cpp | 5 +- .../source/model/ExportEnvironment.cpp | 7 +- aws-cpp-sdk-ec2/source/model/ExportTask.cpp | 12 +- .../source/model/ExportTaskState.cpp | 9 +- .../source/model/ExportToS3Task.cpp | 12 +- .../model/ExportToS3TaskSpecification.cpp | 12 +- aws-cpp-sdk-ec2/source/model/Filter.cpp | 12 +- aws-cpp-sdk-ec2/source/model/FlowLog.cpp | 12 +- .../source/model/FlowLogsResourceType.cpp | 7 +- aws-cpp-sdk-ec2/source/model/GatewayType.cpp | 3 +- .../source/model/GroupIdentifier.cpp | 12 +- .../source/model/HistoryRecord.cpp | 12 +- aws-cpp-sdk-ec2/source/model/Host.cpp | 12 +- aws-cpp-sdk-ec2/source/model/HostInstance.cpp | 12 +- .../source/model/HostProperties.cpp | 12 +- aws-cpp-sdk-ec2/source/model/HostTenancy.cpp | 5 +- .../source/model/HypervisorType.cpp | 5 +- .../source/model/IamInstanceProfile.cpp | 12 +- .../model/IamInstanceProfileSpecification.cpp | 12 +- aws-cpp-sdk-ec2/source/model/IcmpTypeCode.cpp | 12 +- aws-cpp-sdk-ec2/source/model/IdFormat.cpp | 12 +- aws-cpp-sdk-ec2/source/model/Image.cpp | 12 +- .../source/model/ImageAttributeName.cpp | 15 +- .../source/model/ImageDiskContainer.cpp | 12 +- aws-cpp-sdk-ec2/source/model/ImageState.cpp | 15 +- .../source/model/ImageTypeValues.cpp | 7 +- .../source/model/ImportImageTask.cpp | 12 +- .../ImportInstanceLaunchSpecification.cpp | 12 +- .../model/ImportInstanceTaskDetails.cpp | 12 +- .../model/ImportInstanceVolumeDetailItem.cpp | 12 +- .../source/model/ImportSnapshotTask.cpp | 12 +- .../source/model/ImportVolumeTaskDetails.cpp | 12 +- aws-cpp-sdk-ec2/source/model/Instance.cpp | 12 +- .../source/model/InstanceAttributeName.cpp | 27 +- .../model/InstanceBlockDeviceMapping.cpp | 12 +- ...nstanceBlockDeviceMappingSpecification.cpp | 12 +- .../source/model/InstanceCapacity.cpp | 12 +- .../source/model/InstanceCount.cpp | 12 +- .../source/model/InstanceExportDetails.cpp | 12 +- .../source/model/InstanceLifecycleType.cpp | 15 +- .../source/model/InstanceMonitoring.cpp | 12 +- .../source/model/InstanceNetworkInterface.cpp | 12 +- .../InstanceNetworkInterfaceAssociation.cpp | 12 +- .../InstanceNetworkInterfaceAttachment.cpp | 12 +- .../InstanceNetworkInterfaceSpecification.cpp | 12 +- .../source/model/InstancePrivateIpAddress.cpp | 12 +- .../source/model/InstanceState.cpp | 12 +- .../source/model/InstanceStateChange.cpp | 12 +- .../source/model/InstanceStateName.cpp | 13 +- .../source/model/InstanceStatus.cpp | 12 +- .../source/model/InstanceStatusDetails.cpp | 12 +- .../source/model/InstanceStatusEvent.cpp | 12 +- .../source/model/InstanceStatusSummary.cpp | 12 +- aws-cpp-sdk-ec2/source/model/InstanceType.cpp | 121 +- .../source/model/InternetGateway.cpp | 12 +- .../model/InternetGatewayAttachment.cpp | 12 +- aws-cpp-sdk-ec2/source/model/IpPermission.cpp | 12 +- aws-cpp-sdk-ec2/source/model/IpRange.cpp | 12 +- aws-cpp-sdk-ec2/source/model/KeyPairInfo.cpp | 12 +- .../source/model/LaunchPermission.cpp | 12 +- .../model/LaunchPermissionModifications.cpp | 12 +- .../source/model/LaunchSpecification.cpp | 12 +- aws-cpp-sdk-ec2/source/model/ListingState.cpp | 9 +- .../source/model/ListingStatus.cpp | 9 +- aws-cpp-sdk-ec2/source/model/Monitoring.cpp | 12 +- .../source/model/MonitoringState.cpp | 9 +- aws-cpp-sdk-ec2/source/model/MoveStatus.cpp | 5 +- .../source/model/MovingAddressStatus.cpp | 12 +- aws-cpp-sdk-ec2/source/model/NatGateway.cpp | 12 +- .../source/model/NatGatewayAddress.cpp | 12 +- .../source/model/NatGatewayState.cpp | 11 +- aws-cpp-sdk-ec2/source/model/NetworkAcl.cpp | 12 +- .../source/model/NetworkAclAssociation.cpp | 12 +- .../source/model/NetworkAclEntry.cpp | 12 +- .../source/model/NetworkInterface.cpp | 12 +- .../model/NetworkInterfaceAssociation.cpp | 12 +- .../model/NetworkInterfaceAttachment.cpp | 12 +- .../NetworkInterfaceAttachmentChanges.cpp | 12 +- .../model/NetworkInterfaceAttribute.cpp | 9 +- .../NetworkInterfacePrivateIpAddress.cpp | 12 +- .../source/model/NetworkInterfaceStatus.cpp | 9 +- .../source/model/NetworkInterfaceType.cpp | 5 +- .../source/model/NewDhcpConfiguration.cpp | 12 +- .../source/model/OfferingTypeValues.cpp | 13 +- .../source/model/OperationType.cpp | 5 +- .../source/model/PermissionGroup.cpp | 3 +- aws-cpp-sdk-ec2/source/model/Placement.cpp | 12 +- .../source/model/PlacementGroup.cpp | 12 +- .../source/model/PlacementGroupState.cpp | 9 +- .../source/model/PlacementStrategy.cpp | 3 +- .../source/model/PlatformValues.cpp | 3 +- aws-cpp-sdk-ec2/source/model/PortRange.cpp | 12 +- aws-cpp-sdk-ec2/source/model/PrefixList.cpp | 12 +- aws-cpp-sdk-ec2/source/model/PrefixListId.cpp | 12 +- .../source/model/PriceSchedule.cpp | 12 +- .../model/PriceScheduleSpecification.cpp | 12 +- .../source/model/PricingDetail.cpp | 12 +- .../model/PrivateIpAddressSpecification.cpp | 12 +- aws-cpp-sdk-ec2/source/model/ProductCode.cpp | 12 +- .../source/model/ProductCodeValues.cpp | 5 +- .../source/model/PropagatingVgw.cpp | 12 +- .../source/model/PurchaseRequest.cpp | 12 +- .../source/model/RIProductDescription.cpp | 9 +- .../source/model/RecurringCharge.cpp | 12 +- .../source/model/RecurringChargeFrequency.cpp | 3 +- aws-cpp-sdk-ec2/source/model/Region.cpp | 12 +- .../model/ReportInstanceReasonCodes.cpp | 19 +- .../source/model/ReportStatusType.cpp | 5 +- .../model/RequestSpotLaunchSpecification.cpp | 12 +- aws-cpp-sdk-ec2/source/model/Reservation.cpp | 12 +- .../model/ReservedInstanceLimitPrice.cpp | 12 +- .../source/model/ReservedInstanceState.cpp | 9 +- .../source/model/ReservedInstances.cpp | 12 +- .../model/ReservedInstancesConfiguration.cpp | 12 +- .../source/model/ReservedInstancesId.cpp | 12 +- .../source/model/ReservedInstancesListing.cpp | 12 +- .../model/ReservedInstancesModification.cpp | 12 +- .../ReservedInstancesModificationResponse.cpp | 12 +- .../model/ReservedInstancesOffering.cpp | 12 +- .../source/model/ResetImageAttributeName.cpp | 3 +- aws-cpp-sdk-ec2/source/model/ResourceType.cpp | 35 +- .../source/model/ResponseMetadata.cpp | 12 +- aws-cpp-sdk-ec2/source/model/Route.cpp | 12 +- aws-cpp-sdk-ec2/source/model/RouteOrigin.cpp | 7 +- aws-cpp-sdk-ec2/source/model/RouteState.cpp | 5 +- aws-cpp-sdk-ec2/source/model/RouteTable.cpp | 12 +- .../source/model/RouteTableAssociation.cpp | 12 +- aws-cpp-sdk-ec2/source/model/RuleAction.cpp | 5 +- .../model/RunInstancesMonitoringEnabled.cpp | 12 +- aws-cpp-sdk-ec2/source/model/S3Storage.cpp | 12 +- .../source/model/ScheduledInstance.cpp | 12 +- .../model/ScheduledInstanceAvailability.cpp | 12 +- .../model/ScheduledInstanceRecurrence.cpp | 12 +- .../ScheduledInstanceRecurrenceRequest.cpp | 12 +- .../ScheduledInstancesBlockDeviceMapping.cpp | 12 +- .../source/model/ScheduledInstancesEbs.cpp | 12 +- .../ScheduledInstancesIamInstanceProfile.cpp | 12 +- .../ScheduledInstancesLaunchSpecification.cpp | 12 +- .../model/ScheduledInstancesMonitoring.cpp | 12 +- .../ScheduledInstancesNetworkInterface.cpp | 12 +- .../model/ScheduledInstancesPlacement.cpp | 12 +- ...heduledInstancesPrivateIpAddressConfig.cpp | 12 +- .../source/model/SecurityGroup.cpp | 12 +- .../source/model/ShutdownBehavior.cpp | 5 +- .../source/model/SlotDateTimeRangeRequest.cpp | 12 +- .../model/SlotStartTimeRangeRequest.cpp | 12 +- aws-cpp-sdk-ec2/source/model/Snapshot.cpp | 12 +- .../source/model/SnapshotAttributeName.cpp | 5 +- .../source/model/SnapshotDetail.cpp | 12 +- .../source/model/SnapshotDiskContainer.cpp | 12 +- .../source/model/SnapshotState.cpp | 7 +- .../source/model/SnapshotTaskDetail.cpp | 12 +- .../source/model/SpotDatafeedSubscription.cpp | 12 +- .../model/SpotFleetLaunchSpecification.cpp | 12 +- .../source/model/SpotFleetMonitoring.cpp | 12 +- .../source/model/SpotFleetRequestConfig.cpp | 12 +- .../model/SpotFleetRequestConfigData.cpp | 12 +- .../source/model/SpotInstanceRequest.cpp | 12 +- .../source/model/SpotInstanceState.cpp | 11 +- .../source/model/SpotInstanceStateFault.cpp | 12 +- .../source/model/SpotInstanceStatus.cpp | 12 +- .../source/model/SpotInstanceType.cpp | 5 +- .../source/model/SpotPlacement.cpp | 12 +- aws-cpp-sdk-ec2/source/model/SpotPrice.cpp | 12 +- aws-cpp-sdk-ec2/source/model/State.cpp | 9 +- aws-cpp-sdk-ec2/source/model/StateReason.cpp | 12 +- aws-cpp-sdk-ec2/source/model/Status.cpp | 7 +- aws-cpp-sdk-ec2/source/model/StatusName.cpp | 3 +- aws-cpp-sdk-ec2/source/model/StatusType.cpp | 9 +- aws-cpp-sdk-ec2/source/model/Storage.cpp | 12 +- aws-cpp-sdk-ec2/source/model/Subnet.cpp | 12 +- aws-cpp-sdk-ec2/source/model/SubnetState.cpp | 5 +- .../source/model/SummaryStatus.cpp | 11 +- aws-cpp-sdk-ec2/source/model/Tag.cpp | 12 +- .../source/model/TagDescription.cpp | 12 +- .../source/model/TelemetryStatus.cpp | 5 +- aws-cpp-sdk-ec2/source/model/Tenancy.cpp | 7 +- aws-cpp-sdk-ec2/source/model/TrafficType.cpp | 7 +- .../source/model/UnsuccessfulItem.cpp | 12 +- .../source/model/UnsuccessfulItemError.cpp | 12 +- aws-cpp-sdk-ec2/source/model/UserBucket.cpp | 12 +- .../source/model/UserBucketDetails.cpp | 12 +- aws-cpp-sdk-ec2/source/model/UserData.cpp | 12 +- .../source/model/UserIdGroupPair.cpp | 12 +- aws-cpp-sdk-ec2/source/model/VgwTelemetry.cpp | 12 +- .../source/model/VirtualizationType.cpp | 5 +- aws-cpp-sdk-ec2/source/model/Volume.cpp | 12 +- .../source/model/VolumeAttachment.cpp | 12 +- .../source/model/VolumeAttachmentState.cpp | 9 +- .../source/model/VolumeAttributeName.cpp | 5 +- aws-cpp-sdk-ec2/source/model/VolumeDetail.cpp | 12 +- aws-cpp-sdk-ec2/source/model/VolumeState.cpp | 13 +- .../source/model/VolumeStatusAction.cpp | 12 +- .../source/model/VolumeStatusDetails.cpp | 12 +- .../source/model/VolumeStatusEvent.cpp | 12 +- .../source/model/VolumeStatusInfo.cpp | 12 +- .../source/model/VolumeStatusInfoStatus.cpp | 7 +- .../source/model/VolumeStatusItem.cpp | 12 +- .../source/model/VolumeStatusName.cpp | 5 +- aws-cpp-sdk-ec2/source/model/VolumeType.cpp | 26 +- aws-cpp-sdk-ec2/source/model/Vpc.cpp | 12 +- .../source/model/VpcAttachment.cpp | 12 +- .../source/model/VpcAttributeName.cpp | 5 +- .../source/model/VpcClassicLink.cpp | 12 +- aws-cpp-sdk-ec2/source/model/VpcEndpoint.cpp | 12 +- .../source/model/VpcPeeringConnection.cpp | 12 +- .../model/VpcPeeringConnectionStateReason.cpp | 12 +- .../VpcPeeringConnectionStateReasonCode.cpp | 19 +- .../model/VpcPeeringConnectionVpcInfo.cpp | 12 +- aws-cpp-sdk-ec2/source/model/VpcState.cpp | 5 +- .../source/model/VpnConnection.cpp | 12 +- .../source/model/VpnConnectionOptions.cpp | 12 +- .../VpnConnectionOptionsSpecification.cpp | 12 +- aws-cpp-sdk-ec2/source/model/VpnGateway.cpp | 12 +- aws-cpp-sdk-ec2/source/model/VpnState.cpp | 9 +- .../source/model/VpnStaticRoute.cpp | 12 +- .../source/model/VpnStaticRouteSource.cpp | 3 +- aws-cpp-sdk-ecr/CMakeLists.txt | 14 +- aws-cpp-sdk-ecr/source/ECRErrors.cpp | 13 +- .../source/model/AuthorizationData.cpp | 14 +- aws-cpp-sdk-ecr/source/model/Image.cpp | 14 +- aws-cpp-sdk-ecr/source/model/ImageFailure.cpp | 14 +- .../source/model/ImageFailureCode.cpp | 11 +- .../source/model/ImageIdentifier.cpp | 14 +- aws-cpp-sdk-ecr/source/model/Layer.cpp | 14 +- .../source/model/LayerAvailability.cpp | 5 +- aws-cpp-sdk-ecr/source/model/LayerFailure.cpp | 14 +- .../source/model/LayerFailureCode.cpp | 5 +- aws-cpp-sdk-ecr/source/model/Repository.cpp | 14 +- aws-cpp-sdk-ecs/CMakeLists.txt | 14 +- aws-cpp-sdk-ecs/source/ECSErrors.cpp | 13 +- .../source/model/AgentUpdateStatus.cpp | 13 +- aws-cpp-sdk-ecs/source/model/Attribute.cpp | 14 +- aws-cpp-sdk-ecs/source/model/Cluster.cpp | 14 +- aws-cpp-sdk-ecs/source/model/Container.cpp | 14 +- .../source/model/ContainerDefinition.cpp | 14 +- .../source/model/ContainerInstance.cpp | 14 +- .../source/model/ContainerOverride.cpp | 14 +- aws-cpp-sdk-ecs/source/model/Deployment.cpp | 14 +- .../source/model/DeploymentConfiguration.cpp | 14 +- .../source/model/DesiredStatus.cpp | 7 +- aws-cpp-sdk-ecs/source/model/Failure.cpp | 14 +- aws-cpp-sdk-ecs/source/model/HostEntry.cpp | 14 +- .../source/model/HostVolumeProperties.cpp | 14 +- aws-cpp-sdk-ecs/source/model/KeyValuePair.cpp | 14 +- aws-cpp-sdk-ecs/source/model/LoadBalancer.cpp | 14 +- .../source/model/LogConfiguration.cpp | 14 +- aws-cpp-sdk-ecs/source/model/LogDriver.cpp | 23 +- aws-cpp-sdk-ecs/source/model/MountPoint.cpp | 14 +- .../source/model/NetworkBinding.cpp | 14 +- aws-cpp-sdk-ecs/source/model/PortMapping.cpp | 14 +- aws-cpp-sdk-ecs/source/model/Resource.cpp | 14 +- aws-cpp-sdk-ecs/source/model/Service.cpp | 14 +- aws-cpp-sdk-ecs/source/model/ServiceEvent.cpp | 14 +- aws-cpp-sdk-ecs/source/model/SortOrder.cpp | 5 +- aws-cpp-sdk-ecs/source/model/Task.cpp | 14 +- .../source/model/TaskDefinition.cpp | 14 +- .../source/model/TaskDefinitionStatus.cpp | 5 +- aws-cpp-sdk-ecs/source/model/TaskOverride.cpp | 14 +- .../source/model/TransportProtocol.cpp | 5 +- aws-cpp-sdk-ecs/source/model/Ulimit.cpp | 14 +- aws-cpp-sdk-ecs/source/model/UlimitName.cpp | 31 +- aws-cpp-sdk-ecs/source/model/VersionInfo.cpp | 14 +- aws-cpp-sdk-ecs/source/model/Volume.cpp | 14 +- aws-cpp-sdk-ecs/source/model/VolumeFrom.cpp | 14 +- aws-cpp-sdk-elasticache/CMakeLists.txt | 14 +- .../source/ElastiCacheErrors.cpp | 207 +-- .../source/model/AZMode.cpp | 5 +- .../source/model/AutomaticFailoverStatus.cpp | 9 +- .../source/model/AvailabilityZone.cpp | 12 +- .../source/model/CacheCluster.cpp | 12 +- .../source/model/CacheEngineVersion.cpp | 12 +- .../source/model/CacheNode.cpp | 12 +- .../model/CacheNodeTypeSpecificParameter.cpp | 12 +- .../model/CacheNodeTypeSpecificValue.cpp | 12 +- .../source/model/CacheParameterGroup.cpp | 12 +- .../model/CacheParameterGroupStatus.cpp | 12 +- .../source/model/CacheSecurityGroup.cpp | 12 +- .../model/CacheSecurityGroupMembership.cpp | 12 +- .../source/model/CacheSubnetGroup.cpp | 12 +- .../source/model/EC2SecurityGroup.cpp | 12 +- .../source/model/Endpoint.cpp | 12 +- .../source/model/EngineDefaults.cpp | 12 +- .../source/model/Event.cpp | 12 +- .../source/model/NodeGroup.cpp | 12 +- .../source/model/NodeGroupMember.cpp | 12 +- .../source/model/NodeSnapshot.cpp | 12 +- .../model/NotificationConfiguration.cpp | 12 +- .../source/model/Parameter.cpp | 12 +- .../source/model/ParameterNameValue.cpp | 12 +- .../model/PendingAutomaticFailoverStatus.cpp | 5 +- .../source/model/PendingModifiedValues.cpp | 12 +- .../source/model/RecurringCharge.cpp | 12 +- .../source/model/ReplicationGroup.cpp | 12 +- .../ReplicationGroupPendingModifiedValues.cpp | 12 +- .../source/model/ReservedCacheNode.cpp | 12 +- .../model/ReservedCacheNodesOffering.cpp | 12 +- .../source/model/ResponseMetadata.cpp | 12 +- .../source/model/SecurityGroupMembership.cpp | 12 +- .../source/model/Snapshot.cpp | 12 +- .../source/model/SourceType.cpp | 9 +- .../source/model/Subnet.cpp | 12 +- aws-cpp-sdk-elasticache/source/model/Tag.cpp | 12 +- aws-cpp-sdk-elasticbeanstalk/CMakeLists.txt | 14 +- .../elasticbeanstalk/model/EventSeverity.h | 2 +- .../source/ElasticBeanstalkErrors.cpp | 50 +- .../source/model/ApplicationDescription.cpp | 12 +- .../source/model/ApplicationMetrics.cpp | 12 +- .../model/ApplicationVersionDescription.cpp | 12 +- .../source/model/ApplicationVersionStatus.cpp | 9 +- .../source/model/AutoScalingGroup.cpp | 12 +- .../source/model/CPUUtilization.cpp | 12 +- .../model/ConfigurationDeploymentStatus.cpp | 7 +- .../model/ConfigurationOptionDescription.cpp | 12 +- .../model/ConfigurationOptionSetting.cpp | 12 +- .../model/ConfigurationOptionValueType.cpp | 5 +- .../ConfigurationSettingsDescription.cpp | 12 +- .../source/model/EnvironmentDescription.cpp | 12 +- .../source/model/EnvironmentHealth.cpp | 9 +- .../model/EnvironmentHealthAttribute.cpp | 17 +- .../source/model/EnvironmentHealthStatus.cpp | 17 +- .../model/EnvironmentInfoDescription.cpp | 12 +- .../source/model/EnvironmentInfoType.cpp | 5 +- .../source/model/EnvironmentLink.cpp | 12 +- .../model/EnvironmentResourceDescription.cpp | 12 +- .../model/EnvironmentResourcesDescription.cpp | 12 +- .../source/model/EnvironmentStatus.cpp | 11 +- .../source/model/EnvironmentTier.cpp | 12 +- .../source/model/EventDescription.cpp | 12 +- .../source/model/EventSeverity.cpp | 17 +- .../source/model/Instance.cpp | 12 +- .../source/model/InstanceHealthSummary.cpp | 12 +- .../source/model/InstancesHealthAttribute.cpp | 43 +- .../source/model/Latency.cpp | 12 +- .../source/model/LaunchConfiguration.cpp | 12 +- .../source/model/Listener.cpp | 12 +- .../source/model/LoadBalancer.cpp | 12 +- .../source/model/LoadBalancerDescription.cpp | 12 +- .../source/model/OptionRestrictionRegex.cpp | 12 +- .../source/model/OptionSpecification.cpp | 12 +- .../source/model/Queue.cpp | 12 +- .../source/model/ResponseMetadata.cpp | 12 +- .../source/model/S3Location.cpp | 12 +- .../source/model/SingleInstanceHealth.cpp | 12 +- .../source/model/SolutionStackDescription.cpp | 12 +- .../source/model/SourceConfiguration.cpp | 12 +- .../source/model/StatusCodes.cpp | 12 +- .../source/model/SystemStatus.cpp | 12 +- .../source/model/Tag.cpp | 12 +- .../source/model/Trigger.cpp | 12 +- .../source/model/ValidationMessage.cpp | 12 +- .../source/model/ValidationSeverity.cpp | 5 +- aws-cpp-sdk-elasticfilesystem/CMakeLists.txt | 14 +- .../source/EFSErrors.cpp | 13 +- .../source/model/FileSystemDescription.cpp | 14 +- .../source/model/FileSystemSize.cpp | 14 +- .../source/model/LifeCycleState.cpp | 9 +- .../source/model/MountTargetDescription.cpp | 14 +- .../source/model/Tag.cpp | 14 +- .../CMakeLists.txt | 14 +- .../source/ElasticLoadBalancingErrors.cpp | 13 +- .../source/model/AccessLog.cpp | 12 +- .../source/model/AdditionalAttribute.cpp | 12 +- .../model/AppCookieStickinessPolicy.cpp | 12 +- .../source/model/BackendServerDescription.cpp | 12 +- .../source/model/ConnectionDraining.cpp | 12 +- .../source/model/ConnectionSettings.cpp | 12 +- .../source/model/CrossZoneLoadBalancing.cpp | 12 +- .../source/model/HealthCheck.cpp | 12 +- .../source/model/Instance.cpp | 12 +- .../source/model/InstanceState.cpp | 12 +- .../source/model/LBCookieStickinessPolicy.cpp | 12 +- .../source/model/Listener.cpp | 12 +- .../source/model/ListenerDescription.cpp | 12 +- .../source/model/LoadBalancerAttributes.cpp | 12 +- .../source/model/LoadBalancerDescription.cpp | 12 +- .../source/model/Policies.cpp | 12 +- .../source/model/PolicyAttribute.cpp | 12 +- .../model/PolicyAttributeDescription.cpp | 12 +- .../model/PolicyAttributeTypeDescription.cpp | 12 +- .../source/model/PolicyDescription.cpp | 12 +- .../source/model/PolicyTypeDescription.cpp | 12 +- .../source/model/ResponseMetadata.cpp | 12 +- .../source/model/SourceSecurityGroup.cpp | 12 +- .../source/model/Tag.cpp | 12 +- .../source/model/TagDescription.cpp | 12 +- .../source/model/TagKeyOnly.cpp | 12 +- aws-cpp-sdk-elasticmapreduce/CMakeLists.txt | 14 +- .../elasticmapreduce/model/InstanceGroup.h | 6 +- .../model/VolumeSpecification.h | 6 +- .../source/EMRErrors.cpp | 7 +- .../source/model/ActionOnFailure.cpp | 9 +- .../source/model/Application.cpp | 14 +- .../source/model/BootstrapActionConfig.cpp | 14 +- .../source/model/BootstrapActionDetail.cpp | 14 +- .../source/model/Cluster.cpp | 14 +- .../source/model/ClusterState.cpp | 15 +- .../source/model/ClusterStateChangeReason.cpp | 14 +- .../model/ClusterStateChangeReasonCode.cpp | 15 +- .../source/model/ClusterStatus.cpp | 14 +- .../source/model/ClusterSummary.cpp | 14 +- .../source/model/ClusterTimeline.cpp | 14 +- .../source/model/Command.cpp | 14 +- .../source/model/Configuration.cpp | 14 +- .../source/model/EbsBlockDevice.cpp | 14 +- .../source/model/EbsBlockDeviceConfig.cpp | 14 +- .../source/model/EbsConfiguration.cpp | 14 +- .../source/model/EbsVolume.cpp | 14 +- .../source/model/Ec2InstanceAttributes.cpp | 14 +- .../source/model/HadoopJarStepConfig.cpp | 14 +- .../source/model/HadoopStepConfig.cpp | 14 +- .../source/model/Instance.cpp | 14 +- .../source/model/InstanceGroup.cpp | 14 +- .../source/model/InstanceGroupConfig.cpp | 14 +- .../source/model/InstanceGroupDetail.cpp | 14 +- .../model/InstanceGroupModifyConfig.cpp | 14 +- .../source/model/InstanceGroupState.cpp | 21 +- .../model/InstanceGroupStateChangeReason.cpp | 14 +- .../InstanceGroupStateChangeReasonCode.cpp | 9 +- .../source/model/InstanceGroupStatus.cpp | 14 +- .../source/model/InstanceGroupTimeline.cpp | 14 +- .../source/model/InstanceGroupType.cpp | 7 +- .../source/model/InstanceRoleType.cpp | 7 +- .../source/model/InstanceState.cpp | 11 +- .../model/InstanceStateChangeReason.cpp | 14 +- .../model/InstanceStateChangeReasonCode.cpp | 11 +- .../source/model/InstanceStatus.cpp | 14 +- .../source/model/InstanceTimeline.cpp | 14 +- .../source/model/JobFlowDetail.cpp | 14 +- .../source/model/JobFlowExecutionState.cpp | 17 +- .../model/JobFlowExecutionStatusDetail.cpp | 14 +- .../source/model/JobFlowInstancesConfig.cpp | 14 +- .../source/model/JobFlowInstancesDetail.cpp | 14 +- .../source/model/KeyValue.cpp | 14 +- .../source/model/MarketType.cpp | 5 +- .../source/model/PlacementType.cpp | 14 +- .../model/ScriptBootstrapActionConfig.cpp | 14 +- .../source/model/Step.cpp | 14 +- .../source/model/StepConfig.cpp | 14 +- .../source/model/StepDetail.cpp | 14 +- .../source/model/StepExecutionState.cpp | 15 +- .../model/StepExecutionStatusDetail.cpp | 14 +- .../source/model/StepState.cpp | 13 +- .../source/model/StepStateChangeReason.cpp | 14 +- .../model/StepStateChangeReasonCode.cpp | 3 +- .../source/model/StepStatus.cpp | 14 +- .../source/model/StepSummary.cpp | 14 +- .../source/model/StepTimeline.cpp | 14 +- .../source/model/SupportedProductConfig.cpp | 14 +- .../source/model/Tag.cpp | 14 +- .../source/model/VolumeSpecification.cpp | 14 +- aws-cpp-sdk-elastictranscoder/CMakeLists.txt | 14 +- .../source/ElasticTranscoderErrors.cpp | 11 +- .../source/model/Artwork.cpp | 14 +- .../source/model/AudioCodecOptions.cpp | 14 +- .../source/model/AudioParameters.cpp | 14 +- .../source/model/CaptionFormat.cpp | 14 +- .../source/model/CaptionSource.cpp | 14 +- .../source/model/Captions.cpp | 14 +- .../source/model/Clip.cpp | 14 +- .../source/model/CreateJobOutput.cpp | 14 +- .../source/model/CreateJobPlaylist.cpp | 14 +- .../source/model/DetectedProperties.cpp | 14 +- .../source/model/Encryption.cpp | 14 +- .../source/model/HlsContentProtection.cpp | 14 +- .../source/model/Job.cpp | 14 +- .../source/model/JobAlbumArt.cpp | 14 +- .../source/model/JobInput.cpp | 14 +- .../source/model/JobOutput.cpp | 14 +- .../source/model/JobWatermark.cpp | 14 +- .../source/model/Notifications.cpp | 14 +- .../source/model/Permission.cpp | 14 +- .../source/model/Pipeline.cpp | 14 +- .../source/model/PipelineOutputConfig.cpp | 14 +- .../source/model/PlayReadyDrm.cpp | 14 +- .../source/model/Playlist.cpp | 14 +- .../source/model/Preset.cpp | 14 +- .../source/model/PresetWatermark.cpp | 14 +- .../source/model/Thumbnails.cpp | 14 +- .../source/model/TimeSpan.cpp | 14 +- .../source/model/Timing.cpp | 14 +- .../source/model/VideoParameters.cpp | 14 +- .../source/model/Warning.cpp | 14 +- aws-cpp-sdk-email/CMakeLists.txt | 14 +- .../include/aws/email/SESClient.h | 86 +- aws-cpp-sdk-email/source/SESErrors.cpp | 68 +- .../source/model/AddHeaderAction.cpp | 12 +- aws-cpp-sdk-email/source/model/Body.cpp | 12 +- .../source/model/BounceAction.cpp | 12 +- aws-cpp-sdk-email/source/model/BounceType.cpp | 13 +- .../source/model/BouncedRecipientInfo.cpp | 12 +- aws-cpp-sdk-email/source/model/Content.cpp | 12 +- .../source/model/Destination.cpp | 12 +- aws-cpp-sdk-email/source/model/DsnAction.cpp | 11 +- .../source/model/ExtensionField.cpp | 12 +- .../source/model/IdentityDkimAttributes.cpp | 12 +- .../model/IdentityNotificationAttributes.cpp | 12 +- .../source/model/IdentityType.cpp | 5 +- .../model/IdentityVerificationAttributes.cpp | 12 +- .../source/model/InvocationType.cpp | 5 +- .../source/model/LambdaAction.cpp | 12 +- aws-cpp-sdk-email/source/model/Message.cpp | 12 +- aws-cpp-sdk-email/source/model/MessageDsn.cpp | 12 +- .../source/model/NotificationType.cpp | 7 +- aws-cpp-sdk-email/source/model/RawMessage.cpp | 12 +- .../source/model/ReceiptAction.cpp | 12 +- .../source/model/ReceiptFilter.cpp | 12 +- .../source/model/ReceiptFilterPolicy.cpp | 5 +- .../source/model/ReceiptIpFilter.cpp | 12 +- .../source/model/ReceiptRule.cpp | 12 +- .../source/model/ReceiptRuleSetMetadata.cpp | 12 +- .../source/model/RecipientDsnFields.cpp | 12 +- .../source/model/ResponseMetadata.cpp | 12 +- aws-cpp-sdk-email/source/model/S3Action.cpp | 12 +- aws-cpp-sdk-email/source/model/SNSAction.cpp | 12 +- .../source/model/SendDataPoint.cpp | 12 +- aws-cpp-sdk-email/source/model/StopAction.cpp | 12 +- aws-cpp-sdk-email/source/model/StopScope.cpp | 3 +- aws-cpp-sdk-email/source/model/TlsPolicy.cpp | 5 +- .../source/model/VerificationStatus.cpp | 11 +- .../source/model/WorkmailAction.cpp | 12 +- aws-cpp-sdk-es/CMakeLists.txt | 14 +- .../source/ElasticsearchServiceErrors.cpp | 13 +- .../source/model/AccessPoliciesStatus.cpp | 14 +- .../source/model/AdvancedOptionsStatus.cpp | 14 +- aws-cpp-sdk-es/source/model/DomainInfo.cpp | 14 +- aws-cpp-sdk-es/source/model/EBSOptions.cpp | 14 +- .../source/model/EBSOptionsStatus.cpp | 14 +- .../source/model/ESPartitionInstanceType.cpp | 29 +- .../model/ElasticsearchClusterConfig.cpp | 14 +- .../ElasticsearchClusterConfigStatus.cpp | 14 +- .../model/ElasticsearchDomainConfig.cpp | 14 +- .../model/ElasticsearchDomainStatus.cpp | 14 +- aws-cpp-sdk-es/source/model/OptionState.cpp | 7 +- aws-cpp-sdk-es/source/model/OptionStatus.cpp | 14 +- .../source/model/SnapshotOptions.cpp | 14 +- .../source/model/SnapshotOptionsStatus.cpp | 14 +- aws-cpp-sdk-es/source/model/Tag.cpp | 14 +- aws-cpp-sdk-es/source/model/VolumeType.cpp | 7 +- aws-cpp-sdk-events/CMakeLists.txt | 14 +- .../source/CloudWatchEventsErrors.cpp | 11 +- .../source/model/PutEventsRequestEntry.cpp | 14 +- .../source/model/PutEventsResultEntry.cpp | 14 +- .../source/model/PutTargetsResultEntry.cpp | 14 +- .../source/model/RemoveTargetsResultEntry.cpp | 14 +- aws-cpp-sdk-events/source/model/Rule.cpp | 14 +- aws-cpp-sdk-events/source/model/RuleState.cpp | 5 +- aws-cpp-sdk-events/source/model/Target.cpp | 14 +- aws-cpp-sdk-firehose/CMakeLists.txt | 14 +- .../source/FirehoseErrors.cpp | 21 +- .../source/model/BufferingHints.cpp | 14 +- .../source/model/CompressionFormat.cpp | 9 +- .../source/model/CopyCommand.cpp | 14 +- .../model/DeliveryStreamDescription.cpp | 14 +- .../source/model/DeliveryStreamStatus.cpp | 7 +- .../source/model/DestinationDescription.cpp | 14 +- .../source/model/EncryptionConfiguration.cpp | 14 +- .../source/model/KMSEncryptionConfig.cpp | 14 +- .../source/model/NoEncryptionConfig.cpp | 3 +- .../model/PutRecordBatchResponseEntry.cpp | 14 +- aws-cpp-sdk-firehose/source/model/Record.cpp | 14 +- .../RedshiftDestinationConfiguration.cpp | 14 +- .../model/RedshiftDestinationDescription.cpp | 14 +- .../model/RedshiftDestinationUpdate.cpp | 14 +- .../model/S3DestinationConfiguration.cpp | 14 +- .../source/model/S3DestinationDescription.cpp | 14 +- .../source/model/S3DestinationUpdate.cpp | 14 +- aws-cpp-sdk-gamelift/CMakeLists.txt | 14 +- .../source/GameLiftErrors.cpp | 13 +- aws-cpp-sdk-gamelift/source/model/Alias.cpp | 14 +- .../source/model/AwsCredentials.cpp | 14 +- aws-cpp-sdk-gamelift/source/model/Build.cpp | 14 +- .../source/model/BuildStatus.cpp | 7 +- .../source/model/EC2InstanceCounts.cpp | 14 +- .../source/model/EC2InstanceLimit.cpp | 14 +- .../source/model/EC2InstanceType.cpp | 57 +- aws-cpp-sdk-gamelift/source/model/Event.cpp | 14 +- .../source/model/EventCode.cpp | 35 +- .../source/model/FleetAttributes.cpp | 14 +- .../source/model/FleetCapacity.cpp | 14 +- .../source/model/FleetStatus.cpp | 19 +- .../source/model/FleetUtilization.cpp | 14 +- .../source/model/GameProperty.cpp | 14 +- .../source/model/GameSession.cpp | 14 +- .../source/model/GameSessionStatus.cpp | 9 +- .../source/model/IpPermission.cpp | 14 +- .../source/model/IpProtocol.cpp | 5 +- .../source/model/PlayerSession.cpp | 14 +- .../model/PlayerSessionCreationPolicy.cpp | 5 +- .../source/model/PlayerSessionStatus.cpp | 9 +- .../source/model/RoutingStrategy.cpp | 14 +- .../source/model/RoutingStrategyType.cpp | 5 +- .../source/model/S3Location.cpp | 14 +- aws-cpp-sdk-glacier/CMakeLists.txt | 14 +- aws-cpp-sdk-glacier/source/GlacierErrors.cpp | 11 +- .../source/model/ActionCode.cpp | 5 +- .../source/model/DataRetrievalPolicy.cpp | 14 +- .../source/model/DataRetrievalRule.cpp | 14 +- .../source/model/DescribeVaultOutput.cpp | 14 +- .../source/model/GlacierJobDescription.cpp | 14 +- .../InventoryRetrievalJobDescription.cpp | 14 +- .../model/InventoryRetrievalJobInput.cpp | 14 +- .../source/model/JobParameters.cpp | 14 +- .../source/model/PartListElement.cpp | 14 +- .../source/model/StatusCode.cpp | 7 +- .../source/model/UploadListElement.cpp | 14 +- .../source/model/VaultAccessPolicy.cpp | 14 +- .../source/model/VaultLockPolicy.cpp | 14 +- .../source/model/VaultNotificationConfig.cpp | 14 +- aws-cpp-sdk-iam/CMakeLists.txt | 14 +- aws-cpp-sdk-iam/source/IAMErrors.cpp | 13 +- aws-cpp-sdk-iam/source/model/AccessKey.cpp | 12 +- .../source/model/AccessKeyLastUsed.cpp | 12 +- .../source/model/AccessKeyMetadata.cpp | 12 +- .../source/model/AssignmentStatusType.cpp | 7 +- .../source/model/AttachedPolicy.cpp | 12 +- aws-cpp-sdk-iam/source/model/ContextEntry.cpp | 12 +- .../source/model/ContextKeyTypeEnum.cpp | 25 +- aws-cpp-sdk-iam/source/model/EncodingType.cpp | 5 +- aws-cpp-sdk-iam/source/model/EntityType.cpp | 11 +- .../source/model/EvaluationResult.cpp | 12 +- aws-cpp-sdk-iam/source/model/Group.cpp | 12 +- aws-cpp-sdk-iam/source/model/GroupDetail.cpp | 12 +- .../source/model/InstanceProfile.cpp | 12 +- aws-cpp-sdk-iam/source/model/LoginProfile.cpp | 12 +- aws-cpp-sdk-iam/source/model/MFADevice.cpp | 12 +- .../source/model/ManagedPolicyDetail.cpp | 12 +- .../model/OpenIDConnectProviderListEntry.cpp | 12 +- .../source/model/PasswordPolicy.cpp | 12 +- aws-cpp-sdk-iam/source/model/Policy.cpp | 12 +- aws-cpp-sdk-iam/source/model/PolicyDetail.cpp | 12 +- .../model/PolicyEvaluationDecisionType.cpp | 7 +- aws-cpp-sdk-iam/source/model/PolicyGroup.cpp | 12 +- aws-cpp-sdk-iam/source/model/PolicyRole.cpp | 12 +- .../source/model/PolicyScopeType.cpp | 7 +- .../source/model/PolicySourceType.cpp | 15 +- aws-cpp-sdk-iam/source/model/PolicyUser.cpp | 12 +- .../source/model/PolicyVersion.cpp | 12 +- aws-cpp-sdk-iam/source/model/Position.cpp | 12 +- .../source/model/ReportFormatType.cpp | 3 +- .../source/model/ReportStateType.cpp | 7 +- .../source/model/ResourceSpecificResult.cpp | 12 +- .../source/model/ResponseMetadata.cpp | 12 +- aws-cpp-sdk-iam/source/model/Role.cpp | 12 +- aws-cpp-sdk-iam/source/model/RoleDetail.cpp | 12 +- .../source/model/SAMLProviderListEntry.cpp | 12 +- aws-cpp-sdk-iam/source/model/SSHPublicKey.cpp | 12 +- .../source/model/SSHPublicKeyMetadata.cpp | 12 +- .../source/model/ServerCertificate.cpp | 12 +- .../model/ServerCertificateMetadata.cpp | 12 +- .../source/model/SigningCertificate.cpp | 12 +- aws-cpp-sdk-iam/source/model/Statement.cpp | 12 +- aws-cpp-sdk-iam/source/model/StatusType.cpp | 5 +- .../source/model/SummaryKeyType.cpp | 51 +- aws-cpp-sdk-iam/source/model/User.cpp | 12 +- aws-cpp-sdk-iam/source/model/UserDetail.cpp | 12 +- .../source/model/VirtualMFADevice.cpp | 12 +- ...gnitoIdentityProvider_JsonFileImplTest.cpp | 67 +- .../auth/PersistentCognitoIdentityProvider.h | 21 +- ...ntCognitoIdentityProvider_JsonFileImpl.cpp | 178 +- aws-cpp-sdk-importexport/CMakeLists.txt | 14 +- .../source/ImportExportErrors.cpp | 13 +- .../source/model/Artifact.cpp | 12 +- aws-cpp-sdk-importexport/source/model/Job.cpp | 12 +- .../source/model/JobType.cpp | 5 +- .../source/model/ResponseMetadata.cpp | 12 +- aws-cpp-sdk-inspector/CMakeLists.txt | 14 +- .../include/aws/inspector/InspectorClient.h | 6 +- .../source/InspectorErrors.cpp | 13 +- aws-cpp-sdk-inspector/source/model/Agent.cpp | 14 +- .../source/model/AgentPreview.cpp | 14 +- .../source/model/AgentsFilter.cpp | 14 +- .../source/model/Application.cpp | 14 +- .../source/model/ApplicationsFilter.cpp | 14 +- .../source/model/Assessment.cpp | 14 +- .../source/model/AssessmentsFilter.cpp | 14 +- .../source/model/Attribute.cpp | 14 +- .../source/model/DurationRange.cpp | 14 +- .../source/model/Finding.cpp | 14 +- .../source/model/FindingsFilter.cpp | 14 +- .../source/model/LocalizedText.cpp | 14 +- .../source/model/LocalizedTextKey.cpp | 14 +- .../source/model/MessageTypeTelemetry.cpp | 14 +- .../source/model/Parameter.cpp | 14 +- .../source/model/ResourceGroup.cpp | 14 +- .../source/model/RulesPackage.cpp | 14 +- aws-cpp-sdk-inspector/source/model/Run.cpp | 14 +- .../source/model/RunsFilter.cpp | 14 +- aws-cpp-sdk-inspector/source/model/Tag.cpp | 14 +- .../source/model/Telemetry.cpp | 14 +- .../source/model/TimestampRange.cpp | 14 +- aws-cpp-sdk-iot/CMakeLists.txt | 14 +- .../include/aws/iot/model/LogLevel.h | 2 +- aws-cpp-sdk-iot/source/IoTErrors.cpp | 56 +- aws-cpp-sdk-iot/source/model/Action.cpp | 14 +- .../source/model/AttributePayload.cpp | 14 +- aws-cpp-sdk-iot/source/model/Certificate.cpp | 14 +- .../source/model/CertificateDescription.cpp | 14 +- .../source/model/CertificateStatus.cpp | 21 +- .../source/model/DynamoDBAction.cpp | 14 +- .../source/model/FirehoseAction.cpp | 14 +- aws-cpp-sdk-iot/source/model/KeyPair.cpp | 14 +- .../source/model/KinesisAction.cpp | 14 +- aws-cpp-sdk-iot/source/model/LambdaAction.cpp | 14 +- aws-cpp-sdk-iot/source/model/LogLevel.cpp | 15 +- .../source/model/LoggingOptionsPayload.cpp | 14 +- aws-cpp-sdk-iot/source/model/Policy.cpp | 14 +- .../source/model/PolicyVersion.cpp | 14 +- .../source/model/RepublishAction.cpp | 14 +- aws-cpp-sdk-iot/source/model/S3Action.cpp | 14 +- aws-cpp-sdk-iot/source/model/SnsAction.cpp | 14 +- aws-cpp-sdk-iot/source/model/SqsAction.cpp | 14 +- .../source/model/ThingAttribute.cpp | 14 +- aws-cpp-sdk-iot/source/model/TopicRule.cpp | 14 +- .../source/model/TopicRuleListItem.cpp | 14 +- .../source/model/TopicRulePayload.cpp | 14 +- aws-cpp-sdk-kinesis/CMakeLists.txt | 14 +- .../include/aws/kinesis/KinesisClient.h | 1358 ++++++++------- aws-cpp-sdk-kinesis/source/KinesisErrors.cpp | 31 +- .../source/model/HashKeyRange.cpp | 14 +- .../source/model/PutRecordsRequestEntry.cpp | 14 +- .../source/model/PutRecordsResultEntry.cpp | 14 +- aws-cpp-sdk-kinesis/source/model/Record.cpp | 14 +- .../source/model/SequenceNumberRange.cpp | 14 +- aws-cpp-sdk-kinesis/source/model/Shard.cpp | 14 +- .../source/model/ShardIteratorType.cpp | 21 +- .../source/model/StreamDescription.cpp | 14 +- .../source/model/StreamStatus.cpp | 9 +- aws-cpp-sdk-kinesis/source/model/Tag.cpp | 14 +- aws-cpp-sdk-kms/CMakeLists.txt | 14 +- aws-cpp-sdk-kms/source/KMSErrors.cpp | 91 +- .../source/model/AliasListEntry.cpp | 14 +- aws-cpp-sdk-kms/source/model/DataKeySpec.cpp | 5 +- .../source/model/GrantConstraints.cpp | 14 +- .../source/model/GrantListEntry.cpp | 14 +- .../source/model/GrantOperation.cpp | 19 +- aws-cpp-sdk-kms/source/model/KeyListEntry.cpp | 14 +- aws-cpp-sdk-kms/source/model/KeyMetadata.cpp | 14 +- aws-cpp-sdk-kms/source/model/KeyState.cpp | 7 +- aws-cpp-sdk-kms/source/model/KeyUsageType.cpp | 3 +- .../CMakeLists.txt | 7 +- .../FunctionTest.cpp | 22 +- aws-cpp-sdk-lambda/CMakeLists.txt | 14 +- aws-cpp-sdk-lambda/source/LambdaErrors.cpp | 13 +- .../source/model/AliasConfiguration.cpp | 14 +- .../model/EventSourceMappingConfiguration.cpp | 14 +- .../source/model/EventSourcePosition.cpp | 5 +- .../source/model/FunctionCode.cpp | 14 +- .../source/model/FunctionCodeLocation.cpp | 14 +- .../source/model/FunctionConfiguration.cpp | 14 +- .../source/model/InvocationType.cpp | 7 +- aws-cpp-sdk-lambda/source/model/LogType.cpp | 5 +- aws-cpp-sdk-lambda/source/model/Runtime.cpp | 19 +- aws-cpp-sdk-lambda/source/model/VpcConfig.cpp | 14 +- .../source/model/VpcConfigResponse.cpp | 14 +- aws-cpp-sdk-logs/CMakeLists.txt | 14 +- .../source/CloudWatchLogsErrors.cpp | 13 +- aws-cpp-sdk-logs/source/model/Destination.cpp | 14 +- aws-cpp-sdk-logs/source/model/ExportTask.cpp | 14 +- .../source/model/ExportTaskExecutionInfo.cpp | 14 +- .../source/model/ExportTaskStatus.cpp | 14 +- .../source/model/ExportTaskStatusCode.cpp | 13 +- .../source/model/FilteredLogEvent.cpp | 14 +- .../source/model/InputLogEvent.cpp | 14 +- aws-cpp-sdk-logs/source/model/LogGroup.cpp | 14 +- aws-cpp-sdk-logs/source/model/LogStream.cpp | 14 +- .../source/model/MetricFilter.cpp | 14 +- .../source/model/MetricFilterMatchRecord.cpp | 14 +- .../source/model/MetricTransformation.cpp | 14 +- aws-cpp-sdk-logs/source/model/OrderBy.cpp | 5 +- .../source/model/OutputLogEvent.cpp | 14 +- .../source/model/RejectedLogEventsInfo.cpp | 14 +- .../source/model/SearchedLogStream.cpp | 14 +- .../source/model/SubscriptionFilter.cpp | 14 +- aws-cpp-sdk-machinelearning/CMakeLists.txt | 14 +- .../model/CreateDataSourceFromRDSRequest.h | 14 +- .../model/CreateMLModelRequest.h | 28 +- .../source/MachineLearningErrors.cpp | 13 +- .../source/model/Algorithm.cpp | 3 +- .../source/model/BatchPrediction.cpp | 14 +- .../model/BatchPredictionFilterVariable.cpp | 17 +- .../source/model/DataSource.cpp | 14 +- .../source/model/DataSourceFilterVariable.cpp | 13 +- .../source/model/DetailsAttributes.cpp | 5 +- .../source/model/EntityStatus.cpp | 11 +- .../source/model/Evaluation.cpp | 14 +- .../source/model/EvaluationFilterVariable.cpp | 17 +- .../source/model/MLModel.cpp | 14 +- .../source/model/MLModelFilterVariable.cpp | 21 +- .../source/model/MLModelType.cpp | 7 +- .../source/model/PerformanceMetrics.cpp | 14 +- .../source/model/Prediction.cpp | 14 +- .../source/model/RDSDataSpec.cpp | 14 +- .../source/model/RDSDatabase.cpp | 14 +- .../source/model/RDSDatabaseCredentials.cpp | 14 +- .../source/model/RDSMetadata.cpp | 14 +- .../source/model/RealtimeEndpointInfo.cpp | 14 +- .../source/model/RealtimeEndpointStatus.cpp | 9 +- .../source/model/RedshiftDataSpec.cpp | 14 +- .../source/model/RedshiftDatabase.cpp | 14 +- .../model/RedshiftDatabaseCredentials.cpp | 14 +- .../source/model/RedshiftMetadata.cpp | 14 +- .../source/model/S3DataSpec.cpp | 14 +- .../source/model/SortOrder.cpp | 5 +- .../CMakeLists.txt | 14 +- .../MarketplaceCommerceAnalyticsErrors.cpp | 5 +- .../source/model/DataSetType.cpp | 37 +- aws-cpp-sdk-mobileanalytics/CMakeLists.txt | 14 +- .../source/MobileAnalyticsErrors.cpp | 5 +- .../source/model/Event.cpp | 14 +- .../source/model/Session.cpp | 14 +- aws-cpp-sdk-monitoring/CMakeLists.txt | 14 +- .../source/CloudWatchErrors.cpp | 13 +- .../source/model/AlarmHistoryItem.cpp | 12 +- .../source/model/ComparisonOperator.cpp | 9 +- .../source/model/Datapoint.cpp | 12 +- .../source/model/Dimension.cpp | 12 +- .../source/model/DimensionFilter.cpp | 12 +- .../source/model/HistoryItemType.cpp | 7 +- .../source/model/Metric.cpp | 12 +- .../source/model/MetricAlarm.cpp | 12 +- .../source/model/MetricDatum.cpp | 12 +- .../source/model/ResponseMetadata.cpp | 12 +- .../source/model/StandardUnit.cpp | 55 +- .../source/model/StateValue.cpp | 7 +- .../source/model/Statistic.cpp | 11 +- .../source/model/StatisticSet.cpp | 12 +- aws-cpp-sdk-opsworks/CMakeLists.txt | 14 +- .../source/OpsWorksErrors.cpp | 3 +- .../source/model/AgentVersion.cpp | 14 +- aws-cpp-sdk-opsworks/source/model/App.cpp | 14 +- .../source/model/AppAttributesKeys.cpp | 9 +- aws-cpp-sdk-opsworks/source/model/AppType.cpp | 15 +- .../source/model/Architecture.cpp | 5 +- .../source/model/AutoScalingThresholds.cpp | 14 +- .../source/model/AutoScalingType.cpp | 5 +- .../source/model/BlockDeviceMapping.cpp | 14 +- .../source/model/ChefConfiguration.cpp | 14 +- aws-cpp-sdk-opsworks/source/model/Command.cpp | 14 +- .../source/model/DataSource.cpp | 14 +- .../source/model/Deployment.cpp | 14 +- .../source/model/DeploymentCommand.cpp | 14 +- .../source/model/DeploymentCommandName.cpp | 25 +- .../source/model/EbsBlockDevice.cpp | 14 +- .../source/model/EcsCluster.cpp | 14 +- .../source/model/ElasticIp.cpp | 14 +- .../source/model/ElasticLoadBalancer.cpp | 14 +- .../source/model/EnvironmentVariable.cpp | 14 +- .../source/model/Instance.cpp | 14 +- .../source/model/InstanceIdentity.cpp | 14 +- .../source/model/InstancesCount.cpp | 14 +- aws-cpp-sdk-opsworks/source/model/Layer.cpp | 14 +- .../source/model/LayerAttributesKeys.cpp | 51 +- .../source/model/LayerType.cpp | 25 +- .../model/LifecycleEventConfiguration.cpp | 14 +- .../LoadBasedAutoScalingConfiguration.cpp | 14 +- .../source/model/Permission.cpp | 14 +- .../source/model/RaidArray.cpp | 14 +- .../source/model/RdsDbInstance.cpp | 14 +- aws-cpp-sdk-opsworks/source/model/Recipes.cpp | 14 +- .../source/model/ReportedOs.cpp | 14 +- .../source/model/RootDeviceType.cpp | 5 +- .../source/model/SelfUserProfile.cpp | 14 +- .../source/model/ServiceError.cpp | 14 +- .../model/ShutdownEventConfiguration.cpp | 14 +- aws-cpp-sdk-opsworks/source/model/Source.cpp | 14 +- .../source/model/SourceType.cpp | 9 +- .../source/model/SslConfiguration.cpp | 14 +- aws-cpp-sdk-opsworks/source/model/Stack.cpp | 14 +- .../source/model/StackAttributesKeys.cpp | 3 +- .../model/StackConfigurationManager.cpp | 14 +- .../source/model/StackSummary.cpp | 14 +- .../source/model/TemporaryCredential.cpp | 14 +- .../TimeBasedAutoScalingConfiguration.cpp | 14 +- .../source/model/UserProfile.cpp | 14 +- .../source/model/VirtualizationType.cpp | 5 +- aws-cpp-sdk-opsworks/source/model/Volume.cpp | 14 +- .../source/model/VolumeConfiguration.cpp | 14 +- .../source/model/VolumeType.cpp | 7 +- .../model/WeeklyAutoScalingSchedule.cpp | 14 +- aws-cpp-sdk-rds/CMakeLists.txt | 14 +- aws-cpp-sdk-rds/source/RDSErrors.cpp | 13 +- aws-cpp-sdk-rds/source/model/AccountQuota.cpp | 12 +- aws-cpp-sdk-rds/source/model/ApplyMethod.cpp | 5 +- .../source/model/AvailabilityZone.cpp | 12 +- aws-cpp-sdk-rds/source/model/Certificate.cpp | 12 +- aws-cpp-sdk-rds/source/model/CharacterSet.cpp | 12 +- aws-cpp-sdk-rds/source/model/DBCluster.cpp | 12 +- .../source/model/DBClusterMember.cpp | 12 +- .../model/DBClusterOptionGroupStatus.cpp | 12 +- .../source/model/DBClusterParameterGroup.cpp | 12 +- .../source/model/DBClusterSnapshot.cpp | 12 +- .../source/model/DBEngineVersion.cpp | 12 +- aws-cpp-sdk-rds/source/model/DBInstance.cpp | 12 +- .../source/model/DBInstanceStatusInfo.cpp | 12 +- .../source/model/DBParameterGroup.cpp | 12 +- .../source/model/DBParameterGroupStatus.cpp | 12 +- .../source/model/DBSecurityGroup.cpp | 12 +- .../model/DBSecurityGroupMembership.cpp | 12 +- aws-cpp-sdk-rds/source/model/DBSnapshot.cpp | 12 +- .../source/model/DBSnapshotAttribute.cpp | 12 +- .../model/DBSnapshotAttributesResult.cpp | 12 +- .../source/model/DBSubnetGroup.cpp | 12 +- .../model/DescribeDBLogFilesDetails.cpp | 12 +- .../source/model/EC2SecurityGroup.cpp | 12 +- aws-cpp-sdk-rds/source/model/Endpoint.cpp | 12 +- .../source/model/EngineDefaults.cpp | 12 +- aws-cpp-sdk-rds/source/model/Event.cpp | 12 +- .../source/model/EventCategoriesMap.cpp | 12 +- .../source/model/EventSubscription.cpp | 12 +- aws-cpp-sdk-rds/source/model/Filter.cpp | 12 +- aws-cpp-sdk-rds/source/model/IPRange.cpp | 12 +- aws-cpp-sdk-rds/source/model/Option.cpp | 12 +- .../source/model/OptionConfiguration.cpp | 12 +- aws-cpp-sdk-rds/source/model/OptionGroup.cpp | 12 +- .../source/model/OptionGroupMembership.cpp | 12 +- .../source/model/OptionGroupOption.cpp | 12 +- .../source/model/OptionGroupOptionSetting.cpp | 12 +- .../source/model/OptionSetting.cpp | 12 +- .../model/OrderableDBInstanceOption.cpp | 12 +- aws-cpp-sdk-rds/source/model/Parameter.cpp | 12 +- .../source/model/PendingMaintenanceAction.cpp | 12 +- .../source/model/PendingModifiedValues.cpp | 12 +- .../source/model/RecurringCharge.cpp | 12 +- .../source/model/ReservedDBInstance.cpp | 12 +- .../model/ReservedDBInstancesOffering.cpp | 12 +- .../ResourcePendingMaintenanceActions.cpp | 12 +- .../source/model/ResponseMetadata.cpp | 12 +- aws-cpp-sdk-rds/source/model/SourceType.cpp | 13 +- aws-cpp-sdk-rds/source/model/Subnet.cpp | 12 +- aws-cpp-sdk-rds/source/model/Tag.cpp | 12 +- .../source/model/UpgradeTarget.cpp | 12 +- .../model/VpcSecurityGroupMembership.cpp | 12 +- aws-cpp-sdk-redshift/CMakeLists.txt | 14 +- .../source/RedshiftErrors.cpp | 463 +++--- .../source/model/AccountWithRestoreAccess.cpp | 12 +- .../source/model/AvailabilityZone.cpp | 12 +- aws-cpp-sdk-redshift/source/model/Cluster.cpp | 12 +- .../source/model/ClusterNode.cpp | 12 +- .../source/model/ClusterParameterGroup.cpp | 12 +- .../model/ClusterParameterGroupStatus.cpp | 12 +- .../source/model/ClusterParameterStatus.cpp | 12 +- .../source/model/ClusterSecurityGroup.cpp | 12 +- .../model/ClusterSecurityGroupMembership.cpp | 12 +- .../model/ClusterSnapshotCopyStatus.cpp | 12 +- .../source/model/ClusterSubnetGroup.cpp | 12 +- .../source/model/ClusterVersion.cpp | 12 +- .../source/model/DefaultClusterParameters.cpp | 12 +- .../source/model/EC2SecurityGroup.cpp | 12 +- .../source/model/ElasticIpStatus.cpp | 12 +- .../source/model/Endpoint.cpp | 12 +- aws-cpp-sdk-redshift/source/model/Event.cpp | 12 +- .../source/model/EventCategoriesMap.cpp | 12 +- .../source/model/EventInfoMap.cpp | 12 +- .../source/model/EventSubscription.cpp | 12 +- .../source/model/HsmClientCertificate.cpp | 12 +- .../source/model/HsmConfiguration.cpp | 12 +- .../source/model/HsmStatus.cpp | 12 +- aws-cpp-sdk-redshift/source/model/IPRange.cpp | 12 +- .../source/model/OrderableClusterOption.cpp | 12 +- .../source/model/Parameter.cpp | 12 +- .../source/model/ParameterApplyType.cpp | 5 +- .../source/model/PendingModifiedValues.cpp | 12 +- .../source/model/RecurringCharge.cpp | 12 +- .../source/model/ReservedNode.cpp | 12 +- .../source/model/ReservedNodeOffering.cpp | 12 +- .../source/model/ResponseMetadata.cpp | 12 +- .../source/model/RestoreStatus.cpp | 12 +- .../source/model/Snapshot.cpp | 12 +- .../source/model/SnapshotCopyGrant.cpp | 12 +- .../source/model/SourceType.cpp | 9 +- aws-cpp-sdk-redshift/source/model/Subnet.cpp | 12 +- aws-cpp-sdk-redshift/source/model/Tag.cpp | 12 +- .../source/model/TaggedResource.cpp | 12 +- .../model/VpcSecurityGroupMembership.cpp | 12 +- aws-cpp-sdk-route53/CMakeLists.txt | 14 +- aws-cpp-sdk-route53/source/Route53Errors.cpp | 13 +- .../source/model/AliasTarget.cpp | 12 +- aws-cpp-sdk-route53/source/model/Change.cpp | 12 +- .../source/model/ChangeAction.cpp | 7 +- .../source/model/ChangeBatch.cpp | 12 +- .../source/model/ChangeBatchRecord.cpp | 12 +- .../source/model/ChangeInfo.cpp | 12 +- .../source/model/ChangeStatus.cpp | 5 +- .../source/model/DelegationSet.cpp | 12 +- .../source/model/GeoLocation.cpp | 12 +- .../source/model/GeoLocationDetails.cpp | 12 +- .../source/model/HealthCheck.cpp | 12 +- .../source/model/HealthCheckConfig.cpp | 12 +- .../source/model/HealthCheckObservation.cpp | 12 +- .../source/model/HealthCheckType.cpp | 25 +- .../source/model/HostedZone.cpp | 12 +- .../source/model/HostedZoneConfig.cpp | 12 +- aws-cpp-sdk-route53/source/model/RRType.cpp | 21 +- .../source/model/ResourceRecord.cpp | 12 +- .../source/model/ResourceRecordSet.cpp | 12 +- .../model/ResourceRecordSetFailover.cpp | 5 +- .../source/model/ResourceRecordSetRegion.cpp | 23 +- .../source/model/ResourceTagSet.cpp | 12 +- .../source/model/StatusReport.cpp | 12 +- aws-cpp-sdk-route53/source/model/Tag.cpp | 12 +- .../source/model/TagResourceType.cpp | 5 +- .../source/model/TrafficPolicy.cpp | 12 +- .../source/model/TrafficPolicyInstance.cpp | 12 +- .../source/model/TrafficPolicySummary.cpp | 12 +- aws-cpp-sdk-route53/source/model/VPC.cpp | 12 +- .../source/model/VPCRegion.cpp | 23 +- aws-cpp-sdk-route53domains/CMakeLists.txt | 14 +- .../model/CheckDomainAvailabilityResult.h | 90 +- .../source/Route53DomainsErrors.cpp | 31 +- .../source/model/ContactDetail.cpp | 14 +- .../source/model/ContactType.cpp | 11 +- .../source/model/CountryCode.cpp | 459 +++--- .../source/model/DomainAvailability.cpp | 17 +- .../source/model/DomainSummary.cpp | 14 +- .../source/model/ExtraParam.cpp | 14 +- .../source/model/ExtraParamName.cpp | 53 +- .../source/model/Nameserver.cpp | 14 +- .../source/model/OperationStatus.cpp | 11 +- .../source/model/OperationSummary.cpp | 14 +- .../source/model/OperationType.cpp | 15 +- .../source/model/Tag.cpp | 14 +- .../BucketAndObjectOperationTest.cpp | 206 +-- aws-cpp-sdk-s3/CMakeLists.txt | 14 +- .../include/aws/s3/model/CopyObjectRequest.h | 14 +- .../s3/model/CreateMultipartUploadRequest.h | 14 +- .../include/aws/s3/model/GetObjectRequest.h | 14 +- .../include/aws/s3/model/HeadObjectRequest.h | 14 +- .../include/aws/s3/model/PutObjectRequest.h | 14 +- .../aws/s3/model/UploadPartCopyRequest.h | 14 +- .../include/aws/s3/model/UploadPartRequest.h | 14 +- aws-cpp-sdk-s3/source/S3Errors.cpp | 13 +- .../source/model/AccessControlPolicy.cpp | 12 +- aws-cpp-sdk-s3/source/model/Bucket.cpp | 12 +- .../source/model/BucketCannedACL.cpp | 9 +- .../model/BucketLifecycleConfiguration.cpp | 12 +- .../source/model/BucketLocationConstraint.cpp | 21 +- .../source/model/BucketLoggingStatus.cpp | 12 +- .../source/model/BucketLogsPermission.cpp | 7 +- .../source/model/BucketVersioningStatus.cpp | 5 +- .../source/model/CORSConfiguration.cpp | 12 +- aws-cpp-sdk-s3/source/model/CORSRule.cpp | 12 +- .../model/CloudFunctionConfiguration.cpp | 12 +- aws-cpp-sdk-s3/source/model/CommonPrefix.cpp | 12 +- .../source/model/CompletedMultipartUpload.cpp | 12 +- aws-cpp-sdk-s3/source/model/CompletedPart.cpp | 12 +- aws-cpp-sdk-s3/source/model/Condition.cpp | 12 +- .../source/model/CopyPartResult.cpp | 12 +- .../model/CreateBucketConfiguration.cpp | 12 +- aws-cpp-sdk-s3/source/model/Delete.cpp | 12 +- .../source/model/DeleteMarkerEntry.cpp | 12 +- aws-cpp-sdk-s3/source/model/DeletedObject.cpp | 12 +- aws-cpp-sdk-s3/source/model/Destination.cpp | 12 +- aws-cpp-sdk-s3/source/model/EncodingType.cpp | 3 +- aws-cpp-sdk-s3/source/model/Error.cpp | 12 +- aws-cpp-sdk-s3/source/model/ErrorDocument.cpp | 12 +- aws-cpp-sdk-s3/source/model/Event.cpp | 19 +- .../source/model/ExpirationStatus.cpp | 5 +- aws-cpp-sdk-s3/source/model/FilterRule.cpp | 12 +- .../source/model/FilterRuleName.cpp | 5 +- aws-cpp-sdk-s3/source/model/Grant.cpp | 12 +- aws-cpp-sdk-s3/source/model/Grantee.cpp | 12 +- aws-cpp-sdk-s3/source/model/IndexDocument.cpp | 12 +- aws-cpp-sdk-s3/source/model/Initiator.cpp | 12 +- .../model/LambdaFunctionConfiguration.cpp | 12 +- .../source/model/LifecycleConfiguration.cpp | 12 +- .../source/model/LifecycleExpiration.cpp | 12 +- aws-cpp-sdk-s3/source/model/LifecycleRule.cpp | 12 +- .../source/model/LoggingEnabled.cpp | 12 +- aws-cpp-sdk-s3/source/model/MFADelete.cpp | 5 +- .../source/model/MFADeleteStatus.cpp | 5 +- .../source/model/MetadataDirective.cpp | 5 +- .../source/model/MultipartUpload.cpp | 12 +- .../model/NoncurrentVersionExpiration.cpp | 12 +- .../model/NoncurrentVersionTransition.cpp | 12 +- .../model/NotificationConfiguration.cpp | 12 +- .../NotificationConfigurationDeprecated.cpp | 12 +- .../model/NotificationConfigurationFilter.cpp | 12 +- aws-cpp-sdk-s3/source/model/Object.cpp | 12 +- .../source/model/ObjectCannedACL.cpp | 15 +- .../source/model/ObjectIdentifier.cpp | 12 +- .../source/model/ObjectStorageClass.cpp | 7 +- aws-cpp-sdk-s3/source/model/ObjectVersion.cpp | 12 +- .../model/ObjectVersionStorageClass.cpp | 3 +- aws-cpp-sdk-s3/source/model/Owner.cpp | 12 +- aws-cpp-sdk-s3/source/model/Part.cpp | 12 +- aws-cpp-sdk-s3/source/model/Payer.cpp | 5 +- aws-cpp-sdk-s3/source/model/Permission.cpp | 11 +- aws-cpp-sdk-s3/source/model/Protocol.cpp | 5 +- .../source/model/QueueConfiguration.cpp | 12 +- .../model/QueueConfigurationDeprecated.cpp | 12 +- aws-cpp-sdk-s3/source/model/Redirect.cpp | 12 +- .../source/model/RedirectAllRequestsTo.cpp | 12 +- .../source/model/ReplicationConfiguration.cpp | 12 +- .../source/model/ReplicationRule.cpp | 12 +- .../source/model/ReplicationRuleStatus.cpp | 5 +- .../source/model/ReplicationStatus.cpp | 9 +- .../source/model/RequestCharged.cpp | 3 +- aws-cpp-sdk-s3/source/model/RequestPayer.cpp | 3 +- .../model/RequestPaymentConfiguration.cpp | 12 +- .../source/model/RestoreRequest.cpp | 12 +- aws-cpp-sdk-s3/source/model/RoutingRule.cpp | 12 +- aws-cpp-sdk-s3/source/model/Rule.cpp | 12 +- aws-cpp-sdk-s3/source/model/S3KeyFilter.cpp | 12 +- .../source/model/ServerSideEncryption.cpp | 5 +- aws-cpp-sdk-s3/source/model/StorageClass.cpp | 7 +- aws-cpp-sdk-s3/source/model/Tag.cpp | 12 +- aws-cpp-sdk-s3/source/model/Tagging.cpp | 12 +- aws-cpp-sdk-s3/source/model/TargetGrant.cpp | 12 +- .../source/model/TopicConfiguration.cpp | 12 +- .../model/TopicConfigurationDeprecated.cpp | 12 +- aws-cpp-sdk-s3/source/model/Transition.cpp | 12 +- .../source/model/TransitionStorageClass.cpp | 5 +- aws-cpp-sdk-s3/source/model/Type.cpp | 7 +- .../source/model/VersioningConfiguration.cpp | 12 +- .../source/model/WebsiteConfiguration.cpp | 12 +- aws-cpp-sdk-sdb/CMakeLists.txt | 14 +- aws-cpp-sdk-sdb/source/SimpleDBErrors.cpp | 13 +- aws-cpp-sdk-sdb/source/model/Attribute.cpp | 12 +- .../source/model/DeletableItem.cpp | 12 +- aws-cpp-sdk-sdb/source/model/Item.cpp | 12 +- .../source/model/ReplaceableAttribute.cpp | 12 +- .../source/model/ReplaceableItem.cpp | 12 +- .../source/model/ResponseMetadata.cpp | 12 +- .../source/model/UpdateCondition.cpp | 12 +- aws-cpp-sdk-sns/CMakeLists.txt | 14 +- aws-cpp-sdk-sns/source/SNSErrors.cpp | 13 +- .../source/model/MessageAttributeValue.cpp | 12 +- .../source/model/PlatformApplication.cpp | 12 +- .../source/model/ResponseMetadata.cpp | 12 +- aws-cpp-sdk-sns/source/model/Subscription.cpp | 12 +- aws-cpp-sdk-sns/source/model/Topic.cpp | 12 +- aws-cpp-sdk-sqs/CMakeLists.txt | 14 +- aws-cpp-sdk-sqs/source/SQSErrors.cpp | 13 +- .../source/model/BatchResultErrorEntry.cpp | 12 +- ...angeMessageVisibilityBatchRequestEntry.cpp | 12 +- ...hangeMessageVisibilityBatchResultEntry.cpp | 12 +- .../model/DeleteMessageBatchRequestEntry.cpp | 12 +- .../model/DeleteMessageBatchResultEntry.cpp | 12 +- aws-cpp-sdk-sqs/source/model/Message.cpp | 12 +- .../source/model/MessageAttributeValue.cpp | 12 +- .../source/model/QueueAttributeName.cpp | 27 +- .../source/model/ResponseMetadata.cpp | 12 +- .../model/SendMessageBatchRequestEntry.cpp | 12 +- .../model/SendMessageBatchResultEntry.cpp | 12 +- aws-cpp-sdk-ssm/CMakeLists.txt | 14 +- .../include/aws/ssm/model/DocumentParameter.h | 10 +- aws-cpp-sdk-ssm/source/SSMErrors.cpp | 13 +- aws-cpp-sdk-ssm/source/model/Association.cpp | 14 +- .../source/model/AssociationDescription.cpp | 14 +- .../source/model/AssociationFilter.cpp | 14 +- .../source/model/AssociationFilterKey.cpp | 5 +- .../source/model/AssociationStatus.cpp | 14 +- .../source/model/AssociationStatusName.cpp | 7 +- aws-cpp-sdk-ssm/source/model/Command.cpp | 14 +- .../source/model/CommandFilter.cpp | 14 +- .../source/model/CommandFilterKey.cpp | 7 +- .../source/model/CommandInvocation.cpp | 14 +- .../source/model/CommandInvocationStatus.cpp | 15 +- .../source/model/CommandPlugin.cpp | 14 +- .../source/model/CommandPluginStatus.cpp | 13 +- .../source/model/CommandStatus.cpp | 15 +- .../CreateAssociationBatchRequestEntry.cpp | 14 +- .../source/model/DocumentDescription.cpp | 14 +- .../source/model/DocumentFilter.cpp | 14 +- .../source/model/DocumentFilterKey.cpp | 7 +- .../source/model/DocumentIdentifier.cpp | 14 +- .../source/model/DocumentParameter.cpp | 14 +- .../source/model/DocumentParameterType.cpp | 5 +- .../source/model/DocumentStatus.cpp | 7 +- .../source/model/FailedCreateAssociation.cpp | 14 +- aws-cpp-sdk-ssm/source/model/Fault.cpp | 7 +- .../source/model/InstanceInformation.cpp | 14 +- .../model/InstanceInformationFilter.cpp | 14 +- .../model/InstanceInformationFilterKey.cpp | 9 +- aws-cpp-sdk-ssm/source/model/PingStatus.cpp | 7 +- aws-cpp-sdk-ssm/source/model/PlatformType.cpp | 5 +- aws-cpp-sdk-storagegateway/CMakeLists.txt | 14 +- .../aws/storagegateway/StorageGatewayClient.h | 12 +- .../source/StorageGatewayErrors.cpp | 5 +- .../source/model/CachediSCSIVolume.cpp | 14 +- .../source/model/ChapInfo.cpp | 14 +- .../source/model/DeviceiSCSIAttributes.cpp | 14 +- .../source/model/Disk.cpp | 14 +- .../source/model/ErrorCode.cpp | 123 +- .../source/model/GatewayInfo.cpp | 14 +- .../source/model/NetworkInterface.cpp | 14 +- .../source/model/StorageGatewayError.cpp | 14 +- .../source/model/StorediSCSIVolume.cpp | 14 +- .../source/model/Tag.cpp | 14 +- .../source/model/Tape.cpp | 14 +- .../source/model/TapeArchive.cpp | 14 +- .../source/model/TapeRecoveryPointInfo.cpp | 14 +- .../source/model/VTLDevice.cpp | 14 +- .../source/model/VolumeInfo.cpp | 14 +- .../source/model/VolumeRecoveryPointInfo.cpp | 14 +- .../source/model/VolumeiSCSIAttributes.cpp | 14 +- aws-cpp-sdk-sts/CMakeLists.txt | 14 +- aws-cpp-sdk-sts/include/aws/sts/STSClient.h | 6 +- aws-cpp-sdk-sts/source/STSErrors.cpp | 13 +- .../source/model/AssumedRoleUser.cpp | 12 +- aws-cpp-sdk-sts/source/model/Credentials.cpp | 12 +- .../source/model/FederatedUser.cpp | 12 +- .../source/model/ResponseMetadata.cpp | 12 +- aws-cpp-sdk-support/CMakeLists.txt | 14 +- aws-cpp-sdk-support/source/SupportErrors.cpp | 13 +- .../source/model/Attachment.cpp | 14 +- .../source/model/AttachmentDetails.cpp | 14 +- .../source/model/CaseDetails.cpp | 14 +- aws-cpp-sdk-support/source/model/Category.cpp | 14 +- .../source/model/Communication.cpp | 14 +- .../source/model/RecentCaseCommunications.cpp | 14 +- aws-cpp-sdk-support/source/model/Service.cpp | 14 +- .../source/model/SeverityLevel.cpp | 14 +- .../TrustedAdvisorCategorySpecificSummary.cpp | 14 +- .../model/TrustedAdvisorCheckDescription.cpp | 14 +- .../TrustedAdvisorCheckRefreshStatus.cpp | 14 +- .../model/TrustedAdvisorCheckResult.cpp | 14 +- .../model/TrustedAdvisorCheckSummary.cpp | 14 +- .../TrustedAdvisorCostOptimizingSummary.cpp | 14 +- .../model/TrustedAdvisorResourceDetail.cpp | 14 +- .../model/TrustedAdvisorResourcesSummary.cpp | 14 +- aws-cpp-sdk-swf/CMakeLists.txt | 14 +- aws-cpp-sdk-swf/source/SWFErrors.cpp | 13 +- ...vityTaskCancelRequestedEventAttributes.cpp | 14 +- .../ActivityTaskCanceledEventAttributes.cpp | 14 +- .../ActivityTaskCompletedEventAttributes.cpp | 14 +- .../ActivityTaskFailedEventAttributes.cpp | 14 +- .../ActivityTaskScheduledEventAttributes.cpp | 14 +- .../ActivityTaskStartedEventAttributes.cpp | 14 +- .../ActivityTaskTimedOutEventAttributes.cpp | 14 +- .../source/model/ActivityTaskTimeoutType.cpp | 9 +- aws-cpp-sdk-swf/source/model/ActivityType.cpp | 14 +- .../model/ActivityTypeConfiguration.cpp | 14 +- .../source/model/ActivityTypeInfo.cpp | 14 +- .../model/CancelTimerDecisionAttributes.cpp | 14 +- .../source/model/CancelTimerFailedCause.cpp | 5 +- .../CancelTimerFailedEventAttributes.cpp | 14 +- ...celWorkflowExecutionDecisionAttributes.cpp | 14 +- .../CancelWorkflowExecutionFailedCause.cpp | 5 +- ...WorkflowExecutionFailedEventAttributes.cpp | 14 +- aws-cpp-sdk-swf/source/model/ChildPolicy.cpp | 7 +- ...rkflowExecutionCanceledEventAttributes.cpp | 14 +- ...kflowExecutionCompletedEventAttributes.cpp | 14 +- ...WorkflowExecutionFailedEventAttributes.cpp | 14 +- ...orkflowExecutionStartedEventAttributes.cpp | 14 +- ...flowExecutionTerminatedEventAttributes.cpp | 14 +- ...rkflowExecutionTimedOutEventAttributes.cpp | 14 +- aws-cpp-sdk-swf/source/model/CloseStatus.cpp | 13 +- .../source/model/CloseStatusFilter.cpp | 14 +- ...eteWorkflowExecutionDecisionAttributes.cpp | 14 +- .../CompleteWorkflowExecutionFailedCause.cpp | 5 +- ...WorkflowExecutionFailedEventAttributes.cpp | 14 +- ...NewWorkflowExecutionDecisionAttributes.cpp | 14 +- ...tinueAsNewWorkflowExecutionFailedCause.cpp | 19 +- ...WorkflowExecutionFailedEventAttributes.cpp | 14 +- aws-cpp-sdk-swf/source/model/Decision.cpp | 14 +- .../DecisionTaskCompletedEventAttributes.cpp | 14 +- .../DecisionTaskScheduledEventAttributes.cpp | 14 +- .../DecisionTaskStartedEventAttributes.cpp | 14 +- .../DecisionTaskTimedOutEventAttributes.cpp | 14 +- .../source/model/DecisionTaskTimeoutType.cpp | 3 +- aws-cpp-sdk-swf/source/model/DecisionType.cpp | 27 +- .../source/model/DomainConfiguration.cpp | 14 +- aws-cpp-sdk-swf/source/model/DomainInfo.cpp | 14 +- aws-cpp-sdk-swf/source/model/EventType.cpp | 109 +- .../source/model/ExecutionStatus.cpp | 5 +- .../source/model/ExecutionTimeFilter.cpp | 14 +- ...xecutionCancelRequestedEventAttributes.cpp | 14 +- ...rkflowExecutionSignaledEventAttributes.cpp | 14 +- ...ailWorkflowExecutionDecisionAttributes.cpp | 14 +- .../FailWorkflowExecutionFailedCause.cpp | 5 +- ...WorkflowExecutionFailedEventAttributes.cpp | 14 +- aws-cpp-sdk-swf/source/model/HistoryEvent.cpp | 14 +- ...LambdaFunctionCompletedEventAttributes.cpp | 14 +- .../LambdaFunctionFailedEventAttributes.cpp | 14 +- ...LambdaFunctionScheduledEventAttributes.cpp | 14 +- .../LambdaFunctionStartedEventAttributes.cpp | 14 +- .../LambdaFunctionTimedOutEventAttributes.cpp | 14 +- .../model/LambdaFunctionTimeoutType.cpp | 3 +- .../model/MarkerRecordedEventAttributes.cpp | 14 +- .../model/RecordMarkerDecisionAttributes.cpp | 14 +- .../source/model/RecordMarkerFailedCause.cpp | 3 +- .../RecordMarkerFailedEventAttributes.cpp | 14 +- .../source/model/RegistrationStatus.cpp | 5 +- ...stCancelActivityTaskDecisionAttributes.cpp | 14 +- .../RequestCancelActivityTaskFailedCause.cpp | 5 +- ...ancelActivityTaskFailedEventAttributes.cpp | 14 +- ...nalWorkflowExecutionDecisionAttributes.cpp | 14 +- ...elExternalWorkflowExecutionFailedCause.cpp | 7 +- ...WorkflowExecutionFailedEventAttributes.cpp | 14 +- ...kflowExecutionInitiatedEventAttributes.cpp | 14 +- ...ScheduleActivityTaskDecisionAttributes.cpp | 14 +- .../model/ScheduleActivityTaskFailedCause.cpp | 23 +- ...eduleActivityTaskFailedEventAttributes.cpp | 14 +- ...heduleLambdaFunctionDecisionAttributes.cpp | 14 +- .../ScheduleLambdaFunctionFailedCause.cpp | 9 +- ...uleLambdaFunctionFailedEventAttributes.cpp | 14 +- ...nalWorkflowExecutionDecisionAttributes.cpp | 14 +- ...alExternalWorkflowExecutionFailedCause.cpp | 7 +- ...WorkflowExecutionFailedEventAttributes.cpp | 14 +- ...kflowExecutionInitiatedEventAttributes.cpp | 14 +- ...ildWorkflowExecutionDecisionAttributes.cpp | 14 +- ...StartChildWorkflowExecutionFailedCause.cpp | 23 +- ...WorkflowExecutionFailedEventAttributes.cpp | 14 +- ...kflowExecutionInitiatedEventAttributes.cpp | 14 +- .../model/StartLambdaFunctionFailedCause.cpp | 3 +- ...artLambdaFunctionFailedEventAttributes.cpp | 14 +- .../model/StartTimerDecisionAttributes.cpp | 14 +- .../source/model/StartTimerFailedCause.cpp | 9 +- .../model/StartTimerFailedEventAttributes.cpp | 14 +- aws-cpp-sdk-swf/source/model/TagFilter.cpp | 14 +- aws-cpp-sdk-swf/source/model/TaskList.cpp | 14 +- .../model/TimerCanceledEventAttributes.cpp | 14 +- .../model/TimerFiredEventAttributes.cpp | 14 +- .../model/TimerStartedEventAttributes.cpp | 14 +- .../source/model/WorkflowExecution.cpp | 14 +- .../WorkflowExecutionCancelRequestedCause.cpp | 3 +- ...xecutionCancelRequestedEventAttributes.cpp | 14 +- ...rkflowExecutionCanceledEventAttributes.cpp | 14 +- ...kflowExecutionCompletedEventAttributes.cpp | 14 +- .../model/WorkflowExecutionConfiguration.cpp | 14 +- ...ExecutionContinuedAsNewEventAttributes.cpp | 14 +- ...WorkflowExecutionFailedEventAttributes.cpp | 14 +- .../source/model/WorkflowExecutionFilter.cpp | 14 +- .../source/model/WorkflowExecutionInfo.cpp | 14 +- .../model/WorkflowExecutionOpenCounts.cpp | 14 +- ...rkflowExecutionSignaledEventAttributes.cpp | 14 +- ...orkflowExecutionStartedEventAttributes.cpp | 14 +- .../WorkflowExecutionTerminatedCause.cpp | 7 +- ...flowExecutionTerminatedEventAttributes.cpp | 14 +- ...rkflowExecutionTimedOutEventAttributes.cpp | 14 +- .../model/WorkflowExecutionTimeoutType.cpp | 3 +- aws-cpp-sdk-swf/source/model/WorkflowType.cpp | 14 +- .../model/WorkflowTypeConfiguration.cpp | 14 +- .../source/model/WorkflowTypeFilter.cpp | 14 +- .../source/model/WorkflowTypeInfo.cpp | 14 +- aws-cpp-sdk-transfer-tests/TransferTests.cpp | 102 +- aws-cpp-sdk-waf/CMakeLists.txt | 14 +- aws-cpp-sdk-waf/source/WAFErrors.cpp | 13 +- .../source/model/ActivatedRule.cpp | 14 +- aws-cpp-sdk-waf/source/model/ByteMatchSet.cpp | 14 +- .../source/model/ByteMatchSetSummary.cpp | 14 +- .../source/model/ByteMatchSetUpdate.cpp | 14 +- .../source/model/ByteMatchTuple.cpp | 14 +- aws-cpp-sdk-waf/source/model/ChangeAction.cpp | 5 +- .../source/model/ChangeTokenStatus.cpp | 7 +- .../source/model/ComparisonOperator.cpp | 13 +- aws-cpp-sdk-waf/source/model/FieldToMatch.cpp | 14 +- aws-cpp-sdk-waf/source/model/HTTPHeader.cpp | 14 +- aws-cpp-sdk-waf/source/model/HTTPRequest.cpp | 14 +- aws-cpp-sdk-waf/source/model/IPSet.cpp | 14 +- .../source/model/IPSetDescriptor.cpp | 14 +- .../source/model/IPSetDescriptorType.cpp | 3 +- aws-cpp-sdk-waf/source/model/IPSetSummary.cpp | 14 +- aws-cpp-sdk-waf/source/model/IPSetUpdate.cpp | 14 +- .../source/model/MatchFieldType.cpp | 11 +- .../source/model/ParameterExceptionField.cpp | 19 +- .../source/model/ParameterExceptionReason.cpp | 5 +- .../source/model/PositionalConstraint.cpp | 11 +- aws-cpp-sdk-waf/source/model/Predicate.cpp | 14 +- .../source/model/PredicateType.cpp | 21 +- aws-cpp-sdk-waf/source/model/Rule.cpp | 14 +- aws-cpp-sdk-waf/source/model/RuleSummary.cpp | 14 +- aws-cpp-sdk-waf/source/model/RuleUpdate.cpp | 14 +- .../source/model/SampledHTTPRequest.cpp | 14 +- .../source/model/SizeConstraint.cpp | 14 +- .../source/model/SizeConstraintSet.cpp | 14 +- .../source/model/SizeConstraintSetSummary.cpp | 14 +- .../source/model/SizeConstraintSetUpdate.cpp | 14 +- .../source/model/SqlInjectionMatchSet.cpp | 14 +- .../model/SqlInjectionMatchSetSummary.cpp | 14 +- .../model/SqlInjectionMatchSetUpdate.cpp | 14 +- .../source/model/SqlInjectionMatchTuple.cpp | 14 +- .../source/model/TextTransformation.cpp | 13 +- aws-cpp-sdk-waf/source/model/TimeWindow.cpp | 14 +- aws-cpp-sdk-waf/source/model/WafAction.cpp | 14 +- .../source/model/WafActionType.cpp | 7 +- aws-cpp-sdk-waf/source/model/WebACL.cpp | 14 +- .../source/model/WebACLSummary.cpp | 14 +- aws-cpp-sdk-waf/source/model/WebACLUpdate.cpp | 14 +- aws-cpp-sdk-workspaces/CMakeLists.txt | 14 +- .../source/WorkSpacesErrors.cpp | 9 +- .../source/model/Compute.cpp | 7 +- .../source/model/ComputeType.cpp | 14 +- .../DefaultWorkspaceCreationProperties.cpp | 14 +- .../model/FailedCreateWorkspaceRequest.cpp | 14 +- .../model/FailedWorkspaceChangeRequest.cpp | 14 +- .../source/model/RebootRequest.cpp | 14 +- .../source/model/RebuildRequest.cpp | 14 +- .../source/model/TerminateRequest.cpp | 14 +- .../source/model/UserStorage.cpp | 14 +- .../source/model/Workspace.cpp | 14 +- .../source/model/WorkspaceBundle.cpp | 14 +- .../source/model/WorkspaceDirectory.cpp | 14 +- .../source/model/WorkspaceDirectoryState.cpp | 11 +- .../source/model/WorkspaceDirectoryType.cpp | 5 +- .../source/model/WorkspaceRequest.cpp | 14 +- .../source/model/WorkspaceState.cpp | 21 +- .../cpp/PlatformAndKeywordSanitizer.java | 2 + .../velocity/cpp/CMakeFile.vm | 14 +- .../velocity/cpp/EnumSource.vm | 7 +- .../velocity/cpp/ServiceErrorsSource.vm | 11 +- .../velocity/cpp/json/JsonSubObjectSource.vm | 14 +- .../cpp/queryxml/QueryXmlSubObjectSource.vm | 12 +- .../cpp/xml/rest/RestXmlSubObjectSource.vm | 12 +- scripts/build_3rdparty.py | 11 +- scripts/gather_3rdparty.py | 208 +++ scripts/sdk_directories.py | 126 +- .../aws/testing/android/AndroidTesting.h | 2 +- .../source/android/AndroidTesting.cpp | 103 +- .../android.toolchain.cmake | 34 +- 2033 files changed, 24692 insertions(+), 9170 deletions(-) mode change 100644 => 100755 android-tests/gradlew create mode 100644 aws-cpp-sdk-core-tests/utils/FileSystemUtilsTest.cpp create mode 100644 aws-cpp-sdk-core/include/aws/core/SDKConfig.h.in create mode 100644 aws-cpp-sdk-core/include/aws/core/platform/Platform.h create mode 100644 aws-cpp-sdk-core/include/aws/core/platform/PlatformAndroid.h create mode 100644 aws-cpp-sdk-core/source/platform/android/FileSystemUtils.cpp rename aws-cpp-sdk-core/source/{utils/logging => platform}/android/LogcatLogSystem.cpp (100%) create mode 100644 aws-cpp-sdk-core/source/platform/android/OSVersionInfo.cpp create mode 100644 aws-cpp-sdk-core/source/platform/android/Platform.cpp create mode 100644 aws-cpp-sdk-core/source/platform/linux-shared/FileSystemUtils.cpp create mode 100644 aws-cpp-sdk-core/source/platform/linux-shared/OSVersionInfo.cpp create mode 100644 aws-cpp-sdk-core/source/platform/windows/FileSystemUtils.cpp create mode 100644 aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp delete mode 100644 aws-cpp-sdk-core/source/utils/OSVersionInfo.cpp create mode 100644 aws-cpp-sdk-core/source/utils/OSVersionInfoCommon.cpp rename aws-cpp-sdk-core/source/utils/crypto/{ => factory}/Factories.cpp (100%) delete mode 100644 aws-cpp-sdk-core/source/utils/unix/FileSystemUtils.cpp delete mode 100644 aws-cpp-sdk-core/source/utils/windows/FileSystemUtils.cpp create mode 100644 scripts/gather_3rdparty.py rename {android-build => toolchains}/android.toolchain.cmake (98%) diff --git a/.gitignore b/.gitignore index 92bf13c738f..2390eb56c70 100644 --- a/.gitignore +++ b/.gitignore @@ -66,6 +66,10 @@ external openssl zlib credentials +toolchains/android/ -#maven +# codegen code-generation/generator/target/ + +#config output +aws-cpp-sdk-core/include/aws/core/SDKConfig.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 502710a3849..60f86884111 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,9 +18,11 @@ # (2) correctly extracts OPENSSL's version number from openssl/opensslv.h in version 1.0.2d cmake_minimum_required (VERSION 3.1.2) +# git is required for Android builds and optional for all other platforms +find_package(Git) + # Cmake invocation variables: # CUSTOM_MEMORY_MANAGEMENT - if set to 1, generates the sdk project files with custom memory management enabled, otherwise disables it -# STATIC_LINKING - if set to 1, generates the sdk project files to build static libraries, otherwise disables it # NO_HTTP_CLIENT - if set to 1, will not include any platform-specific http client implementations; you will need to provide one via an injected HttpClientFactory implementation # NO_ENCRYPTION - if set to 1, will not include any platform-specific encryption implementations; you will need to provide one # BUILD_ONLY - a semi-colon delimited list, if this is set we will build only the projects listed. Core will always be built as will its unit tests. @@ -28,12 +30,30 @@ cmake_minimum_required (VERSION 3.1.2) # REGENERATE_CLIENTS - all clients being built on this run will be regenerated from the api definitions, this option involves some setup of python, java 8, jdk 1.8, and maven # ADD_CUSTOM_CLIENTS - semi-colon delimited list of format serviceName=,version=;serviceName2=,version= # to use these arguments, you should add the api definition .normal.json file for your service to the api-description folder in the generator. +# NDK_DIR - directory where the android NDK is installed; if not set, the location will be read from the ANDROID_NDK environment variable + +# TODO: convert boolean invocation variables to options +option(MINIMIZE_SIZE "If enabled, the SDK will be built via a unity aggregation process that results in smaller static libraries; additionally, release binaries will favor size optimizations over speed" OFF) +option(ENABLE_UNITY_BUILD "If enabled, the SDK will be built using a single unified .cpp file for each service library. Reduces the size of static library binaries on Windows and Linux" OFF) +option(BUILD_SHARED_LIBS "If enabled, all aws sdk libraries will be build as shared objects; otherwise all Aws libraries will be built as static objects" ON) +option(FORCE_SHARED_CRT "If enabled, will unconditionally link the standard libraries in dynamically, otherwise the standard library will be linked in based on the BUILD_SHARED_LIBS setting" ON) +option(DISABLE_ANDROID_STANDALONE_BUILD "If enabled, the android build will not attempt to generate a standalone toolchain and instead rely on externally passed cmake parameters to specify the complete build environment. The included toolchain file is still used." OFF) + +# backwards compatibility with old command line params +if("${STATIC_LINKING}" STREQUAL "1") + SET(BUILD_SHARED_LIBS OFF) +endif() + +if(MINIMIZE_SIZE) + message(STATUS "MINIMIZE_SIZE enabled") + SET(ENABLE_UNITY_BUILD ON) # MINIMIZE_SIZE always implies UNITY_BUILD +endif() -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") +SET(PYTHON_CMD "python") -# there isn't a reliable way of detecting what architecture we want to build for in a cross-compiling environment, so force the user -# to specify on the command line. Since testing string equality is ugly and awkward in cmake, we use the specified architecture -# to conditionally set a symbol to 1 so that we can continue to just do "if (SYMBOL)" for our conditional execution +# ToDo: untangle platform and compiler specific logic. Right now we have a lot of things checking platform that should be checking compiler +# +# Platform recognition SET(PLATFORM_WINDOWS 0) SET(PLATFORM_LINUX 0) SET(PLATFORM_ANDROID 0) @@ -47,7 +67,11 @@ elseif("${TARGET_ARCH}" STREQUAL "APPLE") SET(PLATFORM_APPLE 1) elseif("${TARGET_ARCH}" STREQUAL "ANDROID") SET(PLATFORM_ANDROID 1) - SET(CMAKE_TOOLCHAIN_FILE ./android-build/android.toolchain.cmake) + SET(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/toolchains/android.toolchain.cmake) + if(NOT GIT_FOUND) + message(FATAL "Unable to find git; git is required in order to build for Android") + endif() + # TODO: check for patch as well, it's required to build zlib/curl/openssl else() message(STATUS "TARGET_ARCH not specified; inferring host OS to be platform compilation target") if(WIN32) @@ -70,41 +94,152 @@ else() cmake_minimum_required (VERSION 2.8) endif() -SET(PYTHON_CMD "python") - if(PLATFORM_WINDOWS) message(STATUS "Generating windows build config") - add_definitions("-DAWS_SDK_PLATFORM_WINDOWS") set(SDK_INSTALL_BINARY_PREFIX "windows") - SET(PYTHON_CMD "py") elseif(PLATFORM_LINUX) message(STATUS "Generating linux build config") - add_definitions("-DAWS_SDK_PLATFORM_LINUX") set(SDK_INSTALL_BINARY_PREFIX "linux") elseif(PLATFORM_APPLE) message(STATUS "Generating Mac OSX/IOS build config") - add_definitions("-DAWS_SDK_PLATFORM_APPLE") set(SDK_INSTALL_BINARY_PREFIX "mac") elseif(PLATFORM_ANDROID) message(STATUS "Generating android build config") - add_definitions("-DAWS_SDK_PLATFORM_ANDROID") set(SDK_INSTALL_BINARY_PREFIX "android") + + # android-specific required overrrides + set(CUSTOM_MEMORY_MANAGEMENT "1") + set(ANDROID_STL_FORCE_FEATURES "OFF") + + # android-specific parameter defaults + if(NOT ANDROID_ABI) + set(ANDROID_ABI "armeabi-v7a") + endif() + + if(NOT ANDROID_TOOLCHAIN_NAME) + set(ANDROID_TOOLCHAIN_NAME "standalone-clang") + endif() + + # minimum API level the native SDK will work against + if(NOT ANDROID_NATIVE_API_LEVEL) + set(ANDROID_NATIVE_API_LEVEL "android-21") + endif() + + # if not explicitly disabled, generate a standalone toolchain + if(NOT DISABLE_ANDROID_STANDALONE_BUILD AND NOT ANDROID_STANDALONE_TOOLCHAIN) + set(STANDALONE_TOOLCHAIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/toolchains/android/${ANDROID_ABI}-${ANDROID_TOOLCHAIN_NAME}-${ANDROID_NATIVE_API_LEVEL}") + if( NOT EXISTS ${STANDALONE_TOOLCHAIN_DIR} ) + message(STATUS "Could not find an appropriate standalone toolchain. Generating one into ${STANDALONE_TOOLCHAIN_DIR}") + if( NOT NDK_DIR ) + set( NDK_DIR $ENV{ANDROID_NDK} ) + endif() + + if( NOT IS_DIRECTORY "${NDK_DIR}" ) + message(FATAL_ERROR "Could not find Android NDK (${NDK_DIR}); either set the ANDROID_NDK environment variable or pass the path in via -DNDK_DIR=..." ) + endif() + + if(CMAKE_HOST_WIN32) + set(SH_VAR "sh") + endif() + + # + if(ANDROID_ABI MATCHES "armeabi") + set(__TOOLCHAIN "arm-linux-androideabi-clang") + elseif(ANDROID_ABI MATCHES "arm64") + set(__TOOLCHAIN "aarch64-linux-android-clang") + elseif(ANDROID_ABI MATCHES "x86_64") + set(__TOOLCHAIN "x86_64-clang") + elseif(ANDROID_ABI MATCHES "x86") + set(__TOOLCHAIN "x86-clang") + elseif(ANDROID_ABI MATCHES "mips64") + set(__TOOLCHAIN "mips64el-linux-android-clang") + elseif(ANDROID_ABI MATCHES "mips") + set(__TOOLCHAIN "mipsel-linux-android-clang") + else() + message(FATAL, "Unable to map ANDROID_ABI value ${ANDROID_ABI} to a valid architecture for make-standalone-toolchain") + endif() + + message(STATUS "standalone toolchain name: ${__TOOLCHAIN}") + + execute_process( + COMMAND ${SH_VAR} ${NDK_DIR}/build/tools/make-standalone-toolchain.sh --ndk-dir=${NDK_DIR} --toolchain=${__TOOLCHAIN} --use-llvm --stl=libc++ --platform=${ANDROID_NATIVE_API_LEVEL} --install-dir=${STANDALONE_TOOLCHAIN_DIR} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) + else() + message(STATUS "Using existing standalone toolchain located at ${STANDALONE_TOOLCHAIN_DIR}") + endif() + + set(ANDROID_STANDALONE_TOOLCHAIN "${STANDALONE_TOOLCHAIN_DIR}") + endif() else() message(FATAL_ERROR "Unknown target platform. How did this happen?") endif() +if(BUILD_SHARED_LIBS) + SET(ARCHIVE_DIRECTORY "bin") + SET(LIBTYPE SHARED) + if(PLATFORM_WINDOWS) + add_definitions("-DUSE_IMPORT_EXPORT") + SET(SUFFIX dll) + elseif(PLATFORM_LINUX OR PLATFORM_ANDROID) + SET(SUFFIX so) + elseif(PLATFORM_APPLE) + SET(SUFFIX dylib) + endif() -# shared libraries as intermediate (non-leaf) targets are not supported in android due to std::string issues -if("${STATIC_LINKING}" STREQUAL "1") - SET(BUILD_SHARED_LIBS 0) + message(STATUS "Building AWS libraries as shared objects") +else() SET(ARCHIVE_DIRECTORY "lib") - message(STATUS "Dynamic linking disabled") + SET(LIBTYPE STATIC) + if(PLATFORM_WINDOWS) + SET(SUFFIX lib) + elseif(PLATFORM_LINUX OR PLATFORM_ANDROID OR PLATFORM_APPLE) + SET(SUFFIX a) + endif() + + message(STATUS "Building AWS libraries as static objects") +endif() + + +# Compiler recognition +SET(COMPILER_MSVC 0) +SET(COMPILER_GCC 0) + +# ToDo: extend as necessary and remove common assumptions +if(MSVC) + SET(COMPILER_MSVC 1) else() - SET(BUILD_SHARED_LIBS 1) - SET(ARCHIVE_DIRECTORY "bin") - message(STATUS "Dynamic linking enabled") + SET(COMPILER_GCC 1) endif() +# Based on the FORCE_SHARED_CRT and BUILD_SHARED_LIBS options, make sure our compile/link flags bring in the right CRT library +# modified from gtest's version; while only the else clause is actually necessary, do both for completeness/future-proofing +macro(set_msvc_crt_settings) + if(COMPILER_MSVC) + foreach (var + CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE + CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO) + if(BUILD_SHARED_LIBS OR FORCE_SHARED_CRT) + string(REPLACE "/MT" "/MD" ${var} "${${var}}") + else() + string(REPLACE "/MD" "/MT" ${var} "${${var}}") + endif() + endforeach() + endif() +endmacro() + +set_msvc_crt_settings() + +if(PLATFORM_ANDROID) + if(FORCE_SHARED_CRT OR BUILD_SHARED_LIBS) + SET(ANDROID_STL "libc++_shared") + else() + SET(ANDROID_STL "libc++_static") + endif() +endif() + + + # Http client control # After this section runs, client availability is technically platform-independent (ie we use the client #defines rather than a mess of platform #defines) # on Windows, set CURL_DIR to a valid curl install directory in order to enable the curl client @@ -164,6 +299,7 @@ else() set(ENABLE_INJECTED_ENCRYPTION 1) endif() + if(ENABLE_BCRYPT_ENCRYPTION) add_definitions(-DENABLE_BCRYPT_ENCRYPTION) message(STATUS "Encryption: Bcrypt") @@ -200,116 +336,230 @@ endif() message(STATUS "Install binary prefix: ${SDK_INSTALL_BINARY_PREFIX}") -#go through and handle dependencies many of these are so tests will compile +# cmake doesn't support maps, so we use list elements as key-value pairs; the ':' becomes a separator between key and value +set(C2J_LIST "") +list(APPEND C2J_LIST "acm:2015-12-08") +list(APPEND C2J_LIST "apigateway:2015-07-09") +list(APPEND C2J_LIST "autoscaling:2011-01-01") +list(APPEND C2J_LIST "cloudformation:2010-05-15") +list(APPEND C2J_LIST "cloudfront:2016-01-28") +list(APPEND C2J_LIST "cloudhsm:2014-05-30") +list(APPEND C2J_LIST "cloudsearch:2013-01-01") +list(APPEND C2J_LIST "cloudsearchdomain:2013-01-01") +list(APPEND C2J_LIST "cloudtrail:2013-11-01") +list(APPEND C2J_LIST "codecommit:2015-04-13") +list(APPEND C2J_LIST "codedeploy:2014-10-06") +list(APPEND C2J_LIST "codepipeline:2015-07-09") +list(APPEND C2J_LIST "cognito-identity:2014-06-30") +list(APPEND C2J_LIST "cognito-sync:2014-06-30") +list(APPEND C2J_LIST "config:2014-11-12") +list(APPEND C2J_LIST "datapipeline:2012-10-29") +list(APPEND C2J_LIST "devicefarm:2015-06-23") +list(APPEND C2J_LIST "directconnect:2012-10-25") +list(APPEND C2J_LIST "dms:2016-01-01") +list(APPEND C2J_LIST "ds:2015-04-16") +list(APPEND C2J_LIST "dynamodb:2012-08-10") +if(NOT PLATFORM_ANDROID OR NOT CMAKE_HOST_WIN32) # ec2 isn't building for android on windows atm due to an internal compiler error, TODO: investigate further + list(APPEND C2J_LIST "ec2:2015-10-01") +endif() +list(APPEND C2J_LIST "ecr:2015-09-21") +list(APPEND C2J_LIST "ecs:2014-11-13") +list(APPEND C2J_LIST "elasticache:2015-02-02") +list(APPEND C2J_LIST "elasticbeanstalk:2010-12-01") +list(APPEND C2J_LIST "elasticfilesystem:2015-02-01") +list(APPEND C2J_LIST "elasticloadbalancing:2012-06-01") +list(APPEND C2J_LIST "elasticmapreduce:2009-03-31") +list(APPEND C2J_LIST "elastictranscoder:2012-09-25") +list(APPEND C2J_LIST "email:2010-12-01") +list(APPEND C2J_LIST "es:2015-01-01") +list(APPEND C2J_LIST "events:2015-10-07") +list(APPEND C2J_LIST "firehose:2015-08-04") +list(APPEND C2J_LIST "gamelift:2015-10-01") +list(APPEND C2J_LIST "glacier:2012-06-01") +list(APPEND C2J_LIST "iam:2010-05-08") +list(APPEND C2J_LIST "importexport:2010-06-01") +list(APPEND C2J_LIST "inspector:2015-08-18") +list(APPEND C2J_LIST "iot:2015-05-28") +list(APPEND C2J_LIST "kinesis:2013-12-02") +list(APPEND C2J_LIST "kms:2014-11-01") +list(APPEND C2J_LIST "lambda:2015-03-31") +list(APPEND C2J_LIST "logs:2014-03-28") +list(APPEND C2J_LIST "machinelearning:2014-12-12") +list(APPEND C2J_LIST "marketplacecommerceanalytics:2015-07-01") +list(APPEND C2J_LIST "meteringmarketplace:2016-01-14") +list(APPEND C2J_LIST "mobileanalytics:2014-06-05") +list(APPEND C2J_LIST "monitoring:2010-08-01") +list(APPEND C2J_LIST "opsworks:2013-02-18") +list(APPEND C2J_LIST "rds:2014-10-31") +list(APPEND C2J_LIST "redshift:2012-12-01") +list(APPEND C2J_LIST "route53:2013-04-01") +list(APPEND C2J_LIST "route53domains:2014-05-15") +list(APPEND C2J_LIST "s3:2006-03-01") +list(APPEND C2J_LIST "sdb:2009-04-15") +list(APPEND C2J_LIST "sns:2010-03-31") +list(APPEND C2J_LIST "sqs:2012-11-05") +list(APPEND C2J_LIST "ssm:2014-11-06") +list(APPEND C2J_LIST "storagegateway:2013-06-30") +list(APPEND C2J_LIST "sts:2011-06-15") +list(APPEND C2J_LIST "support:2013-04-15") +list(APPEND C2J_LIST "swf:2012-01-25") +list(APPEND C2J_LIST "waf:2015-08-24") +list(APPEND C2J_LIST "workspaces:2015-04-08") + +set(SDK_TEST_PROJECT_LIST "") +list(APPEND SDK_TEST_PROJECT_LIST "cognito-identity:aws-cpp-sdk-cognitoidentity-integration-tests") +list(APPEND SDK_TEST_PROJECT_LIST "dynamodb:aws-cpp-sdk-dynamodb-integration-tests") +list(APPEND SDK_TEST_PROJECT_LIST "identity-management:aws-cpp-sdk-identity-management-tests") +list(APPEND SDK_TEST_PROJECT_LIST "lambda:aws-cpp-sdk-lambda-integration-tests") +list(APPEND SDK_TEST_PROJECT_LIST "s3:aws-cpp-sdk-s3-integration-tests") +list(APPEND SDK_TEST_PROJECT_LIST "sqs:aws-cpp-sdk-sqs-integration-tests") +list(APPEND SDK_TEST_PROJECT_LIST "transfer:aws-cpp-sdk-transfer-tests") + +set(SDK_DEPENDENCY_LIST "") +list(APPEND SDK_DEPENDENCY_LIST "access-management:iam") +list(APPEND SDK_DEPENDENCY_LIST "identity-management:cognito-identity") +list(APPEND SDK_DEPENDENCY_LIST "queues:sqs") +list(APPEND SDK_DEPENDENCY_LIST "transfer:s3") + +set(TEST_DEPENDENCY_LIST "") +list(APPEND TEST_DEPENDENCY_LIST "identity-management:cognito-identity") +list(APPEND TEST_DEPENDENCY_LIST "lambda:access-management,cognito-identity,iam,kinesis") +list(APPEND TEST_DEPENDENCY_LIST "sqs:access-management,cognito-identity,iam") +list(APPEND TEST_DEPENDENCY_LIST "transfer:s3") + +# make a list of the generated clients +set(GENERATED_SERVICE_LIST "") +foreach(GENERATED_C2J_SERVICE IN LISTS C2J_LIST) + STRING(REGEX REPLACE "([^:]+):.*" "\\1" SERVICE_RESULT ${GENERATED_C2J_SERVICE}) + list(APPEND GENERATED_SERVICE_LIST ${SERVICE_RESULT}) +endforeach() + +# helper function that that gives primitive map functionality by treating a colon as the key-value separator, while the list semi-colon separates pairs +# to use, pass the list-map in as a third parameter (see helper functions below) +function(get_map_element KEY VALUE_VAR) + foreach(ELEMENT_PAIR ${ARGN}) + STRING(REGEX REPLACE "([^:]+):.*" "\\1" KEY_RESULT ${ELEMENT_PAIR}) + if(${KEY_RESULT} STREQUAL ${KEY} ) + STRING(REGEX REPLACE "[^:]+:(.*)" "\\1" VALUE_RESULT ${ELEMENT_PAIR}) + set(${VALUE_VAR} "${VALUE_RESULT}" PARENT_SCOPE) + return() + endif() + endforeach() + set(${VALUE_VAR} "" PARENT_SCOPE) +endfunction(get_map_element) + +# a bunch of key-value retrieval functions for the list-maps we defined above +function(get_c2j_date_for_service SERVICE_NAME C2J_DATE_VAR) + get_map_element(${SERVICE_NAME} TEMP_VAR ${C2J_LIST}) + set(${C2J_DATE_VAR} "${TEMP_VAR}" PARENT_SCOPE) +endfunction() + +function(get_test_project_for_service SERVICE_NAME TEST_PROJECT_NAME_VAR) + get_map_element(${SERVICE_NAME} TEMP_VAR ${SDK_TEST_PROJECT_LIST}) + set(${TEST_PROJECT_NAME_VAR} "${TEMP_VAR}" PARENT_SCOPE) +endfunction() + +function(get_dependencies_for_sdk PROJECT_NAME DEPENDENCY_LIST_VAR) + get_map_element(${PROJECT_NAME} TEMP_VAR ${SDK_DEPENDENCY_LIST}) + set(${DEPENDENCY_LIST_VAR} "${TEMP_VAR}" PARENT_SCOPE) +endfunction() + +function(get_dependencies_for_test TEST_NAME DEPENDENCY_LIST_VAR) + get_map_element(${TEST_NAME} TEMP_VAR ${TEST_DEPENDENCY_LIST}) + set(${DEPENDENCY_LIST_VAR} "${TEMP_VAR}" PARENT_SCOPE) +endfunction() + +# returns all sdks, including itself, that depend on the supplied sdk +function(get_sdks_depending_on SDK_NAME DEPENDING_SDKS_VAR) + set(TEMP_SDK_LIST "${SDK_NAME}") + foreach(SDK_DEP ${SDK_DEPENDENCY_LIST}) + STRING(REGEX REPLACE "([^:]+):.*" "\\1" KEY_RESULT ${SDK_DEP}) + STRING(REGEX REPLACE "[^:]+:(.*)" "\\1" VALUE_RESULT ${SDK_DEP}) + STRING(REPLACE "," ";" LIST_RESULT ${VALUE_RESULT}) + list(FIND LIST_RESULT ${SDK_NAME} FIND_INDEX) + if(FIND_INDEX GREATER -1) + list(APPEND TEMP_SDK_LIST ${KEY_RESULT}) + endif() + endforeach() + + SET(${DEPENDING_SDKS_VAR} "${TEMP_SDK_LIST}" PARENT_SCOPE) +endfunction() + +# when building a fixed target set, missing SDKs are an error +# when building "everything", we forgive missing SDKs; should this become an option instead? if(BUILD_ONLY) - LIST(FIND BUILD_ONLY "aws-cpp-sdk-access-management" OUTPUT_VAR) - if( OUTPUT_VAR GREATER -1) - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-iam") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-cognito-identity") - endif() - LIST(FIND BUILD_ONLY "aws-cpp-sdk-identity-management" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-cognito-identity") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-access-management") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-iam") - endif() - LIST(FIND BUILD_ONLY "aws-cpp-sdk-transfer" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-s3") - endif() - LIST(FIND BUILD_ONLY "aws-cpp-sdk-sqs" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-access-management") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-cognito-identity") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-iam") - endif() - LIST(FIND BUILD_ONLY "aws-cpp-sdk-queues" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-sqs") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-access-management") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-cognito-identity") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-iam") - endif() - LIST(FIND BUILD_ONLY "aws-cpp-sdk-lambda" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-access-management") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-cognito-identity") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-iam") - endif() - #if none have been supplied, add them all + set(SDK_BUILD_LIST ${BUILD_ONLY}) + + foreach(TARGET IN LISTS BUILD_ONLY) + message(STATUS "Considering ${TARGET}") + get_dependencies_for_sdk(${TARGET} DEPENDENCY_LIST) + if(DEPENDENCY_LIST) + STRING(REPLACE "," ";" LIST_RESULT ${DEPENDENCY_LIST}) + foreach(DEPENDENCY IN LISTS LIST_RESULT) + list(APPEND SDK_BUILD_LIST ${DEPENDENCY}) + endforeach() + endif() + + get_dependencies_for_test(${TARGET} DEPENDENCY_LIST) + if(DEPENDENCY_LIST) + STRING(REPLACE "," ";" LIST_RESULT ${DEPENDENCY_LIST}) + foreach(DEPENDENCY IN LISTS LIST_RESULT) + list(APPEND SDK_BUILD_LIST ${DEPENDENCY}) + endforeach() + endif() + endforeach() + + LIST(REMOVE_DUPLICATES SDK_BUILD_LIST) + + # make sure all the sdks/c2js are present; a missing sdk-directory or c2j file is a build error when building a manually-specified set + foreach(SDK IN LISTS SDK_BUILD_LIST) + SET(SDK_DIR "aws-cpp-sdk-${SDK}") + if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SDK_DIR}") + message(FATAL "${SDK} is required for build, but ${SDK_DIR} directory is missing!") + endif() + + get_c2j_date_for_service(${SDK} SDK_C2J_DATE) + SET(SDK_C2J_FILE "${CMAKE_CURRENT_SOURCE_DIR}/code-generation/api-descriptions/${SDK}-${SDK_C2J_DATE}.normal.json") + if(REGENERATE_CLIENTS AND SDK_C2J_DATE AND NOT (EXISTS ${SDK_C2J_FILE})) + message(FATAL "${SDK} is required for build, but C2J file '${SDK_C2J_FILE}' is missing!") + endif() + endforeach() else() - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-access-management") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-autoscaling") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-acm") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-apigateway") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-cloudhsm") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-cloudformation") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-cloudfront") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-cloudsearch") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-cloudsearchdomain") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-cloudtrail") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-codecommit") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-codedeploy") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-codepipeline") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-cognito-identity") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-cognito-sync") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-config") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-datapipeline") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-devicefarm") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-directconnect") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-dms") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-ds") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-dynamodb") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-ec2") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-ecs") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-ecr") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-elasticache") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-elasticbeanstalk") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-elasticfilesystem") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-elasticloadbalancing") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-elasticmapreduce") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-elastictranscoder") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-email") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-es") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-events") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-firehose") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-gamelift") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-glacier") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-iam") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-importexport") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-inspector") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-iot") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-identity-management") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-kinesis") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-kms") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-lambda") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-logs") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-machinelearning") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-marketplacecommerceanalytics") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-mobileanalytics") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-meteringmarketplace") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-monitoring") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-opsworks") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-queues") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-rds") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-redshift") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-route53") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-route53domains") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-s3") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-sdb") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-sns") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-sqs") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-ssm") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-storagegateway") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-sts") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-support") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-swf") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-transfer") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-waf") - LIST(APPEND BUILD_ONLY "aws-cpp-sdk-workspaces") + set(TEMP_SDK_BUILD_LIST ${GENERATED_SERVICE_LIST}) + list(APPEND TEMP_SDK_BUILD_LIST "access-management") + list(APPEND TEMP_SDK_BUILD_LIST "identity-management") + list(APPEND TEMP_SDK_BUILD_LIST "queues") + list(APPEND TEMP_SDK_BUILD_LIST "transfer") + + set(SDK_BUILD_LIST ${TEMP_SDK_BUILD_LIST}) + + # remove any missing targets from the build list, factoring in dependencies appropriately + foreach(SDK IN LISTS TEMP_SDK_BUILD_LIST) + SET(REMOVE_SDK 0) + + get_c2j_date_for_service(${SDK} SDK_C2J_DATE) + SET(SDK_C2J_FILE "${CMAKE_CURRENT_SOURCE_DIR}/code-generation/api-descriptions/${SDK}-${SDK_C2J_DATE}.normal.json") + if(REGENERATE_CLIENTS AND SDK_C2J_DATE AND NOT (EXISTS ${SDK_C2J_FILE})) + SET(REMOVE_SDK 1) + endif() + + SET(SDK_DIR "aws-cpp-sdk-${SDK}") + if(NOT REGENERATE_CLIENTS OR NOT SDK_C2J_DATE) + if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SDK_DIR}") + SET(REMOVE_SDK 1) + endif() + endif() + + if(REMOVE_SDK) + get_sdks_depending_on(${SDK} REMOVE_LIST) + foreach(REMOVE_SDK IN LISTS REMOVE_LIST) + list(REMOVE_ITEM SDK_BUILD_LIST ${REMOVE_SDK}) + endforeach() + endif() + endforeach() endif() -LIST(REMOVE_DUPLICATES BUILD_ONLY) +# SDK_BUILD_LIST is now a list of present SDKs that can be processed unconditionally if(ADD_CUSTOM_CLIENTS OR REGENERATE_CLIENTS) execute_process( @@ -321,616 +571,19 @@ endif() if(REGENERATE_CLIENTS) message(STATUS "Regenerating clients that have been selected for build.") - execute_process( - COMMAND ${PYTHON_CMD} scripts/wipe_generated_code.py - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - - SET(OUTPUT_VAR -1) - #cognito identity - LIST(FIND BUILD_ONLY "aws-cpp-sdk-cognito-identity" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName cognito-identity --apiVersion 2014-06-30 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #cognito sync - LIST(FIND BUILD_ONLY "aws-cpp-sdk-cognito-sync" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName cognito-sync --apiVersion 2014-06-30 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #dynamodb - LIST(FIND BUILD_ONLY "aws-cpp-sdk-dynamodb" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName dynamodb --apiVersion 2012-08-10 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #dms - LIST(FIND BUILD_ONLY "aws-cpp-sdk-dms" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName dms --apiVersion 2016-01-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #sqs - LIST(FIND BUILD_ONLY "aws-cpp-sdk-sqs" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName sqs --apiVersion 2012-11-05 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() + execute_process( COMMAND ${PYTHON_CMD} scripts/wipe_generated_code.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) - #lambda - LIST(FIND BUILD_ONLY "aws-cpp-sdk-lambda" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName lambda --apiVersion 2015-03-31 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #kinesis - LIST(FIND BUILD_ONLY "aws-cpp-sdk-kinesis" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName kinesis --apiVersion 2013-12-02 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #s3 - LIST(FIND BUILD_ONLY "aws-cpp-sdk-s3" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName s3 --apiVersion 2006-03-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #elastic beanstalk - LIST(FIND BUILD_ONLY "aws-cpp-sdk-elasticbeanstalk" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName elasticbeanstalk --apiVersion 2010-12-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #elastic load balancing - LIST(FIND BUILD_ONLY "aws-cpp-sdk-elasticloadbalancing" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName elasticloadbalancing --apiVersion 2012-06-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #rds - LIST(FIND BUILD_ONLY "aws-cpp-sdk-rds" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName rds --apiVersion 2014-10-31 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #mobileanalytics - LIST(FIND BUILD_ONLY "aws-cpp-sdk-mobileanalytics" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName mobileanalytics --apiVersion 2014-06-05 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #opsworks - LIST(FIND BUILD_ONLY "aws-cpp-sdk-opsworks" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName opsworks --apiVersion 2013-02-18 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #cloudfront - LIST(FIND BUILD_ONLY "aws-cpp-sdk-cloudfront" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName cloudfront --apiVersion 2016-01-28 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #kms - LIST(FIND BUILD_ONLY "aws-cpp-sdk-kms" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName kms --apiVersion 2014-11-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #elastic file system - LIST(FIND BUILD_ONLY "aws-cpp-sdk-elasticfilesystem" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName elasticfilesystem --apiVersion 2015-02-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #code-deploy - LIST(FIND BUILD_ONLY "aws-cpp-sdk-codedeploy" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName codedeploy --apiVersion 2014-10-06 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #redshift - LIST(FIND BUILD_ONLY "aws-cpp-sdk-redshift" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName redshift --apiVersion 2012-12-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #iam - LIST(FIND BUILD_ONLY "aws-cpp-sdk-iam" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName iam --apiVersion 2010-05-08 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #ecs - LIST(FIND BUILD_ONLY "aws-cpp-sdk-ecs" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName ecs --apiVersion 2014-11-13 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #datapipeline - LIST(FIND BUILD_ONLY "aws-cpp-sdk-datapipeline" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName datapipeline --apiVersion 2012-10-29 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #glacier - LIST(FIND BUILD_ONLY "aws-cpp-sdk-glacier" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName glacier --apiVersion 2012-06-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #cloudwatch logs - LIST(FIND BUILD_ONLY "aws-cpp-sdk-logs" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName logs --apiVersion 2014-03-28 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #cloudwatch monitoring - LIST(FIND BUILD_ONLY "aws-cpp-sdk-monitoring" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName monitoring --apiVersion 2010-08-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #simple email service - LIST(FIND BUILD_ONLY "aws-cpp-sdk-email" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName email --apiVersion 2010-12-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #elasticache - LIST(FIND BUILD_ONLY "aws-cpp-sdk-elasticache" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName elasticache --apiVersion 2015-02-02 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #elastic map reduce - LIST(FIND BUILD_ONLY "aws-cpp-sdk-elasticmapreduce" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName elasticmapreduce --apiVersion 2009-03-31 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #simpledb - LIST(FIND BUILD_ONLY "aws-cpp-sdk-sdb" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName sdb --apiVersion 2009-04-15 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #sts - LIST(FIND BUILD_ONLY "aws-cpp-sdk-sts" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName sts --apiVersion 2011-06-15 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #elastic transcoder - LIST(FIND BUILD_ONLY "aws-cpp-sdk-elastictranscoder" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName elastictranscoder --apiVersion 2012-09-25 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #sns - LIST(FIND BUILD_ONLY "aws-cpp-sdk-sns" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName sns --apiVersion 2010-03-31 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #autoscaling - LIST(FIND BUILD_ONLY "aws-cpp-sdk-autoscaling" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName autoscaling --apiVersion 2011-01-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #cloudformation - LIST(FIND BUILD_ONLY "aws-cpp-sdk-cloudformation" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName cloudformation --apiVersion 2010-05-15 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #simple workflow service - LIST(FIND BUILD_ONLY "aws-cpp-sdk-swf" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName swf --apiVersion 2012-01-25 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #firehose - LIST(FIND BUILD_ONLY "aws-cpp-sdk-firehose" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName firehose --apiVersion 2015-08-04 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #acm - LIST(FIND BUILD_ONLY "aws-cpp-sdk-acm" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName acm --apiVersion 2015-12-08 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #api-gateway - LIST(FIND BUILD_ONLY "aws-cpp-sdk-apigateway" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName apigateway --apiVersion 2015-07-09 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #cloudhsm - LIST(FIND BUILD_ONLY "aws-cpp-sdk-cloudhsm" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName cloudhsm --apiVersion 2014-05-30 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #cloudsearch - LIST(FIND BUILD_ONLY "aws-cpp-sdk-cloudsearch" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName cloudsearch --apiVersion 2013-01-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #cloudsearchdomain - LIST(FIND BUILD_ONLY "aws-cpp-sdk-cloudsearchdomain" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName cloudsearchdomain --apiVersion 2013-01-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #cloudtrail - LIST(FIND BUILD_ONLY "aws-cpp-sdk-cloudtrail" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName cloudtrail --apiVersion 2013-11-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #codecommit - LIST(FIND BUILD_ONLY "aws-cpp-sdk-codecommit" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName codecommit --apiVersion 2015-04-13 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #codepipeline - LIST(FIND BUILD_ONLY "aws-cpp-sdk-codepipeline" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName codepipeline --apiVersion 2015-07-09 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #config - LIST(FIND BUILD_ONLY "aws-cpp-sdk-config" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName config --apiVersion 2014-11-12 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #devicefarm - LIST(FIND BUILD_ONLY "aws-cpp-sdk-devicefarm" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName devicefarm --apiVersion 2015-06-23 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #directconnect - LIST(FIND BUILD_ONLY "aws-cpp-sdk-directconnect" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName directconnect --apiVersion 2012-10-25 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #ds - LIST(FIND BUILD_ONLY "aws-cpp-sdk-ds" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName ds --apiVersion 2015-04-16 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #ecr - LIST(FIND BUILD_ONLY "aws-cpp-sdk-ecr" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName ecr --apiVersion 2015-09-21 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #es - LIST(FIND BUILD_ONLY "aws-cpp-sdk-es" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName es --apiVersion 2015-01-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #events - LIST(FIND BUILD_ONLY "aws-cpp-sdk-events" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName events --apiVersion 2015-10-07 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #gamelift - LIST(FIND BUILD_ONLY "aws-cpp-sdk-gamelift" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName gamelift --apiVersion 2015-10-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #importexport - LIST(FIND BUILD_ONLY "aws-cpp-sdk-importexport" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName importexport --apiVersion 2010-06-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #inspector - LIST(FIND BUILD_ONLY "aws-cpp-sdk-inspector" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName inspector --apiVersion 2015-08-18 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #iot - LIST(FIND BUILD_ONLY "aws-cpp-sdk-iot" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName iot --apiVersion 2015-05-28 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #machinelearning - LIST(FIND BUILD_ONLY "aws-cpp-sdk-machinelearning" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName machinelearning --apiVersion 2014-12-12 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #marketplacecommerceanalytics - LIST(FIND BUILD_ONLY "aws-cpp-sdk-marketplacecommerceanalytics" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName marketplacecommerceanalytics --apiVersion 2015-07-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #marketplacemetering meteringmarketplace - LIST(FIND BUILD_ONLY "aws-cpp-sdk-meteringmarketplace" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName meteringmarketplace --apiVersion 2016-01-14 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #route53 - LIST(FIND BUILD_ONLY "aws-cpp-sdk-route53" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName route53 --apiVersion 2013-04-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #route53domains - LIST(FIND BUILD_ONLY "aws-cpp-sdk-route53domains" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName route53domains --apiVersion 2014-05-15 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #ssm - LIST(FIND BUILD_ONLY "aws-cpp-sdk-ssm" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName ssm --apiVersion 2014-11-06 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #storagegateway - LIST(FIND BUILD_ONLY "aws-cpp-sdk-storagegateway" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName storagegateway --apiVersion 2013-06-30 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #support - LIST(FIND BUILD_ONLY "aws-cpp-sdk-support" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName support --apiVersion 2013-04-15 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #waf - LIST(FIND BUILD_ONLY "aws-cpp-sdk-waf" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName waf --apiVersion 2015-08-24 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #workspaces - LIST(FIND BUILD_ONLY "aws-cpp-sdk-workspaces" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName workspaces --apiVersion 2015-04-08 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() - - #ec2 - LIST(FIND BUILD_ONLY "aws-cpp-sdk-ec2" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - execute_process( - COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName ec2 --apiVersion 2015-10-01 --outputLocation ./ - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - endif() + foreach(SDK IN LISTS SDK_BUILD_LIST) + get_c2j_date_for_service(${SDK} C2J_DATE) + if(C2J_DATE) + execute_process( + COMMAND ${PYTHON_CMD} scripts/generate_sdks.py --serviceName ${SDK} --apiVersion ${C2J_DATE} --outputLocation ./ + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) + endif() + endforeach() endif() -if(BUILD_SHARED_LIBS) - SET(LIBTYPE SHARED) - if(PLATFORM_WINDOWS) - add_definitions("-DUSE_IMPORT_EXPORT") - SET(SUFFIX dll) - elseif(PLATFORM_LINUX OR PLATFORM_ANDROID) - SET(SUFFIX so) - elseif(PLATFORM_APPLE) - SET(SUFFIX dylib) - endif() -else() - SET(LIBTYPE STATIC) - if(PLATFORM_WINDOWS) - SET(SUFFIX lib) - elseif(PLATFORM_LINUX OR PLATFORM_ANDROID OR PLATFORM_APPLE) - SET(SUFFIX a) - endif() -endif() macro(copyDlls exeName) if(PLATFORM_WINDOWS AND BUILD_SHARED_LIBS) @@ -944,6 +597,29 @@ macro(copyDlls exeName) endif() endmacro() +# this function is based on the unity build function described at: https://cheind.wordpress.com/2009/12/10/reducing-compilation-time-unity-builds/ +function(enable_unity_build UNITY_SUFFIX SOURCE_FILES) + set(files ${${SOURCE_FILES}}) + + # Generate a unique filename for the unity build translation unit + set(unity_build_file ${CMAKE_CURRENT_BINARY_DIR}/ub_${UNITY_SUFFIX}.cpp) + + # Exclude all translation units from compilation + set_source_files_properties(${files} PROPERTIES HEADER_FILE_ONLY true) + + # Open the ub file + FILE(WRITE ${unity_build_file} "// Unity Build generated by CMake\n") + + # Add include statement for each translation unit + foreach(source_file ${files} ) + FILE( APPEND ${unity_build_file} "#include <${source_file}>\n") + endforeach(source_file) + + # Complement list of translation units with the name of ub + set(${SOURCE_FILES} ${${SOURCE_FILES}} ${unity_build_file} PARENT_SCOPE) +endfunction(enable_unity_build) + + # In Windows, this dumps the CL and LINK command lines to the output - makes it much easier to # check that CMake is passing in the right defines, paths, etc... # @@ -961,6 +637,17 @@ set(CMAKE_CONFIGURATION_TYPES MinSizeRel # Like Release, but optimized for memory rather than speed. ) +# pass this flag to the jsoncpp amalgamated source +add_definitions(-DJSON_USE_EXCEPTION=0) + +if(NOT PLATFORM_WINDOWS) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") + if(NOT BUILD_SHARED_LIBS) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") + endif() +endif() + # warning control if(PLATFORM_WINDOWS) if(MSVC) @@ -979,25 +666,25 @@ if(PLATFORM_WINDOWS) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") endif() - #remove bogus errors at generation time if these variables haven't been manually set - if(NOT CMAKE_CONFIGURATION_TYPES) - set(CMAKE_CONFIGURATION_TYPES "Debug;Release;MinSizeRel;RelWithDebInfo") - endif() - - if(NOT CMAKE_CXX_FLAGS_DEBUGOPT) - set(CMAKE_CXX_FLAGS_DEBUGOPT "") - endif() - - if(NOT CMAKE_EXE_LINKER_FLAGS_DEBUGOPT) - set(CMAKE_EXE_LINKER_FLAGS_DEBUGOPT "") - endif() - - if(NOT CMAKE_SHARED_LINKER_FLAGS_DEBUGOPT) - set(CMAKE_SHARED_LINKER_FLAGS_DEBUGOPT "") - endif() + #remove bogus errors at generation time if these variables haven't been manually set + if(NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_CONFIGURATION_TYPES "Debug;Release;MinSizeRel;RelWithDebInfo") + endif() + + if(NOT CMAKE_CXX_FLAGS_DEBUGOPT) + set(CMAKE_CXX_FLAGS_DEBUGOPT "") + endif() + + if(NOT CMAKE_EXE_LINKER_FLAGS_DEBUGOPT) + set(CMAKE_EXE_LINKER_FLAGS_DEBUGOPT "") + endif() + + if(NOT CMAKE_SHARED_LINKER_FLAGS_DEBUGOPT) + set(CMAKE_SHARED_LINKER_FLAGS_DEBUGOPT "") + endif() endif() elseif(PLATFORM_LINUX OR PLATFORM_ANDROID OR PLATFORM_APPLE) - # max warning level, warnings are errors, turn off unused private field. We have one for an empty class. + # max warning level, warnings are errors, turn off unused private field. We have one for an empty class. set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -pedantic -Wextra") if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") @@ -1006,19 +693,23 @@ elseif(PLATFORM_LINUX OR PLATFORM_ANDROID OR PLATFORM_APPLE) endif() if(NOT PLATFORM_WINDOWS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-rtti") + if(MINIMIZE_SIZE) + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s") + endif() endif() set(CORE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/aws-cpp-sdk-core/") +# The NDK does not provide any http or crypto functionality out of the box; we build versions of zlib, openssl, and curl to account for this. if(PLATFORM_ANDROID) include(ExternalProject) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti -fno-exceptions") + set(EXTERNAL_CXX_FLAGS "-fno-exceptions -fno-rtti -Wno-unused-private-field") + set(EXTERNAL_C_FLAGS "") + set(BASE_SDK_DIR ${CMAKE_SOURCE_DIR} CACHE STRING "Android build" FORCE) set(EXTERNAL_PROJECTS_DIR ${CMAKE_SOURCE_DIR}/external CACHE STRING "Android build" FORCE) - set(USE_PROJECT_CMAKE_MODULE_PATH "-DCMAKE_MODULE_PATH=${MAKE_MODULE_PATH}") - set(TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/android-build/android.toolchain.cmake) # we patch the install process for each dependency to match what we need for 3rd party installation set(EXTERNAL_INSTALL_DIR ${CMAKE_SOURCE_DIR}/external) @@ -1026,83 +717,86 @@ if(PLATFORM_ANDROID) #zlib #based on http://stackoverflow.com/questions/16842218/how-to-use-cmake-externalproject-add-or-alternatives-in-a-cross-platform-way #likely, some of the things here are unnecessary - set(ZLIB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/zlib CACHE INTERNAL "zlib source dir") - set(ZLIB_INSTALL_DIR ${EXTERNAL_INSTALL_DIR}/zlib CACHE INTERNAL "zlib install dir") - set(ZLIB_INCLUDE_DIR ${ZLIB_INSTALL_DIR}/include/zlib CACHE INTERNAL "zlib include dir") - set(ZLIB_LIBRARY_DIR ${ZLIB_INSTALL_DIR}/lib/${SDK_INSTALL_BINARY_PREFIX}/${CMAKE_BUILD_TYPE} CACHE INTERNAL "zlib library dir") - set(ZLIB_DEFINES "-msse2 -mfpmath=sse" CACHE INTERNAL "zlib defines") + if(ENABLE_OPENSSL_ENCRYPTION OR ENABLE_CURL_CLIENT) + set(ZLIB_SOURCE_DIR ${CMAKE_SOURCE_DIR}/zlib CACHE INTERNAL "zlib source dir") + set(ZLIB_INSTALL_DIR ${EXTERNAL_INSTALL_DIR}/zlib CACHE INTERNAL "zlib install dir") + set(ZLIB_INCLUDE_DIR ${ZLIB_INSTALL_DIR}/include/zlib CACHE INTERNAL "zlib include dir") + set(ZLIB_LIBRARY_DIR ${ZLIB_INSTALL_DIR}/lib/${SDK_INSTALL_BINARY_PREFIX}/${CMAKE_BUILD_TYPE} CACHE INTERNAL "zlib library dir") + #set(ZLIB_DEFINES "-msse2 -mfpmath=sse" CACHE INTERNAL "zlib defines") - set( ZLIB_INCLUDE_FLAGS "-isystem ${ZLIB_INCLUDE_DIR}" CACHE INTERNAL "compiler flags to find zlib includes") - set( ZLIB_LINKER_FLAGS "-L${ZLIB_LIBRARY_DIR}" CACHE INTERNAL "linker flags to find zlib") + set( ZLIB_INCLUDE_FLAGS "-isystem ${ZLIB_INCLUDE_DIR}" CACHE INTERNAL "compiler flags to find zlib includes") + set( ZLIB_LINKER_FLAGS "-L${ZLIB_LIBRARY_DIR}" CACHE INTERNAL "linker flags to find zlib") - ExternalProject_Add(ZLIB + ExternalProject_Add(ZLIB SOURCE_DIR ${ZLIB_SOURCE_DIR} URL http://zlib.net/zlib-1.2.8.tar.gz URL_HASH "SHA256=36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d" PATCH_COMMAND patch CMakeLists.txt < ${CMAKE_SOURCE_DIR}/android-build/patches/zlib/CMakeLists.patch CMAKE_ARGS - -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} + -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} + -DANDROID_ABI=${ANDROID_ABI} + -DANDROID_TOOLCHAIN_NAME=${ANDROID_TOOLCHAIN_NAME} + -DANDROID_STANDALONE_TOOLCHAIN=${ANDROID_STANDALONE_TOOLCHAIN} + -DANDROID_STL=${ANDROID_STL} -DCMAKE_INSTALL_PREFIX=${ZLIB_INSTALL_DIR} - -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} - -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} + -DCMAKE_CXX_FLAGS=${EXTERNAL_CXX_FLAGS} + -DCMAKE_C_FLAGS=${EXTERNAL_C_FLAGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DSDK_INSTALL_BINARY_PREFIX=${SDK_INSTALL_BINARY_PREFIX} - -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} - ${USE_PROJECT_CMAKE_MODULE_PATH} + -DBUILD_SHARED_LIBS=0 ) + if(UNIX) + set(ZLIB_NAME libz) + else() + set(ZLIB_NAME zlib) + endif() - if(UNIX) - set(ZLIB_NAME libz) - else() - set(ZLIB_NAME zlib) + add_library(zlib UNKNOWN IMPORTED) + set_property(TARGET zlib PROPERTY IMPORTED_LOCATION ${ZLIB_LIBRARY_DIR}/${ZLIB_NAME}.a) endif() - add_library(zlib UNKNOWN IMPORTED) - set_property(TARGET zlib PROPERTY IMPORTED_LOCATION ${ZLIB_LIBRARY_DIR}/${ZLIB_NAME}.${SUFFIX}) - #OpenSSL - set(OPENSSL_SOURCE_DIR ${CMAKE_SOURCE_DIR}/openssl CACHE INTERNAL "openssl source dir") - set(OPENSSL_INSTALL_DIR ${EXTERNAL_INSTALL_DIR}/openssl CACHE INTERNAL "openssl install dir") - set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include CACHE INTERNAL "openssl include dir") - set(OPENSSL_LIBRARY_DIR ${OPENSSL_INSTALL_DIR}/lib/${SDK_INSTALL_BINARY_PREFIX}/${CMAKE_BUILD_TYPE} CACHE INTERNAL "openssl library dir") - set(OPENSSL_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ZLIB_INCLUDE_FLAGS} -fPIE" CACHE INTERNAL "openssl") - set(OPENSSL_C_FLAGS "${CMAKE_C_FLAGS} ${ZLIB_INCLUDE_FLAGS} -fPIE" CACHE INTERNAL "openssl") - set(OPENSSL_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie" CACHE INTERNAL "openssl") - - set( OPENSSL_INCLUDE_FLAGS "-isystem ${OPENSSL_INCLUDE_DIR} -isystem ${OPENSSL_INCLUDE_DIR}/openssl" CACHE INTERNAL "compiler flags to find openssl includes") - set( OPENSSL_LINKER_FLAGS "-L${OPENSSL_LIBRARY_DIR}" CACHE INTERNAL "linker flags to find openssl") - - if(BUILD_SHARED_LIBS) - set(OPENSSL_SHARED_FLAG "shared" CACHE INTERNAL "") - set(OPENSSL_ZLIB_SHARED_FLAG "zlib zlib-shared" CACHE INTERNAL "") - else() - set(OPENSSL_SHARED_FLAG "no-shared" CACHE INTERNAL "") - set(OPENSSL_ZLIB_SHARED_FLAG "zlib" CACHE INTERNAL "") - endif() - - ExternalProject_Add(OPENSSL + if(ENABLE_OPENSSL_ENCRYPTION) + set(OPENSSL_SOURCE_DIR ${CMAKE_SOURCE_DIR}/openssl CACHE INTERNAL "openssl source dir") + set(OPENSSL_INSTALL_DIR ${EXTERNAL_INSTALL_DIR}/openssl CACHE INTERNAL "openssl install dir") + set(OPENSSL_INCLUDE_DIR ${OPENSSL_INSTALL_DIR}/include CACHE INTERNAL "openssl include dir") + set(OPENSSL_LIBRARY_DIR ${OPENSSL_INSTALL_DIR}/lib/${SDK_INSTALL_BINARY_PREFIX}/${CMAKE_BUILD_TYPE} CACHE INTERNAL "openssl library dir") + set(OPENSSL_CXX_FLAGS "${EXTERNAL_CXX_FLAGS} ${ZLIB_INCLUDE_FLAGS} -fPIE" CACHE INTERNAL "openssl") + set(OPENSSL_C_FLAGS "${EXTERNAL_C_FLAGS} ${ZLIB_INCLUDE_FLAGS} -fPIE" CACHE INTERNAL "openssl") + set(OPENSSL_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie" CACHE INTERNAL "openssl") + + set(OPENSSL_INCLUDE_FLAGS "-isystem ${OPENSSL_INCLUDE_DIR} -isystem ${OPENSSL_INCLUDE_DIR}/openssl" CACHE INTERNAL "compiler flags to find openssl includes") + set(OPENSSL_LINKER_FLAGS "-L${OPENSSL_LIBRARY_DIR}" CACHE INTERNAL "linker flags to find openssl") + + ExternalProject_Add(OPENSSL DEPENDS ZLIB SOURCE_DIR ${OPENSSL_SOURCE_DIR} - URL https://www.openssl.org/source/old/1.0.2/openssl-1.0.2d.tar.gz - URL_HASH "SHA256=671c36487785628a703374c652ad2cebea45fa920ae5681515df25d9f2c9a8c8" - UPDATE_COMMAND cd ${CMAKE_SOURCE_DIR} && python android-build/configure_openssl_cmake.py - CMAKE_ARGS - -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} + GIT_REPOSITORY https://github.com/openssl/openssl.git + GIT_TAG 902f3f50d051dfd6ebf009d352aaf581195caabf # 1.0.2g + UPDATE_COMMAND cd ${CMAKE_SOURCE_DIR} && python android-build/configure_openssl_cmake.py + CMAKE_ARGS + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} + -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} + -DANDROID_ABI=${ANDROID_ABI} + -DANDROID_TOOLCHAIN_NAME=${ANDROID_TOOLCHAIN_NAME} + -DANDROID_STANDALONE_TOOLCHAIN=${ANDROID_STANDALONE_TOOLCHAIN} + -DANDROID_STL=${ANDROID_STL} -DCMAKE_INSTALL_PREFIX=${OPENSSL_INSTALL_DIR} -DCMAKE_CXX_FLAGS=${OPENSSL_CXX_FLAGS} -DCMAKE_C_FLAGS=${OPENSSL_C_FLAGS} -DCMAKE_EXE_LINKER_FLAGS=${OPENSSL_EXE_LINKER_FLAGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DSDK_INSTALL_BINARY_PREFIX=${SDK_INSTALL_BINARY_PREFIX} - -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} - ${USE_PROJECT_CMAKE_MODULE_PATH} - ) + -DBUILD_SHARED_LIBS=0 + ) - add_library(ssl UNKNOWN IMPORTED) - set_property(TARGET ssl PROPERTY IMPORTED_LOCATION ${OPENSSL_LIBRARY_DIR}/libssl.${SUFFIX}) - add_library(crypto UNKNOWN IMPORTED) - set_property(TARGET crypto PROPERTY IMPORTED_LOCATION ${OPENSSL_LIBRARY_DIR}/libcrypto.${SUFFIX}) + add_library(ssl UNKNOWN IMPORTED) + set_property(TARGET ssl PROPERTY IMPORTED_LOCATION ${OPENSSL_LIBRARY_DIR}/libssl.a) + add_library(crypto UNKNOWN IMPORTED) + set_property(TARGET crypto PROPERTY IMPORTED_LOCATION ${OPENSSL_LIBRARY_DIR}/libcrypto.a) + endif() if(ENABLE_CURL_CLIENT) #curl @@ -1111,36 +805,28 @@ if(PLATFORM_ANDROID) set(CURL_INCLUDE_DIR ${CURL_INSTALL_DIR}/include CACHE INTERNAL "libcurl include dir") set(CURL_LIBRARY_DIR ${CURL_INSTALL_DIR}/lib/${SDK_INSTALL_BINARY_PREFIX}/${CMAKE_BUILD_TYPE} CACHE INTERNAL "libcurl library dir") - # required when using cmake 2.8.7, but invalid for later versions - # set( CURL_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} ${ZLIB_LINKER_FLAGS} ${OPENSSL_LINKER_FLAGS}" CACHE INTERNAL "" ) - # set( CURL_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ZLIB_LINKER_FLAGS} ${OPENSSL_LINKER_FLAGS}" CACHE INTERNAL "" ) set( CURL_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS}" CACHE INTERNAL "" ) set( CURL_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" CACHE INTERNAL "" ) - set( CURL_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPENSSL_INCLUDE_FLAGS} ${ZLIB_INCLUDE_FLAGS} -Wno-unused-value -fPIE ${ZLIB_LINKER_FLAGS} ${OPENSSL_LINKER_FLAGS}" CACHE INTERNAL "") - set( CURL_C_FLAGS "${CMAKE_C_FLAGS} ${OPENSSL_INCLUDE_FLAGS} ${ZLIB_INCLUDE_FLAGS} -Wno-unused-value -fPIE ${ZLIB_LINKER_FLAGS} ${OPENSSL_LINKER_FLAGS}" CACHE INTERNAL "") + set( CURL_CXX_FLAGS "${EXTERNAL_CXX_FLAGS} ${OPENSSL_INCLUDE_FLAGS} ${ZLIB_INCLUDE_FLAGS} -Wno-unused-value -fPIE ${ZLIB_LINKER_FLAGS} ${OPENSSL_LINKER_FLAGS}" CACHE INTERNAL "") + set( CURL_C_FLAGS "${EXTERNAL_C_FLAGS} ${OPENSSL_INCLUDE_FLAGS} ${ZLIB_INCLUDE_FLAGS} -Wno-unused-value -fPIE ${ZLIB_LINKER_FLAGS} ${OPENSSL_LINKER_FLAGS}" CACHE INTERNAL "") set( CURL_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie ${ZLIB_LINKER_FLAGS} ${OPENSSL_LINKER_FLAGS}" CACHE INTERNAL "" ) - if ( BUILD_SHARED_LIBS ) - set( CURL_STATICLIB OFF CACHE INTERNAL "" ) - set( BUILD_CURL_EXE OFF CACHE INTERNAL "" ) - else() - set( CURL_STATICLIB ON CACHE INTERNAL "" ) - set( BUILD_CURL_EXE ON CACHE INTERNAL "" ) - endif() - - #todo: figure out a better way of doing this - set( GIT_EXECUTABLE /usr/bin/git ) - ExternalProject_Add(CURL DEPENDS OPENSSL ZLIB SOURCE_DIR ${CURL_SOURCE_DIR} GIT_REPOSITORY https://github.com/bagder/curl.git - GIT_TAG 38e0788 # 7.43.0 + GIT_TAG 9819cec61b00cc872136ea5faf469627b3b87e69 # 7.48.0 + UPDATE_COMMAND "" PATCH_COMMAND patch lib/CMakeLists.txt < ${CMAKE_SOURCE_DIR}/android-build/patches/curl/lib/CMakeLists.patch && patch src/CMakeLists.txt < ${CMAKE_SOURCE_DIR}/android-build/patches/curl/src/CMakeLists.patch CMAKE_ARGS -C ${CMAKE_SOURCE_DIR}/android-build/CurlAndroidCrossCompile.cmake - -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} + -DANDROID_NATIVE_API_LEVEL=${ANDROID_NATIVE_API_LEVEL} + -DANDROID_ABI=${ANDROID_ABI} + -DANDROID_TOOLCHAIN_NAME=${ANDROID_TOOLCHAIN_NAME} + -DANDROID_STANDALONE_TOOLCHAIN=${ANDROID_STANDALONE_TOOLCHAIN} + -DANDROID_STL=${ANDROID_STL} -DCMAKE_INSTALL_PREFIX=${CURL_INSTALL_DIR} -DCMAKE_CXX_FLAGS=${CURL_CXX_FLAGS} -DCMAKE_C_FLAGS=${CURL_C_FLAGS} @@ -1150,24 +836,56 @@ if(PLATFORM_ANDROID) -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DOPENSSL_ROOT_DIR=${OPENSSL_SOURCE_DIR} -DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR} - -DCURL_STATICLIB=${CURL_STATICLIB} - -DBUILD_CURL_EXE=${BUILD_CURL_EXE} + -DCURL_STATICLIB=ON + -DBUILD_CURL_EXE=ON -DBUILD_CURL_TESTS=OFF -DSDK_INSTALL_BINARY_PREFIX=${SDK_INSTALL_BINARY_PREFIX} - ${USE_PROJECT_CMAKE_MODULE_PATH} ) add_library(curl UNKNOWN IMPORTED) - set_property(TARGET curl PROPERTY IMPORTED_LOCATION ${CURL_LIBRARY_DIR}/libcurl.${SUFFIX}) + set_property(TARGET curl PROPERTY IMPORTED_LOCATION ${CURL_LIBRARY_DIR}/libcurl.a) endif() endif() -#release pdbs in windows -if(PLATFORM_WINDOWS AND BUILD_SHARED_LIBS) - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") - set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF") +# special windows build options: +# debug info: pdbs with dlls, embedded in static libs +# release optimisations to purely focus on size, override debug info settings as necessary +if(PLATFORM_WINDOWS) + if(BUILD_SHARED_LIBS) + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi") + set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF") + else() + if(CMAKE_CXX_FLAGS MATCHES "/Zi") + string(REGEX REPLACE "/Zi" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + endif() + if(CMAKE_CXX_FLAGS_DEBUG MATCHES "/Zi") + message(STATUS "Clearing pdb setting") + string(REGEX REPLACE "/Zi" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") + endif() + + # put Z7 in config-specific flags so we can strip from release if we're concerned about size + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /Z7") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Z7") + endif() + + if(MINIMIZE_SIZE) + # strip debug info from release + string(REGEX REPLACE "/Z[a-zA-Z0-9]" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") + string(REGEX REPLACE "/DEBUG" "" CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") + + # strip optimization settings and replace with + string(REGEX REPLACE "/O[a-zA-Z0-9]*" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") + + # pure size flags + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /O1 /Ob0 /Os") + endif() + + message(STATUS "CxxFlags: ${CMAKE_CXX_FLAGS}") + message(STATUS "CxxDebugFlags: ${CMAKE_CXX_FLAGS_DEBUG}") + message(STATUS "CxxReleaseFlags: ${CMAKE_CXX_FLAGS_RELEASE}") endif() + # default libraries to link in per-platform if(PLATFORM_WINDOWS) set(PLATFORM_DEP_LIBS Userenv ) @@ -1201,18 +919,13 @@ LIST(APPEND EXPORTS "") add_subdirectory(aws-cpp-sdk-core) LIST(APPEND EXPORTS "aws-cpp-sdk-core") add_subdirectory(testing-resources) +add_subdirectory(aws-cpp-sdk-core-tests) -if(PLATFORM_ANDROID) - # the EventSeverity::DEBUG entry doesn't compile on android because DEBUG is #defined - # ToDo: fix the client generator to map DEBUG to something else - LIST(REMOVE BUILD_ONLY "aws-cpp-sdk-elasticbeanstalk") - LIST(REMOVE BUILD_ONLY "aws-cpp-sdk-ec2") -endif() - -foreach(build_client ${BUILD_ONLY}) - add_subdirectory("${build_client}") - LIST(APPEND EXPORTS "${build_client}") -endforeach(build_client) +foreach(SDK IN LISTS SDK_BUILD_LIST) + SET(SDK_DIR "aws-cpp-sdk-${SDK}") + add_subdirectory("${SDK_DIR}") + LIST(APPEND EXPORTS "${SDK_DIR}") +endforeach() #at this point, if user has specified some customized clients, generate them and add them to the build here. foreach(custom_client ${ADD_CUSTOM_CLIENTS}) @@ -1239,45 +952,27 @@ endforeach(custom_client) if(PLATFORM_ANDROID AND NOT BUILD_SHARED_LIBS) add_subdirectory(android-unified-tests) else() - add_subdirectory(aws-cpp-sdk-core-tests) - - SET(OUTPUT_VAR -1) - LIST(FIND BUILD_ONLY "aws-cpp-sdk-dynamodb" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - add_subdirectory(aws-cpp-sdk-dynamodb-integration-tests) - endif() - - LIST(FIND BUILD_ONLY "aws-cpp-sdk-cognito-identity" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - add_subdirectory(aws-cpp-sdk-cognitoidentity-integration-tests) - endif() - - LIST(FIND BUILD_ONLY "aws-cpp-sdk-sqs" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - add_subdirectory(aws-cpp-sdk-sqs-integration-tests) - endif() - - LIST(FIND BUILD_ONLY "aws-cpp-sdk-lambda" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - add_subdirectory(aws-cpp-sdk-lambda-integration-tests) - endif() - - LIST(FIND BUILD_ONLY "aws-cpp-sdk-s3" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - add_subdirectory(aws-cpp-sdk-s3-integration-tests) - endif() - - LIST(FIND BUILD_ONLY "aws-cpp-sdk-identity-management" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - add_subdirectory(aws-cpp-sdk-identity-management-tests) - endif() - - # add_subdirectory(aws-cpp-sdk-cloudfront-integration-tests) - LIST(FIND BUILD_ONLY "aws-cpp-sdk-transfer" OUTPUT_VAR) - if(OUTPUT_VAR GREATER -1) - add_subdirectory(aws-cpp-sdk-transfer-tests) - endif() - # add_subdirectory(aws-cpp-sdk-redshift-integration-tests) + foreach(SDK IN LISTS SDK_BUILD_LIST) + get_test_project_for_service(${SDK} TEST_PROJECT) + if(TEST_PROJECT) + # before we add the test, make sure all of its dependencies are present + set(ADD_TEST 1) + get_dependencies_for_test(${SDK} DEPENDENCY_LIST) + if(DEPENDENCY_LIST) + STRING(REPLACE "," ";" LIST_RESULT ${DEPENDENCY_LIST}) + foreach(DEPENDENCY IN LISTS LIST_RESULT) + list(FIND SDK_BUILD_LIST ${DEPENDENCY} DEPENDENCY_INDEX) + if(DEPENDENCY_INDEX LESS 0) + set(ADD_TEST 0) + endif() + endforeach() + endif() + + if(ADD_TEST) + add_subdirectory(${TEST_PROJECT}) + endif() + endif() + endforeach() endif() export(TARGETS ${EXPORTS} FILE aws-sdk-cpp-config.cmake) diff --git a/README.md b/README.md index 330e8e3881e..1ac41be405e 100644 --- a/README.md +++ b/README.md @@ -53,6 +53,18 @@ cmake -G "Visual Studio 12 Win64" msbuild INSTALL.vcxproj /p:Configuration=Release ``` +####Building for Android +To build for Android, add -DTARGET_ARCH=ANDROID to your cmake command line. We've included a cmake toolchain file that should cover what's needed, assuming you have the appropriate environment variables (ANDROID_NDK) set. + +#####Android on Windows +Building for Android on Windows requires some additional setup. In particular, you will need to run cmake from a Visual Studio developer command prompt (2013 or higher). Additionally, you will need 'git' and 'patch' in your path. If you have git installed on a Windows system, then patch is likely found in a sibling directory (.../Git/usr/bin/). Once you've verified these requirements, your cmake command line will change slightly to use nmake: + +cmake -G "NMake Makefiles" -DTARGET_ARCH=ANDROID .. + +Nmake builds targets in a serial fashion. To make things quicker, we recommend installing JOM as an alternative to nmake and then changing the cmake invocation to: + +cmake -G "NMake Makefiles JOM" -DTARGET_ARCH=ANDROID .. + ####CMake Variables #####BUILD_ONLY diff --git a/android-build/build_and_test_android.py b/android-build/build_and_test_android.py index a55ed5a78e4..3d3831957e7 100644 --- a/android-build/build_and_test_android.py +++ b/android-build/build_and_test_android.py @@ -50,8 +50,8 @@ def ParseArguments(): argMap[ "useExistingEmulator" ] = args[ "emu" ] argMap[ "noBuild" ] = args[ "nobuild" ] argMap[ "noInstall" ] = args[ "noinstall" ] - argMap[ "credentialsFile" ] = args[ "credentials" ] or "android-build/credentials" - argMap[ "buildType" ] = args[ "build" ] or "Debug" + argMap[ "credentialsFile" ] = args[ "credentials" ] or "~/.aws/credentials" + argMap[ "buildType" ] = args[ "build" ] or "Release" argMap[ "runTest" ] = args[ "runtest" ] argMap[ "so" ] = args[ "so" ] @@ -117,7 +117,7 @@ def IsValidAVD(avd, abi, avdABIs): def GetTestList(buildSharedObjects): if buildSharedObjects: - return [ 'core', 's3', 'dynamodb', 'cloudfront', 'cognitoidentity', 'identity', 'lambda', 'logging', 'redshifts', 'sqs', 'transfer' ] + return [ 'core', 's3', 'dynamodb', 'cloudfront', 'cognitoidentity', 'identity', 'lambda', 'logging', 'redshift', 'sqs', 'transfer' ] else: return [ 'unified' ] @@ -161,7 +161,7 @@ def SetupJniDirectory(abi, clean): shutil.rmtree(path) if os.path.exists( path ) == False: - os.mkdir( path ) + os.makedirs( path ) return path @@ -172,11 +172,6 @@ def CopyNativeLibraries(buildSharedObjects, jniDir, buildDir, abi): shutil.copy(os.path.join(platformLibDir, "liblog.so"), jniDir) - shutil.copy(os.path.join(buildDir, "ZLIB-prefix", "src", "ZLIB-build", "libz.so"), jniDir) - shutil.copy(os.path.join(buildDir, "OPENSSL-prefix", "src", "OPENSSL-build", "crypto", "libcrypto.so"), jniDir) - shutil.copy(os.path.join(buildDir, "OPENSSL-prefix", "src", "OPENSSL-build", "ssl", "libssl.so"), jniDir) - shutil.copy(os.path.join(buildDir, "CURL-prefix", "src", "CURL-build", "lib", "libcurl.so"), jniDir) - stdLibDir = os.path.join(os.environ['ANDROID_NDK'], "sources", "cxx-stl", "gnu-libstdc++", "4.9", "libs", abi) shutil.copy(os.path.join(stdLibDir, "libgnustl_shared.so"), jniDir) @@ -205,32 +200,34 @@ def BuildNative(abi, clean, buildDir, jniDir, installDir, buildType, buildShared for externalProjectDir in [ "openssl", "zlib", "curl" ]: RemoveTree(externalProjectDir) - os.mkdir( jniDir ) - os.mkdir( buildDir ) + os.makedirs( jniDir ) + os.makedirs( buildDir ) os.chdir( buildDir ) - if buildSharedObjects: - link_type_line = "-DSTATIC_LINKING=0" - stl_line = "-DANDROID_STL=gnustl_shared" + if not buildSharedObjects: + link_type_line = "-DBUILD_SHARED_LIBS=OFF" + crt_line = "-DFORCE_SHARED_CRT=OFF" else: - link_type_line = "-DSTATIC_LINKING=1" - stl_line = "-DANDROID_STL=gnustl_static" - + link_type_line = "-DBUILD_SHARED_LIBS=ON" + crt_line = "-DFORCE_SHARED_CRT=ON" + subprocess.check_call( [ "cmake", link_type_line, + crt_line, "-DCUSTOM_MEMORY_MANAGEMENT=1", - stl_line, - "-DANDROID_STL_FORCE_FEATURES=OFF", "-DTARGET_ARCH=ANDROID", "-DANDROID_ABI=" + abi, - "-DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9", "-DCMAKE_BUILD_TYPE=" + buildType, '-DTEST_CERT_PATH="/data/data/aws.coretests/certs"', + '-DBUILD_ONLY=dynamodb;sqs;s3;lambda;kinesis;cognito-identity;transfer;iam;identity-management;access-management', ".."] ) else: os.chdir( buildDir ) - subprocess.check_call( [ "make", "-j12" ] ) + if buildSharedObjects: + subprocess.check_call( [ "make", "-j12" ] ) + else: + subprocess.check_call( [ "make", "-j12", "android-unified-tests" ] ) os.chdir( ".." ) CopyNativeLibraries(buildSharedObjects, jniDir, buildDir, abi) @@ -304,7 +301,7 @@ def BuildAndInstallCertSet(pemSourceDir, buildDir): # assume that if the directory exists, then the cert set is valid and we just need to upload if not os.path.exists( certDir ): - os.mkdir( certDir ) + os.makedirs( certDir ) # extract all the certs in curl's master cacert.pem file out into individual .pem files subprocess.check_call( "cat " + pemSourceFile + " | awk '{print > \"" + certDir + "/cert\" (1+n) \".pem\"} /-----END CERTIFICATE-----/ {n++}'", shell = True ) @@ -328,6 +325,12 @@ def BuildAndInstallCertSet(pemSourceDir, buildDir): certFileName = os.path.join(rootDir, fileName) subprocess.check_call( [ "adb", "push", certFileName, "/data/data/aws.coretests/certs" ] ) +def UploadTestResources(resourcesDir): + for rootDir, dirNames, fileNames in os.walk( resourcesDir ): + for fileName in fileNames: + resourceFileName = os.path.join( rootDir, fileName ) + subprocess.check_call( [ "adb", "push", resourceFileName, os.path.join( "/data/data/aws.coretests/resources", fileName ) ] ) + def InstallTests(credentialsFile): subprocess.check_call( [ "adb", "install", "-r", "android-tests/app/build/outputs/apk/app-debug.apk" ] ) @@ -411,6 +414,9 @@ def Main(): print("Installing certs...") BuildAndInstallCertSet("android-build", buildDir) + print("Uploading test resources") + UploadTestResources("aws-cpp-sdk-lambda-integration-tests/resources") + print("Running tests...") RunTest( runTest ) diff --git a/android-build/cmakefiles/openssl-cmake/CMakeLists.txt b/android-build/cmakefiles/openssl-cmake/CMakeLists.txt index 669f60de9ac..ca63ee636f7 100644 --- a/android-build/cmakefiles/openssl-cmake/CMakeLists.txt +++ b/android-build/cmakefiles/openssl-cmake/CMakeLists.txt @@ -54,18 +54,12 @@ endif() install( FILES e_os2.h DESTINATION include/openssl ) -install( FILES tools/c_hash tools/c_info tools/c_issuer tools/c_name tools/c_rehash - FAQ LICENSE PROBLEMS README README.ASN1 README.ENGINE - DESTINATION share/openssl ) - -install( DIRECTORY doc DESTINATION ./ ) - # Generate the package target set( CPACK_GENERATOR ZIP TGZ ) set( CPACK_PACKAGE_NAME "openssl-cmake" ) set( CPACK_PACKAGE_VERSION_MAJOR 1 ) set( CPACK_PACKAGE_VERSION_MINOR 0 ) -set( CPACK_PACKAGE_VERSION_PATCH 2a ) +set( CPACK_PACKAGE_VERSION_PATCH 2g ) include( CPack ) diff --git a/android-build/cmakefiles/openssl-cmake/apps/CMakeLists.txt b/android-build/cmakefiles/openssl-cmake/apps/CMakeLists.txt index ca0a6ab1f6c..d4d79f8d074 100644 --- a/android-build/cmakefiles/openssl-cmake/apps/CMakeLists.txt +++ b/android-build/cmakefiles/openssl-cmake/apps/CMakeLists.txt @@ -41,4 +41,3 @@ target_link_libraries ( openssl z crypto ssl ) install( TARGETS openssl RUNTIME DESTINATION bin/${SDK_INSTALL_BINARY_PREFIX}/${CMAKE_BUILD_TYPE} ) -install( FILES CA.sh CA.pl tsget DESTINATION share/openssl ) diff --git a/android-build/configure_openssl_cmake.py b/android-build/configure_openssl_cmake.py index d31adf26a65..7f0b92acf37 100644 --- a/android-build/configure_openssl_cmake.py +++ b/android-build/configure_openssl_cmake.py @@ -88,7 +88,6 @@ def BuildIncludeFileList(): "../../crypto/objects/obj_mac.h", "../../crypto/objects/objects.h", "../../crypto/ocsp/ocsp.h", - "../../crypto/opensslconf.h", "../../crypto/opensslv.h", "../../crypto/ossl_typ.h", "../../crypto/pem/pem.h", @@ -128,7 +127,7 @@ def BuildIncludeFileList(): def CopyIncludeDirectory(): path = os.path.join( "openssl", "include", "openssl" ) if os.path.exists( path ) == False: - os.mkdir( path ) + os.makedirs( path ) os.chdir( path ) for includeFile in BuildIncludeFileList(): @@ -138,12 +137,14 @@ def CopyIncludeDirectory(): def Main(): + print ("Copying CMakeLists.txt files") if not CopyCMakeFiles(os.path.join("openssl")): print( "Failed to copy required CMake files" ) return 1 - if platform.system() == "Windows": # symbolic links aren't extracted properly by cmake in windows, so copy the include file set manually - CopyIncludeDirectory() + print("Making unified include directory") + # normally these would be symlinks created by configure, but since we're not running configure, copy them manually + CopyIncludeDirectory() return 0 diff --git a/android-tests/android-tests.iml b/android-tests/android-tests.iml index 1e4250d225c..0bb6048ae08 100644 --- a/android-tests/android-tests.iml +++ b/android-tests/android-tests.iml @@ -1,14 +1,13 @@ - + - + @@ -16,4 +15,5 @@ - \ No newline at end of file + + diff --git a/android-tests/app/app.iml b/android-tests/app/app.iml index 6b161570dff..e2ed5bc026e 100644 --- a/android-tests/app/app.iml +++ b/android-tests/app/app.iml @@ -1,5 +1,5 @@ - + @@ -13,11 +13,8 @@ - + @@ -84,7 +81,6 @@ - @@ -92,4 +88,5 @@ - \ No newline at end of file + + diff --git a/android-tests/app/src/main/java/aws/coretests/TestActivity.java b/android-tests/app/src/main/java/aws/coretests/TestActivity.java index a4570e5c2b9..a9ff68475ff 100644 --- a/android-tests/app/src/main/java/aws/coretests/TestActivity.java +++ b/android-tests/app/src/main/java/aws/coretests/TestActivity.java @@ -15,6 +15,7 @@ package aws.coretests; +import android.content.Context; import android.support.v7.app.ActionBarActivity; import android.os.Bundle; import android.view.Menu; @@ -129,10 +130,6 @@ protected Boolean doInBackground(String... testNames) //System.loadLibrary("c"); System.loadLibrary("gnustl_shared"); - System.loadLibrary("z"); - System.loadLibrary("crypto"); - System.loadLibrary("ssl"); - System.loadLibrary("curl"); System.loadLibrary("log"); System.loadLibrary("aws-cpp-sdk-core"); System.loadLibrary("testing-resources"); @@ -154,7 +151,7 @@ protected Boolean doInBackground(String... testNames) Log.i("AwsNativeSDK", "Starting tests"); - boolean success = runTests() == 0; + boolean success = runTests((Context)m_source) == 0; if(success) { Log.i("AwsNativeSDK", "Tests Succeeded!"); } else { @@ -171,7 +168,7 @@ protected void onPostExecute(Boolean testsSucceeded) } } - public native int runTests(); + static public native int runTests(Context context); @Override public void onDestroy() @@ -187,7 +184,7 @@ protected void onCreate(Bundle savedInstanceState) { String testName = getIntent().getStringExtra("test"); if(testName == null) { - testName = "dynamodb"; + testName = "unified"; } new TestTask(this).execute(testName); } diff --git a/android-tests/gradlew b/android-tests/gradlew old mode 100644 new mode 100755 diff --git a/android-unified-tests/CMakeLists.txt b/android-unified-tests/CMakeLists.txt index 1210b821ea9..895ac36b631 100644 --- a/android-unified-tests/CMakeLists.txt +++ b/android-unified-tests/CMakeLists.txt @@ -18,10 +18,8 @@ file(GLOB SQS_SRC "${AWS_NATIVE_SDK_ROOT}/aws-cpp-sdk-sqs-integration-tests/Queu file(GLOB S3_SRC "${AWS_NATIVE_SDK_ROOT}/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp") file(GLOB LAMBDA_SRC "${AWS_NATIVE_SDK_ROOT}/aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp") file(GLOB COGNITO_IDENTITY_IDENTITY_POOL_SRC "${AWS_NATIVE_SDK_ROOT}/aws-cpp-sdk-cognitoidentity-integration-tests/IdentityPoolOperationTest.cpp") -file(GLOB COGNITO_IDENTITY_CREDENTIALS_SRC "${AWS_NATIVE_SDK_ROOT}/aws-cpp-sdk-cognitoidentity-integration-tests/GetCredentialsTest.cpp") file(GLOB TRANSFER_RESOURCE_SRC "${AWS_NATIVE_SDK_ROOT}/aws-cpp-sdk-transfer-tests/ResourceTests.cpp") file(GLOB TRANSFER_SRC "${AWS_NATIVE_SDK_ROOT}/aws-cpp-sdk-transfer-tests/TransferTests.cpp") -file(GLOB LOGGING_SRC "${AWS_NATIVE_SDK_ROOT}/aws-cpp-sdk-logging-tests/LoggingTest.cpp") file(GLOB IDENTITY_MANAGEMENT_SRC "${AWS_NATIVE_SDK_ROOT}/aws-cpp-sdk-identity-management-tests/auth/*.cpp") file(GLOB TEST_SRC "${CMAKE_CURRENT_SOURCE_DIR}/RunTests.cpp") @@ -38,14 +36,12 @@ file(GLOB AWS_UNIFIED_INTEGRATION_TESTS_SRC ${CORE_UTILS_RATE_LIMITER_SRC} ${CORE_UTILS_XML_SRC} ${DYNAMODB_SRC} - ${SQS_SRC} +# ${SQS_SRC} # ${S3_SRC} # ${LAMBDA_SRC} # ${COGNITO_IDENTITY_IDENTITY_POOL_SRC} -# ${COGNITO_IDENTITY_CREDENTIALS_SRC} - ${TRANSFER_RESOURCE_SRC} +# ${TRANSFER_RESOURCE_SRC} # ${TRANSFER_SRC} - ${LOGGING_SRC} # ${IDENTITY_MANAGEMENT_SRC} ${TEST_SRC} ) @@ -71,7 +67,13 @@ set(AWS_UNIFIED_INTEGRATION_TEST_APPLICATION_INCLUDES ) include_directories(${AWS_UNIFIED_INTEGRATION_TEST_APPLICATION_INCLUDES}) -add_definitions(-DRESOURCES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/resources") + +if(PLATFORM_ANDROID) + add_definitions(-DRESOURCES_DIR="resources") +else() + add_definitions(-DRESOURCES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/resources") +endif() + SET(LIBTYPE SHARED) SET(SUFFIX so) @@ -79,19 +81,18 @@ SET(SUFFIX so) add_library(android-unified-tests ${LIBTYPE} ${AWS_UNIFIED_INTEGRATION_TESTS_SRC}) target_link_libraries(android-unified-tests aws-cpp-sdk-dynamodb - aws-cpp-sdk-sqs - aws-cpp-sdk-s3 - aws-cpp-sdk-lambda - aws-cpp-sdk-kinesis - aws-cpp-sdk-cognito-identity - aws-cpp-sdk-transfer - aws-cpp-sdk-logging + aws-cpp-sdk-sqs + aws-cpp-sdk-s3 + aws-cpp-sdk-lambda + aws-cpp-sdk-kinesis + aws-cpp-sdk-cognito-identity + aws-cpp-sdk-transfer aws-cpp-sdk-iam - aws-cpp-sdk-identity-management - aws-cpp-sdk-access-management - testing-resources - aws-cpp-sdk-core - ${CLIENT_LIBS} - ${PLATFORM_DEP_LIBS}) + aws-cpp-sdk-identity-management + aws-cpp-sdk-access-management + testing-resources + aws-cpp-sdk-core + ${CLIENT_LIBS} + ${PLATFORM_DEP_LIBS}) diff --git a/android-unified-tests/RunTests.cpp b/android-unified-tests/RunTests.cpp index 9488fff4753..79858976229 100644 --- a/android-unified-tests/RunTests.cpp +++ b/android-unified-tests/RunTests.cpp @@ -14,6 +14,7 @@ */ #include + #include @@ -22,9 +23,9 @@ extern "C" { #endif // __cplusplus JNIEXPORT jint JNICALL -Java_aws_coretests_TestActivity_linkTest( JNIEnv* env, jobject thisRef ) +Java_aws_coretests_TestActivity_linkTest( JNIEnv* env, jobject classRef, jobject context ) { - return Java_aws_coretests_TestActivity_runTests(env, thisRef); + return Java_aws_coretests_TestActivity_runTests(env, classRef, context); } #ifdef __cplusplus diff --git a/aws-cpp-sdk-acm/CMakeLists.txt b/aws-cpp-sdk-acm/CMakeLists.txt index ac890616462..3154d3dc39a 100644 --- a/aws-cpp-sdk-acm/CMakeLists.txt +++ b/aws-cpp-sdk-acm/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-acm) "source/model/*.cpp" ) - file(GLOB ACM_SRC + file(GLOB ACM_UNIFIED_HEADERS ${AWS_ACM_HEADERS} ${AWS_ACM_MODEL_HEADERS} + ) + + file(GLOB ACM_UNITY_SRC ${AWS_ACM_SOURCE} ${AWS_ACM_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("ACM" ACM_UNITY_SRC) + endif() + + file(GLOB ACM_SRC + ${ACM_UNIFIED_HEADERS} + ${ACM_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-acm/source/ACMErrors.cpp b/aws-cpp-sdk-acm/source/ACMErrors.cpp index fc75dc50a3e..55951eca50b 100644 --- a/aws-cpp-sdk-acm/source/ACMErrors.cpp +++ b/aws-cpp-sdk-acm/source/ACMErrors.cpp @@ -20,15 +20,6 @@ using namespace Aws::Client; using namespace Aws::ACM; using namespace Aws::Utils; -static const int INVALID_DOMAIN_VALIDATION_OPTIONS_HASH = HashingUtils::HashString("InvalidDomainValidationOptionsException"); -static const int RESOURCE_IN_USE_HASH = HashingUtils::HashString("ResourceInUseException"); -static const int INVALID_STATE_HASH = HashingUtils::HashString("InvalidStateException"); -static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); -static const int INVALID_TAG_HASH = HashingUtils::HashString("InvalidTagException"); -static const int INVALID_ARN_HASH = HashingUtils::HashString("InvalidArnException"); -static const int REQUEST_IN_PROGRESS_HASH = HashingUtils::HashString("RequestInProgressException"); -static const int TOO_MANY_TAGS_HASH = HashingUtils::HashString("TooManyTagsException"); - namespace Aws { namespace ACM @@ -36,30 +27,26 @@ namespace ACM namespace ACMErrorMapper { +static const int INVALID_STATE_HASH = HashingUtils::HashString("InvalidStateException"); +static const int RESOURCE_IN_USE_HASH = HashingUtils::HashString("ResourceInUseException"); +static const int INVALID_ARN_HASH = HashingUtils::HashString("InvalidArnException"); +static const int REQUEST_IN_PROGRESS_HASH = HashingUtils::HashString("RequestInProgressException"); +static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); +static const int INVALID_DOMAIN_VALIDATION_OPTIONS_HASH = HashingUtils::HashString("InvalidDomainValidationOptionsException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); - if (hashCode == INVALID_DOMAIN_VALIDATION_OPTIONS_HASH) + if (hashCode == INVALID_STATE_HASH) { - return AWSError(static_cast(ACMErrors::INVALID_DOMAIN_VALIDATION_OPTIONS), false); + return AWSError(static_cast(ACMErrors::INVALID_STATE), false); } else if (hashCode == RESOURCE_IN_USE_HASH) { return AWSError(static_cast(ACMErrors::RESOURCE_IN_USE), false); } - else if (hashCode == INVALID_STATE_HASH) - { - return AWSError(static_cast(ACMErrors::INVALID_STATE), false); - } - else if (hashCode == LIMIT_EXCEEDED_HASH) - { - return AWSError(static_cast(ACMErrors::LIMIT_EXCEEDED), false); - } - else if (hashCode == INVALID_TAG_HASH) - { - return AWSError(static_cast(ACMErrors::INVALID_TAG), false); - } else if (hashCode == INVALID_ARN_HASH) { return AWSError(static_cast(ACMErrors::INVALID_ARN), false); @@ -68,9 +55,13 @@ AWSError GetErrorForName(const char* errorName) { return AWSError(static_cast(ACMErrors::REQUEST_IN_PROGRESS), false); } - else if (hashCode == TOO_MANY_TAGS_HASH) + else if (hashCode == LIMIT_EXCEEDED_HASH) { - return AWSError(static_cast(ACMErrors::TOO_MANY_TAGS), false); + return AWSError(static_cast(ACMErrors::LIMIT_EXCEEDED), false); + } + else if (hashCode == INVALID_DOMAIN_VALIDATION_OPTIONS_HASH) + { + return AWSError(static_cast(ACMErrors::INVALID_DOMAIN_VALIDATION_OPTIONS), false); } return AWSError(CoreErrors::UNKNOWN, false); } diff --git a/aws-cpp-sdk-acm/source/model/CertificateDetail.cpp b/aws-cpp-sdk-acm/source/model/CertificateDetail.cpp index 5cb120f60ef..151339cfdda 100644 --- a/aws-cpp-sdk-acm/source/model/CertificateDetail.cpp +++ b/aws-cpp-sdk-acm/source/model/CertificateDetail.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ACM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ACM +{ +namespace Model +{ + CertificateDetail::CertificateDetail() : m_certificateArnHasBeenSet(false), m_domainNameHasBeenSet(false), @@ -311,4 +317,8 @@ JsonValue CertificateDetail::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ACM +} // namespace Aws diff --git a/aws-cpp-sdk-acm/source/model/CertificateStatus.cpp b/aws-cpp-sdk-acm/source/model/CertificateStatus.cpp index fe14ca26d10..5af60bfdf12 100644 --- a/aws-cpp-sdk-acm/source/model/CertificateStatus.cpp +++ b/aws-cpp-sdk-acm/source/model/CertificateStatus.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int PENDING_VALIDATION_HASH = HashingUtils::HashString("PENDING_VALIDATION"); -static const int ISSUED_HASH = HashingUtils::HashString("ISSUED"); -static const int INACTIVE_HASH = HashingUtils::HashString("INACTIVE"); -static const int EXPIRED_HASH = HashingUtils::HashString("EXPIRED"); -static const int VALIDATION_TIMED_OUT_HASH = HashingUtils::HashString("VALIDATION_TIMED_OUT"); -static const int REVOKED_HASH = HashingUtils::HashString("REVOKED"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace CertificateStatusMapper { + static const int PENDING_VALIDATION_HASH = HashingUtils::HashString("PENDING_VALIDATION"); + static const int ISSUED_HASH = HashingUtils::HashString("ISSUED"); + static const int INACTIVE_HASH = HashingUtils::HashString("INACTIVE"); + static const int EXPIRED_HASH = HashingUtils::HashString("EXPIRED"); + static const int VALIDATION_TIMED_OUT_HASH = HashingUtils::HashString("VALIDATION_TIMED_OUT"); + static const int REVOKED_HASH = HashingUtils::HashString("REVOKED"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + CertificateStatus GetCertificateStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-acm/source/model/CertificateSummary.cpp b/aws-cpp-sdk-acm/source/model/CertificateSummary.cpp index 02aac181225..03d920125bd 100644 --- a/aws-cpp-sdk-acm/source/model/CertificateSummary.cpp +++ b/aws-cpp-sdk-acm/source/model/CertificateSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ACM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ACM +{ +namespace Model +{ + CertificateSummary::CertificateSummary() : m_certificateArnHasBeenSet(false), m_domainNameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue CertificateSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ACM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-acm/source/model/DomainValidation.cpp b/aws-cpp-sdk-acm/source/model/DomainValidation.cpp index 34f032e6f83..32b9c5b47a0 100644 --- a/aws-cpp-sdk-acm/source/model/DomainValidation.cpp +++ b/aws-cpp-sdk-acm/source/model/DomainValidation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ACM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ACM +{ +namespace Model +{ + DomainValidation::DomainValidation() : m_domainNameHasBeenSet(false), m_validationEmailsHasBeenSet(false), @@ -93,4 +99,8 @@ JsonValue DomainValidation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ACM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-acm/source/model/DomainValidationOption.cpp b/aws-cpp-sdk-acm/source/model/DomainValidationOption.cpp index e2be4f4b764..f05ddc213be 100644 --- a/aws-cpp-sdk-acm/source/model/DomainValidationOption.cpp +++ b/aws-cpp-sdk-acm/source/model/DomainValidationOption.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ACM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ACM +{ +namespace Model +{ + DomainValidationOption::DomainValidationOption() : m_domainNameHasBeenSet(false), m_validationDomainHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue DomainValidationOption::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ACM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-acm/source/model/KeyAlgorithm.cpp b/aws-cpp-sdk-acm/source/model/KeyAlgorithm.cpp index eec29e09ea2..93030292094 100644 --- a/aws-cpp-sdk-acm/source/model/KeyAlgorithm.cpp +++ b/aws-cpp-sdk-acm/source/model/KeyAlgorithm.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int RSA_2048_HASH = HashingUtils::HashString("RSA_2048"); -static const int EC_prime256v1_HASH = HashingUtils::HashString("EC_prime256v1"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace KeyAlgorithmMapper { + static const int RSA_2048_HASH = HashingUtils::HashString("RSA_2048"); + static const int EC_prime256v1_HASH = HashingUtils::HashString("EC_prime256v1"); + KeyAlgorithm GetKeyAlgorithmForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-acm/source/model/RevocationReason.cpp b/aws-cpp-sdk-acm/source/model/RevocationReason.cpp index d7148e5b320..bc767c8a901 100644 --- a/aws-cpp-sdk-acm/source/model/RevocationReason.cpp +++ b/aws-cpp-sdk-acm/source/model/RevocationReason.cpp @@ -19,16 +19,6 @@ using namespace Aws::Utils; -static const int UNSPECIFIED_HASH = HashingUtils::HashString("UNSPECIFIED"); -static const int KEY_COMPROMISE_HASH = HashingUtils::HashString("KEY_COMPROMISE"); -static const int CA_COMPROMISE_HASH = HashingUtils::HashString("CA_COMPROMISE"); -static const int AFFILIATION_CHANGED_HASH = HashingUtils::HashString("AFFILIATION_CHANGED"); -static const int SUPERCEDED_HASH = HashingUtils::HashString("SUPERCEDED"); -static const int CESSATION_OF_OPERATION_HASH = HashingUtils::HashString("CESSATION_OF_OPERATION"); -static const int CERTIFICATE_HOLD_HASH = HashingUtils::HashString("CERTIFICATE_HOLD"); -static const int REMOVE_FROM_CRL_HASH = HashingUtils::HashString("REMOVE_FROM_CRL"); -static const int PRIVILEGE_WITHDRAWN_HASH = HashingUtils::HashString("PRIVILEGE_WITHDRAWN"); -static const int A_A_COMPROMISE_HASH = HashingUtils::HashString("A_A_COMPROMISE"); namespace Aws { @@ -39,6 +29,17 @@ namespace Aws namespace RevocationReasonMapper { + static const int UNSPECIFIED_HASH = HashingUtils::HashString("UNSPECIFIED"); + static const int KEY_COMPROMISE_HASH = HashingUtils::HashString("KEY_COMPROMISE"); + static const int CA_COMPROMISE_HASH = HashingUtils::HashString("CA_COMPROMISE"); + static const int AFFILIATION_CHANGED_HASH = HashingUtils::HashString("AFFILIATION_CHANGED"); + static const int SUPERCEDED_HASH = HashingUtils::HashString("SUPERCEDED"); + static const int CESSATION_OF_OPERATION_HASH = HashingUtils::HashString("CESSATION_OF_OPERATION"); + static const int CERTIFICATE_HOLD_HASH = HashingUtils::HashString("CERTIFICATE_HOLD"); + static const int REMOVE_FROM_CRL_HASH = HashingUtils::HashString("REMOVE_FROM_CRL"); + static const int PRIVILEGE_WITHDRAWN_HASH = HashingUtils::HashString("PRIVILEGE_WITHDRAWN"); + static const int A_A_COMPROMISE_HASH = HashingUtils::HashString("A_A_COMPROMISE"); + RevocationReason GetRevocationReasonForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-apigateway/CMakeLists.txt b/aws-cpp-sdk-apigateway/CMakeLists.txt index 8eb5f0d8d07..fed6c4961be 100644 --- a/aws-cpp-sdk-apigateway/CMakeLists.txt +++ b/aws-cpp-sdk-apigateway/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-apigateway) "source/model/*.cpp" ) - file(GLOB APIGATEWAY_SRC + file(GLOB APIGATEWAY_UNIFIED_HEADERS ${AWS_APIGATEWAY_HEADERS} ${AWS_APIGATEWAY_MODEL_HEADERS} + ) + + file(GLOB APIGATEWAY_UNITY_SRC ${AWS_APIGATEWAY_SOURCE} ${AWS_APIGATEWAY_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("APIGATEWAY" APIGATEWAY_UNITY_SRC) + endif() + + file(GLOB APIGATEWAY_SRC + ${APIGATEWAY_UNIFIED_HEADERS} + ${APIGATEWAY_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-apigateway/source/APIGatewayErrors.cpp b/aws-cpp-sdk-apigateway/source/APIGatewayErrors.cpp index a0961831286..008999bd247 100644 --- a/aws-cpp-sdk-apigateway/source/APIGatewayErrors.cpp +++ b/aws-cpp-sdk-apigateway/source/APIGatewayErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::APIGateway; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace APIGatewayErrorMapper +{ + static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); static const int UNAUTHORIZED_HASH = HashingUtils::HashString("UnauthorizedException"); static const int TOO_MANY_REQUESTS_HASH = HashingUtils::HashString("TooManyRequestsException"); @@ -27,12 +34,6 @@ static const int BAD_REQUEST_HASH = HashingUtils::HashString("BadRequestExceptio static const int CONFLICT_HASH = HashingUtils::HashString("ConflictException"); static const int NOT_FOUND_HASH = HashingUtils::HashString("NotFoundException"); -namespace Aws -{ -namespace APIGateway -{ -namespace APIGatewayErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-apigateway/source/model/ApiKey.cpp b/aws-cpp-sdk-apigateway/source/model/ApiKey.cpp index d8b49a3dbff..c74a3068e5c 100644 --- a/aws-cpp-sdk-apigateway/source/model/ApiKey.cpp +++ b/aws-cpp-sdk-apigateway/source/model/ApiKey.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + ApiKey::ApiKey() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -153,4 +159,8 @@ JsonValue ApiKey::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws diff --git a/aws-cpp-sdk-apigateway/source/model/Authorizer.cpp b/aws-cpp-sdk-apigateway/source/model/Authorizer.cpp index 0ad92e9e3ee..653103a373d 100644 --- a/aws-cpp-sdk-apigateway/source/model/Authorizer.cpp +++ b/aws-cpp-sdk-apigateway/source/model/Authorizer.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + Authorizer::Authorizer() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -176,4 +182,8 @@ JsonValue Authorizer::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws diff --git a/aws-cpp-sdk-apigateway/source/model/AuthorizerType.cpp b/aws-cpp-sdk-apigateway/source/model/AuthorizerType.cpp index 1a04a2afaf5..787da1a034d 100644 --- a/aws-cpp-sdk-apigateway/source/model/AuthorizerType.cpp +++ b/aws-cpp-sdk-apigateway/source/model/AuthorizerType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int TOKEN_HASH = HashingUtils::HashString("TOKEN"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace AuthorizerTypeMapper { + static const int TOKEN_HASH = HashingUtils::HashString("TOKEN"); + AuthorizerType GetAuthorizerTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-apigateway/source/model/BasePathMapping.cpp b/aws-cpp-sdk-apigateway/source/model/BasePathMapping.cpp index f22c4949a18..027e06a748e 100644 --- a/aws-cpp-sdk-apigateway/source/model/BasePathMapping.cpp +++ b/aws-cpp-sdk-apigateway/source/model/BasePathMapping.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + BasePathMapping::BasePathMapping() : m_basePathHasBeenSet(false), m_restApiIdHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue BasePathMapping::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-apigateway/source/model/CacheClusterSize.cpp b/aws-cpp-sdk-apigateway/source/model/CacheClusterSize.cpp index 39e44f6f757..6912e6679c4 100644 --- a/aws-cpp-sdk-apigateway/source/model/CacheClusterSize.cpp +++ b/aws-cpp-sdk-apigateway/source/model/CacheClusterSize.cpp @@ -19,14 +19,6 @@ using namespace Aws::Utils; -static const int _0_5_HASH = HashingUtils::HashString("0.5"); -static const int _1_6_HASH = HashingUtils::HashString("1.6"); -static const int _6_1_HASH = HashingUtils::HashString("6.1"); -static const int _13_5_HASH = HashingUtils::HashString("13.5"); -static const int _28_4_HASH = HashingUtils::HashString("28.4"); -static const int _58_2_HASH = HashingUtils::HashString("58.2"); -static const int _118_HASH = HashingUtils::HashString("118"); -static const int _237_HASH = HashingUtils::HashString("237"); namespace Aws { @@ -37,6 +29,15 @@ namespace Aws namespace CacheClusterSizeMapper { + static const int _0_5_HASH = HashingUtils::HashString("0.5"); + static const int _1_6_HASH = HashingUtils::HashString("1.6"); + static const int _6_1_HASH = HashingUtils::HashString("6.1"); + static const int _13_5_HASH = HashingUtils::HashString("13.5"); + static const int _28_4_HASH = HashingUtils::HashString("28.4"); + static const int _58_2_HASH = HashingUtils::HashString("58.2"); + static const int _118_HASH = HashingUtils::HashString("118"); + static const int _237_HASH = HashingUtils::HashString("237"); + CacheClusterSize GetCacheClusterSizeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-apigateway/source/model/CacheClusterStatus.cpp b/aws-cpp-sdk-apigateway/source/model/CacheClusterStatus.cpp index e5760dd5708..fb4b4312c2a 100644 --- a/aws-cpp-sdk-apigateway/source/model/CacheClusterStatus.cpp +++ b/aws-cpp-sdk-apigateway/source/model/CacheClusterStatus.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int CREATE_IN_PROGRESS_HASH = HashingUtils::HashString("CREATE_IN_PROGRESS"); -static const int AVAILABLE_HASH = HashingUtils::HashString("AVAILABLE"); -static const int DELETE_IN_PROGRESS_HASH = HashingUtils::HashString("DELETE_IN_PROGRESS"); -static const int NOT_AVAILABLE_HASH = HashingUtils::HashString("NOT_AVAILABLE"); -static const int FLUSH_IN_PROGRESS_HASH = HashingUtils::HashString("FLUSH_IN_PROGRESS"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace CacheClusterStatusMapper { + static const int CREATE_IN_PROGRESS_HASH = HashingUtils::HashString("CREATE_IN_PROGRESS"); + static const int AVAILABLE_HASH = HashingUtils::HashString("AVAILABLE"); + static const int DELETE_IN_PROGRESS_HASH = HashingUtils::HashString("DELETE_IN_PROGRESS"); + static const int NOT_AVAILABLE_HASH = HashingUtils::HashString("NOT_AVAILABLE"); + static const int FLUSH_IN_PROGRESS_HASH = HashingUtils::HashString("FLUSH_IN_PROGRESS"); + CacheClusterStatus GetCacheClusterStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-apigateway/source/model/ClientCertificate.cpp b/aws-cpp-sdk-apigateway/source/model/ClientCertificate.cpp index d39be0a4a62..39ebab9e36e 100644 --- a/aws-cpp-sdk-apigateway/source/model/ClientCertificate.cpp +++ b/aws-cpp-sdk-apigateway/source/model/ClientCertificate.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + ClientCertificate::ClientCertificate() : m_clientCertificateIdHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -113,4 +119,8 @@ JsonValue ClientCertificate::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws diff --git a/aws-cpp-sdk-apigateway/source/model/Deployment.cpp b/aws-cpp-sdk-apigateway/source/model/Deployment.cpp index b5360690672..426722e817b 100644 --- a/aws-cpp-sdk-apigateway/source/model/Deployment.cpp +++ b/aws-cpp-sdk-apigateway/source/model/Deployment.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + Deployment::Deployment() : m_idHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -118,4 +124,8 @@ JsonValue Deployment::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws diff --git a/aws-cpp-sdk-apigateway/source/model/DomainName.cpp b/aws-cpp-sdk-apigateway/source/model/DomainName.cpp index c60dcf3c501..32d7b55af37 100644 --- a/aws-cpp-sdk-apigateway/source/model/DomainName.cpp +++ b/aws-cpp-sdk-apigateway/source/model/DomainName.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + DomainName::DomainName() : m_domainNameHasBeenSet(false), m_certificateNameHasBeenSet(false), @@ -99,4 +105,8 @@ JsonValue DomainName::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws diff --git a/aws-cpp-sdk-apigateway/source/model/Integration.cpp b/aws-cpp-sdk-apigateway/source/model/Integration.cpp index 56e8cb34af0..e3b55b16a50 100644 --- a/aws-cpp-sdk-apigateway/source/model/Integration.cpp +++ b/aws-cpp-sdk-apigateway/source/model/Integration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + Integration::Integration() : m_typeHasBeenSet(false), m_httpMethodHasBeenSet(false), @@ -221,4 +227,8 @@ JsonValue Integration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws diff --git a/aws-cpp-sdk-apigateway/source/model/IntegrationResponse.cpp b/aws-cpp-sdk-apigateway/source/model/IntegrationResponse.cpp index 15fae9cb751..891905205cc 100644 --- a/aws-cpp-sdk-apigateway/source/model/IntegrationResponse.cpp +++ b/aws-cpp-sdk-apigateway/source/model/IntegrationResponse.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + IntegrationResponse::IntegrationResponse() : m_statusCodeHasBeenSet(false), m_selectionPatternHasBeenSet(false), @@ -116,4 +122,8 @@ JsonValue IntegrationResponse::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-apigateway/source/model/IntegrationType.cpp b/aws-cpp-sdk-apigateway/source/model/IntegrationType.cpp index 6ed07a65468..690e040cac9 100644 --- a/aws-cpp-sdk-apigateway/source/model/IntegrationType.cpp +++ b/aws-cpp-sdk-apigateway/source/model/IntegrationType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int HTTP_HASH = HashingUtils::HashString("HTTP"); -static const int AWS_HASH = HashingUtils::HashString("AWS"); -static const int MOCK_HASH = HashingUtils::HashString("MOCK"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace IntegrationTypeMapper { + static const int HTTP_HASH = HashingUtils::HashString("HTTP"); + static const int AWS_HASH = HashingUtils::HashString("AWS"); + static const int MOCK_HASH = HashingUtils::HashString("MOCK"); + IntegrationType GetIntegrationTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-apigateway/source/model/Method.cpp b/aws-cpp-sdk-apigateway/source/model/Method.cpp index ea094d3f5fa..fe59e5d47bd 100644 --- a/aws-cpp-sdk-apigateway/source/model/Method.cpp +++ b/aws-cpp-sdk-apigateway/source/model/Method.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + Method::Method() : m_httpMethodHasBeenSet(false), m_authorizationTypeHasBeenSet(false), @@ -186,4 +192,8 @@ JsonValue Method::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-apigateway/source/model/MethodResponse.cpp b/aws-cpp-sdk-apigateway/source/model/MethodResponse.cpp index 6ad186da8dc..07bd96919a2 100644 --- a/aws-cpp-sdk-apigateway/source/model/MethodResponse.cpp +++ b/aws-cpp-sdk-apigateway/source/model/MethodResponse.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + MethodResponse::MethodResponse() : m_statusCodeHasBeenSet(false), m_responseParametersHasBeenSet(false), @@ -101,4 +107,8 @@ JsonValue MethodResponse::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-apigateway/source/model/MethodSetting.cpp b/aws-cpp-sdk-apigateway/source/model/MethodSetting.cpp index a17b5ef6d97..3e214f3a585 100644 --- a/aws-cpp-sdk-apigateway/source/model/MethodSetting.cpp +++ b/aws-cpp-sdk-apigateway/source/model/MethodSetting.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + MethodSetting::MethodSetting() : m_metricsEnabled(false), m_metricsEnabledHasBeenSet(false), @@ -205,4 +211,8 @@ JsonValue MethodSetting::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws diff --git a/aws-cpp-sdk-apigateway/source/model/MethodSnapshot.cpp b/aws-cpp-sdk-apigateway/source/model/MethodSnapshot.cpp index 68ea9338877..9750da04c57 100644 --- a/aws-cpp-sdk-apigateway/source/model/MethodSnapshot.cpp +++ b/aws-cpp-sdk-apigateway/source/model/MethodSnapshot.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + MethodSnapshot::MethodSnapshot() : m_authorizationTypeHasBeenSet(false), m_apiKeyRequired(false), @@ -72,4 +78,8 @@ JsonValue MethodSnapshot::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-apigateway/source/model/Model.cpp b/aws-cpp-sdk-apigateway/source/model/Model.cpp index c768b37cc26..c2de27111ae 100644 --- a/aws-cpp-sdk-apigateway/source/model/Model.cpp +++ b/aws-cpp-sdk-apigateway/source/model/Model.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + Model::Model() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -115,4 +121,8 @@ JsonValue Model::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-apigateway/source/model/Op.cpp b/aws-cpp-sdk-apigateway/source/model/Op.cpp index 70c5ee30d5c..59b69b03c73 100644 --- a/aws-cpp-sdk-apigateway/source/model/Op.cpp +++ b/aws-cpp-sdk-apigateway/source/model/Op.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int add_HASH = HashingUtils::HashString("add"); -static const int remove_HASH = HashingUtils::HashString("remove"); -static const int replace_HASH = HashingUtils::HashString("replace"); -static const int move_HASH = HashingUtils::HashString("move"); -static const int copy_HASH = HashingUtils::HashString("copy"); -static const int test_HASH = HashingUtils::HashString("test"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace OpMapper { + static const int add_HASH = HashingUtils::HashString("add"); + static const int remove_HASH = HashingUtils::HashString("remove"); + static const int replace_HASH = HashingUtils::HashString("replace"); + static const int move_HASH = HashingUtils::HashString("move"); + static const int copy_HASH = HashingUtils::HashString("copy"); + static const int test_HASH = HashingUtils::HashString("test"); + Op GetOpForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-apigateway/source/model/PatchOperation.cpp b/aws-cpp-sdk-apigateway/source/model/PatchOperation.cpp index 8bfbeb7eddf..f91f508476c 100644 --- a/aws-cpp-sdk-apigateway/source/model/PatchOperation.cpp +++ b/aws-cpp-sdk-apigateway/source/model/PatchOperation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + PatchOperation::PatchOperation() : m_opHasBeenSet(false), m_pathHasBeenSet(false), @@ -99,4 +105,8 @@ JsonValue PatchOperation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-apigateway/source/model/Resource.cpp b/aws-cpp-sdk-apigateway/source/model/Resource.cpp index 5d40f9b7468..9fd312ab009 100644 --- a/aws-cpp-sdk-apigateway/source/model/Resource.cpp +++ b/aws-cpp-sdk-apigateway/source/model/Resource.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + Resource::Resource() : m_idHasBeenSet(false), m_parentIdHasBeenSet(false), @@ -123,4 +129,8 @@ JsonValue Resource::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-apigateway/source/model/RestApi.cpp b/aws-cpp-sdk-apigateway/source/model/RestApi.cpp index c41fc50da68..4c33cb41f17 100644 --- a/aws-cpp-sdk-apigateway/source/model/RestApi.cpp +++ b/aws-cpp-sdk-apigateway/source/model/RestApi.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + RestApi::RestApi() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -122,4 +128,8 @@ JsonValue RestApi::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws diff --git a/aws-cpp-sdk-apigateway/source/model/Stage.cpp b/aws-cpp-sdk-apigateway/source/model/Stage.cpp index dcc8d8c8bda..c254bdd3f65 100644 --- a/aws-cpp-sdk-apigateway/source/model/Stage.cpp +++ b/aws-cpp-sdk-apigateway/source/model/Stage.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + Stage::Stage() : m_deploymentIdHasBeenSet(false), m_clientCertificateIdHasBeenSet(false), @@ -219,4 +225,8 @@ JsonValue Stage::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws diff --git a/aws-cpp-sdk-apigateway/source/model/StageKey.cpp b/aws-cpp-sdk-apigateway/source/model/StageKey.cpp index cdf606d03b0..b2270954ccf 100644 --- a/aws-cpp-sdk-apigateway/source/model/StageKey.cpp +++ b/aws-cpp-sdk-apigateway/source/model/StageKey.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + StageKey::StageKey() : m_restApiIdHasBeenSet(false), m_stageNameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue StageKey::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-apigateway/source/model/ThrottleSettings.cpp b/aws-cpp-sdk-apigateway/source/model/ThrottleSettings.cpp index 0c9d4280975..e6c0c2d2068 100644 --- a/aws-cpp-sdk-apigateway/source/model/ThrottleSettings.cpp +++ b/aws-cpp-sdk-apigateway/source/model/ThrottleSettings.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::APIGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace APIGateway +{ +namespace Model +{ + ThrottleSettings::ThrottleSettings() : m_burstLimit(0), m_burstLimitHasBeenSet(false), @@ -74,4 +80,8 @@ JsonValue ThrottleSettings::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace APIGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/CMakeLists.txt b/aws-cpp-sdk-autoscaling/CMakeLists.txt index d449dd0678d..f20baf55118 100644 --- a/aws-cpp-sdk-autoscaling/CMakeLists.txt +++ b/aws-cpp-sdk-autoscaling/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-autoscaling) "source/model/*.cpp" ) - file(GLOB AUTOSCALING_SRC + file(GLOB AUTOSCALING_UNIFIED_HEADERS ${AWS_AUTOSCALING_HEADERS} ${AWS_AUTOSCALING_MODEL_HEADERS} + ) + + file(GLOB AUTOSCALING_UNITY_SRC ${AWS_AUTOSCALING_SOURCE} ${AWS_AUTOSCALING_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("AUTOSCALING" AUTOSCALING_UNITY_SRC) + endif() + + file(GLOB AUTOSCALING_SRC + ${AUTOSCALING_UNIFIED_HEADERS} + ${AUTOSCALING_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-autoscaling/source/AutoScalingErrors.cpp b/aws-cpp-sdk-autoscaling/source/AutoScalingErrors.cpp index 96eb43b1422..7591a44e768 100644 --- a/aws-cpp-sdk-autoscaling/source/AutoScalingErrors.cpp +++ b/aws-cpp-sdk-autoscaling/source/AutoScalingErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::AutoScaling; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace AutoScalingErrorMapper +{ + static const int RESOURCE_IN_USE_FAULT_HASH = HashingUtils::HashString("ResourceInUse"); static const int LIMIT_EXCEEDED_FAULT_HASH = HashingUtils::HashString("LimitExceeded"); static const int ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("AlreadyExists"); @@ -27,12 +34,6 @@ static const int SCALING_ACTIVITY_IN_PROGRESS_FAULT_HASH = HashingUtils::HashStr static const int INVALID_NEXT_TOKEN_HASH = HashingUtils::HashString("InvalidNextToken"); static const int RESOURCE_CONTENTION_FAULT_HASH = HashingUtils::HashString("ResourceContention"); -namespace Aws -{ -namespace AutoScaling -{ -namespace AutoScalingErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-autoscaling/source/model/Activity.cpp b/aws-cpp-sdk-autoscaling/source/model/Activity.cpp index ceba0ba63ca..5cdf5beaa1d 100644 --- a/aws-cpp-sdk-autoscaling/source/model/Activity.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/Activity.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + Activity::Activity() : m_activityIdHasBeenSet(false), m_autoScalingGroupNameHasBeenSet(false), @@ -212,3 +218,7 @@ void Activity::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Details=" << StringUtils::URLEncode(m_details.c_str()) << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws diff --git a/aws-cpp-sdk-autoscaling/source/model/AdjustmentType.cpp b/aws-cpp-sdk-autoscaling/source/model/AdjustmentType.cpp index 70d3e43c22b..a6375516489 100644 --- a/aws-cpp-sdk-autoscaling/source/model/AdjustmentType.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/AdjustmentType.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + AdjustmentType::AdjustmentType() : m_adjustmentTypeHasBeenSet(false) { @@ -66,3 +72,7 @@ void AdjustmentType::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".AdjustmentType=" << StringUtils::URLEncode(m_adjustmentType.c_str()) << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/Alarm.cpp b/aws-cpp-sdk-autoscaling/source/model/Alarm.cpp index 18e069920e9..32320f95a97 100644 --- a/aws-cpp-sdk-autoscaling/source/model/Alarm.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/Alarm.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + Alarm::Alarm() : m_alarmNameHasBeenSet(false), m_alarmARNHasBeenSet(false) @@ -82,3 +88,7 @@ void Alarm::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".AlarmARN=" << StringUtils::URLEncode(m_alarmARN.c_str()) << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/AutoScalingGroup.cpp b/aws-cpp-sdk-autoscaling/source/model/AutoScalingGroup.cpp index 07e793e8e40..6c4461f85d6 100644 --- a/aws-cpp-sdk-autoscaling/source/model/AutoScalingGroup.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/AutoScalingGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + AutoScalingGroup::AutoScalingGroup() : m_autoScalingGroupNameHasBeenSet(false), m_autoScalingGroupARNHasBeenSet(false), @@ -512,3 +518,7 @@ void AutoScalingGroup::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".NewInstancesProtectedFromScaleIn=" << m_newInstancesProtectedFromScaleIn << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws diff --git a/aws-cpp-sdk-autoscaling/source/model/AutoScalingInstanceDetails.cpp b/aws-cpp-sdk-autoscaling/source/model/AutoScalingInstanceDetails.cpp index db6331872a3..12ebcbf03e0 100644 --- a/aws-cpp-sdk-autoscaling/source/model/AutoScalingInstanceDetails.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/AutoScalingInstanceDetails.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + AutoScalingInstanceDetails::AutoScalingInstanceDetails() : m_instanceIdHasBeenSet(false), m_autoScalingGroupNameHasBeenSet(false), @@ -164,3 +170,7 @@ void AutoScalingInstanceDetails::OutputToStream(Aws::OStream& oStream, const cha oStream << location << ".ProtectedFromScaleIn=" << m_protectedFromScaleIn << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/BlockDeviceMapping.cpp b/aws-cpp-sdk-autoscaling/source/model/BlockDeviceMapping.cpp index 4e872da3791..fa15c5ff248 100644 --- a/aws-cpp-sdk-autoscaling/source/model/BlockDeviceMapping.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/BlockDeviceMapping.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + BlockDeviceMapping::BlockDeviceMapping() : m_virtualNameHasBeenSet(false), m_deviceNameHasBeenSet(false), @@ -120,3 +126,7 @@ void BlockDeviceMapping::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".NoDevice=" << m_noDevice << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/Ebs.cpp b/aws-cpp-sdk-autoscaling/source/model/Ebs.cpp index 44750301547..d3dbc09cb3e 100644 --- a/aws-cpp-sdk-autoscaling/source/model/Ebs.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/Ebs.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + Ebs::Ebs() : m_snapshotIdHasBeenSet(false), m_volumeSize(0), @@ -154,3 +160,7 @@ void Ebs::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Encrypted=" << m_encrypted << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/EnabledMetric.cpp b/aws-cpp-sdk-autoscaling/source/model/EnabledMetric.cpp index 7a871f80f94..fb1e4a7cd7d 100644 --- a/aws-cpp-sdk-autoscaling/source/model/EnabledMetric.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/EnabledMetric.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + EnabledMetric::EnabledMetric() : m_metricHasBeenSet(false), m_granularityHasBeenSet(false) @@ -82,3 +88,7 @@ void EnabledMetric::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".Granularity=" << StringUtils::URLEncode(m_granularity.c_str()) << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/Filter.cpp b/aws-cpp-sdk-autoscaling/source/model/Filter.cpp index d3a66a50078..c34ca757c7f 100644 --- a/aws-cpp-sdk-autoscaling/source/model/Filter.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/Filter.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + Filter::Filter() : m_nameHasBeenSet(false), m_valuesHasBeenSet(false) @@ -96,3 +102,7 @@ void Filter::OutputToStream(Aws::OStream& oStream, const char* location) const } } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/Instance.cpp b/aws-cpp-sdk-autoscaling/source/model/Instance.cpp index a12815d84f6..15ae3398a33 100644 --- a/aws-cpp-sdk-autoscaling/source/model/Instance.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/Instance.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + Instance::Instance() : m_instanceIdHasBeenSet(false), m_availabilityZoneHasBeenSet(false), @@ -148,3 +154,7 @@ void Instance::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".ProtectedFromScaleIn=" << m_protectedFromScaleIn << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/InstanceMonitoring.cpp b/aws-cpp-sdk-autoscaling/source/model/InstanceMonitoring.cpp index 2929e1d705a..4e0a76ad3b8 100644 --- a/aws-cpp-sdk-autoscaling/source/model/InstanceMonitoring.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/InstanceMonitoring.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + InstanceMonitoring::InstanceMonitoring() : m_enabled(false), m_enabledHasBeenSet(false) @@ -68,3 +74,7 @@ void InstanceMonitoring::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".Enabled=" << m_enabled << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/LaunchConfiguration.cpp b/aws-cpp-sdk-autoscaling/source/model/LaunchConfiguration.cpp index 11b5a6a2191..62478b88092 100644 --- a/aws-cpp-sdk-autoscaling/source/model/LaunchConfiguration.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/LaunchConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + LaunchConfiguration::LaunchConfiguration() : m_launchConfigurationNameHasBeenSet(false), m_launchConfigurationARNHasBeenSet(false), @@ -408,3 +414,7 @@ void LaunchConfiguration::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".PlacementTenancy=" << StringUtils::URLEncode(m_placementTenancy.c_str()) << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws diff --git a/aws-cpp-sdk-autoscaling/source/model/LifecycleHook.cpp b/aws-cpp-sdk-autoscaling/source/model/LifecycleHook.cpp index 61005923c49..04774639509 100644 --- a/aws-cpp-sdk-autoscaling/source/model/LifecycleHook.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/LifecycleHook.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + LifecycleHook::LifecycleHook() : m_lifecycleHookNameHasBeenSet(false), m_autoScalingGroupNameHasBeenSet(false), @@ -198,3 +204,7 @@ void LifecycleHook::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".DefaultResult=" << StringUtils::URLEncode(m_defaultResult.c_str()) << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/LifecycleState.cpp b/aws-cpp-sdk-autoscaling/source/model/LifecycleState.cpp index c74e9d4790e..80ad4330d3d 100644 --- a/aws-cpp-sdk-autoscaling/source/model/LifecycleState.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/LifecycleState.cpp @@ -19,19 +19,6 @@ using namespace Aws::Utils; -static const int Pending_HASH = HashingUtils::HashString("Pending"); -static const int Pending_Wait_HASH = HashingUtils::HashString("Pending:Wait"); -static const int Pending_Proceed_HASH = HashingUtils::HashString("Pending:Proceed"); -static const int Quarantined_HASH = HashingUtils::HashString("Quarantined"); -static const int InService_HASH = HashingUtils::HashString("InService"); -static const int Terminating_HASH = HashingUtils::HashString("Terminating"); -static const int Terminating_Wait_HASH = HashingUtils::HashString("Terminating:Wait"); -static const int Terminating_Proceed_HASH = HashingUtils::HashString("Terminating:Proceed"); -static const int Terminated_HASH = HashingUtils::HashString("Terminated"); -static const int Detaching_HASH = HashingUtils::HashString("Detaching"); -static const int Detached_HASH = HashingUtils::HashString("Detached"); -static const int EnteringStandby_HASH = HashingUtils::HashString("EnteringStandby"); -static const int Standby_HASH = HashingUtils::HashString("Standby"); namespace Aws { @@ -42,6 +29,20 @@ namespace Aws namespace LifecycleStateMapper { + static const int Pending_HASH = HashingUtils::HashString("Pending"); + static const int Pending_Wait_HASH = HashingUtils::HashString("Pending:Wait"); + static const int Pending_Proceed_HASH = HashingUtils::HashString("Pending:Proceed"); + static const int Quarantined_HASH = HashingUtils::HashString("Quarantined"); + static const int InService_HASH = HashingUtils::HashString("InService"); + static const int Terminating_HASH = HashingUtils::HashString("Terminating"); + static const int Terminating_Wait_HASH = HashingUtils::HashString("Terminating:Wait"); + static const int Terminating_Proceed_HASH = HashingUtils::HashString("Terminating:Proceed"); + static const int Terminated_HASH = HashingUtils::HashString("Terminated"); + static const int Detaching_HASH = HashingUtils::HashString("Detaching"); + static const int Detached_HASH = HashingUtils::HashString("Detached"); + static const int EnteringStandby_HASH = HashingUtils::HashString("EnteringStandby"); + static const int Standby_HASH = HashingUtils::HashString("Standby"); + LifecycleState GetLifecycleStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-autoscaling/source/model/LoadBalancerState.cpp b/aws-cpp-sdk-autoscaling/source/model/LoadBalancerState.cpp index b3cd571be41..3e902b67719 100644 --- a/aws-cpp-sdk-autoscaling/source/model/LoadBalancerState.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/LoadBalancerState.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + LoadBalancerState::LoadBalancerState() : m_loadBalancerNameHasBeenSet(false), m_stateHasBeenSet(false) @@ -82,3 +88,7 @@ void LoadBalancerState::OutputToStream(Aws::OStream& oStream, const char* locati oStream << location << ".State=" << StringUtils::URLEncode(m_state.c_str()) << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/MetricCollectionType.cpp b/aws-cpp-sdk-autoscaling/source/model/MetricCollectionType.cpp index e67adf4de0a..8a2022df581 100644 --- a/aws-cpp-sdk-autoscaling/source/model/MetricCollectionType.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/MetricCollectionType.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + MetricCollectionType::MetricCollectionType() : m_metricHasBeenSet(false) { @@ -66,3 +72,7 @@ void MetricCollectionType::OutputToStream(Aws::OStream& oStream, const char* loc oStream << location << ".Metric=" << StringUtils::URLEncode(m_metric.c_str()) << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/MetricGranularityType.cpp b/aws-cpp-sdk-autoscaling/source/model/MetricGranularityType.cpp index 2244b4dba01..2bb94e2291c 100644 --- a/aws-cpp-sdk-autoscaling/source/model/MetricGranularityType.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/MetricGranularityType.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + MetricGranularityType::MetricGranularityType() : m_granularityHasBeenSet(false) { @@ -66,3 +72,7 @@ void MetricGranularityType::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".Granularity=" << StringUtils::URLEncode(m_granularity.c_str()) << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/NotificationConfiguration.cpp b/aws-cpp-sdk-autoscaling/source/model/NotificationConfiguration.cpp index b06cd86a7ad..b6e9d9c5c55 100644 --- a/aws-cpp-sdk-autoscaling/source/model/NotificationConfiguration.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/NotificationConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + NotificationConfiguration::NotificationConfiguration() : m_autoScalingGroupNameHasBeenSet(false), m_topicARNHasBeenSet(false), @@ -98,3 +104,7 @@ void NotificationConfiguration::OutputToStream(Aws::OStream& oStream, const char oStream << location << ".NotificationType=" << StringUtils::URLEncode(m_notificationType.c_str()) << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/ProcessType.cpp b/aws-cpp-sdk-autoscaling/source/model/ProcessType.cpp index 511a092c582..3e0a196045a 100644 --- a/aws-cpp-sdk-autoscaling/source/model/ProcessType.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/ProcessType.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + ProcessType::ProcessType() : m_processNameHasBeenSet(false) { @@ -66,3 +72,7 @@ void ProcessType::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".ProcessName=" << StringUtils::URLEncode(m_processName.c_str()) << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-autoscaling/source/model/ResponseMetadata.cpp index 8301b02cab7..09387f665e3 100644 --- a/aws-cpp-sdk-autoscaling/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/ScalingActivityStatusCode.cpp b/aws-cpp-sdk-autoscaling/source/model/ScalingActivityStatusCode.cpp index daed6d2f200..c61926fa8db 100644 --- a/aws-cpp-sdk-autoscaling/source/model/ScalingActivityStatusCode.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/ScalingActivityStatusCode.cpp @@ -19,18 +19,6 @@ using namespace Aws::Utils; -static const int PendingSpotBidPlacement_HASH = HashingUtils::HashString("PendingSpotBidPlacement"); -static const int WaitingForSpotInstanceRequestId_HASH = HashingUtils::HashString("WaitingForSpotInstanceRequestId"); -static const int WaitingForSpotInstanceId_HASH = HashingUtils::HashString("WaitingForSpotInstanceId"); -static const int WaitingForInstanceId_HASH = HashingUtils::HashString("WaitingForInstanceId"); -static const int PreInService_HASH = HashingUtils::HashString("PreInService"); -static const int InProgress_HASH = HashingUtils::HashString("InProgress"); -static const int WaitingForELBConnectionDraining_HASH = HashingUtils::HashString("WaitingForELBConnectionDraining"); -static const int MidLifecycleAction_HASH = HashingUtils::HashString("MidLifecycleAction"); -static const int WaitingForInstanceWarmup_HASH = HashingUtils::HashString("WaitingForInstanceWarmup"); -static const int Successful_HASH = HashingUtils::HashString("Successful"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); -static const int Cancelled_HASH = HashingUtils::HashString("Cancelled"); namespace Aws { @@ -41,6 +29,19 @@ namespace Aws namespace ScalingActivityStatusCodeMapper { + static const int PendingSpotBidPlacement_HASH = HashingUtils::HashString("PendingSpotBidPlacement"); + static const int WaitingForSpotInstanceRequestId_HASH = HashingUtils::HashString("WaitingForSpotInstanceRequestId"); + static const int WaitingForSpotInstanceId_HASH = HashingUtils::HashString("WaitingForSpotInstanceId"); + static const int WaitingForInstanceId_HASH = HashingUtils::HashString("WaitingForInstanceId"); + static const int PreInService_HASH = HashingUtils::HashString("PreInService"); + static const int InProgress_HASH = HashingUtils::HashString("InProgress"); + static const int WaitingForELBConnectionDraining_HASH = HashingUtils::HashString("WaitingForELBConnectionDraining"); + static const int MidLifecycleAction_HASH = HashingUtils::HashString("MidLifecycleAction"); + static const int WaitingForInstanceWarmup_HASH = HashingUtils::HashString("WaitingForInstanceWarmup"); + static const int Successful_HASH = HashingUtils::HashString("Successful"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + static const int Cancelled_HASH = HashingUtils::HashString("Cancelled"); + ScalingActivityStatusCode GetScalingActivityStatusCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-autoscaling/source/model/ScalingPolicy.cpp b/aws-cpp-sdk-autoscaling/source/model/ScalingPolicy.cpp index 90aaa0c7121..7c382471072 100644 --- a/aws-cpp-sdk-autoscaling/source/model/ScalingPolicy.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/ScalingPolicy.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + ScalingPolicy::ScalingPolicy() : m_autoScalingGroupNameHasBeenSet(false), m_policyNameHasBeenSet(false), @@ -304,3 +310,7 @@ void ScalingPolicy::OutputToStream(Aws::OStream& oStream, const char* location) } } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/ScheduledUpdateGroupAction.cpp b/aws-cpp-sdk-autoscaling/source/model/ScheduledUpdateGroupAction.cpp index 912a39eb53c..4deff2ff23f 100644 --- a/aws-cpp-sdk-autoscaling/source/model/ScheduledUpdateGroupAction.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/ScheduledUpdateGroupAction.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + ScheduledUpdateGroupAction::ScheduledUpdateGroupAction() : m_autoScalingGroupNameHasBeenSet(false), m_scheduledActionNameHasBeenSet(false), @@ -216,3 +222,7 @@ void ScheduledUpdateGroupAction::OutputToStream(Aws::OStream& oStream, const cha oStream << location << ".DesiredCapacity=" << m_desiredCapacity << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws diff --git a/aws-cpp-sdk-autoscaling/source/model/StepAdjustment.cpp b/aws-cpp-sdk-autoscaling/source/model/StepAdjustment.cpp index 3e3eb428ee3..c29c5dce2cb 100644 --- a/aws-cpp-sdk-autoscaling/source/model/StepAdjustment.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/StepAdjustment.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + StepAdjustment::StepAdjustment() : m_metricIntervalLowerBound(0.0), m_metricIntervalLowerBoundHasBeenSet(false), @@ -104,3 +110,7 @@ void StepAdjustment::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".ScalingAdjustment=" << m_scalingAdjustment << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/SuspendedProcess.cpp b/aws-cpp-sdk-autoscaling/source/model/SuspendedProcess.cpp index c26e604242e..25579122aba 100644 --- a/aws-cpp-sdk-autoscaling/source/model/SuspendedProcess.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/SuspendedProcess.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + SuspendedProcess::SuspendedProcess() : m_processNameHasBeenSet(false), m_suspensionReasonHasBeenSet(false) @@ -82,3 +88,7 @@ void SuspendedProcess::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".SuspensionReason=" << StringUtils::URLEncode(m_suspensionReason.c_str()) << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/Tag.cpp b/aws-cpp-sdk-autoscaling/source/model/Tag.cpp index 260b6edb6cf..bc29dadc574 100644 --- a/aws-cpp-sdk-autoscaling/source/model/Tag.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/Tag.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + Tag::Tag() : m_resourceIdHasBeenSet(false), m_resourceTypeHasBeenSet(false), @@ -132,3 +138,7 @@ void Tag::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".PropagateAtLaunch=" << m_propagateAtLaunch << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-autoscaling/source/model/TagDescription.cpp b/aws-cpp-sdk-autoscaling/source/model/TagDescription.cpp index 658c4fe6510..89431b9487f 100644 --- a/aws-cpp-sdk-autoscaling/source/model/TagDescription.cpp +++ b/aws-cpp-sdk-autoscaling/source/model/TagDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::AutoScaling::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace AutoScaling +{ +namespace Model +{ + TagDescription::TagDescription() : m_resourceIdHasBeenSet(false), m_resourceTypeHasBeenSet(false), @@ -132,3 +138,7 @@ void TagDescription::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".PropagateAtLaunch=" << m_propagateAtLaunch << "&"; } } + +} // namespace Model +} // namespace AutoScaling +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudformation/CMakeLists.txt b/aws-cpp-sdk-cloudformation/CMakeLists.txt index 460640b95f2..0cf259a5536 100644 --- a/aws-cpp-sdk-cloudformation/CMakeLists.txt +++ b/aws-cpp-sdk-cloudformation/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-cloudformation) "source/model/*.cpp" ) - file(GLOB CLOUDFORMATION_SRC + file(GLOB CLOUDFORMATION_UNIFIED_HEADERS ${AWS_CLOUDFORMATION_HEADERS} ${AWS_CLOUDFORMATION_MODEL_HEADERS} + ) + + file(GLOB CLOUDFORMATION_UNITY_SRC ${AWS_CLOUDFORMATION_SOURCE} ${AWS_CLOUDFORMATION_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("CLOUDFORMATION" CLOUDFORMATION_UNITY_SRC) + endif() + + file(GLOB CLOUDFORMATION_SRC + ${CLOUDFORMATION_UNIFIED_HEADERS} + ${CLOUDFORMATION_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-cloudformation/source/CloudFormationErrors.cpp b/aws-cpp-sdk-cloudformation/source/CloudFormationErrors.cpp index b6a3828ee7f..46585e5d46a 100644 --- a/aws-cpp-sdk-cloudformation/source/CloudFormationErrors.cpp +++ b/aws-cpp-sdk-cloudformation/source/CloudFormationErrors.cpp @@ -20,12 +20,6 @@ using namespace Aws::Client; using namespace Aws::CloudFormation; using namespace Aws::Utils; -static const int INVALID_CHANGE_SET_STATUS_HASH = HashingUtils::HashString("InvalidChangeSetStatus"); -static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); -static const int INSUFFICIENT_CAPABILITIES_HASH = HashingUtils::HashString("InsufficientCapabilitiesException"); -static const int CHANGE_SET_NOT_FOUND_HASH = HashingUtils::HashString("ChangeSetNotFound"); -static const int ALREADY_EXISTS_HASH = HashingUtils::HashString("AlreadyExistsException"); - namespace Aws { namespace CloudFormation @@ -33,15 +27,16 @@ namespace CloudFormation namespace CloudFormationErrorMapper { +static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); +static const int INSUFFICIENT_CAPABILITIES_HASH = HashingUtils::HashString("InsufficientCapabilitiesException"); +static const int ALREADY_EXISTS_HASH = HashingUtils::HashString("AlreadyExistsException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); - if (hashCode == INVALID_CHANGE_SET_STATUS_HASH) - { - return AWSError(static_cast(CloudFormationErrors::INVALID_CHANGE_SET_STATUS), false); - } - else if (hashCode == LIMIT_EXCEEDED_HASH) + if (hashCode == LIMIT_EXCEEDED_HASH) { return AWSError(static_cast(CloudFormationErrors::LIMIT_EXCEEDED), false); } @@ -49,10 +44,6 @@ AWSError GetErrorForName(const char* errorName) { return AWSError(static_cast(CloudFormationErrors::INSUFFICIENT_CAPABILITIES), false); } - else if (hashCode == CHANGE_SET_NOT_FOUND_HASH) - { - return AWSError(static_cast(CloudFormationErrors::CHANGE_SET_NOT_FOUND), false); - } else if (hashCode == ALREADY_EXISTS_HASH) { return AWSError(static_cast(CloudFormationErrors::ALREADY_EXISTS), false); diff --git a/aws-cpp-sdk-cloudformation/source/model/AccountLimit.cpp b/aws-cpp-sdk-cloudformation/source/model/AccountLimit.cpp index 302cdae9d98..d887f3fac85 100644 --- a/aws-cpp-sdk-cloudformation/source/model/AccountLimit.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/AccountLimit.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFormation::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFormation +{ +namespace Model +{ + AccountLimit::AccountLimit() : m_nameHasBeenSet(false), m_value(0), @@ -84,3 +90,7 @@ void AccountLimit::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".Value=" << m_value << "&"; } } + +} // namespace Model +} // namespace CloudFormation +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudformation/source/model/Capability.cpp b/aws-cpp-sdk-cloudformation/source/model/Capability.cpp index fc291e89081..c7a61372d76 100644 --- a/aws-cpp-sdk-cloudformation/source/model/Capability.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/Capability.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int CAPABILITY_IAM_HASH = HashingUtils::HashString("CAPABILITY_IAM"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace CapabilityMapper { + static const int CAPABILITY_IAM_HASH = HashingUtils::HashString("CAPABILITY_IAM"); + Capability GetCapabilityForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudformation/source/model/OnFailure.cpp b/aws-cpp-sdk-cloudformation/source/model/OnFailure.cpp index 110380cabba..4787e2e2c73 100644 --- a/aws-cpp-sdk-cloudformation/source/model/OnFailure.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/OnFailure.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int DO_NOTHING_HASH = HashingUtils::HashString("DO_NOTHING"); -static const int ROLLBACK_HASH = HashingUtils::HashString("ROLLBACK"); -static const int DELETE__HASH = HashingUtils::HashString("DELETE"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace OnFailureMapper { + static const int DO_NOTHING_HASH = HashingUtils::HashString("DO_NOTHING"); + static const int ROLLBACK_HASH = HashingUtils::HashString("ROLLBACK"); + static const int DELETE__HASH = HashingUtils::HashString("DELETE"); + OnFailure GetOnFailureForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudformation/source/model/Output.cpp b/aws-cpp-sdk-cloudformation/source/model/Output.cpp index 0a02a54e691..1f010db0467 100644 --- a/aws-cpp-sdk-cloudformation/source/model/Output.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/Output.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFormation::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFormation +{ +namespace Model +{ + Output::Output() : m_outputKeyHasBeenSet(false), m_outputValueHasBeenSet(false), @@ -98,3 +104,7 @@ void Output::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Description=" << StringUtils::URLEncode(m_description.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudFormation +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudformation/source/model/Parameter.cpp b/aws-cpp-sdk-cloudformation/source/model/Parameter.cpp index 43fea7e0591..1ae9548ae5e 100644 --- a/aws-cpp-sdk-cloudformation/source/model/Parameter.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/Parameter.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFormation::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFormation +{ +namespace Model +{ + Parameter::Parameter() : m_parameterKeyHasBeenSet(false), m_parameterValueHasBeenSet(false), @@ -100,3 +106,7 @@ void Parameter::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".UsePreviousValue=" << m_usePreviousValue << "&"; } } + +} // namespace Model +} // namespace CloudFormation +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudformation/source/model/ParameterConstraints.cpp b/aws-cpp-sdk-cloudformation/source/model/ParameterConstraints.cpp index 775dcf2fc3d..cc0696a9fd1 100644 --- a/aws-cpp-sdk-cloudformation/source/model/ParameterConstraints.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/ParameterConstraints.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFormation::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFormation +{ +namespace Model +{ + ParameterConstraints::ParameterConstraints() : m_allowedValuesHasBeenSet(false) { @@ -80,3 +86,7 @@ void ParameterConstraints::OutputToStream(Aws::OStream& oStream, const char* loc } } } + +} // namespace Model +} // namespace CloudFormation +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudformation/source/model/ParameterDeclaration.cpp b/aws-cpp-sdk-cloudformation/source/model/ParameterDeclaration.cpp index abde58d5217..0e088c89ad4 100644 --- a/aws-cpp-sdk-cloudformation/source/model/ParameterDeclaration.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/ParameterDeclaration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFormation::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFormation +{ +namespace Model +{ + ParameterDeclaration::ParameterDeclaration() : m_parameterKeyHasBeenSet(false), m_defaultValueHasBeenSet(false), @@ -152,3 +158,7 @@ void ParameterDeclaration::OutputToStream(Aws::OStream& oStream, const char* loc m_parameterConstraints.OutputToStream(oStream, parameterConstraintsLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace CloudFormation +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudformation/source/model/ResourceSignalStatus.cpp b/aws-cpp-sdk-cloudformation/source/model/ResourceSignalStatus.cpp index bfb8a79a61f..5efc676601f 100644 --- a/aws-cpp-sdk-cloudformation/source/model/ResourceSignalStatus.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/ResourceSignalStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int SUCCESS_HASH = HashingUtils::HashString("SUCCESS"); -static const int FAILURE_HASH = HashingUtils::HashString("FAILURE"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ResourceSignalStatusMapper { + static const int SUCCESS_HASH = HashingUtils::HashString("SUCCESS"); + static const int FAILURE_HASH = HashingUtils::HashString("FAILURE"); + ResourceSignalStatus GetResourceSignalStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudformation/source/model/ResourceStatus.cpp b/aws-cpp-sdk-cloudformation/source/model/ResourceStatus.cpp index c69b58ae1d3..201533b765c 100644 --- a/aws-cpp-sdk-cloudformation/source/model/ResourceStatus.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/ResourceStatus.cpp @@ -19,16 +19,6 @@ using namespace Aws::Utils; -static const int CREATE_IN_PROGRESS_HASH = HashingUtils::HashString("CREATE_IN_PROGRESS"); -static const int CREATE_FAILED_HASH = HashingUtils::HashString("CREATE_FAILED"); -static const int CREATE_COMPLETE_HASH = HashingUtils::HashString("CREATE_COMPLETE"); -static const int DELETE_IN_PROGRESS_HASH = HashingUtils::HashString("DELETE_IN_PROGRESS"); -static const int DELETE_FAILED_HASH = HashingUtils::HashString("DELETE_FAILED"); -static const int DELETE_COMPLETE_HASH = HashingUtils::HashString("DELETE_COMPLETE"); -static const int DELETE_SKIPPED_HASH = HashingUtils::HashString("DELETE_SKIPPED"); -static const int UPDATE_IN_PROGRESS_HASH = HashingUtils::HashString("UPDATE_IN_PROGRESS"); -static const int UPDATE_FAILED_HASH = HashingUtils::HashString("UPDATE_FAILED"); -static const int UPDATE_COMPLETE_HASH = HashingUtils::HashString("UPDATE_COMPLETE"); namespace Aws { @@ -39,6 +29,17 @@ namespace Aws namespace ResourceStatusMapper { + static const int CREATE_IN_PROGRESS_HASH = HashingUtils::HashString("CREATE_IN_PROGRESS"); + static const int CREATE_FAILED_HASH = HashingUtils::HashString("CREATE_FAILED"); + static const int CREATE_COMPLETE_HASH = HashingUtils::HashString("CREATE_COMPLETE"); + static const int DELETE_IN_PROGRESS_HASH = HashingUtils::HashString("DELETE_IN_PROGRESS"); + static const int DELETE_FAILED_HASH = HashingUtils::HashString("DELETE_FAILED"); + static const int DELETE_COMPLETE_HASH = HashingUtils::HashString("DELETE_COMPLETE"); + static const int DELETE_SKIPPED_HASH = HashingUtils::HashString("DELETE_SKIPPED"); + static const int UPDATE_IN_PROGRESS_HASH = HashingUtils::HashString("UPDATE_IN_PROGRESS"); + static const int UPDATE_FAILED_HASH = HashingUtils::HashString("UPDATE_FAILED"); + static const int UPDATE_COMPLETE_HASH = HashingUtils::HashString("UPDATE_COMPLETE"); + ResourceStatus GetResourceStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudformation/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-cloudformation/source/model/ResponseMetadata.cpp index 35cceb62e3f..51ce01d05ec 100644 --- a/aws-cpp-sdk-cloudformation/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFormation::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFormation +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudFormation +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudformation/source/model/Stack.cpp b/aws-cpp-sdk-cloudformation/source/model/Stack.cpp index 767cb607ee6..4dfb74efa83 100644 --- a/aws-cpp-sdk-cloudformation/source/model/Stack.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/Stack.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFormation::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFormation +{ +namespace Model +{ + Stack::Stack() : m_stackIdHasBeenSet(false), m_stackNameHasBeenSet(false), @@ -360,3 +366,7 @@ void Stack::OutputToStream(Aws::OStream& oStream, const char* location) const } } } + +} // namespace Model +} // namespace CloudFormation +} // namespace Aws diff --git a/aws-cpp-sdk-cloudformation/source/model/StackEvent.cpp b/aws-cpp-sdk-cloudformation/source/model/StackEvent.cpp index e75930f9d3a..c7c9b2a93a9 100644 --- a/aws-cpp-sdk-cloudformation/source/model/StackEvent.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/StackEvent.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFormation::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFormation +{ +namespace Model +{ + StackEvent::StackEvent() : m_stackIdHasBeenSet(false), m_eventIdHasBeenSet(false), @@ -210,3 +216,7 @@ void StackEvent::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".ResourceProperties=" << StringUtils::URLEncode(m_resourceProperties.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudFormation +} // namespace Aws diff --git a/aws-cpp-sdk-cloudformation/source/model/StackResource.cpp b/aws-cpp-sdk-cloudformation/source/model/StackResource.cpp index 94f14c38a20..3e6f0bc940c 100644 --- a/aws-cpp-sdk-cloudformation/source/model/StackResource.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/StackResource.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFormation::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFormation +{ +namespace Model +{ + StackResource::StackResource() : m_stackNameHasBeenSet(false), m_stackIdHasBeenSet(false), @@ -194,3 +200,7 @@ void StackResource::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".Description=" << StringUtils::URLEncode(m_description.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudFormation +} // namespace Aws diff --git a/aws-cpp-sdk-cloudformation/source/model/StackResourceDetail.cpp b/aws-cpp-sdk-cloudformation/source/model/StackResourceDetail.cpp index 68e0e323757..60cc154e659 100644 --- a/aws-cpp-sdk-cloudformation/source/model/StackResourceDetail.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/StackResourceDetail.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFormation::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFormation +{ +namespace Model +{ + StackResourceDetail::StackResourceDetail() : m_stackNameHasBeenSet(false), m_stackIdHasBeenSet(false), @@ -210,3 +216,7 @@ void StackResourceDetail::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".Metadata=" << StringUtils::URLEncode(m_metadata.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudFormation +} // namespace Aws diff --git a/aws-cpp-sdk-cloudformation/source/model/StackResourceSummary.cpp b/aws-cpp-sdk-cloudformation/source/model/StackResourceSummary.cpp index 0c6c7fd9b8a..33897979695 100644 --- a/aws-cpp-sdk-cloudformation/source/model/StackResourceSummary.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/StackResourceSummary.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFormation::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFormation +{ +namespace Model +{ + StackResourceSummary::StackResourceSummary() : m_logicalResourceIdHasBeenSet(false), m_physicalResourceIdHasBeenSet(false), @@ -146,3 +152,7 @@ void StackResourceSummary::OutputToStream(Aws::OStream& oStream, const char* loc oStream << location << ".ResourceStatusReason=" << StringUtils::URLEncode(m_resourceStatusReason.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudFormation +} // namespace Aws diff --git a/aws-cpp-sdk-cloudformation/source/model/StackStatus.cpp b/aws-cpp-sdk-cloudformation/source/model/StackStatus.cpp index 34ef6ee8388..743f63088fa 100644 --- a/aws-cpp-sdk-cloudformation/source/model/StackStatus.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/StackStatus.cpp @@ -19,22 +19,6 @@ using namespace Aws::Utils; -static const int CREATE_IN_PROGRESS_HASH = HashingUtils::HashString("CREATE_IN_PROGRESS"); -static const int CREATE_FAILED_HASH = HashingUtils::HashString("CREATE_FAILED"); -static const int CREATE_COMPLETE_HASH = HashingUtils::HashString("CREATE_COMPLETE"); -static const int ROLLBACK_IN_PROGRESS_HASH = HashingUtils::HashString("ROLLBACK_IN_PROGRESS"); -static const int ROLLBACK_FAILED_HASH = HashingUtils::HashString("ROLLBACK_FAILED"); -static const int ROLLBACK_COMPLETE_HASH = HashingUtils::HashString("ROLLBACK_COMPLETE"); -static const int DELETE_IN_PROGRESS_HASH = HashingUtils::HashString("DELETE_IN_PROGRESS"); -static const int DELETE_FAILED_HASH = HashingUtils::HashString("DELETE_FAILED"); -static const int DELETE_COMPLETE_HASH = HashingUtils::HashString("DELETE_COMPLETE"); -static const int UPDATE_IN_PROGRESS_HASH = HashingUtils::HashString("UPDATE_IN_PROGRESS"); -static const int UPDATE_COMPLETE_CLEANUP_IN_PROGRESS_HASH = HashingUtils::HashString("UPDATE_COMPLETE_CLEANUP_IN_PROGRESS"); -static const int UPDATE_COMPLETE_HASH = HashingUtils::HashString("UPDATE_COMPLETE"); -static const int UPDATE_ROLLBACK_IN_PROGRESS_HASH = HashingUtils::HashString("UPDATE_ROLLBACK_IN_PROGRESS"); -static const int UPDATE_ROLLBACK_FAILED_HASH = HashingUtils::HashString("UPDATE_ROLLBACK_FAILED"); -static const int UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS_HASH = HashingUtils::HashString("UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS"); -static const int UPDATE_ROLLBACK_COMPLETE_HASH = HashingUtils::HashString("UPDATE_ROLLBACK_COMPLETE"); namespace Aws { @@ -45,6 +29,23 @@ namespace Aws namespace StackStatusMapper { + static const int CREATE_IN_PROGRESS_HASH = HashingUtils::HashString("CREATE_IN_PROGRESS"); + static const int CREATE_FAILED_HASH = HashingUtils::HashString("CREATE_FAILED"); + static const int CREATE_COMPLETE_HASH = HashingUtils::HashString("CREATE_COMPLETE"); + static const int ROLLBACK_IN_PROGRESS_HASH = HashingUtils::HashString("ROLLBACK_IN_PROGRESS"); + static const int ROLLBACK_FAILED_HASH = HashingUtils::HashString("ROLLBACK_FAILED"); + static const int ROLLBACK_COMPLETE_HASH = HashingUtils::HashString("ROLLBACK_COMPLETE"); + static const int DELETE_IN_PROGRESS_HASH = HashingUtils::HashString("DELETE_IN_PROGRESS"); + static const int DELETE_FAILED_HASH = HashingUtils::HashString("DELETE_FAILED"); + static const int DELETE_COMPLETE_HASH = HashingUtils::HashString("DELETE_COMPLETE"); + static const int UPDATE_IN_PROGRESS_HASH = HashingUtils::HashString("UPDATE_IN_PROGRESS"); + static const int UPDATE_COMPLETE_CLEANUP_IN_PROGRESS_HASH = HashingUtils::HashString("UPDATE_COMPLETE_CLEANUP_IN_PROGRESS"); + static const int UPDATE_COMPLETE_HASH = HashingUtils::HashString("UPDATE_COMPLETE"); + static const int UPDATE_ROLLBACK_IN_PROGRESS_HASH = HashingUtils::HashString("UPDATE_ROLLBACK_IN_PROGRESS"); + static const int UPDATE_ROLLBACK_FAILED_HASH = HashingUtils::HashString("UPDATE_ROLLBACK_FAILED"); + static const int UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS_HASH = HashingUtils::HashString("UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS"); + static const int UPDATE_ROLLBACK_COMPLETE_HASH = HashingUtils::HashString("UPDATE_ROLLBACK_COMPLETE"); + StackStatus GetStackStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudformation/source/model/StackSummary.cpp b/aws-cpp-sdk-cloudformation/source/model/StackSummary.cpp index fc3c6f8ba3e..ed5a84348b7 100644 --- a/aws-cpp-sdk-cloudformation/source/model/StackSummary.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/StackSummary.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFormation::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFormation +{ +namespace Model +{ + StackSummary::StackSummary() : m_stackIdHasBeenSet(false), m_stackNameHasBeenSet(false), @@ -178,3 +184,7 @@ void StackSummary::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".StackStatusReason=" << StringUtils::URLEncode(m_stackStatusReason.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudFormation +} // namespace Aws diff --git a/aws-cpp-sdk-cloudformation/source/model/Tag.cpp b/aws-cpp-sdk-cloudformation/source/model/Tag.cpp index 38aa7bf3ba1..30ca3818a33 100644 --- a/aws-cpp-sdk-cloudformation/source/model/Tag.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/Tag.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFormation::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFormation +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -82,3 +88,7 @@ void Tag::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudFormation +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudformation/source/model/TemplateParameter.cpp b/aws-cpp-sdk-cloudformation/source/model/TemplateParameter.cpp index ccd2e8524cb..b8551dfd825 100644 --- a/aws-cpp-sdk-cloudformation/source/model/TemplateParameter.cpp +++ b/aws-cpp-sdk-cloudformation/source/model/TemplateParameter.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFormation::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFormation +{ +namespace Model +{ + TemplateParameter::TemplateParameter() : m_parameterKeyHasBeenSet(false), m_defaultValueHasBeenSet(false), @@ -116,3 +122,7 @@ void TemplateParameter::OutputToStream(Aws::OStream& oStream, const char* locati oStream << location << ".Description=" << StringUtils::URLEncode(m_description.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudFormation +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudfront/CMakeLists.txt b/aws-cpp-sdk-cloudfront/CMakeLists.txt index f89ad953825..6d8361ff555 100644 --- a/aws-cpp-sdk-cloudfront/CMakeLists.txt +++ b/aws-cpp-sdk-cloudfront/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-cloudfront) "source/model/*.cpp" ) - file(GLOB CLOUDFRONT_SRC + file(GLOB CLOUDFRONT_UNIFIED_HEADERS ${AWS_CLOUDFRONT_HEADERS} ${AWS_CLOUDFRONT_MODEL_HEADERS} + ) + + file(GLOB CLOUDFRONT_UNITY_SRC ${AWS_CLOUDFRONT_SOURCE} ${AWS_CLOUDFRONT_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("CLOUDFRONT" CLOUDFRONT_UNITY_SRC) + endif() + + file(GLOB CLOUDFRONT_SRC + ${CLOUDFRONT_UNIFIED_HEADERS} + ${CLOUDFRONT_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-cloudfront/source/CloudFrontErrors.cpp b/aws-cpp-sdk-cloudfront/source/CloudFrontErrors.cpp index c91a063db07..a5d05d927a9 100644 --- a/aws-cpp-sdk-cloudfront/source/CloudFrontErrors.cpp +++ b/aws-cpp-sdk-cloudfront/source/CloudFrontErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::CloudFront; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace CloudFrontErrorMapper +{ + static const int INVALID_WEB_A_C_L_ID_HASH = HashingUtils::HashString("InvalidWebACLId"); static const int CLOUD_FRONT_ORIGIN_ACCESS_IDENTITY_ALREADY_EXISTS_HASH = HashingUtils::HashString("CloudFrontOriginAccessIdentityAlreadyExists"); static const int NO_SUCH_ORIGIN_HASH = HashingUtils::HashString("NoSuchOrigin"); @@ -70,12 +77,6 @@ static const int TOO_MANY_HEADERS_IN_FORWARDED_VALUES_HASH = HashingUtils::HashS static const int BATCH_TOO_LARGE_HASH = HashingUtils::HashString("BatchTooLarge"); static const int TOO_MANY_DISTRIBUTION_C_N_A_M_ES_HASH = HashingUtils::HashString("TooManyDistributionCNAMEs"); -namespace Aws -{ -namespace CloudFront -{ -namespace CloudFrontErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-cloudfront/source/model/ActiveTrustedSigners.cpp b/aws-cpp-sdk-cloudfront/source/model/ActiveTrustedSigners.cpp index 6d017780155..01f1c4dd40e 100644 --- a/aws-cpp-sdk-cloudfront/source/model/ActiveTrustedSigners.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/ActiveTrustedSigners.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + ActiveTrustedSigners::ActiveTrustedSigners() : m_enabled(false), m_enabledHasBeenSet(false), @@ -107,3 +113,7 @@ void ActiveTrustedSigners::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/Aliases.cpp b/aws-cpp-sdk-cloudfront/source/model/Aliases.cpp index 3d2d5a6848f..7f4ef5ff00a 100644 --- a/aws-cpp-sdk-cloudfront/source/model/Aliases.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/Aliases.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + Aliases::Aliases() : m_quantity(0), m_quantityHasBeenSet(false), @@ -89,3 +95,7 @@ void Aliases::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/AllowedMethods.cpp b/aws-cpp-sdk-cloudfront/source/model/AllowedMethods.cpp index 94cb7da6604..166727924c6 100644 --- a/aws-cpp-sdk-cloudfront/source/model/AllowedMethods.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/AllowedMethods.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + AllowedMethods::AllowedMethods() : m_quantity(0), m_quantityHasBeenSet(false), @@ -103,3 +109,7 @@ void AllowedMethods::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/CacheBehavior.cpp b/aws-cpp-sdk-cloudfront/source/model/CacheBehavior.cpp index 131dd30cb5a..4289be8433e 100644 --- a/aws-cpp-sdk-cloudfront/source/model/CacheBehavior.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/CacheBehavior.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + CacheBehavior::CacheBehavior() : m_pathPatternHasBeenSet(false), m_targetOriginIdHasBeenSet(false), @@ -221,3 +227,7 @@ void CacheBehavior::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/CacheBehaviors.cpp b/aws-cpp-sdk-cloudfront/source/model/CacheBehaviors.cpp index 64630389f48..18552944bdb 100644 --- a/aws-cpp-sdk-cloudfront/source/model/CacheBehaviors.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/CacheBehaviors.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + CacheBehaviors::CacheBehaviors() : m_quantity(0), m_quantityHasBeenSet(false), @@ -89,3 +95,7 @@ void CacheBehaviors::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/CachedMethods.cpp b/aws-cpp-sdk-cloudfront/source/model/CachedMethods.cpp index 75006c3568d..6de965adeb8 100644 --- a/aws-cpp-sdk-cloudfront/source/model/CachedMethods.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/CachedMethods.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + CachedMethods::CachedMethods() : m_quantity(0), m_quantityHasBeenSet(false), @@ -89,3 +95,7 @@ void CachedMethods::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentity.cpp b/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentity.cpp index 66b5d0024aa..94da12ea9aa 100644 --- a/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentity.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentity.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + CloudFrontOriginAccessIdentity::CloudFrontOriginAccessIdentity() : m_idHasBeenSet(false), m_s3CanonicalUserIdHasBeenSet(false), @@ -89,3 +95,7 @@ void CloudFrontOriginAccessIdentity::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentityConfig.cpp b/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentityConfig.cpp index cebd475132b..8465bda4789 100644 --- a/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentityConfig.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentityConfig.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + CloudFrontOriginAccessIdentityConfig::CloudFrontOriginAccessIdentityConfig() : m_callerReferenceHasBeenSet(false), m_commentHasBeenSet(false) @@ -75,3 +81,7 @@ void CloudFrontOriginAccessIdentityConfig::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentityList.cpp b/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentityList.cpp index 9f510fa662a..939904d2029 100644 --- a/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentityList.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentityList.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + CloudFrontOriginAccessIdentityList::CloudFrontOriginAccessIdentityList() : m_markerHasBeenSet(false), m_nextMarkerHasBeenSet(false), @@ -153,3 +159,7 @@ void CloudFrontOriginAccessIdentityList::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentitySummary.cpp b/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentitySummary.cpp index ebf940e85c4..a0437f59479 100644 --- a/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentitySummary.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/CloudFrontOriginAccessIdentitySummary.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + CloudFrontOriginAccessIdentitySummary::CloudFrontOriginAccessIdentitySummary() : m_idHasBeenSet(false), m_s3CanonicalUserIdHasBeenSet(false), @@ -89,3 +95,7 @@ void CloudFrontOriginAccessIdentitySummary::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/CookieNames.cpp b/aws-cpp-sdk-cloudfront/source/model/CookieNames.cpp index c1e8b3b8021..0d1288262ff 100644 --- a/aws-cpp-sdk-cloudfront/source/model/CookieNames.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/CookieNames.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + CookieNames::CookieNames() : m_quantity(0), m_quantityHasBeenSet(false), @@ -89,3 +95,7 @@ void CookieNames::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/CookiePreference.cpp b/aws-cpp-sdk-cloudfront/source/model/CookiePreference.cpp index 10fe8bbe16c..cf277a2d5b8 100644 --- a/aws-cpp-sdk-cloudfront/source/model/CookiePreference.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/CookiePreference.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + CookiePreference::CookiePreference() : m_forwardHasBeenSet(false), m_whitelistedNamesHasBeenSet(false) @@ -75,3 +81,7 @@ void CookiePreference::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/CustomErrorResponse.cpp b/aws-cpp-sdk-cloudfront/source/model/CustomErrorResponse.cpp index 85f6be293f0..6079617c09e 100644 --- a/aws-cpp-sdk-cloudfront/source/model/CustomErrorResponse.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/CustomErrorResponse.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + CustomErrorResponse::CustomErrorResponse() : m_errorCode(0), m_errorCodeHasBeenSet(false), @@ -111,3 +117,7 @@ void CustomErrorResponse::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/CustomErrorResponses.cpp b/aws-cpp-sdk-cloudfront/source/model/CustomErrorResponses.cpp index e77cd94ed45..d6bbb964390 100644 --- a/aws-cpp-sdk-cloudfront/source/model/CustomErrorResponses.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/CustomErrorResponses.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + CustomErrorResponses::CustomErrorResponses() : m_quantity(0), m_quantityHasBeenSet(false), @@ -89,3 +95,7 @@ void CustomErrorResponses::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/CustomHeaders.cpp b/aws-cpp-sdk-cloudfront/source/model/CustomHeaders.cpp index ba61a47f16e..016a24e1994 100644 --- a/aws-cpp-sdk-cloudfront/source/model/CustomHeaders.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/CustomHeaders.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + CustomHeaders::CustomHeaders() : m_quantity(0), m_quantityHasBeenSet(false), @@ -89,3 +95,7 @@ void CustomHeaders::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/CustomOriginConfig.cpp b/aws-cpp-sdk-cloudfront/source/model/CustomOriginConfig.cpp index 9d8438269e5..4fc549a4992 100644 --- a/aws-cpp-sdk-cloudfront/source/model/CustomOriginConfig.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/CustomOriginConfig.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + CustomOriginConfig::CustomOriginConfig() : m_hTTPPort(0), m_hTTPPortHasBeenSet(false), @@ -111,3 +117,7 @@ void CustomOriginConfig::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/DefaultCacheBehavior.cpp b/aws-cpp-sdk-cloudfront/source/model/DefaultCacheBehavior.cpp index 200a347d794..2a7b843d68c 100644 --- a/aws-cpp-sdk-cloudfront/source/model/DefaultCacheBehavior.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/DefaultCacheBehavior.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + DefaultCacheBehavior::DefaultCacheBehavior() : m_targetOriginIdHasBeenSet(false), m_forwardedValuesHasBeenSet(false), @@ -207,3 +213,7 @@ void DefaultCacheBehavior::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/Distribution.cpp b/aws-cpp-sdk-cloudfront/source/model/Distribution.cpp index 3011fa9d076..b63f2ab7374 100644 --- a/aws-cpp-sdk-cloudfront/source/model/Distribution.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/Distribution.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + Distribution::Distribution() : m_idHasBeenSet(false), m_statusHasBeenSet(false), @@ -149,3 +155,7 @@ void Distribution::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/DistributionConfig.cpp b/aws-cpp-sdk-cloudfront/source/model/DistributionConfig.cpp index 774b08b8f52..106914e0416 100644 --- a/aws-cpp-sdk-cloudfront/source/model/DistributionConfig.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/DistributionConfig.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + DistributionConfig::DistributionConfig() : m_callerReferenceHasBeenSet(false), m_aliasesHasBeenSet(false), @@ -247,3 +253,7 @@ void DistributionConfig::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/DistributionList.cpp b/aws-cpp-sdk-cloudfront/source/model/DistributionList.cpp index d338dcc44f8..4607577c2d5 100644 --- a/aws-cpp-sdk-cloudfront/source/model/DistributionList.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/DistributionList.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + DistributionList::DistributionList() : m_markerHasBeenSet(false), m_nextMarkerHasBeenSet(false), @@ -153,3 +159,7 @@ void DistributionList::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/DistributionSummary.cpp b/aws-cpp-sdk-cloudfront/source/model/DistributionSummary.cpp index 42e42a5d697..c22495c4147 100644 --- a/aws-cpp-sdk-cloudfront/source/model/DistributionSummary.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/DistributionSummary.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + DistributionSummary::DistributionSummary() : m_idHasBeenSet(false), m_statusHasBeenSet(false), @@ -261,3 +267,7 @@ void DistributionSummary::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/ForwardedValues.cpp b/aws-cpp-sdk-cloudfront/source/model/ForwardedValues.cpp index 77f6e650bb4..2bb6debb92d 100644 --- a/aws-cpp-sdk-cloudfront/source/model/ForwardedValues.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/ForwardedValues.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + ForwardedValues::ForwardedValues() : m_queryString(false), m_queryStringHasBeenSet(false), @@ -93,3 +99,7 @@ void ForwardedValues::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/GeoRestriction.cpp b/aws-cpp-sdk-cloudfront/source/model/GeoRestriction.cpp index 38cf820b7c0..98e17185d10 100644 --- a/aws-cpp-sdk-cloudfront/source/model/GeoRestriction.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/GeoRestriction.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + GeoRestriction::GeoRestriction() : m_restrictionTypeHasBeenSet(false), m_quantity(0), @@ -103,3 +109,7 @@ void GeoRestriction::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/GeoRestrictionType.cpp b/aws-cpp-sdk-cloudfront/source/model/GeoRestrictionType.cpp index 7b606ff5953..87bba048e2f 100644 --- a/aws-cpp-sdk-cloudfront/source/model/GeoRestrictionType.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/GeoRestrictionType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int blacklist_HASH = HashingUtils::HashString("blacklist"); -static const int whitelist_HASH = HashingUtils::HashString("whitelist"); -static const int none_HASH = HashingUtils::HashString("none"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace GeoRestrictionTypeMapper { + static const int blacklist_HASH = HashingUtils::HashString("blacklist"); + static const int whitelist_HASH = HashingUtils::HashString("whitelist"); + static const int none_HASH = HashingUtils::HashString("none"); + GeoRestrictionType GetGeoRestrictionTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudfront/source/model/Headers.cpp b/aws-cpp-sdk-cloudfront/source/model/Headers.cpp index 8ce326f3668..6357066ff04 100644 --- a/aws-cpp-sdk-cloudfront/source/model/Headers.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/Headers.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + Headers::Headers() : m_quantity(0), m_quantityHasBeenSet(false), @@ -89,3 +95,7 @@ void Headers::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/Invalidation.cpp b/aws-cpp-sdk-cloudfront/source/model/Invalidation.cpp index 15367dd1e2a..44f6573c495 100644 --- a/aws-cpp-sdk-cloudfront/source/model/Invalidation.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/Invalidation.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + Invalidation::Invalidation() : m_idHasBeenSet(false), m_statusHasBeenSet(false), @@ -103,3 +109,7 @@ void Invalidation::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/InvalidationBatch.cpp b/aws-cpp-sdk-cloudfront/source/model/InvalidationBatch.cpp index e0a75a49f95..3bf7b7f538d 100644 --- a/aws-cpp-sdk-cloudfront/source/model/InvalidationBatch.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/InvalidationBatch.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + InvalidationBatch::InvalidationBatch() : m_pathsHasBeenSet(false), m_callerReferenceHasBeenSet(false) @@ -75,3 +81,7 @@ void InvalidationBatch::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/InvalidationList.cpp b/aws-cpp-sdk-cloudfront/source/model/InvalidationList.cpp index 3c3e3660656..0818ea7bda2 100644 --- a/aws-cpp-sdk-cloudfront/source/model/InvalidationList.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/InvalidationList.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + InvalidationList::InvalidationList() : m_markerHasBeenSet(false), m_nextMarkerHasBeenSet(false), @@ -153,3 +159,7 @@ void InvalidationList::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/InvalidationSummary.cpp b/aws-cpp-sdk-cloudfront/source/model/InvalidationSummary.cpp index d061400f468..7f6e57f188b 100644 --- a/aws-cpp-sdk-cloudfront/source/model/InvalidationSummary.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/InvalidationSummary.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + InvalidationSummary::InvalidationSummary() : m_idHasBeenSet(false), m_createTimeHasBeenSet(false), @@ -89,3 +95,7 @@ void InvalidationSummary::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/ItemSelection.cpp b/aws-cpp-sdk-cloudfront/source/model/ItemSelection.cpp index 25fe404ab26..a8ad563adfc 100644 --- a/aws-cpp-sdk-cloudfront/source/model/ItemSelection.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/ItemSelection.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int none_HASH = HashingUtils::HashString("none"); -static const int whitelist_HASH = HashingUtils::HashString("whitelist"); -static const int all_HASH = HashingUtils::HashString("all"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ItemSelectionMapper { + static const int none_HASH = HashingUtils::HashString("none"); + static const int whitelist_HASH = HashingUtils::HashString("whitelist"); + static const int all_HASH = HashingUtils::HashString("all"); + ItemSelection GetItemSelectionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudfront/source/model/KeyPairIds.cpp b/aws-cpp-sdk-cloudfront/source/model/KeyPairIds.cpp index c41972fb48e..90ca181586e 100644 --- a/aws-cpp-sdk-cloudfront/source/model/KeyPairIds.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/KeyPairIds.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + KeyPairIds::KeyPairIds() : m_quantity(0), m_quantityHasBeenSet(false), @@ -89,3 +95,7 @@ void KeyPairIds::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/LoggingConfig.cpp b/aws-cpp-sdk-cloudfront/source/model/LoggingConfig.cpp index 272df1889fa..ea0d4758d8d 100644 --- a/aws-cpp-sdk-cloudfront/source/model/LoggingConfig.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/LoggingConfig.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + LoggingConfig::LoggingConfig() : m_enabled(false), m_enabledHasBeenSet(false), @@ -111,3 +117,7 @@ void LoggingConfig::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/Method.cpp b/aws-cpp-sdk-cloudfront/source/model/Method.cpp index 907404ca361..b73e7073c11 100644 --- a/aws-cpp-sdk-cloudfront/source/model/Method.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/Method.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int GET__HASH = HashingUtils::HashString("GET"); -static const int HEAD_HASH = HashingUtils::HashString("HEAD"); -static const int POST_HASH = HashingUtils::HashString("POST"); -static const int PUT_HASH = HashingUtils::HashString("PUT"); -static const int PATCH_HASH = HashingUtils::HashString("PATCH"); -static const int OPTIONS_HASH = HashingUtils::HashString("OPTIONS"); -static const int DELETE__HASH = HashingUtils::HashString("DELETE"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace MethodMapper { + static const int GET__HASH = HashingUtils::HashString("GET"); + static const int HEAD_HASH = HashingUtils::HashString("HEAD"); + static const int POST_HASH = HashingUtils::HashString("POST"); + static const int PUT_HASH = HashingUtils::HashString("PUT"); + static const int PATCH_HASH = HashingUtils::HashString("PATCH"); + static const int OPTIONS_HASH = HashingUtils::HashString("OPTIONS"); + static const int DELETE__HASH = HashingUtils::HashString("DELETE"); + Method GetMethodForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudfront/source/model/MinimumProtocolVersion.cpp b/aws-cpp-sdk-cloudfront/source/model/MinimumProtocolVersion.cpp index 2b46ffd8510..07e1ca081ba 100644 --- a/aws-cpp-sdk-cloudfront/source/model/MinimumProtocolVersion.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/MinimumProtocolVersion.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int SSLv3_HASH = HashingUtils::HashString("SSLv3"); -static const int TLSv1_HASH = HashingUtils::HashString("TLSv1"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace MinimumProtocolVersionMapper { + static const int SSLv3_HASH = HashingUtils::HashString("SSLv3"); + static const int TLSv1_HASH = HashingUtils::HashString("TLSv1"); + MinimumProtocolVersion GetMinimumProtocolVersionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudfront/source/model/Origin.cpp b/aws-cpp-sdk-cloudfront/source/model/Origin.cpp index 2ef1ba25486..c38675641da 100644 --- a/aws-cpp-sdk-cloudfront/source/model/Origin.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/Origin.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + Origin::Origin() : m_idHasBeenSet(false), m_domainNameHasBeenSet(false), @@ -131,3 +137,7 @@ void Origin::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/OriginCustomHeader.cpp b/aws-cpp-sdk-cloudfront/source/model/OriginCustomHeader.cpp index 8dd9292650e..b4eb3e937c0 100644 --- a/aws-cpp-sdk-cloudfront/source/model/OriginCustomHeader.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/OriginCustomHeader.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + OriginCustomHeader::OriginCustomHeader() : m_headerNameHasBeenSet(false), m_headerValueHasBeenSet(false) @@ -75,3 +81,7 @@ void OriginCustomHeader::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/OriginProtocolPolicy.cpp b/aws-cpp-sdk-cloudfront/source/model/OriginProtocolPolicy.cpp index 0030c105150..460b49e188d 100644 --- a/aws-cpp-sdk-cloudfront/source/model/OriginProtocolPolicy.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/OriginProtocolPolicy.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int http_only_HASH = HashingUtils::HashString("http-only"); -static const int match_viewer_HASH = HashingUtils::HashString("match-viewer"); -static const int https_only_HASH = HashingUtils::HashString("https-only"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace OriginProtocolPolicyMapper { + static const int http_only_HASH = HashingUtils::HashString("http-only"); + static const int match_viewer_HASH = HashingUtils::HashString("match-viewer"); + static const int https_only_HASH = HashingUtils::HashString("https-only"); + OriginProtocolPolicy GetOriginProtocolPolicyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudfront/source/model/OriginSslProtocols.cpp b/aws-cpp-sdk-cloudfront/source/model/OriginSslProtocols.cpp index aefd1a25aab..9b376a14d57 100644 --- a/aws-cpp-sdk-cloudfront/source/model/OriginSslProtocols.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/OriginSslProtocols.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + OriginSslProtocols::OriginSslProtocols() : m_quantity(0), m_quantityHasBeenSet(false), @@ -89,3 +95,7 @@ void OriginSslProtocols::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/Origins.cpp b/aws-cpp-sdk-cloudfront/source/model/Origins.cpp index f28a41ab7bd..1abaf055c03 100644 --- a/aws-cpp-sdk-cloudfront/source/model/Origins.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/Origins.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + Origins::Origins() : m_quantity(0), m_quantityHasBeenSet(false), @@ -89,3 +95,7 @@ void Origins::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/Paths.cpp b/aws-cpp-sdk-cloudfront/source/model/Paths.cpp index 0d9cba03d67..3ef590905aa 100644 --- a/aws-cpp-sdk-cloudfront/source/model/Paths.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/Paths.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + Paths::Paths() : m_quantity(0), m_quantityHasBeenSet(false), @@ -89,3 +95,7 @@ void Paths::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/PriceClass.cpp b/aws-cpp-sdk-cloudfront/source/model/PriceClass.cpp index 925fbbf2ee4..4e0abf0e1a5 100644 --- a/aws-cpp-sdk-cloudfront/source/model/PriceClass.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/PriceClass.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int PriceClass_100_HASH = HashingUtils::HashString("PriceClass_100"); -static const int PriceClass_200_HASH = HashingUtils::HashString("PriceClass_200"); -static const int PriceClass_All_HASH = HashingUtils::HashString("PriceClass_All"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace PriceClassMapper { + static const int PriceClass_100_HASH = HashingUtils::HashString("PriceClass_100"); + static const int PriceClass_200_HASH = HashingUtils::HashString("PriceClass_200"); + static const int PriceClass_All_HASH = HashingUtils::HashString("PriceClass_All"); + PriceClass GetPriceClassForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudfront/source/model/Restrictions.cpp b/aws-cpp-sdk-cloudfront/source/model/Restrictions.cpp index 31387a3c2cd..89ae239206b 100644 --- a/aws-cpp-sdk-cloudfront/source/model/Restrictions.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/Restrictions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + Restrictions::Restrictions() : m_geoRestrictionHasBeenSet(false) { @@ -61,3 +67,7 @@ void Restrictions::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/S3Origin.cpp b/aws-cpp-sdk-cloudfront/source/model/S3Origin.cpp index 41a76bb0a47..44fc3c57307 100644 --- a/aws-cpp-sdk-cloudfront/source/model/S3Origin.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/S3Origin.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + S3Origin::S3Origin() : m_domainNameHasBeenSet(false), m_originAccessIdentityHasBeenSet(false) @@ -75,3 +81,7 @@ void S3Origin::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/S3OriginConfig.cpp b/aws-cpp-sdk-cloudfront/source/model/S3OriginConfig.cpp index e4585f10a64..97e88b93b14 100644 --- a/aws-cpp-sdk-cloudfront/source/model/S3OriginConfig.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/S3OriginConfig.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + S3OriginConfig::S3OriginConfig() : m_originAccessIdentityHasBeenSet(false) { @@ -61,3 +67,7 @@ void S3OriginConfig::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/SSLSupportMethod.cpp b/aws-cpp-sdk-cloudfront/source/model/SSLSupportMethod.cpp index 3f2c098fa05..a016c1e68a1 100644 --- a/aws-cpp-sdk-cloudfront/source/model/SSLSupportMethod.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/SSLSupportMethod.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int sni_only_HASH = HashingUtils::HashString("sni-only"); -static const int vip_HASH = HashingUtils::HashString("vip"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace SSLSupportMethodMapper { + static const int sni_only_HASH = HashingUtils::HashString("sni-only"); + static const int vip_HASH = HashingUtils::HashString("vip"); + SSLSupportMethod GetSSLSupportMethodForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudfront/source/model/Signer.cpp b/aws-cpp-sdk-cloudfront/source/model/Signer.cpp index 1e36b07f15a..e46d6f82c2f 100644 --- a/aws-cpp-sdk-cloudfront/source/model/Signer.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/Signer.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + Signer::Signer() : m_awsAccountNumberHasBeenSet(false), m_keyPairIdsHasBeenSet(false) @@ -75,3 +81,7 @@ void Signer::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/SslProtocol.cpp b/aws-cpp-sdk-cloudfront/source/model/SslProtocol.cpp index efa78fb67f2..c138e5777fe 100644 --- a/aws-cpp-sdk-cloudfront/source/model/SslProtocol.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/SslProtocol.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int SSLv3_HASH = HashingUtils::HashString("SSLv3"); -static const int TLSv1_HASH = HashingUtils::HashString("TLSv1"); -static const int TLSv1_1_HASH = HashingUtils::HashString("TLSv1.1"); -static const int TLSv1_2_HASH = HashingUtils::HashString("TLSv1.2"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace SslProtocolMapper { + static const int SSLv3_HASH = HashingUtils::HashString("SSLv3"); + static const int TLSv1_HASH = HashingUtils::HashString("TLSv1"); + static const int TLSv1_1_HASH = HashingUtils::HashString("TLSv1.1"); + static const int TLSv1_2_HASH = HashingUtils::HashString("TLSv1.2"); + SslProtocol GetSslProtocolForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudfront/source/model/StreamingDistribution.cpp b/aws-cpp-sdk-cloudfront/source/model/StreamingDistribution.cpp index 02d830db3f2..7bf2d823f6e 100644 --- a/aws-cpp-sdk-cloudfront/source/model/StreamingDistribution.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/StreamingDistribution.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + StreamingDistribution::StreamingDistribution() : m_idHasBeenSet(false), m_statusHasBeenSet(false), @@ -131,3 +137,7 @@ void StreamingDistribution::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/StreamingDistributionConfig.cpp b/aws-cpp-sdk-cloudfront/source/model/StreamingDistributionConfig.cpp index 81f8b0537ec..70bb2ff354b 100644 --- a/aws-cpp-sdk-cloudfront/source/model/StreamingDistributionConfig.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/StreamingDistributionConfig.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + StreamingDistributionConfig::StreamingDistributionConfig() : m_callerReferenceHasBeenSet(false), m_s3OriginHasBeenSet(false), @@ -163,3 +169,7 @@ void StreamingDistributionConfig::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/StreamingDistributionList.cpp b/aws-cpp-sdk-cloudfront/source/model/StreamingDistributionList.cpp index afed234d76c..a14a28ca066 100644 --- a/aws-cpp-sdk-cloudfront/source/model/StreamingDistributionList.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/StreamingDistributionList.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + StreamingDistributionList::StreamingDistributionList() : m_markerHasBeenSet(false), m_nextMarkerHasBeenSet(false), @@ -153,3 +159,7 @@ void StreamingDistributionList::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/StreamingDistributionSummary.cpp b/aws-cpp-sdk-cloudfront/source/model/StreamingDistributionSummary.cpp index 0e49fb93e9b..f22f82dc214 100644 --- a/aws-cpp-sdk-cloudfront/source/model/StreamingDistributionSummary.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/StreamingDistributionSummary.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + StreamingDistributionSummary::StreamingDistributionSummary() : m_idHasBeenSet(false), m_statusHasBeenSet(false), @@ -191,3 +197,7 @@ void StreamingDistributionSummary::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/StreamingLoggingConfig.cpp b/aws-cpp-sdk-cloudfront/source/model/StreamingLoggingConfig.cpp index 4e4f3339f4b..19c0ebf9599 100644 --- a/aws-cpp-sdk-cloudfront/source/model/StreamingLoggingConfig.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/StreamingLoggingConfig.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + StreamingLoggingConfig::StreamingLoggingConfig() : m_enabled(false), m_enabledHasBeenSet(false), @@ -93,3 +99,7 @@ void StreamingLoggingConfig::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/TrustedSigners.cpp b/aws-cpp-sdk-cloudfront/source/model/TrustedSigners.cpp index a131023690c..0d5d8bf0e63 100644 --- a/aws-cpp-sdk-cloudfront/source/model/TrustedSigners.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/TrustedSigners.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + TrustedSigners::TrustedSigners() : m_enabled(false), m_enabledHasBeenSet(false), @@ -107,3 +113,7 @@ void TrustedSigners::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/ViewerCertificate.cpp b/aws-cpp-sdk-cloudfront/source/model/ViewerCertificate.cpp index 267bbbfb589..f0a2e2afcee 100644 --- a/aws-cpp-sdk-cloudfront/source/model/ViewerCertificate.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/ViewerCertificate.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudFront::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudFront +{ +namespace Model +{ + ViewerCertificate::ViewerCertificate() : m_cloudFrontDefaultCertificate(false), m_cloudFrontDefaultCertificateHasBeenSet(false), @@ -121,3 +127,7 @@ void ViewerCertificate::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace CloudFront +} // namespace Aws diff --git a/aws-cpp-sdk-cloudfront/source/model/ViewerProtocolPolicy.cpp b/aws-cpp-sdk-cloudfront/source/model/ViewerProtocolPolicy.cpp index bdb551789c4..9ed9d37780d 100644 --- a/aws-cpp-sdk-cloudfront/source/model/ViewerProtocolPolicy.cpp +++ b/aws-cpp-sdk-cloudfront/source/model/ViewerProtocolPolicy.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int allow_all_HASH = HashingUtils::HashString("allow-all"); -static const int https_only_HASH = HashingUtils::HashString("https-only"); -static const int redirect_to_https_HASH = HashingUtils::HashString("redirect-to-https"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ViewerProtocolPolicyMapper { + static const int allow_all_HASH = HashingUtils::HashString("allow-all"); + static const int https_only_HASH = HashingUtils::HashString("https-only"); + static const int redirect_to_https_HASH = HashingUtils::HashString("redirect-to-https"); + ViewerProtocolPolicy GetViewerProtocolPolicyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudhsm/CMakeLists.txt b/aws-cpp-sdk-cloudhsm/CMakeLists.txt index 5c3f67d58b4..6430d6e2a9a 100644 --- a/aws-cpp-sdk-cloudhsm/CMakeLists.txt +++ b/aws-cpp-sdk-cloudhsm/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-cloudhsm) "source/model/*.cpp" ) - file(GLOB CLOUDHSM_SRC + file(GLOB CLOUDHSM_UNIFIED_HEADERS ${AWS_CLOUDHSM_HEADERS} ${AWS_CLOUDHSM_MODEL_HEADERS} + ) + + file(GLOB CLOUDHSM_UNITY_SRC ${AWS_CLOUDHSM_SOURCE} ${AWS_CLOUDHSM_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("CLOUDHSM" CLOUDHSM_UNITY_SRC) + endif() + + file(GLOB CLOUDHSM_SRC + ${CLOUDHSM_UNIFIED_HEADERS} + ${CLOUDHSM_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-cloudhsm/source/CloudHSMErrors.cpp b/aws-cpp-sdk-cloudhsm/source/CloudHSMErrors.cpp index 429a3315b3c..7095b6edc12 100644 --- a/aws-cpp-sdk-cloudhsm/source/CloudHSMErrors.cpp +++ b/aws-cpp-sdk-cloudhsm/source/CloudHSMErrors.cpp @@ -20,10 +20,6 @@ using namespace Aws::Client; using namespace Aws::CloudHSM; using namespace Aws::Utils; -static const int CLOUD_HSM_SERVICE_HASH = HashingUtils::HashString("CloudHsmServiceException"); -static const int CLOUD_HSM_INTERNAL_HASH = HashingUtils::HashString("CloudHsmInternalException"); -static const int INVALID_REQUEST_HASH = HashingUtils::HashString("InvalidRequestException"); - namespace Aws { namespace CloudHSM @@ -31,6 +27,11 @@ namespace CloudHSM namespace CloudHSMErrorMapper { +static const int CLOUD_HSM_SERVICE_HASH = HashingUtils::HashString("CloudHsmServiceException"); +static const int CLOUD_HSM_INTERNAL_HASH = HashingUtils::HashString("CloudHsmInternalException"); +static const int INVALID_REQUEST_HASH = HashingUtils::HashString("InvalidRequestException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-cloudhsm/source/model/ClientVersion.cpp b/aws-cpp-sdk-cloudhsm/source/model/ClientVersion.cpp index 4a74eee312c..31b02c4f1f5 100644 --- a/aws-cpp-sdk-cloudhsm/source/model/ClientVersion.cpp +++ b/aws-cpp-sdk-cloudhsm/source/model/ClientVersion.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int _5_1_HASH = HashingUtils::HashString("5.1"); -static const int _5_3_HASH = HashingUtils::HashString("5.3"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ClientVersionMapper { + static const int _5_1_HASH = HashingUtils::HashString("5.1"); + static const int _5_3_HASH = HashingUtils::HashString("5.3"); + ClientVersion GetClientVersionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudhsm/source/model/CloudHsmObjectState.cpp b/aws-cpp-sdk-cloudhsm/source/model/CloudHsmObjectState.cpp index 3ce86f73bcf..9ad8ad679e2 100644 --- a/aws-cpp-sdk-cloudhsm/source/model/CloudHsmObjectState.cpp +++ b/aws-cpp-sdk-cloudhsm/source/model/CloudHsmObjectState.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int READY_HASH = HashingUtils::HashString("READY"); -static const int UPDATING_HASH = HashingUtils::HashString("UPDATING"); -static const int DEGRADED_HASH = HashingUtils::HashString("DEGRADED"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace CloudHsmObjectStateMapper { + static const int READY_HASH = HashingUtils::HashString("READY"); + static const int UPDATING_HASH = HashingUtils::HashString("UPDATING"); + static const int DEGRADED_HASH = HashingUtils::HashString("DEGRADED"); + CloudHsmObjectState GetCloudHsmObjectStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudhsm/source/model/HsmStatus.cpp b/aws-cpp-sdk-cloudhsm/source/model/HsmStatus.cpp index cf484b20e82..7b8b118bdb5 100644 --- a/aws-cpp-sdk-cloudhsm/source/model/HsmStatus.cpp +++ b/aws-cpp-sdk-cloudhsm/source/model/HsmStatus.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int PENDING_HASH = HashingUtils::HashString("PENDING"); -static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); -static const int UPDATING_HASH = HashingUtils::HashString("UPDATING"); -static const int SUSPENDED_HASH = HashingUtils::HashString("SUSPENDED"); -static const int TERMINATING_HASH = HashingUtils::HashString("TERMINATING"); -static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); -static const int DEGRADED_HASH = HashingUtils::HashString("DEGRADED"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace HsmStatusMapper { + static const int PENDING_HASH = HashingUtils::HashString("PENDING"); + static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); + static const int UPDATING_HASH = HashingUtils::HashString("UPDATING"); + static const int SUSPENDED_HASH = HashingUtils::HashString("SUSPENDED"); + static const int TERMINATING_HASH = HashingUtils::HashString("TERMINATING"); + static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); + static const int DEGRADED_HASH = HashingUtils::HashString("DEGRADED"); + HsmStatus GetHsmStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudhsm/source/model/SubscriptionType.cpp b/aws-cpp-sdk-cloudhsm/source/model/SubscriptionType.cpp index bc4fcd2ae79..f037518c77e 100644 --- a/aws-cpp-sdk-cloudhsm/source/model/SubscriptionType.cpp +++ b/aws-cpp-sdk-cloudhsm/source/model/SubscriptionType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int PRODUCTION_HASH = HashingUtils::HashString("PRODUCTION"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace SubscriptionTypeMapper { + static const int PRODUCTION_HASH = HashingUtils::HashString("PRODUCTION"); + SubscriptionType GetSubscriptionTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudsearch/CMakeLists.txt b/aws-cpp-sdk-cloudsearch/CMakeLists.txt index 7394a781d47..294453970df 100644 --- a/aws-cpp-sdk-cloudsearch/CMakeLists.txt +++ b/aws-cpp-sdk-cloudsearch/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-cloudsearch) "source/model/*.cpp" ) - file(GLOB CLOUDSEARCH_SRC + file(GLOB CLOUDSEARCH_UNIFIED_HEADERS ${AWS_CLOUDSEARCH_HEADERS} ${AWS_CLOUDSEARCH_MODEL_HEADERS} + ) + + file(GLOB CLOUDSEARCH_UNITY_SRC ${AWS_CLOUDSEARCH_SOURCE} ${AWS_CLOUDSEARCH_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("CLOUDSEARCH" CLOUDSEARCH_UNITY_SRC) + endif() + + file(GLOB CLOUDSEARCH_SRC + ${CLOUDSEARCH_UNIFIED_HEADERS} + ${CLOUDSEARCH_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-cloudsearch/source/CloudSearchErrors.cpp b/aws-cpp-sdk-cloudsearch/source/CloudSearchErrors.cpp index 5edddf0229a..1fe98900d2f 100644 --- a/aws-cpp-sdk-cloudsearch/source/CloudSearchErrors.cpp +++ b/aws-cpp-sdk-cloudsearch/source/CloudSearchErrors.cpp @@ -20,12 +20,6 @@ using namespace Aws::Client; using namespace Aws::CloudSearch; using namespace Aws::Utils; -static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceeded"); -static const int BASE_HASH = HashingUtils::HashString("BaseException"); -static const int INTERNAL_HASH = HashingUtils::HashString("InternalException"); -static const int INVALID_TYPE_HASH = HashingUtils::HashString("InvalidType"); -static const int DISABLED_OPERATION_HASH = HashingUtils::HashString("DisabledAction"); - namespace Aws { namespace CloudSearch @@ -33,6 +27,13 @@ namespace CloudSearch namespace CloudSearchErrorMapper { +static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceeded"); +static const int BASE_HASH = HashingUtils::HashString("BaseException"); +static const int INTERNAL_HASH = HashingUtils::HashString("InternalException"); +static const int INVALID_TYPE_HASH = HashingUtils::HashString("InvalidType"); +static const int DISABLED_OPERATION_HASH = HashingUtils::HashString("DisabledAction"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-cloudsearch/source/model/AccessPoliciesStatus.cpp b/aws-cpp-sdk-cloudsearch/source/model/AccessPoliciesStatus.cpp index 57e6b75e18a..be480160dea 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/AccessPoliciesStatus.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/AccessPoliciesStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + AccessPoliciesStatus::AccessPoliciesStatus() : m_optionsHasBeenSet(false), m_statusHasBeenSet(false) @@ -86,3 +92,7 @@ void AccessPoliciesStatus::OutputToStream(Aws::OStream& oStream, const char* loc m_status.OutputToStream(oStream, statusLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/AlgorithmicStemming.cpp b/aws-cpp-sdk-cloudsearch/source/model/AlgorithmicStemming.cpp index 6e559908d27..e698ff5165f 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/AlgorithmicStemming.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/AlgorithmicStemming.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int none_HASH = HashingUtils::HashString("none"); -static const int minimal_HASH = HashingUtils::HashString("minimal"); -static const int light_HASH = HashingUtils::HashString("light"); -static const int full_HASH = HashingUtils::HashString("full"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace AlgorithmicStemmingMapper { + static const int none_HASH = HashingUtils::HashString("none"); + static const int minimal_HASH = HashingUtils::HashString("minimal"); + static const int light_HASH = HashingUtils::HashString("light"); + static const int full_HASH = HashingUtils::HashString("full"); + AlgorithmicStemming GetAlgorithmicStemmingForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudsearch/source/model/AnalysisOptions.cpp b/aws-cpp-sdk-cloudsearch/source/model/AnalysisOptions.cpp index 0b6828203b6..05c845262ff 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/AnalysisOptions.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/AnalysisOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + AnalysisOptions::AnalysisOptions() : m_synonymsHasBeenSet(false), m_stopwordsHasBeenSet(false), @@ -130,3 +136,7 @@ void AnalysisOptions::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".AlgorithmicStemming=" << AlgorithmicStemmingMapper::GetNameForAlgorithmicStemming(m_algorithmicStemming) << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/AnalysisScheme.cpp b/aws-cpp-sdk-cloudsearch/source/model/AnalysisScheme.cpp index 6180dbdb572..93a2f77ae95 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/AnalysisScheme.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/AnalysisScheme.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + AnalysisScheme::AnalysisScheme() : m_analysisSchemeNameHasBeenSet(false), m_analysisSchemeLanguageHasBeenSet(false), @@ -102,3 +108,7 @@ void AnalysisScheme::OutputToStream(Aws::OStream& oStream, const char* location) m_analysisOptions.OutputToStream(oStream, analysisOptionsLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/AnalysisSchemeLanguage.cpp b/aws-cpp-sdk-cloudsearch/source/model/AnalysisSchemeLanguage.cpp index 26f1e731bb1..5042fcd00b1 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/AnalysisSchemeLanguage.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/AnalysisSchemeLanguage.cpp @@ -19,41 +19,6 @@ using namespace Aws::Utils; -static const int ar_HASH = HashingUtils::HashString("ar"); -static const int bg_HASH = HashingUtils::HashString("bg"); -static const int ca_HASH = HashingUtils::HashString("ca"); -static const int cs_HASH = HashingUtils::HashString("cs"); -static const int da_HASH = HashingUtils::HashString("da"); -static const int de_HASH = HashingUtils::HashString("de"); -static const int el_HASH = HashingUtils::HashString("el"); -static const int en_HASH = HashingUtils::HashString("en"); -static const int es_HASH = HashingUtils::HashString("es"); -static const int eu_HASH = HashingUtils::HashString("eu"); -static const int fa_HASH = HashingUtils::HashString("fa"); -static const int fi_HASH = HashingUtils::HashString("fi"); -static const int fr_HASH = HashingUtils::HashString("fr"); -static const int ga_HASH = HashingUtils::HashString("ga"); -static const int gl_HASH = HashingUtils::HashString("gl"); -static const int he_HASH = HashingUtils::HashString("he"); -static const int hi_HASH = HashingUtils::HashString("hi"); -static const int hu_HASH = HashingUtils::HashString("hu"); -static const int hy_HASH = HashingUtils::HashString("hy"); -static const int id_HASH = HashingUtils::HashString("id"); -static const int it_HASH = HashingUtils::HashString("it"); -static const int ja_HASH = HashingUtils::HashString("ja"); -static const int ko_HASH = HashingUtils::HashString("ko"); -static const int lv_HASH = HashingUtils::HashString("lv"); -static const int mul_HASH = HashingUtils::HashString("mul"); -static const int nl_HASH = HashingUtils::HashString("nl"); -static const int no_HASH = HashingUtils::HashString("no"); -static const int pt_HASH = HashingUtils::HashString("pt"); -static const int ro_HASH = HashingUtils::HashString("ro"); -static const int ru_HASH = HashingUtils::HashString("ru"); -static const int sv_HASH = HashingUtils::HashString("sv"); -static const int th_HASH = HashingUtils::HashString("th"); -static const int tr_HASH = HashingUtils::HashString("tr"); -static const int zh_Hans_HASH = HashingUtils::HashString("zh-Hans"); -static const int zh_Hant_HASH = HashingUtils::HashString("zh-Hant"); namespace Aws { @@ -64,6 +29,42 @@ namespace Aws namespace AnalysisSchemeLanguageMapper { + static const int ar_HASH = HashingUtils::HashString("ar"); + static const int bg_HASH = HashingUtils::HashString("bg"); + static const int ca_HASH = HashingUtils::HashString("ca"); + static const int cs_HASH = HashingUtils::HashString("cs"); + static const int da_HASH = HashingUtils::HashString("da"); + static const int de_HASH = HashingUtils::HashString("de"); + static const int el_HASH = HashingUtils::HashString("el"); + static const int en_HASH = HashingUtils::HashString("en"); + static const int es_HASH = HashingUtils::HashString("es"); + static const int eu_HASH = HashingUtils::HashString("eu"); + static const int fa_HASH = HashingUtils::HashString("fa"); + static const int fi_HASH = HashingUtils::HashString("fi"); + static const int fr_HASH = HashingUtils::HashString("fr"); + static const int ga_HASH = HashingUtils::HashString("ga"); + static const int gl_HASH = HashingUtils::HashString("gl"); + static const int he_HASH = HashingUtils::HashString("he"); + static const int hi_HASH = HashingUtils::HashString("hi"); + static const int hu_HASH = HashingUtils::HashString("hu"); + static const int hy_HASH = HashingUtils::HashString("hy"); + static const int id_HASH = HashingUtils::HashString("id"); + static const int it_HASH = HashingUtils::HashString("it"); + static const int ja_HASH = HashingUtils::HashString("ja"); + static const int ko_HASH = HashingUtils::HashString("ko"); + static const int lv_HASH = HashingUtils::HashString("lv"); + static const int mul_HASH = HashingUtils::HashString("mul"); + static const int nl_HASH = HashingUtils::HashString("nl"); + static const int no_HASH = HashingUtils::HashString("no"); + static const int pt_HASH = HashingUtils::HashString("pt"); + static const int ro_HASH = HashingUtils::HashString("ro"); + static const int ru_HASH = HashingUtils::HashString("ru"); + static const int sv_HASH = HashingUtils::HashString("sv"); + static const int th_HASH = HashingUtils::HashString("th"); + static const int tr_HASH = HashingUtils::HashString("tr"); + static const int zh_Hans_HASH = HashingUtils::HashString("zh-Hans"); + static const int zh_Hant_HASH = HashingUtils::HashString("zh-Hant"); + AnalysisSchemeLanguage GetAnalysisSchemeLanguageForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudsearch/source/model/AnalysisSchemeStatus.cpp b/aws-cpp-sdk-cloudsearch/source/model/AnalysisSchemeStatus.cpp index 0d151b9e836..8bb3da247d5 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/AnalysisSchemeStatus.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/AnalysisSchemeStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + AnalysisSchemeStatus::AnalysisSchemeStatus() : m_optionsHasBeenSet(false), m_statusHasBeenSet(false) @@ -90,3 +96,7 @@ void AnalysisSchemeStatus::OutputToStream(Aws::OStream& oStream, const char* loc m_status.OutputToStream(oStream, statusLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/AvailabilityOptionsStatus.cpp b/aws-cpp-sdk-cloudsearch/source/model/AvailabilityOptionsStatus.cpp index 65365dea619..5b889590163 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/AvailabilityOptionsStatus.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/AvailabilityOptionsStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + AvailabilityOptionsStatus::AvailabilityOptionsStatus() : m_options(false), m_optionsHasBeenSet(false), @@ -88,3 +94,7 @@ void AvailabilityOptionsStatus::OutputToStream(Aws::OStream& oStream, const char m_status.OutputToStream(oStream, statusLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/DateArrayOptions.cpp b/aws-cpp-sdk-cloudsearch/source/model/DateArrayOptions.cpp index 188ab66c8ec..e5df7a75bc2 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/DateArrayOptions.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/DateArrayOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + DateArrayOptions::DateArrayOptions() : m_defaultValueHasBeenSet(false), m_sourceFieldsHasBeenSet(false), @@ -136,3 +142,7 @@ void DateArrayOptions::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".ReturnEnabled=" << m_returnEnabled << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/DateOptions.cpp b/aws-cpp-sdk-cloudsearch/source/model/DateOptions.cpp index ba543a98d42..17704a2445e 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/DateOptions.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/DateOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + DateOptions::DateOptions() : m_defaultValueHasBeenSet(false), m_sourceFieldHasBeenSet(false), @@ -154,3 +160,7 @@ void DateOptions::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".SortEnabled=" << m_sortEnabled << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/DocumentSuggesterOptions.cpp b/aws-cpp-sdk-cloudsearch/source/model/DocumentSuggesterOptions.cpp index 4991926db4f..4e5b198faa4 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/DocumentSuggesterOptions.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/DocumentSuggesterOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + DocumentSuggesterOptions::DocumentSuggesterOptions() : m_sourceFieldHasBeenSet(false), m_fuzzyMatchingHasBeenSet(false), @@ -98,3 +104,7 @@ void DocumentSuggesterOptions::OutputToStream(Aws::OStream& oStream, const char* oStream << location << ".SortExpression=" << StringUtils::URLEncode(m_sortExpression.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/DomainStatus.cpp b/aws-cpp-sdk-cloudsearch/source/model/DomainStatus.cpp index 7fa2328eddf..adf416a834d 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/DomainStatus.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/DomainStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + DomainStatus::DomainStatus() : m_domainIdHasBeenSet(false), m_domainNameHasBeenSet(false), @@ -282,3 +288,7 @@ void DomainStatus::OutputToStream(Aws::OStream& oStream, const char* location) c m_limits.OutputToStream(oStream, limitsLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/DoubleArrayOptions.cpp b/aws-cpp-sdk-cloudsearch/source/model/DoubleArrayOptions.cpp index eb93fd42f61..1e903e056d5 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/DoubleArrayOptions.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/DoubleArrayOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + DoubleArrayOptions::DoubleArrayOptions() : m_defaultValue(0.0), m_defaultValueHasBeenSet(false), @@ -138,3 +144,7 @@ void DoubleArrayOptions::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".ReturnEnabled=" << m_returnEnabled << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/DoubleOptions.cpp b/aws-cpp-sdk-cloudsearch/source/model/DoubleOptions.cpp index d8094665860..2fedbf4d844 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/DoubleOptions.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/DoubleOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + DoubleOptions::DoubleOptions() : m_defaultValue(0.0), m_defaultValueHasBeenSet(false), @@ -156,3 +162,7 @@ void DoubleOptions::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".SortEnabled=" << m_sortEnabled << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/Expression.cpp b/aws-cpp-sdk-cloudsearch/source/model/Expression.cpp index 7123815d3ee..c9b4d55e082 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/Expression.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/Expression.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + Expression::Expression() : m_expressionNameHasBeenSet(false), m_expressionValueHasBeenSet(false) @@ -82,3 +88,7 @@ void Expression::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".ExpressionValue=" << StringUtils::URLEncode(m_expressionValue.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/ExpressionStatus.cpp b/aws-cpp-sdk-cloudsearch/source/model/ExpressionStatus.cpp index a2099dc3294..f545d11c3fa 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/ExpressionStatus.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/ExpressionStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + ExpressionStatus::ExpressionStatus() : m_optionsHasBeenSet(false), m_statusHasBeenSet(false) @@ -90,3 +96,7 @@ void ExpressionStatus::OutputToStream(Aws::OStream& oStream, const char* locatio m_status.OutputToStream(oStream, statusLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/IndexField.cpp b/aws-cpp-sdk-cloudsearch/source/model/IndexField.cpp index c2dc734f4ae..9aaa8f0eddf 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/IndexField.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/IndexField.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + IndexField::IndexField() : m_indexFieldNameHasBeenSet(false), m_indexFieldTypeHasBeenSet(false), @@ -302,3 +308,7 @@ void IndexField::OutputToStream(Aws::OStream& oStream, const char* location) con m_dateArrayOptions.OutputToStream(oStream, dateArrayOptionsLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/IndexFieldStatus.cpp b/aws-cpp-sdk-cloudsearch/source/model/IndexFieldStatus.cpp index a979bec291d..c9f75d060b4 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/IndexFieldStatus.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/IndexFieldStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + IndexFieldStatus::IndexFieldStatus() : m_optionsHasBeenSet(false), m_statusHasBeenSet(false) @@ -90,3 +96,7 @@ void IndexFieldStatus::OutputToStream(Aws::OStream& oStream, const char* locatio m_status.OutputToStream(oStream, statusLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/IndexFieldType.cpp b/aws-cpp-sdk-cloudsearch/source/model/IndexFieldType.cpp index d51cf454347..c12de6df997 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/IndexFieldType.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/IndexFieldType.cpp @@ -19,17 +19,6 @@ using namespace Aws::Utils; -static const int int__HASH = HashingUtils::HashString("int"); -static const int double__HASH = HashingUtils::HashString("double"); -static const int literal_HASH = HashingUtils::HashString("literal"); -static const int text_HASH = HashingUtils::HashString("text"); -static const int date_HASH = HashingUtils::HashString("date"); -static const int latlon_HASH = HashingUtils::HashString("latlon"); -static const int int_array_HASH = HashingUtils::HashString("int-array"); -static const int double_array_HASH = HashingUtils::HashString("double-array"); -static const int literal_array_HASH = HashingUtils::HashString("literal-array"); -static const int text_array_HASH = HashingUtils::HashString("text-array"); -static const int date_array_HASH = HashingUtils::HashString("date-array"); namespace Aws { @@ -40,6 +29,18 @@ namespace Aws namespace IndexFieldTypeMapper { + static const int int__HASH = HashingUtils::HashString("int"); + static const int double__HASH = HashingUtils::HashString("double"); + static const int literal_HASH = HashingUtils::HashString("literal"); + static const int text_HASH = HashingUtils::HashString("text"); + static const int date_HASH = HashingUtils::HashString("date"); + static const int latlon_HASH = HashingUtils::HashString("latlon"); + static const int int_array_HASH = HashingUtils::HashString("int-array"); + static const int double_array_HASH = HashingUtils::HashString("double-array"); + static const int literal_array_HASH = HashingUtils::HashString("literal-array"); + static const int text_array_HASH = HashingUtils::HashString("text-array"); + static const int date_array_HASH = HashingUtils::HashString("date-array"); + IndexFieldType GetIndexFieldTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudsearch/source/model/IntArrayOptions.cpp b/aws-cpp-sdk-cloudsearch/source/model/IntArrayOptions.cpp index ee2d268a205..c47872ec81d 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/IntArrayOptions.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/IntArrayOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + IntArrayOptions::IntArrayOptions() : m_defaultValue(0), m_defaultValueHasBeenSet(false), @@ -138,3 +144,7 @@ void IntArrayOptions::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".ReturnEnabled=" << m_returnEnabled << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/IntOptions.cpp b/aws-cpp-sdk-cloudsearch/source/model/IntOptions.cpp index 1cb33667897..ac350b0a7de 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/IntOptions.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/IntOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + IntOptions::IntOptions() : m_defaultValue(0), m_defaultValueHasBeenSet(false), @@ -156,3 +162,7 @@ void IntOptions::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".SortEnabled=" << m_sortEnabled << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/LatLonOptions.cpp b/aws-cpp-sdk-cloudsearch/source/model/LatLonOptions.cpp index ada270c14de..aa81c5d9435 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/LatLonOptions.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/LatLonOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + LatLonOptions::LatLonOptions() : m_defaultValueHasBeenSet(false), m_sourceFieldHasBeenSet(false), @@ -154,3 +160,7 @@ void LatLonOptions::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".SortEnabled=" << m_sortEnabled << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/Limits.cpp b/aws-cpp-sdk-cloudsearch/source/model/Limits.cpp index d07365755cb..07b7bc19743 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/Limits.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/Limits.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + Limits::Limits() : m_maximumReplicationCount(0), m_maximumReplicationCountHasBeenSet(false), @@ -86,3 +92,7 @@ void Limits::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".MaximumPartitionCount=" << m_maximumPartitionCount << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/LiteralArrayOptions.cpp b/aws-cpp-sdk-cloudsearch/source/model/LiteralArrayOptions.cpp index 47176974d9a..fbb71ed21b5 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/LiteralArrayOptions.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/LiteralArrayOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + LiteralArrayOptions::LiteralArrayOptions() : m_defaultValueHasBeenSet(false), m_sourceFieldsHasBeenSet(false), @@ -136,3 +142,7 @@ void LiteralArrayOptions::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".ReturnEnabled=" << m_returnEnabled << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/LiteralOptions.cpp b/aws-cpp-sdk-cloudsearch/source/model/LiteralOptions.cpp index fd474d0b5c2..7852cc58217 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/LiteralOptions.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/LiteralOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + LiteralOptions::LiteralOptions() : m_defaultValueHasBeenSet(false), m_sourceFieldHasBeenSet(false), @@ -154,3 +160,7 @@ void LiteralOptions::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".SortEnabled=" << m_sortEnabled << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/OptionState.cpp b/aws-cpp-sdk-cloudsearch/source/model/OptionState.cpp index f2bdc2f802b..0153fa3525d 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/OptionState.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/OptionState.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int RequiresIndexDocuments_HASH = HashingUtils::HashString("RequiresIndexDocuments"); -static const int Processing_HASH = HashingUtils::HashString("Processing"); -static const int Active_HASH = HashingUtils::HashString("Active"); -static const int FailedToValidate_HASH = HashingUtils::HashString("FailedToValidate"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace OptionStateMapper { + static const int RequiresIndexDocuments_HASH = HashingUtils::HashString("RequiresIndexDocuments"); + static const int Processing_HASH = HashingUtils::HashString("Processing"); + static const int Active_HASH = HashingUtils::HashString("Active"); + static const int FailedToValidate_HASH = HashingUtils::HashString("FailedToValidate"); + OptionState GetOptionStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudsearch/source/model/OptionStatus.cpp b/aws-cpp-sdk-cloudsearch/source/model/OptionStatus.cpp index f4daaab4fe0..6a60689172c 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/OptionStatus.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/OptionStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + OptionStatus::OptionStatus() : m_creationDateHasBeenSet(false), m_updateDateHasBeenSet(false), @@ -134,3 +140,7 @@ void OptionStatus::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".PendingDeletion=" << m_pendingDeletion << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws diff --git a/aws-cpp-sdk-cloudsearch/source/model/PartitionInstanceType.cpp b/aws-cpp-sdk-cloudsearch/source/model/PartitionInstanceType.cpp index 004b55469bc..397a75083f9 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/PartitionInstanceType.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/PartitionInstanceType.cpp @@ -19,14 +19,6 @@ using namespace Aws::Utils; -static const int search_m1_small_HASH = HashingUtils::HashString("search.m1.small"); -static const int search_m1_large_HASH = HashingUtils::HashString("search.m1.large"); -static const int search_m2_xlarge_HASH = HashingUtils::HashString("search.m2.xlarge"); -static const int search_m2_2xlarge_HASH = HashingUtils::HashString("search.m2.2xlarge"); -static const int search_m3_medium_HASH = HashingUtils::HashString("search.m3.medium"); -static const int search_m3_large_HASH = HashingUtils::HashString("search.m3.large"); -static const int search_m3_xlarge_HASH = HashingUtils::HashString("search.m3.xlarge"); -static const int search_m3_2xlarge_HASH = HashingUtils::HashString("search.m3.2xlarge"); namespace Aws { @@ -37,6 +29,15 @@ namespace Aws namespace PartitionInstanceTypeMapper { + static const int search_m1_small_HASH = HashingUtils::HashString("search.m1.small"); + static const int search_m1_large_HASH = HashingUtils::HashString("search.m1.large"); + static const int search_m2_xlarge_HASH = HashingUtils::HashString("search.m2.xlarge"); + static const int search_m2_2xlarge_HASH = HashingUtils::HashString("search.m2.2xlarge"); + static const int search_m3_medium_HASH = HashingUtils::HashString("search.m3.medium"); + static const int search_m3_large_HASH = HashingUtils::HashString("search.m3.large"); + static const int search_m3_xlarge_HASH = HashingUtils::HashString("search.m3.xlarge"); + static const int search_m3_2xlarge_HASH = HashingUtils::HashString("search.m3.2xlarge"); + PartitionInstanceType GetPartitionInstanceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudsearch/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-cloudsearch/source/model/ResponseMetadata.cpp index 0a2058930ed..453014306b7 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/ScalingParameters.cpp b/aws-cpp-sdk-cloudsearch/source/model/ScalingParameters.cpp index d51b90916a0..e57ca252a89 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/ScalingParameters.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/ScalingParameters.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + ScalingParameters::ScalingParameters() : m_desiredInstanceTypeHasBeenSet(false), m_desiredReplicationCount(0), @@ -102,3 +108,7 @@ void ScalingParameters::OutputToStream(Aws::OStream& oStream, const char* locati oStream << location << ".DesiredPartitionCount=" << m_desiredPartitionCount << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/ScalingParametersStatus.cpp b/aws-cpp-sdk-cloudsearch/source/model/ScalingParametersStatus.cpp index 7fd2d739d9f..2404b347915 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/ScalingParametersStatus.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/ScalingParametersStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + ScalingParametersStatus::ScalingParametersStatus() : m_optionsHasBeenSet(false), m_statusHasBeenSet(false) @@ -90,3 +96,7 @@ void ScalingParametersStatus::OutputToStream(Aws::OStream& oStream, const char* m_status.OutputToStream(oStream, statusLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/ServiceEndpoint.cpp b/aws-cpp-sdk-cloudsearch/source/model/ServiceEndpoint.cpp index 0dfc11f90dd..b65fb88c6b9 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/ServiceEndpoint.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/ServiceEndpoint.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + ServiceEndpoint::ServiceEndpoint() : m_endpointHasBeenSet(false) { @@ -66,3 +72,7 @@ void ServiceEndpoint::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".Endpoint=" << StringUtils::URLEncode(m_endpoint.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/Suggester.cpp b/aws-cpp-sdk-cloudsearch/source/model/Suggester.cpp index 55576860be5..c0b56126c36 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/Suggester.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/Suggester.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + Suggester::Suggester() : m_suggesterNameHasBeenSet(false), m_documentSuggesterOptionsHasBeenSet(false) @@ -86,3 +92,7 @@ void Suggester::OutputToStream(Aws::OStream& oStream, const char* location) cons m_documentSuggesterOptions.OutputToStream(oStream, documentSuggesterOptionsLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/SuggesterFuzzyMatching.cpp b/aws-cpp-sdk-cloudsearch/source/model/SuggesterFuzzyMatching.cpp index f5ba654de53..846c37c9bdf 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/SuggesterFuzzyMatching.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/SuggesterFuzzyMatching.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int none_HASH = HashingUtils::HashString("none"); -static const int low_HASH = HashingUtils::HashString("low"); -static const int high_HASH = HashingUtils::HashString("high"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace SuggesterFuzzyMatchingMapper { + static const int none_HASH = HashingUtils::HashString("none"); + static const int low_HASH = HashingUtils::HashString("low"); + static const int high_HASH = HashingUtils::HashString("high"); + SuggesterFuzzyMatching GetSuggesterFuzzyMatchingForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudsearch/source/model/SuggesterStatus.cpp b/aws-cpp-sdk-cloudsearch/source/model/SuggesterStatus.cpp index b056f943f1a..e757e42a54f 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/SuggesterStatus.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/SuggesterStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + SuggesterStatus::SuggesterStatus() : m_optionsHasBeenSet(false), m_statusHasBeenSet(false) @@ -90,3 +96,7 @@ void SuggesterStatus::OutputToStream(Aws::OStream& oStream, const char* location m_status.OutputToStream(oStream, statusLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/TextArrayOptions.cpp b/aws-cpp-sdk-cloudsearch/source/model/TextArrayOptions.cpp index d4eb1019efa..33e68ed438b 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/TextArrayOptions.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/TextArrayOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + TextArrayOptions::TextArrayOptions() : m_defaultValueHasBeenSet(false), m_sourceFieldsHasBeenSet(false), @@ -134,3 +140,7 @@ void TextArrayOptions::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".AnalysisScheme=" << StringUtils::URLEncode(m_analysisScheme.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearch/source/model/TextOptions.cpp b/aws-cpp-sdk-cloudsearch/source/model/TextOptions.cpp index 9ce3bc9d137..6bae567073c 100644 --- a/aws-cpp-sdk-cloudsearch/source/model/TextOptions.cpp +++ b/aws-cpp-sdk-cloudsearch/source/model/TextOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudSearch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearch +{ +namespace Model +{ + TextOptions::TextOptions() : m_defaultValueHasBeenSet(false), m_sourceFieldHasBeenSet(false), @@ -152,3 +158,7 @@ void TextOptions::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".AnalysisScheme=" << StringUtils::URLEncode(m_analysisScheme.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudSearch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearchdomain/CMakeLists.txt b/aws-cpp-sdk-cloudsearchdomain/CMakeLists.txt index 7baee9ae483..ef73ba63d83 100644 --- a/aws-cpp-sdk-cloudsearchdomain/CMakeLists.txt +++ b/aws-cpp-sdk-cloudsearchdomain/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-cloudsearchdomain) "source/model/*.cpp" ) - file(GLOB CLOUDSEARCHDOMAIN_SRC + file(GLOB CLOUDSEARCHDOMAIN_UNIFIED_HEADERS ${AWS_CLOUDSEARCHDOMAIN_HEADERS} ${AWS_CLOUDSEARCHDOMAIN_MODEL_HEADERS} + ) + + file(GLOB CLOUDSEARCHDOMAIN_UNITY_SRC ${AWS_CLOUDSEARCHDOMAIN_SOURCE} ${AWS_CLOUDSEARCHDOMAIN_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("CLOUDSEARCHDOMAIN" CLOUDSEARCHDOMAIN_UNITY_SRC) + endif() + + file(GLOB CLOUDSEARCHDOMAIN_SRC + ${CLOUDSEARCHDOMAIN_UNIFIED_HEADERS} + ${CLOUDSEARCHDOMAIN_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-cloudsearchdomain/source/CloudSearchDomainErrors.cpp b/aws-cpp-sdk-cloudsearchdomain/source/CloudSearchDomainErrors.cpp index e1ba8f1d828..9c89a52b568 100644 --- a/aws-cpp-sdk-cloudsearchdomain/source/CloudSearchDomainErrors.cpp +++ b/aws-cpp-sdk-cloudsearchdomain/source/CloudSearchDomainErrors.cpp @@ -20,9 +20,6 @@ using namespace Aws::Client; using namespace Aws::CloudSearchDomain; using namespace Aws::Utils; -static const int DOCUMENT_SERVICE_HASH = HashingUtils::HashString("DocumentServiceException"); -static const int SEARCH_HASH = HashingUtils::HashString("SearchException"); - namespace Aws { namespace CloudSearchDomain @@ -30,6 +27,10 @@ namespace CloudSearchDomain namespace CloudSearchDomainErrorMapper { +static const int DOCUMENT_SERVICE_HASH = HashingUtils::HashString("DocumentServiceException"); +static const int SEARCH_HASH = HashingUtils::HashString("SearchException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-cloudsearchdomain/source/model/Bucket.cpp b/aws-cpp-sdk-cloudsearchdomain/source/model/Bucket.cpp index 477d6dc69b2..6f6ae791a68 100644 --- a/aws-cpp-sdk-cloudsearchdomain/source/model/Bucket.cpp +++ b/aws-cpp-sdk-cloudsearchdomain/source/model/Bucket.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudSearchDomain::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearchDomain +{ +namespace Model +{ + Bucket::Bucket() : m_valueHasBeenSet(false), m_count(0), @@ -72,4 +78,8 @@ JsonValue Bucket::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudSearchDomain +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearchdomain/source/model/BucketInfo.cpp b/aws-cpp-sdk-cloudsearchdomain/source/model/BucketInfo.cpp index 351772f466f..7226f0b5209 100644 --- a/aws-cpp-sdk-cloudsearchdomain/source/model/BucketInfo.cpp +++ b/aws-cpp-sdk-cloudsearchdomain/source/model/BucketInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudSearchDomain::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearchDomain +{ +namespace Model +{ + BucketInfo::BucketInfo() : m_bucketsHasBeenSet(false) { @@ -63,4 +69,8 @@ JsonValue BucketInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudSearchDomain +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearchdomain/source/model/ContentType.cpp b/aws-cpp-sdk-cloudsearchdomain/source/model/ContentType.cpp index 52e5b67da14..5b9eb6c65c5 100644 --- a/aws-cpp-sdk-cloudsearchdomain/source/model/ContentType.cpp +++ b/aws-cpp-sdk-cloudsearchdomain/source/model/ContentType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int application_json_HASH = HashingUtils::HashString("application/json"); -static const int application_xml_HASH = HashingUtils::HashString("application/xml"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ContentTypeMapper { + static const int application_json_HASH = HashingUtils::HashString("application/json"); + static const int application_xml_HASH = HashingUtils::HashString("application/xml"); + ContentType GetContentTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudsearchdomain/source/model/DocumentServiceWarning.cpp b/aws-cpp-sdk-cloudsearchdomain/source/model/DocumentServiceWarning.cpp index a7c154058bb..fec793dee7e 100644 --- a/aws-cpp-sdk-cloudsearchdomain/source/model/DocumentServiceWarning.cpp +++ b/aws-cpp-sdk-cloudsearchdomain/source/model/DocumentServiceWarning.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudSearchDomain::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearchDomain +{ +namespace Model +{ + DocumentServiceWarning::DocumentServiceWarning() : m_messageHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue DocumentServiceWarning::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudSearchDomain +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearchdomain/source/model/Hit.cpp b/aws-cpp-sdk-cloudsearchdomain/source/model/Hit.cpp index e51f024636e..f675e079f5d 100644 --- a/aws-cpp-sdk-cloudsearchdomain/source/model/Hit.cpp +++ b/aws-cpp-sdk-cloudsearchdomain/source/model/Hit.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudSearchDomain::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearchDomain +{ +namespace Model +{ + Hit::Hit() : m_idHasBeenSet(false), m_fieldsHasBeenSet(false), @@ -135,4 +141,8 @@ JsonValue Hit::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudSearchDomain +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearchdomain/source/model/Hits.cpp b/aws-cpp-sdk-cloudsearchdomain/source/model/Hits.cpp index 29789084306..1ca93a0a8ff 100644 --- a/aws-cpp-sdk-cloudsearchdomain/source/model/Hits.cpp +++ b/aws-cpp-sdk-cloudsearchdomain/source/model/Hits.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudSearchDomain::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearchDomain +{ +namespace Model +{ + Hits::Hits() : m_found(0), m_foundHasBeenSet(false), @@ -112,4 +118,8 @@ JsonValue Hits::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudSearchDomain +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearchdomain/source/model/QueryParser.cpp b/aws-cpp-sdk-cloudsearchdomain/source/model/QueryParser.cpp index 00b2abb04c2..2351d2197a7 100644 --- a/aws-cpp-sdk-cloudsearchdomain/source/model/QueryParser.cpp +++ b/aws-cpp-sdk-cloudsearchdomain/source/model/QueryParser.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int simple_HASH = HashingUtils::HashString("simple"); -static const int structured_HASH = HashingUtils::HashString("structured"); -static const int lucene_HASH = HashingUtils::HashString("lucene"); -static const int dismax_HASH = HashingUtils::HashString("dismax"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace QueryParserMapper { + static const int simple_HASH = HashingUtils::HashString("simple"); + static const int structured_HASH = HashingUtils::HashString("structured"); + static const int lucene_HASH = HashingUtils::HashString("lucene"); + static const int dismax_HASH = HashingUtils::HashString("dismax"); + QueryParser GetQueryParserForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudsearchdomain/source/model/SearchStatus.cpp b/aws-cpp-sdk-cloudsearchdomain/source/model/SearchStatus.cpp index 0feb935c53e..31516382235 100644 --- a/aws-cpp-sdk-cloudsearchdomain/source/model/SearchStatus.cpp +++ b/aws-cpp-sdk-cloudsearchdomain/source/model/SearchStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudSearchDomain::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearchDomain +{ +namespace Model +{ + SearchStatus::SearchStatus() : m_timems(0), m_timemsHasBeenSet(false), @@ -72,4 +78,8 @@ JsonValue SearchStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudSearchDomain +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearchdomain/source/model/SuggestModel.cpp b/aws-cpp-sdk-cloudsearchdomain/source/model/SuggestModel.cpp index d4f56eba928..45e1c309ef4 100644 --- a/aws-cpp-sdk-cloudsearchdomain/source/model/SuggestModel.cpp +++ b/aws-cpp-sdk-cloudsearchdomain/source/model/SuggestModel.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudSearchDomain::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearchDomain +{ +namespace Model +{ + SuggestModel::SuggestModel() : m_queryHasBeenSet(false), m_found(0), @@ -95,4 +101,8 @@ JsonValue SuggestModel::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudSearchDomain +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearchdomain/source/model/SuggestStatus.cpp b/aws-cpp-sdk-cloudsearchdomain/source/model/SuggestStatus.cpp index 6e8ac5cb979..a9cbd267b15 100644 --- a/aws-cpp-sdk-cloudsearchdomain/source/model/SuggestStatus.cpp +++ b/aws-cpp-sdk-cloudsearchdomain/source/model/SuggestStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudSearchDomain::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearchDomain +{ +namespace Model +{ + SuggestStatus::SuggestStatus() : m_timems(0), m_timemsHasBeenSet(false), @@ -72,4 +78,8 @@ JsonValue SuggestStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudSearchDomain +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudsearchdomain/source/model/SuggestionMatch.cpp b/aws-cpp-sdk-cloudsearchdomain/source/model/SuggestionMatch.cpp index 191360876bc..4d1df30ed6d 100644 --- a/aws-cpp-sdk-cloudsearchdomain/source/model/SuggestionMatch.cpp +++ b/aws-cpp-sdk-cloudsearchdomain/source/model/SuggestionMatch.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudSearchDomain::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudSearchDomain +{ +namespace Model +{ + SuggestionMatch::SuggestionMatch() : m_suggestionHasBeenSet(false), m_score(0), @@ -87,4 +93,8 @@ JsonValue SuggestionMatch::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudSearchDomain +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudtrail/CMakeLists.txt b/aws-cpp-sdk-cloudtrail/CMakeLists.txt index b4de2aaf794..c1c1bf2abf1 100644 --- a/aws-cpp-sdk-cloudtrail/CMakeLists.txt +++ b/aws-cpp-sdk-cloudtrail/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-cloudtrail) "source/model/*.cpp" ) - file(GLOB CLOUDTRAIL_SRC + file(GLOB CLOUDTRAIL_UNIFIED_HEADERS ${AWS_CLOUDTRAIL_HEADERS} ${AWS_CLOUDTRAIL_MODEL_HEADERS} + ) + + file(GLOB CLOUDTRAIL_UNITY_SRC ${AWS_CLOUDTRAIL_SOURCE} ${AWS_CLOUDTRAIL_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("CLOUDTRAIL" CLOUDTRAIL_UNITY_SRC) + endif() + + file(GLOB CLOUDTRAIL_SRC + ${CLOUDTRAIL_UNIFIED_HEADERS} + ${CLOUDTRAIL_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-cloudtrail/source/CloudTrailErrors.cpp b/aws-cpp-sdk-cloudtrail/source/CloudTrailErrors.cpp index 5b1319b8c5b..10104167533 100644 --- a/aws-cpp-sdk-cloudtrail/source/CloudTrailErrors.cpp +++ b/aws-cpp-sdk-cloudtrail/source/CloudTrailErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::CloudTrail; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudTrail +{ +namespace CloudTrailErrorMapper +{ + static const int INVALID_CLOUD_WATCH_LOGS_LOG_GROUP_ARN_HASH = HashingUtils::HashString("InvalidCloudWatchLogsLogGroupArnException"); static const int INVALID_S3_BUCKET_NAME_HASH = HashingUtils::HashString("InvalidS3BucketNameException"); static const int INVALID_KMS_KEY_ID_HASH = HashingUtils::HashString("InvalidKmsKeyIdException"); @@ -52,12 +59,6 @@ static const int INSUFFICIENT_S3_BUCKET_POLICY_HASH = HashingUtils::HashString(" static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OperationNotPermittedException"); static const int KMS_KEY_DISABLED_HASH = HashingUtils::HashString("KmsKeyDisabledException"); -namespace Aws -{ -namespace CloudTrail -{ -namespace CloudTrailErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-cloudtrail/source/model/Event.cpp b/aws-cpp-sdk-cloudtrail/source/model/Event.cpp index 4f89c83a9fb..5f40f7055ee 100644 --- a/aws-cpp-sdk-cloudtrail/source/model/Event.cpp +++ b/aws-cpp-sdk-cloudtrail/source/model/Event.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudTrail::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudTrail +{ +namespace Model +{ + Event::Event() : m_eventIdHasBeenSet(false), m_eventNameHasBeenSet(false), @@ -137,4 +143,8 @@ JsonValue Event::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudTrail +} // namespace Aws diff --git a/aws-cpp-sdk-cloudtrail/source/model/LookupAttribute.cpp b/aws-cpp-sdk-cloudtrail/source/model/LookupAttribute.cpp index 628ae70da96..587158ea2fd 100644 --- a/aws-cpp-sdk-cloudtrail/source/model/LookupAttribute.cpp +++ b/aws-cpp-sdk-cloudtrail/source/model/LookupAttribute.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudTrail::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudTrail +{ +namespace Model +{ + LookupAttribute::LookupAttribute() : m_attributeKeyHasBeenSet(false), m_attributeValueHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue LookupAttribute::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudTrail +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudtrail/source/model/LookupAttributeKey.cpp b/aws-cpp-sdk-cloudtrail/source/model/LookupAttributeKey.cpp index 6140b958766..f2b0a52f08f 100644 --- a/aws-cpp-sdk-cloudtrail/source/model/LookupAttributeKey.cpp +++ b/aws-cpp-sdk-cloudtrail/source/model/LookupAttributeKey.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int EventId_HASH = HashingUtils::HashString("EventId"); -static const int EventName_HASH = HashingUtils::HashString("EventName"); -static const int Username_HASH = HashingUtils::HashString("Username"); -static const int ResourceType_HASH = HashingUtils::HashString("ResourceType"); -static const int ResourceName_HASH = HashingUtils::HashString("ResourceName"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace LookupAttributeKeyMapper { + static const int EventId_HASH = HashingUtils::HashString("EventId"); + static const int EventName_HASH = HashingUtils::HashString("EventName"); + static const int Username_HASH = HashingUtils::HashString("Username"); + static const int ResourceType_HASH = HashingUtils::HashString("ResourceType"); + static const int ResourceName_HASH = HashingUtils::HashString("ResourceName"); + LookupAttributeKey GetLookupAttributeKeyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cloudtrail/source/model/PublicKey.cpp b/aws-cpp-sdk-cloudtrail/source/model/PublicKey.cpp index 67ac1e015f1..c041de1da13 100644 --- a/aws-cpp-sdk-cloudtrail/source/model/PublicKey.cpp +++ b/aws-cpp-sdk-cloudtrail/source/model/PublicKey.cpp @@ -18,10 +18,16 @@ #include -using namespace Aws::CloudTrail::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudTrail +{ +namespace Model +{ + PublicKey::PublicKey() : m_valueHasBeenSet(false), m_validityStartTimeHasBeenSet(false), @@ -97,4 +103,8 @@ JsonValue PublicKey::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudTrail +} // namespace Aws diff --git a/aws-cpp-sdk-cloudtrail/source/model/Resource.cpp b/aws-cpp-sdk-cloudtrail/source/model/Resource.cpp index 6b672571f1c..b83e70189bf 100644 --- a/aws-cpp-sdk-cloudtrail/source/model/Resource.cpp +++ b/aws-cpp-sdk-cloudtrail/source/model/Resource.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudTrail::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudTrail +{ +namespace Model +{ + Resource::Resource() : m_resourceTypeHasBeenSet(false), m_resourceNameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Resource::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudTrail +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudtrail/source/model/ResourceTag.cpp b/aws-cpp-sdk-cloudtrail/source/model/ResourceTag.cpp index ba5930eb73a..4a67d2a4da0 100644 --- a/aws-cpp-sdk-cloudtrail/source/model/ResourceTag.cpp +++ b/aws-cpp-sdk-cloudtrail/source/model/ResourceTag.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudTrail::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudTrail +{ +namespace Model +{ + ResourceTag::ResourceTag() : m_resourceIdHasBeenSet(false), m_tagsListHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue ResourceTag::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudTrail +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudtrail/source/model/Tag.cpp b/aws-cpp-sdk-cloudtrail/source/model/Tag.cpp index 14d5ac6ec83..c24a5fdcd02 100644 --- a/aws-cpp-sdk-cloudtrail/source/model/Tag.cpp +++ b/aws-cpp-sdk-cloudtrail/source/model/Tag.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudTrail::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudTrail +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Tag::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudTrail +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cloudtrail/source/model/Trail.cpp b/aws-cpp-sdk-cloudtrail/source/model/Trail.cpp index 7ae7011ba05..c2132e3c93d 100644 --- a/aws-cpp-sdk-cloudtrail/source/model/Trail.cpp +++ b/aws-cpp-sdk-cloudtrail/source/model/Trail.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudTrail::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudTrail +{ +namespace Model +{ + Trail::Trail() : m_nameHasBeenSet(false), m_s3BucketNameHasBeenSet(false), @@ -226,4 +232,8 @@ JsonValue Trail::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudTrail +} // namespace Aws diff --git a/aws-cpp-sdk-codecommit/CMakeLists.txt b/aws-cpp-sdk-codecommit/CMakeLists.txt index 53bc81ceb76..82319878a32 100644 --- a/aws-cpp-sdk-codecommit/CMakeLists.txt +++ b/aws-cpp-sdk-codecommit/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-codecommit) "source/model/*.cpp" ) - file(GLOB CODECOMMIT_SRC + file(GLOB CODECOMMIT_UNIFIED_HEADERS ${AWS_CODECOMMIT_HEADERS} ${AWS_CODECOMMIT_MODEL_HEADERS} + ) + + file(GLOB CODECOMMIT_UNITY_SRC ${AWS_CODECOMMIT_SOURCE} ${AWS_CODECOMMIT_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("CODECOMMIT" CODECOMMIT_UNITY_SRC) + endif() + + file(GLOB CODECOMMIT_SRC + ${CODECOMMIT_UNIFIED_HEADERS} + ${CODECOMMIT_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-codecommit/source/CodeCommitErrors.cpp b/aws-cpp-sdk-codecommit/source/CodeCommitErrors.cpp index da8f26dbe16..d30745b2870 100644 --- a/aws-cpp-sdk-codecommit/source/CodeCommitErrors.cpp +++ b/aws-cpp-sdk-codecommit/source/CodeCommitErrors.cpp @@ -20,158 +20,89 @@ using namespace Aws::Client; using namespace Aws::CodeCommit; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeCommit +{ +namespace CodeCommitErrorMapper +{ + +static const int REPOSITORY_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("RepositoryLimitExceededException"); +static const int INVALID_ORDER_HASH = HashingUtils::HashString("InvalidOrderException"); static const int ENCRYPTION_KEY_ACCESS_DENIED_HASH = HashingUtils::HashString("EncryptionKeyAccessDeniedException"); -static const int INVALID_REPOSITORY_TRIGGER_DESTINATION_ARN_HASH = HashingUtils::HashString("InvalidRepositoryTriggerDestinationArnException"); -static const int REPOSITORY_TRIGGER_EVENTS_LIST_REQUIRED_HASH = HashingUtils::HashString("RepositoryTriggerEventsListRequiredException"); -static const int COMMIT_ID_REQUIRED_HASH = HashingUtils::HashString("CommitIdRequiredException"); -static const int REPOSITORY_TRIGGER_DESTINATION_ARN_REQUIRED_HASH = HashingUtils::HashString("RepositoryTriggerDestinationArnRequiredException"); -static const int REPOSITORY_NAMES_REQUIRED_HASH = HashingUtils::HashString("RepositoryNamesRequiredException"); -static const int REPOSITORY_NAME_EXISTS_HASH = HashingUtils::HashString("RepositoryNameExistsException"); -static const int INVALID_REPOSITORY_TRIGGER_EVENTS_HASH = HashingUtils::HashString("InvalidRepositoryTriggerEventsException"); -static const int ENCRYPTION_INTEGRITY_CHECKS_FAILED_HASH = HashingUtils::HashString("EncryptionIntegrityChecksFailedException"); -static const int INVALID_REPOSITORY_TRIGGER_BRANCH_NAME_HASH = HashingUtils::HashString("InvalidRepositoryTriggerBranchNameException"); static const int ENCRYPTION_KEY_UNAVAILABLE_HASH = HashingUtils::HashString("EncryptionKeyUnavailableException"); -static const int REPOSITORY_TRIGGER_BRANCH_NAME_LIST_REQUIRED_HASH = HashingUtils::HashString("RepositoryTriggerBranchNameListRequiredException"); -static const int INVALID_REPOSITORY_NAME_HASH = HashingUtils::HashString("InvalidRepositoryNameException"); -static const int REPOSITORY_TRIGGER_NAME_REQUIRED_HASH = HashingUtils::HashString("RepositoryTriggerNameRequiredException"); -static const int INVALID_REPOSITORY_TRIGGER_REGION_HASH = HashingUtils::HashString("InvalidRepositoryTriggerRegionException"); -static const int COMMIT_ID_DOES_NOT_EXIST_HASH = HashingUtils::HashString("CommitIdDoesNotExistException"); -static const int INVALID_ORDER_HASH = HashingUtils::HashString("InvalidOrderException"); -static const int INVALID_REPOSITORY_TRIGGER_NAME_HASH = HashingUtils::HashString("InvalidRepositoryTriggerNameException"); -static const int ENCRYPTION_KEY_NOT_FOUND_HASH = HashingUtils::HashString("EncryptionKeyNotFoundException"); -static const int MAXIMUM_BRANCHES_EXCEEDED_HASH = HashingUtils::HashString("MaximumBranchesExceededException"); -static const int REPOSITORY_TRIGGERS_LIST_REQUIRED_HASH = HashingUtils::HashString("RepositoryTriggersListRequiredException"); +static const int REPOSITORY_NAME_EXISTS_HASH = HashingUtils::HashString("RepositoryNameExistsException"); static const int ENCRYPTION_KEY_DISABLED_HASH = HashingUtils::HashString("EncryptionKeyDisabledException"); +static const int INVALID_REPOSITORY_NAME_HASH = HashingUtils::HashString("InvalidRepositoryNameException"); +static const int ENCRYPTION_INTEGRITY_CHECKS_FAILED_HASH = HashingUtils::HashString("EncryptionIntegrityChecksFailedException"); +static const int REPOSITORY_DOES_NOT_EXIST_HASH = HashingUtils::HashString("RepositoryDoesNotExistException"); +static const int INVALID_BRANCH_NAME_HASH = HashingUtils::HashString("InvalidBranchNameException"); static const int INVALID_COMMIT_ID_HASH = HashingUtils::HashString("InvalidCommitIdException"); -static const int COMMIT_DOES_NOT_EXIST_HASH = HashingUtils::HashString("CommitDoesNotExistException"); -static const int INVALID_SORT_BY_HASH = HashingUtils::HashString("InvalidSortByException"); -static const int BRANCH_NAME_REQUIRED_HASH = HashingUtils::HashString("BranchNameRequiredException"); +static const int REPOSITORY_NAME_REQUIRED_HASH = HashingUtils::HashString("RepositoryNameRequiredException"); static const int INVALID_REPOSITORY_DESCRIPTION_HASH = HashingUtils::HashString("InvalidRepositoryDescriptionException"); static const int BRANCH_DOES_NOT_EXIST_HASH = HashingUtils::HashString("BranchDoesNotExistException"); -static const int REPOSITORY_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("RepositoryLimitExceededException"); -static const int INVALID_BRANCH_NAME_HASH = HashingUtils::HashString("InvalidBranchNameException"); -static const int INVALID_CONTINUATION_TOKEN_HASH = HashingUtils::HashString("InvalidContinuationTokenException"); -static const int MAXIMUM_REPOSITORY_TRIGGERS_EXCEEDED_HASH = HashingUtils::HashString("MaximumRepositoryTriggersExceededException"); -static const int REPOSITORY_NAME_REQUIRED_HASH = HashingUtils::HashString("RepositoryNameRequiredException"); static const int BRANCH_NAME_EXISTS_HASH = HashingUtils::HashString("BranchNameExistsException"); -static const int INVALID_REPOSITORY_TRIGGER_CUSTOM_DATA_HASH = HashingUtils::HashString("InvalidRepositoryTriggerCustomDataException"); -static const int REPOSITORY_DOES_NOT_EXIST_HASH = HashingUtils::HashString("RepositoryDoesNotExistException"); +static const int REPOSITORY_NAMES_REQUIRED_HASH = HashingUtils::HashString("RepositoryNamesRequiredException"); +static const int BRANCH_NAME_REQUIRED_HASH = HashingUtils::HashString("BranchNameRequiredException"); +static const int COMMIT_DOES_NOT_EXIST_HASH = HashingUtils::HashString("CommitDoesNotExistException"); static const int MAXIMUM_REPOSITORY_NAMES_EXCEEDED_HASH = HashingUtils::HashString("MaximumRepositoryNamesExceededException"); +static const int COMMIT_ID_REQUIRED_HASH = HashingUtils::HashString("CommitIdRequiredException"); +static const int INVALID_CONTINUATION_TOKEN_HASH = HashingUtils::HashString("InvalidContinuationTokenException"); +static const int ENCRYPTION_KEY_NOT_FOUND_HASH = HashingUtils::HashString("EncryptionKeyNotFoundException"); +static const int INVALID_SORT_BY_HASH = HashingUtils::HashString("InvalidSortByException"); -namespace Aws -{ -namespace CodeCommit -{ -namespace CodeCommitErrorMapper -{ AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); - if (hashCode == ENCRYPTION_KEY_ACCESS_DENIED_HASH) - { - return AWSError(static_cast(CodeCommitErrors::ENCRYPTION_KEY_ACCESS_DENIED), false); - } - else if (hashCode == INVALID_REPOSITORY_TRIGGER_DESTINATION_ARN_HASH) + if (hashCode == REPOSITORY_LIMIT_EXCEEDED_HASH) { - return AWSError(static_cast(CodeCommitErrors::INVALID_REPOSITORY_TRIGGER_DESTINATION_ARN), false); - } - else if (hashCode == REPOSITORY_TRIGGER_EVENTS_LIST_REQUIRED_HASH) - { - return AWSError(static_cast(CodeCommitErrors::REPOSITORY_TRIGGER_EVENTS_LIST_REQUIRED), false); + return AWSError(static_cast(CodeCommitErrors::REPOSITORY_LIMIT_EXCEEDED), false); } - else if (hashCode == COMMIT_ID_REQUIRED_HASH) + else if (hashCode == INVALID_ORDER_HASH) { - return AWSError(static_cast(CodeCommitErrors::COMMIT_ID_REQUIRED), false); + return AWSError(static_cast(CodeCommitErrors::INVALID_ORDER), false); } - else if (hashCode == REPOSITORY_TRIGGER_DESTINATION_ARN_REQUIRED_HASH) + else if (hashCode == ENCRYPTION_KEY_ACCESS_DENIED_HASH) { - return AWSError(static_cast(CodeCommitErrors::REPOSITORY_TRIGGER_DESTINATION_ARN_REQUIRED), false); + return AWSError(static_cast(CodeCommitErrors::ENCRYPTION_KEY_ACCESS_DENIED), false); } - else if (hashCode == REPOSITORY_NAMES_REQUIRED_HASH) + else if (hashCode == ENCRYPTION_KEY_UNAVAILABLE_HASH) { - return AWSError(static_cast(CodeCommitErrors::REPOSITORY_NAMES_REQUIRED), false); + return AWSError(static_cast(CodeCommitErrors::ENCRYPTION_KEY_UNAVAILABLE), false); } else if (hashCode == REPOSITORY_NAME_EXISTS_HASH) { return AWSError(static_cast(CodeCommitErrors::REPOSITORY_NAME_EXISTS), false); } - else if (hashCode == INVALID_REPOSITORY_TRIGGER_EVENTS_HASH) - { - return AWSError(static_cast(CodeCommitErrors::INVALID_REPOSITORY_TRIGGER_EVENTS), false); - } - else if (hashCode == ENCRYPTION_INTEGRITY_CHECKS_FAILED_HASH) - { - return AWSError(static_cast(CodeCommitErrors::ENCRYPTION_INTEGRITY_CHECKS_FAILED), false); - } - else if (hashCode == INVALID_REPOSITORY_TRIGGER_BRANCH_NAME_HASH) - { - return AWSError(static_cast(CodeCommitErrors::INVALID_REPOSITORY_TRIGGER_BRANCH_NAME), false); - } - else if (hashCode == ENCRYPTION_KEY_UNAVAILABLE_HASH) - { - return AWSError(static_cast(CodeCommitErrors::ENCRYPTION_KEY_UNAVAILABLE), false); - } - else if (hashCode == REPOSITORY_TRIGGER_BRANCH_NAME_LIST_REQUIRED_HASH) + else if (hashCode == ENCRYPTION_KEY_DISABLED_HASH) { - return AWSError(static_cast(CodeCommitErrors::REPOSITORY_TRIGGER_BRANCH_NAME_LIST_REQUIRED), false); + return AWSError(static_cast(CodeCommitErrors::ENCRYPTION_KEY_DISABLED), false); } else if (hashCode == INVALID_REPOSITORY_NAME_HASH) { return AWSError(static_cast(CodeCommitErrors::INVALID_REPOSITORY_NAME), false); } - else if (hashCode == REPOSITORY_TRIGGER_NAME_REQUIRED_HASH) - { - return AWSError(static_cast(CodeCommitErrors::REPOSITORY_TRIGGER_NAME_REQUIRED), false); - } - else if (hashCode == INVALID_REPOSITORY_TRIGGER_REGION_HASH) - { - return AWSError(static_cast(CodeCommitErrors::INVALID_REPOSITORY_TRIGGER_REGION), false); - } - else if (hashCode == COMMIT_ID_DOES_NOT_EXIST_HASH) - { - return AWSError(static_cast(CodeCommitErrors::COMMIT_ID_DOES_NOT_EXIST), false); - } - else if (hashCode == INVALID_ORDER_HASH) - { - return AWSError(static_cast(CodeCommitErrors::INVALID_ORDER), false); - } - else if (hashCode == INVALID_REPOSITORY_TRIGGER_NAME_HASH) - { - return AWSError(static_cast(CodeCommitErrors::INVALID_REPOSITORY_TRIGGER_NAME), false); - } - else if (hashCode == ENCRYPTION_KEY_NOT_FOUND_HASH) - { - return AWSError(static_cast(CodeCommitErrors::ENCRYPTION_KEY_NOT_FOUND), false); - } - else if (hashCode == MAXIMUM_BRANCHES_EXCEEDED_HASH) + else if (hashCode == ENCRYPTION_INTEGRITY_CHECKS_FAILED_HASH) { - return AWSError(static_cast(CodeCommitErrors::MAXIMUM_BRANCHES_EXCEEDED), false); + return AWSError(static_cast(CodeCommitErrors::ENCRYPTION_INTEGRITY_CHECKS_FAILED), false); } - else if (hashCode == REPOSITORY_TRIGGERS_LIST_REQUIRED_HASH) + else if (hashCode == REPOSITORY_DOES_NOT_EXIST_HASH) { - return AWSError(static_cast(CodeCommitErrors::REPOSITORY_TRIGGERS_LIST_REQUIRED), false); + return AWSError(static_cast(CodeCommitErrors::REPOSITORY_DOES_NOT_EXIST), false); } - else if (hashCode == ENCRYPTION_KEY_DISABLED_HASH) + else if (hashCode == INVALID_BRANCH_NAME_HASH) { - return AWSError(static_cast(CodeCommitErrors::ENCRYPTION_KEY_DISABLED), false); + return AWSError(static_cast(CodeCommitErrors::INVALID_BRANCH_NAME), false); } else if (hashCode == INVALID_COMMIT_ID_HASH) { return AWSError(static_cast(CodeCommitErrors::INVALID_COMMIT_ID), false); } - else if (hashCode == COMMIT_DOES_NOT_EXIST_HASH) - { - return AWSError(static_cast(CodeCommitErrors::COMMIT_DOES_NOT_EXIST), false); - } - else if (hashCode == INVALID_SORT_BY_HASH) - { - return AWSError(static_cast(CodeCommitErrors::INVALID_SORT_BY), false); - } - else if (hashCode == BRANCH_NAME_REQUIRED_HASH) + else if (hashCode == REPOSITORY_NAME_REQUIRED_HASH) { - return AWSError(static_cast(CodeCommitErrors::BRANCH_NAME_REQUIRED), false); + return AWSError(static_cast(CodeCommitErrors::REPOSITORY_NAME_REQUIRED), false); } else if (hashCode == INVALID_REPOSITORY_DESCRIPTION_HASH) { @@ -181,41 +112,41 @@ AWSError GetErrorForName(const char* errorName) { return AWSError(static_cast(CodeCommitErrors::BRANCH_DOES_NOT_EXIST), false); } - else if (hashCode == REPOSITORY_LIMIT_EXCEEDED_HASH) + else if (hashCode == BRANCH_NAME_EXISTS_HASH) { - return AWSError(static_cast(CodeCommitErrors::REPOSITORY_LIMIT_EXCEEDED), false); + return AWSError(static_cast(CodeCommitErrors::BRANCH_NAME_EXISTS), false); } - else if (hashCode == INVALID_BRANCH_NAME_HASH) + else if (hashCode == REPOSITORY_NAMES_REQUIRED_HASH) { - return AWSError(static_cast(CodeCommitErrors::INVALID_BRANCH_NAME), false); + return AWSError(static_cast(CodeCommitErrors::REPOSITORY_NAMES_REQUIRED), false); } - else if (hashCode == INVALID_CONTINUATION_TOKEN_HASH) + else if (hashCode == BRANCH_NAME_REQUIRED_HASH) { - return AWSError(static_cast(CodeCommitErrors::INVALID_CONTINUATION_TOKEN), false); + return AWSError(static_cast(CodeCommitErrors::BRANCH_NAME_REQUIRED), false); } - else if (hashCode == MAXIMUM_REPOSITORY_TRIGGERS_EXCEEDED_HASH) + else if (hashCode == COMMIT_DOES_NOT_EXIST_HASH) { - return AWSError(static_cast(CodeCommitErrors::MAXIMUM_REPOSITORY_TRIGGERS_EXCEEDED), false); + return AWSError(static_cast(CodeCommitErrors::COMMIT_DOES_NOT_EXIST), false); } - else if (hashCode == REPOSITORY_NAME_REQUIRED_HASH) + else if (hashCode == MAXIMUM_REPOSITORY_NAMES_EXCEEDED_HASH) { - return AWSError(static_cast(CodeCommitErrors::REPOSITORY_NAME_REQUIRED), false); + return AWSError(static_cast(CodeCommitErrors::MAXIMUM_REPOSITORY_NAMES_EXCEEDED), false); } - else if (hashCode == BRANCH_NAME_EXISTS_HASH) + else if (hashCode == COMMIT_ID_REQUIRED_HASH) { - return AWSError(static_cast(CodeCommitErrors::BRANCH_NAME_EXISTS), false); + return AWSError(static_cast(CodeCommitErrors::COMMIT_ID_REQUIRED), false); } - else if (hashCode == INVALID_REPOSITORY_TRIGGER_CUSTOM_DATA_HASH) + else if (hashCode == INVALID_CONTINUATION_TOKEN_HASH) { - return AWSError(static_cast(CodeCommitErrors::INVALID_REPOSITORY_TRIGGER_CUSTOM_DATA), false); + return AWSError(static_cast(CodeCommitErrors::INVALID_CONTINUATION_TOKEN), false); } - else if (hashCode == REPOSITORY_DOES_NOT_EXIST_HASH) + else if (hashCode == ENCRYPTION_KEY_NOT_FOUND_HASH) { - return AWSError(static_cast(CodeCommitErrors::REPOSITORY_DOES_NOT_EXIST), false); + return AWSError(static_cast(CodeCommitErrors::ENCRYPTION_KEY_NOT_FOUND), false); } - else if (hashCode == MAXIMUM_REPOSITORY_NAMES_EXCEEDED_HASH) + else if (hashCode == INVALID_SORT_BY_HASH) { - return AWSError(static_cast(CodeCommitErrors::MAXIMUM_REPOSITORY_NAMES_EXCEEDED), false); + return AWSError(static_cast(CodeCommitErrors::INVALID_SORT_BY), false); } return AWSError(CoreErrors::UNKNOWN, false); } diff --git a/aws-cpp-sdk-codecommit/source/model/BranchInfo.cpp b/aws-cpp-sdk-codecommit/source/model/BranchInfo.cpp index 52347e0f059..4c5c6d3cab0 100644 --- a/aws-cpp-sdk-codecommit/source/model/BranchInfo.cpp +++ b/aws-cpp-sdk-codecommit/source/model/BranchInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeCommit::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeCommit +{ +namespace Model +{ + BranchInfo::BranchInfo() : m_branchNameHasBeenSet(false), m_commitIdHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue BranchInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeCommit +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codecommit/source/model/OrderEnum.cpp b/aws-cpp-sdk-codecommit/source/model/OrderEnum.cpp index 8930a47197d..1535ff425f2 100644 --- a/aws-cpp-sdk-codecommit/source/model/OrderEnum.cpp +++ b/aws-cpp-sdk-codecommit/source/model/OrderEnum.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ascending_HASH = HashingUtils::HashString("ascending"); -static const int descending_HASH = HashingUtils::HashString("descending"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace OrderEnumMapper { + static const int ascending_HASH = HashingUtils::HashString("ascending"); + static const int descending_HASH = HashingUtils::HashString("descending"); + OrderEnum GetOrderEnumForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codecommit/source/model/RepositoryMetadata.cpp b/aws-cpp-sdk-codecommit/source/model/RepositoryMetadata.cpp index fdb5772b105..2bf9a37089c 100644 --- a/aws-cpp-sdk-codecommit/source/model/RepositoryMetadata.cpp +++ b/aws-cpp-sdk-codecommit/source/model/RepositoryMetadata.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeCommit::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeCommit +{ +namespace Model +{ + RepositoryMetadata::RepositoryMetadata() : m_accountIdHasBeenSet(false), m_repositoryIdHasBeenSet(false), @@ -188,4 +194,8 @@ JsonValue RepositoryMetadata::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeCommit +} // namespace Aws diff --git a/aws-cpp-sdk-codecommit/source/model/RepositoryNameIdPair.cpp b/aws-cpp-sdk-codecommit/source/model/RepositoryNameIdPair.cpp index 2cdbe7d95a4..d04d0e94770 100644 --- a/aws-cpp-sdk-codecommit/source/model/RepositoryNameIdPair.cpp +++ b/aws-cpp-sdk-codecommit/source/model/RepositoryNameIdPair.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeCommit::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeCommit +{ +namespace Model +{ + RepositoryNameIdPair::RepositoryNameIdPair() : m_repositoryNameHasBeenSet(false), m_repositoryIdHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue RepositoryNameIdPair::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeCommit +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codecommit/source/model/SortByEnum.cpp b/aws-cpp-sdk-codecommit/source/model/SortByEnum.cpp index 7a205fa2a30..c00a7df8eae 100644 --- a/aws-cpp-sdk-codecommit/source/model/SortByEnum.cpp +++ b/aws-cpp-sdk-codecommit/source/model/SortByEnum.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int repositoryName_HASH = HashingUtils::HashString("repositoryName"); -static const int lastModifiedDate_HASH = HashingUtils::HashString("lastModifiedDate"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace SortByEnumMapper { + static const int repositoryName_HASH = HashingUtils::HashString("repositoryName"); + static const int lastModifiedDate_HASH = HashingUtils::HashString("lastModifiedDate"); + SortByEnum GetSortByEnumForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/CMakeLists.txt b/aws-cpp-sdk-codedeploy/CMakeLists.txt index 42ac4bf33e5..388c376c2c6 100644 --- a/aws-cpp-sdk-codedeploy/CMakeLists.txt +++ b/aws-cpp-sdk-codedeploy/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-codedeploy) "source/model/*.cpp" ) - file(GLOB CODEDEPLOY_SRC + file(GLOB CODEDEPLOY_UNIFIED_HEADERS ${AWS_CODEDEPLOY_HEADERS} ${AWS_CODEDEPLOY_MODEL_HEADERS} + ) + + file(GLOB CODEDEPLOY_UNITY_SRC ${AWS_CODEDEPLOY_SOURCE} ${AWS_CODEDEPLOY_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("CODEDEPLOY" CODEDEPLOY_UNITY_SRC) + endif() + + file(GLOB CODEDEPLOY_SRC + ${CODEDEPLOY_UNIFIED_HEADERS} + ${CODEDEPLOY_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-codedeploy/source/CodeDeployErrors.cpp b/aws-cpp-sdk-codedeploy/source/CodeDeployErrors.cpp index 0fe19de1467..6178182c25b 100644 --- a/aws-cpp-sdk-codedeploy/source/CodeDeployErrors.cpp +++ b/aws-cpp-sdk-codedeploy/source/CodeDeployErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::CodeDeploy; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace CodeDeployErrorMapper +{ + static const int BUCKET_NAME_FILTER_REQUIRED_HASH = HashingUtils::HashString("BucketNameFilterRequiredException"); static const int INSTANCE_NAME_REQUIRED_HASH = HashingUtils::HashString("InstanceNameRequiredException"); static const int TAG_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("TagLimitExceededException"); @@ -82,12 +89,6 @@ static const int INVALID_TAG_HASH = HashingUtils::HashString("InvalidTagExceptio static const int TAG_REQUIRED_HASH = HashingUtils::HashString("TagRequiredException"); static const int DEPLOYMENT_CONFIG_ALREADY_EXISTS_HASH = HashingUtils::HashString("DeploymentConfigAlreadyExistsException"); -namespace Aws -{ -namespace CodeDeploy -{ -namespace CodeDeployErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-codedeploy/source/model/ApplicationInfo.cpp b/aws-cpp-sdk-codedeploy/source/model/ApplicationInfo.cpp index 7225942f664..41d35de2d0c 100644 --- a/aws-cpp-sdk-codedeploy/source/model/ApplicationInfo.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/ApplicationInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + ApplicationInfo::ApplicationInfo() : m_applicationIdHasBeenSet(false), m_applicationNameHasBeenSet(false), @@ -101,4 +107,8 @@ JsonValue ApplicationInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws diff --git a/aws-cpp-sdk-codedeploy/source/model/ApplicationRevisionSortBy.cpp b/aws-cpp-sdk-codedeploy/source/model/ApplicationRevisionSortBy.cpp index 0e6c0f557f1..ab0d66e74da 100644 --- a/aws-cpp-sdk-codedeploy/source/model/ApplicationRevisionSortBy.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/ApplicationRevisionSortBy.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int registerTime_HASH = HashingUtils::HashString("registerTime"); -static const int firstUsedTime_HASH = HashingUtils::HashString("firstUsedTime"); -static const int lastUsedTime_HASH = HashingUtils::HashString("lastUsedTime"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ApplicationRevisionSortByMapper { + static const int registerTime_HASH = HashingUtils::HashString("registerTime"); + static const int firstUsedTime_HASH = HashingUtils::HashString("firstUsedTime"); + static const int lastUsedTime_HASH = HashingUtils::HashString("lastUsedTime"); + ApplicationRevisionSortBy GetApplicationRevisionSortByForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/AutoScalingGroup.cpp b/aws-cpp-sdk-codedeploy/source/model/AutoScalingGroup.cpp index dfdd82b7bb7..a465e639a6a 100644 --- a/aws-cpp-sdk-codedeploy/source/model/AutoScalingGroup.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/AutoScalingGroup.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + AutoScalingGroup::AutoScalingGroup() : m_nameHasBeenSet(false), m_hookHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue AutoScalingGroup::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codedeploy/source/model/BundleType.cpp b/aws-cpp-sdk-codedeploy/source/model/BundleType.cpp index 96a1bc2ae43..4c17dabd6c2 100644 --- a/aws-cpp-sdk-codedeploy/source/model/BundleType.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/BundleType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int tar_HASH = HashingUtils::HashString("tar"); -static const int tgz_HASH = HashingUtils::HashString("tgz"); -static const int zip_HASH = HashingUtils::HashString("zip"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace BundleTypeMapper { + static const int tar_HASH = HashingUtils::HashString("tar"); + static const int tgz_HASH = HashingUtils::HashString("tgz"); + static const int zip_HASH = HashingUtils::HashString("zip"); + BundleType GetBundleTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/DeploymentConfigInfo.cpp b/aws-cpp-sdk-codedeploy/source/model/DeploymentConfigInfo.cpp index 5b7f3b09e35..21375970c77 100644 --- a/aws-cpp-sdk-codedeploy/source/model/DeploymentConfigInfo.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/DeploymentConfigInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + DeploymentConfigInfo::DeploymentConfigInfo() : m_deploymentConfigIdHasBeenSet(false), m_deploymentConfigNameHasBeenSet(false), @@ -99,4 +105,8 @@ JsonValue DeploymentConfigInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws diff --git a/aws-cpp-sdk-codedeploy/source/model/DeploymentCreator.cpp b/aws-cpp-sdk-codedeploy/source/model/DeploymentCreator.cpp index 8d09772c5f6..cfa878581ea 100644 --- a/aws-cpp-sdk-codedeploy/source/model/DeploymentCreator.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/DeploymentCreator.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int user_HASH = HashingUtils::HashString("user"); -static const int autoscaling_HASH = HashingUtils::HashString("autoscaling"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace DeploymentCreatorMapper { + static const int user_HASH = HashingUtils::HashString("user"); + static const int autoscaling_HASH = HashingUtils::HashString("autoscaling"); + DeploymentCreator GetDeploymentCreatorForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/DeploymentGroupInfo.cpp b/aws-cpp-sdk-codedeploy/source/model/DeploymentGroupInfo.cpp index c84bd2c3427..be94a72bb81 100644 --- a/aws-cpp-sdk-codedeploy/source/model/DeploymentGroupInfo.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/DeploymentGroupInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + DeploymentGroupInfo::DeploymentGroupInfo() : m_applicationNameHasBeenSet(false), m_deploymentGroupIdHasBeenSet(false), @@ -222,4 +228,8 @@ JsonValue DeploymentGroupInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codedeploy/source/model/DeploymentInfo.cpp b/aws-cpp-sdk-codedeploy/source/model/DeploymentInfo.cpp index 6b5777dc222..406d4ea10b0 100644 --- a/aws-cpp-sdk-codedeploy/source/model/DeploymentInfo.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/DeploymentInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + DeploymentInfo::DeploymentInfo() : m_applicationNameHasBeenSet(false), m_deploymentGroupNameHasBeenSet(false), @@ -247,4 +253,8 @@ JsonValue DeploymentInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws diff --git a/aws-cpp-sdk-codedeploy/source/model/DeploymentOverview.cpp b/aws-cpp-sdk-codedeploy/source/model/DeploymentOverview.cpp index a0cabb34abe..6240b7b834f 100644 --- a/aws-cpp-sdk-codedeploy/source/model/DeploymentOverview.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/DeploymentOverview.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + DeploymentOverview::DeploymentOverview() : m_pending(0), m_pendingHasBeenSet(false), @@ -125,4 +131,8 @@ JsonValue DeploymentOverview::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codedeploy/source/model/DeploymentStatus.cpp b/aws-cpp-sdk-codedeploy/source/model/DeploymentStatus.cpp index c1c78936dd6..89f0c9022db 100644 --- a/aws-cpp-sdk-codedeploy/source/model/DeploymentStatus.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/DeploymentStatus.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int Created_HASH = HashingUtils::HashString("Created"); -static const int Queued_HASH = HashingUtils::HashString("Queued"); -static const int InProgress_HASH = HashingUtils::HashString("InProgress"); -static const int Succeeded_HASH = HashingUtils::HashString("Succeeded"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); -static const int Stopped_HASH = HashingUtils::HashString("Stopped"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace DeploymentStatusMapper { + static const int Created_HASH = HashingUtils::HashString("Created"); + static const int Queued_HASH = HashingUtils::HashString("Queued"); + static const int InProgress_HASH = HashingUtils::HashString("InProgress"); + static const int Succeeded_HASH = HashingUtils::HashString("Succeeded"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + static const int Stopped_HASH = HashingUtils::HashString("Stopped"); + DeploymentStatus GetDeploymentStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/Diagnostics.cpp b/aws-cpp-sdk-codedeploy/source/model/Diagnostics.cpp index cfa49618592..9a842dffa26 100644 --- a/aws-cpp-sdk-codedeploy/source/model/Diagnostics.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/Diagnostics.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + Diagnostics::Diagnostics() : m_errorCodeHasBeenSet(false), m_scriptNameHasBeenSet(false), @@ -99,4 +105,8 @@ JsonValue Diagnostics::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codedeploy/source/model/EC2TagFilter.cpp b/aws-cpp-sdk-codedeploy/source/model/EC2TagFilter.cpp index 608ac865e99..366d713a1fa 100644 --- a/aws-cpp-sdk-codedeploy/source/model/EC2TagFilter.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/EC2TagFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + EC2TagFilter::EC2TagFilter() : m_keyHasBeenSet(false), m_valueHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue EC2TagFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codedeploy/source/model/EC2TagFilterType.cpp b/aws-cpp-sdk-codedeploy/source/model/EC2TagFilterType.cpp index 906a6fd26c3..ce0613acb4d 100644 --- a/aws-cpp-sdk-codedeploy/source/model/EC2TagFilterType.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/EC2TagFilterType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int KEY_ONLY_HASH = HashingUtils::HashString("KEY_ONLY"); -static const int VALUE_ONLY_HASH = HashingUtils::HashString("VALUE_ONLY"); -static const int KEY_AND_VALUE_HASH = HashingUtils::HashString("KEY_AND_VALUE"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace EC2TagFilterTypeMapper { + static const int KEY_ONLY_HASH = HashingUtils::HashString("KEY_ONLY"); + static const int VALUE_ONLY_HASH = HashingUtils::HashString("VALUE_ONLY"); + static const int KEY_AND_VALUE_HASH = HashingUtils::HashString("KEY_AND_VALUE"); + EC2TagFilterType GetEC2TagFilterTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/ErrorCode.cpp b/aws-cpp-sdk-codedeploy/source/model/ErrorCode.cpp index 537e928942d..c7b0bfc211a 100644 --- a/aws-cpp-sdk-codedeploy/source/model/ErrorCode.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/ErrorCode.cpp @@ -19,19 +19,6 @@ using namespace Aws::Utils; -static const int DEPLOYMENT_GROUP_MISSING_HASH = HashingUtils::HashString("DEPLOYMENT_GROUP_MISSING"); -static const int APPLICATION_MISSING_HASH = HashingUtils::HashString("APPLICATION_MISSING"); -static const int REVISION_MISSING_HASH = HashingUtils::HashString("REVISION_MISSING"); -static const int IAM_ROLE_MISSING_HASH = HashingUtils::HashString("IAM_ROLE_MISSING"); -static const int IAM_ROLE_PERMISSIONS_HASH = HashingUtils::HashString("IAM_ROLE_PERMISSIONS"); -static const int NO_EC2_SUBSCRIPTION_HASH = HashingUtils::HashString("NO_EC2_SUBSCRIPTION"); -static const int OVER_MAX_INSTANCES_HASH = HashingUtils::HashString("OVER_MAX_INSTANCES"); -static const int NO_INSTANCES_HASH = HashingUtils::HashString("NO_INSTANCES"); -static const int TIMEOUT_HASH = HashingUtils::HashString("TIMEOUT"); -static const int HEALTH_CONSTRAINTS_INVALID_HASH = HashingUtils::HashString("HEALTH_CONSTRAINTS_INVALID"); -static const int HEALTH_CONSTRAINTS_HASH = HashingUtils::HashString("HEALTH_CONSTRAINTS"); -static const int INTERNAL_ERROR_HASH = HashingUtils::HashString("INTERNAL_ERROR"); -static const int THROTTLED_HASH = HashingUtils::HashString("THROTTLED"); namespace Aws { @@ -42,6 +29,20 @@ namespace Aws namespace ErrorCodeMapper { + static const int DEPLOYMENT_GROUP_MISSING_HASH = HashingUtils::HashString("DEPLOYMENT_GROUP_MISSING"); + static const int APPLICATION_MISSING_HASH = HashingUtils::HashString("APPLICATION_MISSING"); + static const int REVISION_MISSING_HASH = HashingUtils::HashString("REVISION_MISSING"); + static const int IAM_ROLE_MISSING_HASH = HashingUtils::HashString("IAM_ROLE_MISSING"); + static const int IAM_ROLE_PERMISSIONS_HASH = HashingUtils::HashString("IAM_ROLE_PERMISSIONS"); + static const int NO_EC2_SUBSCRIPTION_HASH = HashingUtils::HashString("NO_EC2_SUBSCRIPTION"); + static const int OVER_MAX_INSTANCES_HASH = HashingUtils::HashString("OVER_MAX_INSTANCES"); + static const int NO_INSTANCES_HASH = HashingUtils::HashString("NO_INSTANCES"); + static const int TIMEOUT_HASH = HashingUtils::HashString("TIMEOUT"); + static const int HEALTH_CONSTRAINTS_INVALID_HASH = HashingUtils::HashString("HEALTH_CONSTRAINTS_INVALID"); + static const int HEALTH_CONSTRAINTS_HASH = HashingUtils::HashString("HEALTH_CONSTRAINTS"); + static const int INTERNAL_ERROR_HASH = HashingUtils::HashString("INTERNAL_ERROR"); + static const int THROTTLED_HASH = HashingUtils::HashString("THROTTLED"); + ErrorCode GetErrorCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/ErrorInformation.cpp b/aws-cpp-sdk-codedeploy/source/model/ErrorInformation.cpp index 8a3d7c66276..b58f03b566e 100644 --- a/aws-cpp-sdk-codedeploy/source/model/ErrorInformation.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/ErrorInformation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + ErrorInformation::ErrorInformation() : m_codeHasBeenSet(false), m_messageHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue ErrorInformation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codedeploy/source/model/GenericRevisionInfo.cpp b/aws-cpp-sdk-codedeploy/source/model/GenericRevisionInfo.cpp index 98bd7a9e4fc..fdfe4eae02d 100644 --- a/aws-cpp-sdk-codedeploy/source/model/GenericRevisionInfo.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/GenericRevisionInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + GenericRevisionInfo::GenericRevisionInfo() : m_descriptionHasBeenSet(false), m_deploymentGroupsHasBeenSet(false), @@ -120,4 +126,8 @@ JsonValue GenericRevisionInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws diff --git a/aws-cpp-sdk-codedeploy/source/model/GitHubLocation.cpp b/aws-cpp-sdk-codedeploy/source/model/GitHubLocation.cpp index cac98d0f18a..36c3f20a08f 100644 --- a/aws-cpp-sdk-codedeploy/source/model/GitHubLocation.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/GitHubLocation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + GitHubLocation::GitHubLocation() : m_repositoryHasBeenSet(false), m_commitIdHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue GitHubLocation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codedeploy/source/model/InstanceInfo.cpp b/aws-cpp-sdk-codedeploy/source/model/InstanceInfo.cpp index a157711cc70..2966c093a63 100644 --- a/aws-cpp-sdk-codedeploy/source/model/InstanceInfo.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/InstanceInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + InstanceInfo::InstanceInfo() : m_instanceNameHasBeenSet(false), m_iamUserArnHasBeenSet(false), @@ -136,4 +142,8 @@ JsonValue InstanceInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws diff --git a/aws-cpp-sdk-codedeploy/source/model/InstanceStatus.cpp b/aws-cpp-sdk-codedeploy/source/model/InstanceStatus.cpp index 452e0a1f387..21f4a79f189 100644 --- a/aws-cpp-sdk-codedeploy/source/model/InstanceStatus.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/InstanceStatus.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int Pending_HASH = HashingUtils::HashString("Pending"); -static const int InProgress_HASH = HashingUtils::HashString("InProgress"); -static const int Succeeded_HASH = HashingUtils::HashString("Succeeded"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); -static const int Skipped_HASH = HashingUtils::HashString("Skipped"); -static const int Unknown_HASH = HashingUtils::HashString("Unknown"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace InstanceStatusMapper { + static const int Pending_HASH = HashingUtils::HashString("Pending"); + static const int InProgress_HASH = HashingUtils::HashString("InProgress"); + static const int Succeeded_HASH = HashingUtils::HashString("Succeeded"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + static const int Skipped_HASH = HashingUtils::HashString("Skipped"); + static const int Unknown_HASH = HashingUtils::HashString("Unknown"); + InstanceStatus GetInstanceStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/InstanceSummary.cpp b/aws-cpp-sdk-codedeploy/source/model/InstanceSummary.cpp index c54f5962e87..0b8f77b2f53 100644 --- a/aws-cpp-sdk-codedeploy/source/model/InstanceSummary.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/InstanceSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + InstanceSummary::InstanceSummary() : m_deploymentIdHasBeenSet(false), m_instanceIdHasBeenSet(false), @@ -121,4 +127,8 @@ JsonValue InstanceSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws diff --git a/aws-cpp-sdk-codedeploy/source/model/LifecycleErrorCode.cpp b/aws-cpp-sdk-codedeploy/source/model/LifecycleErrorCode.cpp index 98e91cb4826..9331d44f7b1 100644 --- a/aws-cpp-sdk-codedeploy/source/model/LifecycleErrorCode.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/LifecycleErrorCode.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int Success_HASH = HashingUtils::HashString("Success"); -static const int ScriptMissing_HASH = HashingUtils::HashString("ScriptMissing"); -static const int ScriptNotExecutable_HASH = HashingUtils::HashString("ScriptNotExecutable"); -static const int ScriptTimedOut_HASH = HashingUtils::HashString("ScriptTimedOut"); -static const int ScriptFailed_HASH = HashingUtils::HashString("ScriptFailed"); -static const int UnknownError_HASH = HashingUtils::HashString("UnknownError"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace LifecycleErrorCodeMapper { + static const int Success_HASH = HashingUtils::HashString("Success"); + static const int ScriptMissing_HASH = HashingUtils::HashString("ScriptMissing"); + static const int ScriptNotExecutable_HASH = HashingUtils::HashString("ScriptNotExecutable"); + static const int ScriptTimedOut_HASH = HashingUtils::HashString("ScriptTimedOut"); + static const int ScriptFailed_HASH = HashingUtils::HashString("ScriptFailed"); + static const int UnknownError_HASH = HashingUtils::HashString("UnknownError"); + LifecycleErrorCode GetLifecycleErrorCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/LifecycleEvent.cpp b/aws-cpp-sdk-codedeploy/source/model/LifecycleEvent.cpp index 4e496a8430d..a5ccb7326b8 100644 --- a/aws-cpp-sdk-codedeploy/source/model/LifecycleEvent.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/LifecycleEvent.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + LifecycleEvent::LifecycleEvent() : m_lifecycleEventNameHasBeenSet(false), m_diagnosticsHasBeenSet(false), @@ -112,4 +118,8 @@ JsonValue LifecycleEvent::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws diff --git a/aws-cpp-sdk-codedeploy/source/model/LifecycleEventStatus.cpp b/aws-cpp-sdk-codedeploy/source/model/LifecycleEventStatus.cpp index 17f495f11a6..ab05b693ed3 100644 --- a/aws-cpp-sdk-codedeploy/source/model/LifecycleEventStatus.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/LifecycleEventStatus.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int Pending_HASH = HashingUtils::HashString("Pending"); -static const int InProgress_HASH = HashingUtils::HashString("InProgress"); -static const int Succeeded_HASH = HashingUtils::HashString("Succeeded"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); -static const int Skipped_HASH = HashingUtils::HashString("Skipped"); -static const int Unknown_HASH = HashingUtils::HashString("Unknown"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace LifecycleEventStatusMapper { + static const int Pending_HASH = HashingUtils::HashString("Pending"); + static const int InProgress_HASH = HashingUtils::HashString("InProgress"); + static const int Succeeded_HASH = HashingUtils::HashString("Succeeded"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + static const int Skipped_HASH = HashingUtils::HashString("Skipped"); + static const int Unknown_HASH = HashingUtils::HashString("Unknown"); + LifecycleEventStatus GetLifecycleEventStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/ListStateFilterAction.cpp b/aws-cpp-sdk-codedeploy/source/model/ListStateFilterAction.cpp index c097dfe8b3f..ae7c76b2bc9 100644 --- a/aws-cpp-sdk-codedeploy/source/model/ListStateFilterAction.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/ListStateFilterAction.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int include_HASH = HashingUtils::HashString("include"); -static const int exclude_HASH = HashingUtils::HashString("exclude"); -static const int ignore_HASH = HashingUtils::HashString("ignore"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ListStateFilterActionMapper { + static const int include_HASH = HashingUtils::HashString("include"); + static const int exclude_HASH = HashingUtils::HashString("exclude"); + static const int ignore_HASH = HashingUtils::HashString("ignore"); + ListStateFilterAction GetListStateFilterActionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/MinimumHealthyHosts.cpp b/aws-cpp-sdk-codedeploy/source/model/MinimumHealthyHosts.cpp index f68f398c147..7328832f3de 100644 --- a/aws-cpp-sdk-codedeploy/source/model/MinimumHealthyHosts.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/MinimumHealthyHosts.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + MinimumHealthyHosts::MinimumHealthyHosts() : m_value(0), m_valueHasBeenSet(false), @@ -71,4 +77,8 @@ JsonValue MinimumHealthyHosts::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codedeploy/source/model/MinimumHealthyHostsType.cpp b/aws-cpp-sdk-codedeploy/source/model/MinimumHealthyHostsType.cpp index edb4dbb29ce..0bcbbef3842 100644 --- a/aws-cpp-sdk-codedeploy/source/model/MinimumHealthyHostsType.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/MinimumHealthyHostsType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int HOST_COUNT_HASH = HashingUtils::HashString("HOST_COUNT"); -static const int FLEET_PERCENT_HASH = HashingUtils::HashString("FLEET_PERCENT"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace MinimumHealthyHostsTypeMapper { + static const int HOST_COUNT_HASH = HashingUtils::HashString("HOST_COUNT"); + static const int FLEET_PERCENT_HASH = HashingUtils::HashString("FLEET_PERCENT"); + MinimumHealthyHostsType GetMinimumHealthyHostsTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/RegistrationStatus.cpp b/aws-cpp-sdk-codedeploy/source/model/RegistrationStatus.cpp index 61424fbafbe..1a78cb7dbb7 100644 --- a/aws-cpp-sdk-codedeploy/source/model/RegistrationStatus.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/RegistrationStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Registered_HASH = HashingUtils::HashString("Registered"); -static const int Deregistered_HASH = HashingUtils::HashString("Deregistered"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace RegistrationStatusMapper { + static const int Registered_HASH = HashingUtils::HashString("Registered"); + static const int Deregistered_HASH = HashingUtils::HashString("Deregistered"); + RegistrationStatus GetRegistrationStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/RevisionInfo.cpp b/aws-cpp-sdk-codedeploy/source/model/RevisionInfo.cpp index 504942697d9..fbc41b674ee 100644 --- a/aws-cpp-sdk-codedeploy/source/model/RevisionInfo.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/RevisionInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + RevisionInfo::RevisionInfo() : m_revisionLocationHasBeenSet(false), m_genericRevisionInfoHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue RevisionInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codedeploy/source/model/RevisionLocation.cpp b/aws-cpp-sdk-codedeploy/source/model/RevisionLocation.cpp index 65bfa5d6de8..e785f6b851f 100644 --- a/aws-cpp-sdk-codedeploy/source/model/RevisionLocation.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/RevisionLocation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + RevisionLocation::RevisionLocation() : m_revisionTypeHasBeenSet(false), m_s3LocationHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue RevisionLocation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codedeploy/source/model/RevisionLocationType.cpp b/aws-cpp-sdk-codedeploy/source/model/RevisionLocationType.cpp index 850329968a9..91b611b94c0 100644 --- a/aws-cpp-sdk-codedeploy/source/model/RevisionLocationType.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/RevisionLocationType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int S3_HASH = HashingUtils::HashString("S3"); -static const int GitHub_HASH = HashingUtils::HashString("GitHub"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace RevisionLocationTypeMapper { + static const int S3_HASH = HashingUtils::HashString("S3"); + static const int GitHub_HASH = HashingUtils::HashString("GitHub"); + RevisionLocationType GetRevisionLocationTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/S3Location.cpp b/aws-cpp-sdk-codedeploy/source/model/S3Location.cpp index 5dc4ebb9546..b893b3f325a 100644 --- a/aws-cpp-sdk-codedeploy/source/model/S3Location.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/S3Location.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + S3Location::S3Location() : m_bucketHasBeenSet(false), m_keyHasBeenSet(false), @@ -114,4 +120,8 @@ JsonValue S3Location::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codedeploy/source/model/SortOrder.cpp b/aws-cpp-sdk-codedeploy/source/model/SortOrder.cpp index 564e05d5558..576fdb7e050 100644 --- a/aws-cpp-sdk-codedeploy/source/model/SortOrder.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/SortOrder.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ascending_HASH = HashingUtils::HashString("ascending"); -static const int descending_HASH = HashingUtils::HashString("descending"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace SortOrderMapper { + static const int ascending_HASH = HashingUtils::HashString("ascending"); + static const int descending_HASH = HashingUtils::HashString("descending"); + SortOrder GetSortOrderForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/StopStatus.cpp b/aws-cpp-sdk-codedeploy/source/model/StopStatus.cpp index c68ea59464c..31ed64f8066 100644 --- a/aws-cpp-sdk-codedeploy/source/model/StopStatus.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/StopStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Pending_HASH = HashingUtils::HashString("Pending"); -static const int Succeeded_HASH = HashingUtils::HashString("Succeeded"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace StopStatusMapper { + static const int Pending_HASH = HashingUtils::HashString("Pending"); + static const int Succeeded_HASH = HashingUtils::HashString("Succeeded"); + StopStatus GetStopStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/Tag.cpp b/aws-cpp-sdk-codedeploy/source/model/Tag.cpp index cc1e59ff9c6..119773225cf 100644 --- a/aws-cpp-sdk-codedeploy/source/model/Tag.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/Tag.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Tag::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codedeploy/source/model/TagFilter.cpp b/aws-cpp-sdk-codedeploy/source/model/TagFilter.cpp index 96b077ca7c0..2c65214ffde 100644 --- a/aws-cpp-sdk-codedeploy/source/model/TagFilter.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/TagFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + TagFilter::TagFilter() : m_keyHasBeenSet(false), m_valueHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue TagFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codedeploy/source/model/TagFilterType.cpp b/aws-cpp-sdk-codedeploy/source/model/TagFilterType.cpp index 61a347cb57e..dd20d4af38f 100644 --- a/aws-cpp-sdk-codedeploy/source/model/TagFilterType.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/TagFilterType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int KEY_ONLY_HASH = HashingUtils::HashString("KEY_ONLY"); -static const int VALUE_ONLY_HASH = HashingUtils::HashString("VALUE_ONLY"); -static const int KEY_AND_VALUE_HASH = HashingUtils::HashString("KEY_AND_VALUE"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace TagFilterTypeMapper { + static const int KEY_ONLY_HASH = HashingUtils::HashString("KEY_ONLY"); + static const int VALUE_ONLY_HASH = HashingUtils::HashString("VALUE_ONLY"); + static const int KEY_AND_VALUE_HASH = HashingUtils::HashString("KEY_AND_VALUE"); + TagFilterType GetTagFilterTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codedeploy/source/model/TimeRange.cpp b/aws-cpp-sdk-codedeploy/source/model/TimeRange.cpp index 698a5149cd0..4a52ee91d3f 100644 --- a/aws-cpp-sdk-codedeploy/source/model/TimeRange.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/TimeRange.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + TimeRange::TimeRange() : m_startHasBeenSet(false), m_endHasBeenSet(false) @@ -68,4 +74,8 @@ JsonValue TimeRange::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws diff --git a/aws-cpp-sdk-codedeploy/source/model/TriggerConfig.cpp b/aws-cpp-sdk-codedeploy/source/model/TriggerConfig.cpp index 6b45c123a20..5ec2c177108 100644 --- a/aws-cpp-sdk-codedeploy/source/model/TriggerConfig.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/TriggerConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodeDeploy::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodeDeploy +{ +namespace Model +{ + TriggerConfig::TriggerConfig() : m_triggerNameHasBeenSet(false), m_triggerTargetArnHasBeenSet(false), @@ -93,4 +99,8 @@ JsonValue TriggerConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodeDeploy +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codedeploy/source/model/TriggerEventType.cpp b/aws-cpp-sdk-codedeploy/source/model/TriggerEventType.cpp index 93be077440e..e0c112cc0b9 100644 --- a/aws-cpp-sdk-codedeploy/source/model/TriggerEventType.cpp +++ b/aws-cpp-sdk-codedeploy/source/model/TriggerEventType.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int DeploymentStart_HASH = HashingUtils::HashString("DeploymentStart"); -static const int DeploymentSuccess_HASH = HashingUtils::HashString("DeploymentSuccess"); -static const int DeploymentFailure_HASH = HashingUtils::HashString("DeploymentFailure"); -static const int DeploymentStop_HASH = HashingUtils::HashString("DeploymentStop"); -static const int InstanceStart_HASH = HashingUtils::HashString("InstanceStart"); -static const int InstanceSuccess_HASH = HashingUtils::HashString("InstanceSuccess"); -static const int InstanceFailure_HASH = HashingUtils::HashString("InstanceFailure"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace TriggerEventTypeMapper { + static const int DeploymentStart_HASH = HashingUtils::HashString("DeploymentStart"); + static const int DeploymentSuccess_HASH = HashingUtils::HashString("DeploymentSuccess"); + static const int DeploymentFailure_HASH = HashingUtils::HashString("DeploymentFailure"); + static const int DeploymentStop_HASH = HashingUtils::HashString("DeploymentStop"); + static const int InstanceStart_HASH = HashingUtils::HashString("InstanceStart"); + static const int InstanceSuccess_HASH = HashingUtils::HashString("InstanceSuccess"); + static const int InstanceFailure_HASH = HashingUtils::HashString("InstanceFailure"); + TriggerEventType GetTriggerEventTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codepipeline/CMakeLists.txt b/aws-cpp-sdk-codepipeline/CMakeLists.txt index 266cd4708c4..0759a69524a 100644 --- a/aws-cpp-sdk-codepipeline/CMakeLists.txt +++ b/aws-cpp-sdk-codepipeline/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-codepipeline) "source/model/*.cpp" ) - file(GLOB CODEPIPELINE_SRC + file(GLOB CODEPIPELINE_UNIFIED_HEADERS ${AWS_CODEPIPELINE_HEADERS} ${AWS_CODEPIPELINE_MODEL_HEADERS} + ) + + file(GLOB CODEPIPELINE_UNITY_SRC ${AWS_CODEPIPELINE_SOURCE} ${AWS_CODEPIPELINE_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("CODEPIPELINE" CODEPIPELINE_UNITY_SRC) + endif() + + file(GLOB CODEPIPELINE_SRC + ${CODEPIPELINE_UNIFIED_HEADERS} + ${CODEPIPELINE_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-codepipeline/source/CodePipelineErrors.cpp b/aws-cpp-sdk-codepipeline/source/CodePipelineErrors.cpp index b1f920f71f3..6c5c4873b2a 100644 --- a/aws-cpp-sdk-codepipeline/source/CodePipelineErrors.cpp +++ b/aws-cpp-sdk-codepipeline/source/CodePipelineErrors.cpp @@ -20,102 +20,103 @@ using namespace Aws::Client; using namespace Aws::CodePipeline; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace CodePipelineErrorMapper +{ + +static const int STAGE_NOT_FOUND_HASH = HashingUtils::HashString("StageNotFoundException"); +static const int JOB_NOT_FOUND_HASH = HashingUtils::HashString("JobNotFoundException"); +static const int ACTION_TYPE_NOT_FOUND_HASH = HashingUtils::HashString("ActionTypeNotFoundException"); static const int ACTION_NOT_FOUND_HASH = HashingUtils::HashString("ActionNotFoundException"); -static const int INVALID_NONCE_HASH = HashingUtils::HashString("InvalidNonceException"); -static const int INVALID_STRUCTURE_HASH = HashingUtils::HashString("InvalidStructureException"); -static const int INVALID_STAGE_DECLARATION_HASH = HashingUtils::HashString("InvalidStageDeclarationException"); +static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); static const int INVALID_NEXT_TOKEN_HASH = HashingUtils::HashString("InvalidNextTokenException"); -static const int INVALID_CLIENT_TOKEN_HASH = HashingUtils::HashString("InvalidClientTokenException"); -static const int INVALID_JOB_STATE_HASH = HashingUtils::HashString("InvalidJobStateException"); +static const int INVALID_ACTION_DECLARATION_HASH = HashingUtils::HashString("InvalidActionDeclarationException"); static const int INVALID_BLOCKER_DECLARATION_HASH = HashingUtils::HashString("InvalidBlockerDeclarationException"); -static const int PIPELINE_NOT_FOUND_HASH = HashingUtils::HashString("PipelineNotFoundException"); -static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); static const int PIPELINE_VERSION_NOT_FOUND_HASH = HashingUtils::HashString("PipelineVersionNotFoundException"); -static const int JOB_NOT_FOUND_HASH = HashingUtils::HashString("JobNotFoundException"); -static const int INVALID_ACTION_DECLARATION_HASH = HashingUtils::HashString("InvalidActionDeclarationException"); -static const int ACTION_TYPE_NOT_FOUND_HASH = HashingUtils::HashString("ActionTypeNotFoundException"); -static const int STAGE_NOT_FOUND_HASH = HashingUtils::HashString("StageNotFoundException"); +static const int INVALID_CLIENT_TOKEN_HASH = HashingUtils::HashString("InvalidClientTokenException"); +static const int PIPELINE_NOT_FOUND_HASH = HashingUtils::HashString("PipelineNotFoundException"); static const int PIPELINE_NAME_IN_USE_HASH = HashingUtils::HashString("PipelineNameInUseException"); +static const int INVALID_STRUCTURE_HASH = HashingUtils::HashString("InvalidStructureException"); static const int INVALID_JOB_HASH = HashingUtils::HashString("InvalidJobException"); +static const int INVALID_STAGE_DECLARATION_HASH = HashingUtils::HashString("InvalidStageDeclarationException"); +static const int INVALID_JOB_STATE_HASH = HashingUtils::HashString("InvalidJobStateException"); +static const int INVALID_NONCE_HASH = HashingUtils::HashString("InvalidNonceException"); -namespace Aws -{ -namespace CodePipeline -{ -namespace CodePipelineErrorMapper -{ AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); - if (hashCode == ACTION_NOT_FOUND_HASH) + if (hashCode == STAGE_NOT_FOUND_HASH) { - return AWSError(static_cast(CodePipelineErrors::ACTION_NOT_FOUND), false); + return AWSError(static_cast(CodePipelineErrors::STAGE_NOT_FOUND), false); } - else if (hashCode == INVALID_NONCE_HASH) + else if (hashCode == JOB_NOT_FOUND_HASH) { - return AWSError(static_cast(CodePipelineErrors::INVALID_NONCE), false); + return AWSError(static_cast(CodePipelineErrors::JOB_NOT_FOUND), false); } - else if (hashCode == INVALID_STRUCTURE_HASH) + else if (hashCode == ACTION_TYPE_NOT_FOUND_HASH) { - return AWSError(static_cast(CodePipelineErrors::INVALID_STRUCTURE), false); + return AWSError(static_cast(CodePipelineErrors::ACTION_TYPE_NOT_FOUND), false); } - else if (hashCode == INVALID_STAGE_DECLARATION_HASH) + else if (hashCode == ACTION_NOT_FOUND_HASH) { - return AWSError(static_cast(CodePipelineErrors::INVALID_STAGE_DECLARATION), false); + return AWSError(static_cast(CodePipelineErrors::ACTION_NOT_FOUND), false); } - else if (hashCode == INVALID_NEXT_TOKEN_HASH) + else if (hashCode == LIMIT_EXCEEDED_HASH) { - return AWSError(static_cast(CodePipelineErrors::INVALID_NEXT_TOKEN), false); + return AWSError(static_cast(CodePipelineErrors::LIMIT_EXCEEDED), false); } - else if (hashCode == INVALID_CLIENT_TOKEN_HASH) + else if (hashCode == INVALID_NEXT_TOKEN_HASH) { - return AWSError(static_cast(CodePipelineErrors::INVALID_CLIENT_TOKEN), false); + return AWSError(static_cast(CodePipelineErrors::INVALID_NEXT_TOKEN), false); } - else if (hashCode == INVALID_JOB_STATE_HASH) + else if (hashCode == INVALID_ACTION_DECLARATION_HASH) { - return AWSError(static_cast(CodePipelineErrors::INVALID_JOB_STATE), false); + return AWSError(static_cast(CodePipelineErrors::INVALID_ACTION_DECLARATION), false); } else if (hashCode == INVALID_BLOCKER_DECLARATION_HASH) { return AWSError(static_cast(CodePipelineErrors::INVALID_BLOCKER_DECLARATION), false); } - else if (hashCode == PIPELINE_NOT_FOUND_HASH) + else if (hashCode == PIPELINE_VERSION_NOT_FOUND_HASH) { - return AWSError(static_cast(CodePipelineErrors::PIPELINE_NOT_FOUND), false); + return AWSError(static_cast(CodePipelineErrors::PIPELINE_VERSION_NOT_FOUND), false); } - else if (hashCode == LIMIT_EXCEEDED_HASH) + else if (hashCode == INVALID_CLIENT_TOKEN_HASH) { - return AWSError(static_cast(CodePipelineErrors::LIMIT_EXCEEDED), false); + return AWSError(static_cast(CodePipelineErrors::INVALID_CLIENT_TOKEN), false); } - else if (hashCode == PIPELINE_VERSION_NOT_FOUND_HASH) + else if (hashCode == PIPELINE_NOT_FOUND_HASH) { - return AWSError(static_cast(CodePipelineErrors::PIPELINE_VERSION_NOT_FOUND), false); + return AWSError(static_cast(CodePipelineErrors::PIPELINE_NOT_FOUND), false); } - else if (hashCode == JOB_NOT_FOUND_HASH) + else if (hashCode == PIPELINE_NAME_IN_USE_HASH) { - return AWSError(static_cast(CodePipelineErrors::JOB_NOT_FOUND), false); + return AWSError(static_cast(CodePipelineErrors::PIPELINE_NAME_IN_USE), false); } - else if (hashCode == INVALID_ACTION_DECLARATION_HASH) + else if (hashCode == INVALID_STRUCTURE_HASH) { - return AWSError(static_cast(CodePipelineErrors::INVALID_ACTION_DECLARATION), false); + return AWSError(static_cast(CodePipelineErrors::INVALID_STRUCTURE), false); } - else if (hashCode == ACTION_TYPE_NOT_FOUND_HASH) + else if (hashCode == INVALID_JOB_HASH) { - return AWSError(static_cast(CodePipelineErrors::ACTION_TYPE_NOT_FOUND), false); + return AWSError(static_cast(CodePipelineErrors::INVALID_JOB), false); } - else if (hashCode == STAGE_NOT_FOUND_HASH) + else if (hashCode == INVALID_STAGE_DECLARATION_HASH) { - return AWSError(static_cast(CodePipelineErrors::STAGE_NOT_FOUND), false); + return AWSError(static_cast(CodePipelineErrors::INVALID_STAGE_DECLARATION), false); } - else if (hashCode == PIPELINE_NAME_IN_USE_HASH) + else if (hashCode == INVALID_JOB_STATE_HASH) { - return AWSError(static_cast(CodePipelineErrors::PIPELINE_NAME_IN_USE), false); + return AWSError(static_cast(CodePipelineErrors::INVALID_JOB_STATE), false); } - else if (hashCode == INVALID_JOB_HASH) + else if (hashCode == INVALID_NONCE_HASH) { - return AWSError(static_cast(CodePipelineErrors::INVALID_JOB), false); + return AWSError(static_cast(CodePipelineErrors::INVALID_NONCE), false); } return AWSError(CoreErrors::UNKNOWN, false); } diff --git a/aws-cpp-sdk-codepipeline/source/model/AWSSessionCredentials.cpp b/aws-cpp-sdk-codepipeline/source/model/AWSSessionCredentials.cpp index 93119dab31b..ee3b2709a09 100644 --- a/aws-cpp-sdk-codepipeline/source/model/AWSSessionCredentials.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/AWSSessionCredentials.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + AWSSessionCredentials::AWSSessionCredentials() : m_accessKeyIdHasBeenSet(false), m_secretAccessKeyHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue AWSSessionCredentials::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ActionCategory.cpp b/aws-cpp-sdk-codepipeline/source/model/ActionCategory.cpp index 3f7c351b265..5281043fe97 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ActionCategory.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ActionCategory.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int Source_HASH = HashingUtils::HashString("Source"); -static const int Build_HASH = HashingUtils::HashString("Build"); -static const int Deploy_HASH = HashingUtils::HashString("Deploy"); -static const int Test_HASH = HashingUtils::HashString("Test"); -static const int Invoke_HASH = HashingUtils::HashString("Invoke"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace ActionCategoryMapper { + static const int Source_HASH = HashingUtils::HashString("Source"); + static const int Build_HASH = HashingUtils::HashString("Build"); + static const int Deploy_HASH = HashingUtils::HashString("Deploy"); + static const int Test_HASH = HashingUtils::HashString("Test"); + static const int Invoke_HASH = HashingUtils::HashString("Invoke"); + ActionCategory GetActionCategoryForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codepipeline/source/model/ActionConfiguration.cpp b/aws-cpp-sdk-codepipeline/source/model/ActionConfiguration.cpp index e0c479ed030..1dc87fa744b 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ActionConfiguration.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ActionConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ActionConfiguration::ActionConfiguration() : m_configurationHasBeenSet(false) { @@ -63,4 +69,8 @@ JsonValue ActionConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ActionConfigurationProperty.cpp b/aws-cpp-sdk-codepipeline/source/model/ActionConfigurationProperty.cpp index 9ad9986ec8e..189f409c4a5 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ActionConfigurationProperty.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ActionConfigurationProperty.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ActionConfigurationProperty::ActionConfigurationProperty() : m_nameHasBeenSet(false), m_required(false), @@ -152,4 +158,8 @@ JsonValue ActionConfigurationProperty::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ActionConfigurationPropertyType.cpp b/aws-cpp-sdk-codepipeline/source/model/ActionConfigurationPropertyType.cpp index d4ab675c870..383af12e154 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ActionConfigurationPropertyType.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ActionConfigurationPropertyType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int String_HASH = HashingUtils::HashString("String"); -static const int Number_HASH = HashingUtils::HashString("Number"); -static const int Boolean_HASH = HashingUtils::HashString("Boolean"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ActionConfigurationPropertyTypeMapper { + static const int String_HASH = HashingUtils::HashString("String"); + static const int Number_HASH = HashingUtils::HashString("Number"); + static const int Boolean_HASH = HashingUtils::HashString("Boolean"); + ActionConfigurationPropertyType GetActionConfigurationPropertyTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codepipeline/source/model/ActionContext.cpp b/aws-cpp-sdk-codepipeline/source/model/ActionContext.cpp index 368e1fc15ae..c67724e1b64 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ActionContext.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ActionContext.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ActionContext::ActionContext() : m_nameHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue ActionContext::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ActionDeclaration.cpp b/aws-cpp-sdk-codepipeline/source/model/ActionDeclaration.cpp index 2daa7dc7ee5..039f623c3c4 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ActionDeclaration.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ActionDeclaration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ActionDeclaration::ActionDeclaration() : m_nameHasBeenSet(false), m_actionTypeIdHasBeenSet(false), @@ -171,4 +177,8 @@ JsonValue ActionDeclaration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ActionExecution.cpp b/aws-cpp-sdk-codepipeline/source/model/ActionExecution.cpp index 50ad1c72fad..bd1e81bff57 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ActionExecution.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ActionExecution.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ActionExecution::ActionExecution() : m_statusHasBeenSet(false), m_summaryHasBeenSet(false), @@ -145,4 +151,8 @@ JsonValue ActionExecution::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws diff --git a/aws-cpp-sdk-codepipeline/source/model/ActionExecutionStatus.cpp b/aws-cpp-sdk-codepipeline/source/model/ActionExecutionStatus.cpp index 42bc3ed9a47..d56923b42d9 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ActionExecutionStatus.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ActionExecutionStatus.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int InProgress_HASH = HashingUtils::HashString("InProgress"); -static const int Succeeded_HASH = HashingUtils::HashString("Succeeded"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ActionExecutionStatusMapper { + static const int InProgress_HASH = HashingUtils::HashString("InProgress"); + static const int Succeeded_HASH = HashingUtils::HashString("Succeeded"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + ActionExecutionStatus GetActionExecutionStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codepipeline/source/model/ActionOwner.cpp b/aws-cpp-sdk-codepipeline/source/model/ActionOwner.cpp index db15ecb1545..c44025b33c7 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ActionOwner.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ActionOwner.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int AWS_HASH = HashingUtils::HashString("AWS"); -static const int ThirdParty_HASH = HashingUtils::HashString("ThirdParty"); -static const int Custom_HASH = HashingUtils::HashString("Custom"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ActionOwnerMapper { + static const int AWS_HASH = HashingUtils::HashString("AWS"); + static const int ThirdParty_HASH = HashingUtils::HashString("ThirdParty"); + static const int Custom_HASH = HashingUtils::HashString("Custom"); + ActionOwner GetActionOwnerForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codepipeline/source/model/ActionRevision.cpp b/aws-cpp-sdk-codepipeline/source/model/ActionRevision.cpp index 910c42e1ce5..5fc9374faec 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ActionRevision.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ActionRevision.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ActionRevision::ActionRevision() : m_revisionIdHasBeenSet(false), m_revisionChangeIdHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue ActionRevision::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws diff --git a/aws-cpp-sdk-codepipeline/source/model/ActionState.cpp b/aws-cpp-sdk-codepipeline/source/model/ActionState.cpp index 7f7ed1c7c42..7a7f281753c 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ActionState.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ActionState.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ActionState::ActionState() : m_actionNameHasBeenSet(false), m_currentRevisionHasBeenSet(false), @@ -115,4 +121,8 @@ JsonValue ActionState::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ActionType.cpp b/aws-cpp-sdk-codepipeline/source/model/ActionType.cpp index 03bbff37f2b..61a21bd6826 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ActionType.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ActionType.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ActionType::ActionType() : m_idHasBeenSet(false), m_settingsHasBeenSet(false), @@ -123,4 +129,8 @@ JsonValue ActionType::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ActionTypeId.cpp b/aws-cpp-sdk-codepipeline/source/model/ActionTypeId.cpp index 65b507e93e2..801ca32e141 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ActionTypeId.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ActionTypeId.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ActionTypeId::ActionTypeId() : m_categoryHasBeenSet(false), m_ownerHasBeenSet(false), @@ -98,4 +104,8 @@ JsonValue ActionTypeId::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ActionTypeSettings.cpp b/aws-cpp-sdk-codepipeline/source/model/ActionTypeSettings.cpp index 8c3a612c07f..dedf67b4229 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ActionTypeSettings.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ActionTypeSettings.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ActionTypeSettings::ActionTypeSettings() : m_thirdPartyConfigurationUrlHasBeenSet(false), m_entityUrlTemplateHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue ActionTypeSettings::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/Artifact.cpp b/aws-cpp-sdk-codepipeline/source/model/Artifact.cpp index aeaa06bd34b..715e99dbf38 100644 --- a/aws-cpp-sdk-codepipeline/source/model/Artifact.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/Artifact.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + Artifact::Artifact() : m_nameHasBeenSet(false), m_revisionHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue Artifact::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ArtifactDetails.cpp b/aws-cpp-sdk-codepipeline/source/model/ArtifactDetails.cpp index 86bf3cabbf4..118c91a60a1 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ArtifactDetails.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ArtifactDetails.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ArtifactDetails::ArtifactDetails() : m_minimumCount(0), m_minimumCountHasBeenSet(false), @@ -74,4 +80,8 @@ JsonValue ArtifactDetails::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ArtifactLocation.cpp b/aws-cpp-sdk-codepipeline/source/model/ArtifactLocation.cpp index 51d176cd74d..e91cee106b2 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ArtifactLocation.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ArtifactLocation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ArtifactLocation::ArtifactLocation() : m_typeHasBeenSet(false), m_s3LocationHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue ArtifactLocation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ArtifactLocationType.cpp b/aws-cpp-sdk-codepipeline/source/model/ArtifactLocationType.cpp index 7facfdfa061..85277d73cb4 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ArtifactLocationType.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ArtifactLocationType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int S3_HASH = HashingUtils::HashString("S3"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace ArtifactLocationTypeMapper { + static const int S3_HASH = HashingUtils::HashString("S3"); + ArtifactLocationType GetArtifactLocationTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codepipeline/source/model/ArtifactStore.cpp b/aws-cpp-sdk-codepipeline/source/model/ArtifactStore.cpp index 63bd9e78ece..f6f17cb7d34 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ArtifactStore.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ArtifactStore.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ArtifactStore::ArtifactStore() : m_typeHasBeenSet(false), m_locationHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue ArtifactStore::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ArtifactStoreType.cpp b/aws-cpp-sdk-codepipeline/source/model/ArtifactStoreType.cpp index d9b718f5020..b4804ba9a77 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ArtifactStoreType.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ArtifactStoreType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int S3_HASH = HashingUtils::HashString("S3"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace ArtifactStoreTypeMapper { + static const int S3_HASH = HashingUtils::HashString("S3"); + ArtifactStoreType GetArtifactStoreTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codepipeline/source/model/BlockerDeclaration.cpp b/aws-cpp-sdk-codepipeline/source/model/BlockerDeclaration.cpp index 1fbe5c71355..bc606051e67 100644 --- a/aws-cpp-sdk-codepipeline/source/model/BlockerDeclaration.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/BlockerDeclaration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + BlockerDeclaration::BlockerDeclaration() : m_nameHasBeenSet(false), m_typeHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue BlockerDeclaration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/BlockerType.cpp b/aws-cpp-sdk-codepipeline/source/model/BlockerType.cpp index 358f1517df3..6ba71fab4dd 100644 --- a/aws-cpp-sdk-codepipeline/source/model/BlockerType.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/BlockerType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int Schedule_HASH = HashingUtils::HashString("Schedule"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace BlockerTypeMapper { + static const int Schedule_HASH = HashingUtils::HashString("Schedule"); + BlockerType GetBlockerTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codepipeline/source/model/CurrentRevision.cpp b/aws-cpp-sdk-codepipeline/source/model/CurrentRevision.cpp index 23910eedbcc..953b7077d69 100644 --- a/aws-cpp-sdk-codepipeline/source/model/CurrentRevision.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/CurrentRevision.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + CurrentRevision::CurrentRevision() : m_revisionHasBeenSet(false), m_changeIdentifierHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue CurrentRevision::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/EncryptionKey.cpp b/aws-cpp-sdk-codepipeline/source/model/EncryptionKey.cpp index 39498670f5d..c24a61782be 100644 --- a/aws-cpp-sdk-codepipeline/source/model/EncryptionKey.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/EncryptionKey.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + EncryptionKey::EncryptionKey() : m_idHasBeenSet(false), m_typeHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue EncryptionKey::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/EncryptionKeyType.cpp b/aws-cpp-sdk-codepipeline/source/model/EncryptionKeyType.cpp index ec657a87920..b10c63bd507 100644 --- a/aws-cpp-sdk-codepipeline/source/model/EncryptionKeyType.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/EncryptionKeyType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int KMS_HASH = HashingUtils::HashString("KMS"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace EncryptionKeyTypeMapper { + static const int KMS_HASH = HashingUtils::HashString("KMS"); + EncryptionKeyType GetEncryptionKeyTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codepipeline/source/model/ErrorDetails.cpp b/aws-cpp-sdk-codepipeline/source/model/ErrorDetails.cpp index 9ee91a6c3c8..7ed42e75b58 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ErrorDetails.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ErrorDetails.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ErrorDetails::ErrorDetails() : m_codeHasBeenSet(false), m_messageHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue ErrorDetails::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ExecutionDetails.cpp b/aws-cpp-sdk-codepipeline/source/model/ExecutionDetails.cpp index 0ae26f7b05b..75f4de1a1d3 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ExecutionDetails.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ExecutionDetails.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ExecutionDetails::ExecutionDetails() : m_summaryHasBeenSet(false), m_externalExecutionIdHasBeenSet(false), @@ -87,4 +93,8 @@ JsonValue ExecutionDetails::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/FailureDetails.cpp b/aws-cpp-sdk-codepipeline/source/model/FailureDetails.cpp index 5a9a75e44fb..ada1b05e0c6 100644 --- a/aws-cpp-sdk-codepipeline/source/model/FailureDetails.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/FailureDetails.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + FailureDetails::FailureDetails() : m_typeHasBeenSet(false), m_messageHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue FailureDetails::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/FailureType.cpp b/aws-cpp-sdk-codepipeline/source/model/FailureType.cpp index b377cae9844..afd07507094 100644 --- a/aws-cpp-sdk-codepipeline/source/model/FailureType.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/FailureType.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int JobFailed_HASH = HashingUtils::HashString("JobFailed"); -static const int ConfigurationError_HASH = HashingUtils::HashString("ConfigurationError"); -static const int PermissionError_HASH = HashingUtils::HashString("PermissionError"); -static const int RevisionOutOfSync_HASH = HashingUtils::HashString("RevisionOutOfSync"); -static const int RevisionUnavailable_HASH = HashingUtils::HashString("RevisionUnavailable"); -static const int SystemUnavailable_HASH = HashingUtils::HashString("SystemUnavailable"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace FailureTypeMapper { + static const int JobFailed_HASH = HashingUtils::HashString("JobFailed"); + static const int ConfigurationError_HASH = HashingUtils::HashString("ConfigurationError"); + static const int PermissionError_HASH = HashingUtils::HashString("PermissionError"); + static const int RevisionOutOfSync_HASH = HashingUtils::HashString("RevisionOutOfSync"); + static const int RevisionUnavailable_HASH = HashingUtils::HashString("RevisionUnavailable"); + static const int SystemUnavailable_HASH = HashingUtils::HashString("SystemUnavailable"); + FailureType GetFailureTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codepipeline/source/model/InputArtifact.cpp b/aws-cpp-sdk-codepipeline/source/model/InputArtifact.cpp index 1d329363e53..3c83078719e 100644 --- a/aws-cpp-sdk-codepipeline/source/model/InputArtifact.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/InputArtifact.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + InputArtifact::InputArtifact() : m_nameHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue InputArtifact::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/Job.cpp b/aws-cpp-sdk-codepipeline/source/model/Job.cpp index 44eeb631255..4a052005bef 100644 --- a/aws-cpp-sdk-codepipeline/source/model/Job.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/Job.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + Job::Job() : m_idHasBeenSet(false), m_dataHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue Job::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/JobData.cpp b/aws-cpp-sdk-codepipeline/source/model/JobData.cpp index 61f4f63d485..a581d380c98 100644 --- a/aws-cpp-sdk-codepipeline/source/model/JobData.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/JobData.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + JobData::JobData() : m_actionTypeIdHasBeenSet(false), m_actionConfigurationHasBeenSet(false), @@ -176,4 +182,8 @@ JsonValue JobData::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/JobDetails.cpp b/aws-cpp-sdk-codepipeline/source/model/JobDetails.cpp index 20896a23876..12cd568d34c 100644 --- a/aws-cpp-sdk-codepipeline/source/model/JobDetails.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/JobDetails.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + JobDetails::JobDetails() : m_idHasBeenSet(false), m_dataHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue JobDetails::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/JobStatus.cpp b/aws-cpp-sdk-codepipeline/source/model/JobStatus.cpp index c0d23c87265..44e98a18afb 100644 --- a/aws-cpp-sdk-codepipeline/source/model/JobStatus.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/JobStatus.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int Created_HASH = HashingUtils::HashString("Created"); -static const int Queued_HASH = HashingUtils::HashString("Queued"); -static const int Dispatched_HASH = HashingUtils::HashString("Dispatched"); -static const int InProgress_HASH = HashingUtils::HashString("InProgress"); -static const int TimedOut_HASH = HashingUtils::HashString("TimedOut"); -static const int Succeeded_HASH = HashingUtils::HashString("Succeeded"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace JobStatusMapper { + static const int Created_HASH = HashingUtils::HashString("Created"); + static const int Queued_HASH = HashingUtils::HashString("Queued"); + static const int Dispatched_HASH = HashingUtils::HashString("Dispatched"); + static const int InProgress_HASH = HashingUtils::HashString("InProgress"); + static const int TimedOut_HASH = HashingUtils::HashString("TimedOut"); + static const int Succeeded_HASH = HashingUtils::HashString("Succeeded"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + JobStatus GetJobStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codepipeline/source/model/OutputArtifact.cpp b/aws-cpp-sdk-codepipeline/source/model/OutputArtifact.cpp index 120bec6145f..aa37895898a 100644 --- a/aws-cpp-sdk-codepipeline/source/model/OutputArtifact.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/OutputArtifact.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + OutputArtifact::OutputArtifact() : m_nameHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue OutputArtifact::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/PipelineContext.cpp b/aws-cpp-sdk-codepipeline/source/model/PipelineContext.cpp index 691bfc4aa89..cb14d481519 100644 --- a/aws-cpp-sdk-codepipeline/source/model/PipelineContext.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/PipelineContext.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + PipelineContext::PipelineContext() : m_pipelineNameHasBeenSet(false), m_stageHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue PipelineContext::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/PipelineDeclaration.cpp b/aws-cpp-sdk-codepipeline/source/model/PipelineDeclaration.cpp index ca6b254ab09..c9e6bf826be 100644 --- a/aws-cpp-sdk-codepipeline/source/model/PipelineDeclaration.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/PipelineDeclaration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + PipelineDeclaration::PipelineDeclaration() : m_nameHasBeenSet(false), m_roleArnHasBeenSet(false), @@ -125,4 +131,8 @@ JsonValue PipelineDeclaration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/PipelineSummary.cpp b/aws-cpp-sdk-codepipeline/source/model/PipelineSummary.cpp index a534dc447cb..8e40504b1bc 100644 --- a/aws-cpp-sdk-codepipeline/source/model/PipelineSummary.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/PipelineSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + PipelineSummary::PipelineSummary() : m_nameHasBeenSet(false), m_version(0), @@ -100,4 +106,8 @@ JsonValue PipelineSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws diff --git a/aws-cpp-sdk-codepipeline/source/model/S3ArtifactLocation.cpp b/aws-cpp-sdk-codepipeline/source/model/S3ArtifactLocation.cpp index 1d19ce3f0fe..e7fd72735b6 100644 --- a/aws-cpp-sdk-codepipeline/source/model/S3ArtifactLocation.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/S3ArtifactLocation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + S3ArtifactLocation::S3ArtifactLocation() : m_bucketNameHasBeenSet(false), m_objectKeyHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue S3ArtifactLocation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/StageContext.cpp b/aws-cpp-sdk-codepipeline/source/model/StageContext.cpp index ccbf6ec3cc7..a75f3b3f655 100644 --- a/aws-cpp-sdk-codepipeline/source/model/StageContext.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/StageContext.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + StageContext::StageContext() : m_nameHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue StageContext::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/StageDeclaration.cpp b/aws-cpp-sdk-codepipeline/source/model/StageDeclaration.cpp index af56c9c3332..7895b694dd6 100644 --- a/aws-cpp-sdk-codepipeline/source/model/StageDeclaration.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/StageDeclaration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + StageDeclaration::StageDeclaration() : m_nameHasBeenSet(false), m_blockersHasBeenSet(false), @@ -101,4 +107,8 @@ JsonValue StageDeclaration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/StageState.cpp b/aws-cpp-sdk-codepipeline/source/model/StageState.cpp index 461e85b9d2f..cbde7df158d 100644 --- a/aws-cpp-sdk-codepipeline/source/model/StageState.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/StageState.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + StageState::StageState() : m_stageNameHasBeenSet(false), m_inboundTransitionStateHasBeenSet(false), @@ -93,4 +99,8 @@ JsonValue StageState::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/StageTransitionType.cpp b/aws-cpp-sdk-codepipeline/source/model/StageTransitionType.cpp index 3887e59a692..aa9af7f7675 100644 --- a/aws-cpp-sdk-codepipeline/source/model/StageTransitionType.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/StageTransitionType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Inbound_HASH = HashingUtils::HashString("Inbound"); -static const int Outbound_HASH = HashingUtils::HashString("Outbound"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace StageTransitionTypeMapper { + static const int Inbound_HASH = HashingUtils::HashString("Inbound"); + static const int Outbound_HASH = HashingUtils::HashString("Outbound"); + StageTransitionType GetStageTransitionTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-codepipeline/source/model/ThirdPartyJob.cpp b/aws-cpp-sdk-codepipeline/source/model/ThirdPartyJob.cpp index ef382e7d017..1bbd90aa543 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ThirdPartyJob.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ThirdPartyJob.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ThirdPartyJob::ThirdPartyJob() : m_clientIdHasBeenSet(false), m_jobIdHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue ThirdPartyJob::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ThirdPartyJobData.cpp b/aws-cpp-sdk-codepipeline/source/model/ThirdPartyJobData.cpp index 74fca52ea89..aa2904f3016 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ThirdPartyJobData.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ThirdPartyJobData.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ThirdPartyJobData::ThirdPartyJobData() : m_actionTypeIdHasBeenSet(false), m_actionConfigurationHasBeenSet(false), @@ -176,4 +182,8 @@ JsonValue ThirdPartyJobData::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/ThirdPartyJobDetails.cpp b/aws-cpp-sdk-codepipeline/source/model/ThirdPartyJobDetails.cpp index 398eef7a788..6627a820a8e 100644 --- a/aws-cpp-sdk-codepipeline/source/model/ThirdPartyJobDetails.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/ThirdPartyJobDetails.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + ThirdPartyJobDetails::ThirdPartyJobDetails() : m_idHasBeenSet(false), m_dataHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue ThirdPartyJobDetails::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-codepipeline/source/model/TransitionState.cpp b/aws-cpp-sdk-codepipeline/source/model/TransitionState.cpp index ffd650355de..60bf87deefe 100644 --- a/aws-cpp-sdk-codepipeline/source/model/TransitionState.cpp +++ b/aws-cpp-sdk-codepipeline/source/model/TransitionState.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CodePipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CodePipeline +{ +namespace Model +{ + TransitionState::TransitionState() : m_enabled(false), m_enabledHasBeenSet(false), @@ -101,4 +107,8 @@ JsonValue TransitionState::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CodePipeline +} // namespace Aws diff --git a/aws-cpp-sdk-cognito-identity/CMakeLists.txt b/aws-cpp-sdk-cognito-identity/CMakeLists.txt index bef1e1e6736..b3c0b6a0881 100644 --- a/aws-cpp-sdk-cognito-identity/CMakeLists.txt +++ b/aws-cpp-sdk-cognito-identity/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-cognito-identity) "source/model/*.cpp" ) - file(GLOB COGNITO-IDENTITY_SRC + file(GLOB COGNITO-IDENTITY_UNIFIED_HEADERS ${AWS_COGNITO-IDENTITY_HEADERS} ${AWS_COGNITO-IDENTITY_MODEL_HEADERS} + ) + + file(GLOB COGNITO-IDENTITY_UNITY_SRC ${AWS_COGNITO-IDENTITY_SOURCE} ${AWS_COGNITO-IDENTITY_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("COGNITO-IDENTITY" COGNITO-IDENTITY_UNITY_SRC) + endif() + + file(GLOB COGNITO-IDENTITY_SRC + ${COGNITO-IDENTITY_UNIFIED_HEADERS} + ${COGNITO-IDENTITY_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-cognito-identity/source/CognitoIdentityErrors.cpp b/aws-cpp-sdk-cognito-identity/source/CognitoIdentityErrors.cpp index 094c5cc9acb..6ce9dfb417d 100644 --- a/aws-cpp-sdk-cognito-identity/source/CognitoIdentityErrors.cpp +++ b/aws-cpp-sdk-cognito-identity/source/CognitoIdentityErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::CognitoIdentity; using namespace Aws::Utils; +namespace Aws +{ +namespace CognitoIdentity +{ +namespace CognitoIdentityErrorMapper +{ + static const int INVALID_IDENTITY_POOL_CONFIGURATION_HASH = HashingUtils::HashString("InvalidIdentityPoolConfigurationException"); static const int EXTERNAL_SERVICE_HASH = HashingUtils::HashString("ExternalServiceException"); static const int DEVELOPER_USER_ALREADY_REGISTERED_HASH = HashingUtils::HashString("DeveloperUserAlreadyRegisteredException"); @@ -31,12 +38,6 @@ static const int TOO_MANY_REQUESTS_HASH = HashingUtils::HashString("TooManyReque static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); static const int CONCURRENT_MODIFICATION_HASH = HashingUtils::HashString("ConcurrentModificationException"); -namespace Aws -{ -namespace CognitoIdentity -{ -namespace CognitoIdentityErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-cognito-identity/source/model/Credentials.cpp b/aws-cpp-sdk-cognito-identity/source/model/Credentials.cpp index a8cb477c8e4..9d81b21c5c1 100644 --- a/aws-cpp-sdk-cognito-identity/source/model/Credentials.cpp +++ b/aws-cpp-sdk-cognito-identity/source/model/Credentials.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CognitoIdentity::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CognitoIdentity +{ +namespace Model +{ + Credentials::Credentials() : m_accessKeyIdHasBeenSet(false), m_secretKeyHasBeenSet(false), @@ -99,4 +105,8 @@ JsonValue Credentials::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CognitoIdentity +} // namespace Aws diff --git a/aws-cpp-sdk-cognito-identity/source/model/ErrorCode.cpp b/aws-cpp-sdk-cognito-identity/source/model/ErrorCode.cpp index e00a703ad2f..e6647cffe08 100644 --- a/aws-cpp-sdk-cognito-identity/source/model/ErrorCode.cpp +++ b/aws-cpp-sdk-cognito-identity/source/model/ErrorCode.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int AccessDenied_HASH = HashingUtils::HashString("AccessDenied"); -static const int InternalServerError_HASH = HashingUtils::HashString("InternalServerError"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ErrorCodeMapper { + static const int AccessDenied_HASH = HashingUtils::HashString("AccessDenied"); + static const int InternalServerError_HASH = HashingUtils::HashString("InternalServerError"); + ErrorCode GetErrorCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cognito-identity/source/model/IdentityDescription.cpp b/aws-cpp-sdk-cognito-identity/source/model/IdentityDescription.cpp index 00bdb81dda2..fffa81dd03e 100644 --- a/aws-cpp-sdk-cognito-identity/source/model/IdentityDescription.cpp +++ b/aws-cpp-sdk-cognito-identity/source/model/IdentityDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CognitoIdentity::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CognitoIdentity +{ +namespace Model +{ + IdentityDescription::IdentityDescription() : m_identityIdHasBeenSet(false), m_loginsHasBeenSet(false), @@ -106,4 +112,8 @@ JsonValue IdentityDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CognitoIdentity +} // namespace Aws diff --git a/aws-cpp-sdk-cognito-identity/source/model/IdentityPoolShortDescription.cpp b/aws-cpp-sdk-cognito-identity/source/model/IdentityPoolShortDescription.cpp index cfc4ab07be5..1c9002a58e6 100644 --- a/aws-cpp-sdk-cognito-identity/source/model/IdentityPoolShortDescription.cpp +++ b/aws-cpp-sdk-cognito-identity/source/model/IdentityPoolShortDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CognitoIdentity::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CognitoIdentity +{ +namespace Model +{ + IdentityPoolShortDescription::IdentityPoolShortDescription() : m_identityPoolIdHasBeenSet(false), m_identityPoolNameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue IdentityPoolShortDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CognitoIdentity +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cognito-identity/source/model/UnprocessedIdentityId.cpp b/aws-cpp-sdk-cognito-identity/source/model/UnprocessedIdentityId.cpp index f36810893b1..9f38d4d4c63 100644 --- a/aws-cpp-sdk-cognito-identity/source/model/UnprocessedIdentityId.cpp +++ b/aws-cpp-sdk-cognito-identity/source/model/UnprocessedIdentityId.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CognitoIdentity::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CognitoIdentity +{ +namespace Model +{ + UnprocessedIdentityId::UnprocessedIdentityId() : m_identityIdHasBeenSet(false), m_errorCodeHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue UnprocessedIdentityId::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CognitoIdentity +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cognito-sync/CMakeLists.txt b/aws-cpp-sdk-cognito-sync/CMakeLists.txt index 6f2df644416..c233319b5c1 100644 --- a/aws-cpp-sdk-cognito-sync/CMakeLists.txt +++ b/aws-cpp-sdk-cognito-sync/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-cognito-sync) "source/model/*.cpp" ) - file(GLOB COGNITO-SYNC_SRC + file(GLOB COGNITO-SYNC_UNIFIED_HEADERS ${AWS_COGNITO-SYNC_HEADERS} ${AWS_COGNITO-SYNC_MODEL_HEADERS} + ) + + file(GLOB COGNITO-SYNC_UNITY_SRC ${AWS_COGNITO-SYNC_SOURCE} ${AWS_COGNITO-SYNC_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("COGNITO-SYNC" COGNITO-SYNC_UNITY_SRC) + endif() + + file(GLOB COGNITO-SYNC_SRC + ${COGNITO-SYNC_UNIFIED_HEADERS} + ${COGNITO-SYNC_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-cognito-sync/source/CognitoSyncErrors.cpp b/aws-cpp-sdk-cognito-sync/source/CognitoSyncErrors.cpp index 1ddcc97c584..fff23256679 100644 --- a/aws-cpp-sdk-cognito-sync/source/CognitoSyncErrors.cpp +++ b/aws-cpp-sdk-cognito-sync/source/CognitoSyncErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::CognitoSync; using namespace Aws::Utils; +namespace Aws +{ +namespace CognitoSync +{ +namespace CognitoSyncErrorMapper +{ + static const int TOO_MANY_REQUESTS_HASH = HashingUtils::HashString("TooManyRequests"); static const int INVALID_PARAMETER_HASH = HashingUtils::HashString("InvalidParameter"); static const int INVALID_CONFIGURATION_HASH = HashingUtils::HashString("InvalidConfiguration"); @@ -33,12 +40,6 @@ static const int ALREADY_STREAMED_HASH = HashingUtils::HashString("AlreadyStream static const int INTERNAL_ERROR_HASH = HashingUtils::HashString("InternalError"); static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceeded"); -namespace Aws -{ -namespace CognitoSync -{ -namespace CognitoSyncErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-cognito-sync/source/model/BulkPublishStatus.cpp b/aws-cpp-sdk-cognito-sync/source/model/BulkPublishStatus.cpp index 676cf719cb5..eef095705ba 100644 --- a/aws-cpp-sdk-cognito-sync/source/model/BulkPublishStatus.cpp +++ b/aws-cpp-sdk-cognito-sync/source/model/BulkPublishStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int NOT_STARTED_HASH = HashingUtils::HashString("NOT_STARTED"); -static const int IN_PROGRESS_HASH = HashingUtils::HashString("IN_PROGRESS"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); -static const int SUCCEEDED_HASH = HashingUtils::HashString("SUCCEEDED"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace BulkPublishStatusMapper { + static const int NOT_STARTED_HASH = HashingUtils::HashString("NOT_STARTED"); + static const int IN_PROGRESS_HASH = HashingUtils::HashString("IN_PROGRESS"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + static const int SUCCEEDED_HASH = HashingUtils::HashString("SUCCEEDED"); + BulkPublishStatus GetBulkPublishStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cognito-sync/source/model/CognitoStreams.cpp b/aws-cpp-sdk-cognito-sync/source/model/CognitoStreams.cpp index b3d19d7d082..bee9434f316 100644 --- a/aws-cpp-sdk-cognito-sync/source/model/CognitoStreams.cpp +++ b/aws-cpp-sdk-cognito-sync/source/model/CognitoStreams.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CognitoSync::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CognitoSync +{ +namespace Model +{ + CognitoStreams::CognitoStreams() : m_streamNameHasBeenSet(false), m_roleArnHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue CognitoStreams::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CognitoSync +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cognito-sync/source/model/Dataset.cpp b/aws-cpp-sdk-cognito-sync/source/model/Dataset.cpp index b892a6deb5e..568a2a99066 100644 --- a/aws-cpp-sdk-cognito-sync/source/model/Dataset.cpp +++ b/aws-cpp-sdk-cognito-sync/source/model/Dataset.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CognitoSync::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CognitoSync +{ +namespace Model +{ + Dataset::Dataset() : m_identityIdHasBeenSet(false), m_datasetNameHasBeenSet(false), @@ -147,4 +153,8 @@ JsonValue Dataset::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CognitoSync +} // namespace Aws diff --git a/aws-cpp-sdk-cognito-sync/source/model/IdentityPoolUsage.cpp b/aws-cpp-sdk-cognito-sync/source/model/IdentityPoolUsage.cpp index 29b9657b2a1..7d11b8be71e 100644 --- a/aws-cpp-sdk-cognito-sync/source/model/IdentityPoolUsage.cpp +++ b/aws-cpp-sdk-cognito-sync/source/model/IdentityPoolUsage.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CognitoSync::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CognitoSync +{ +namespace Model +{ + IdentityPoolUsage::IdentityPoolUsage() : m_identityPoolIdHasBeenSet(false), m_syncSessionsCount(0), @@ -103,4 +109,8 @@ JsonValue IdentityPoolUsage::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CognitoSync +} // namespace Aws diff --git a/aws-cpp-sdk-cognito-sync/source/model/IdentityUsage.cpp b/aws-cpp-sdk-cognito-sync/source/model/IdentityUsage.cpp index 23391ea774b..554c8daaacf 100644 --- a/aws-cpp-sdk-cognito-sync/source/model/IdentityUsage.cpp +++ b/aws-cpp-sdk-cognito-sync/source/model/IdentityUsage.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CognitoSync::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CognitoSync +{ +namespace Model +{ + IdentityUsage::IdentityUsage() : m_identityIdHasBeenSet(false), m_identityPoolIdHasBeenSet(false), @@ -118,4 +124,8 @@ JsonValue IdentityUsage::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CognitoSync +} // namespace Aws diff --git a/aws-cpp-sdk-cognito-sync/source/model/Operation.cpp b/aws-cpp-sdk-cognito-sync/source/model/Operation.cpp index 53b8bc29bdc..13a32e018e4 100644 --- a/aws-cpp-sdk-cognito-sync/source/model/Operation.cpp +++ b/aws-cpp-sdk-cognito-sync/source/model/Operation.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int replace_HASH = HashingUtils::HashString("replace"); -static const int remove_HASH = HashingUtils::HashString("remove"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace OperationMapper { + static const int replace_HASH = HashingUtils::HashString("replace"); + static const int remove_HASH = HashingUtils::HashString("remove"); + Operation GetOperationForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cognito-sync/source/model/Platform.cpp b/aws-cpp-sdk-cognito-sync/source/model/Platform.cpp index 6327ae83be2..8f54765d0de 100644 --- a/aws-cpp-sdk-cognito-sync/source/model/Platform.cpp +++ b/aws-cpp-sdk-cognito-sync/source/model/Platform.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int APNS_HASH = HashingUtils::HashString("APNS"); -static const int APNS_SANDBOX_HASH = HashingUtils::HashString("APNS_SANDBOX"); -static const int GCM_HASH = HashingUtils::HashString("GCM"); -static const int ADM_HASH = HashingUtils::HashString("ADM"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace PlatformMapper { + static const int APNS_HASH = HashingUtils::HashString("APNS"); + static const int APNS_SANDBOX_HASH = HashingUtils::HashString("APNS_SANDBOX"); + static const int GCM_HASH = HashingUtils::HashString("GCM"); + static const int ADM_HASH = HashingUtils::HashString("ADM"); + Platform GetPlatformForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-cognito-sync/source/model/PushSync.cpp b/aws-cpp-sdk-cognito-sync/source/model/PushSync.cpp index bfc91d70bc0..eb11b2b47da 100644 --- a/aws-cpp-sdk-cognito-sync/source/model/PushSync.cpp +++ b/aws-cpp-sdk-cognito-sync/source/model/PushSync.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CognitoSync::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CognitoSync +{ +namespace Model +{ + PushSync::PushSync() : m_applicationArnsHasBeenSet(false), m_roleArnHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue PushSync::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CognitoSync +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-cognito-sync/source/model/Record.cpp b/aws-cpp-sdk-cognito-sync/source/model/Record.cpp index 7bd021c0d79..bae90d9d805 100644 --- a/aws-cpp-sdk-cognito-sync/source/model/Record.cpp +++ b/aws-cpp-sdk-cognito-sync/source/model/Record.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CognitoSync::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CognitoSync +{ +namespace Model +{ + Record::Record() : m_keyHasBeenSet(false), m_valueHasBeenSet(false), @@ -130,4 +136,8 @@ JsonValue Record::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CognitoSync +} // namespace Aws diff --git a/aws-cpp-sdk-cognito-sync/source/model/RecordPatch.cpp b/aws-cpp-sdk-cognito-sync/source/model/RecordPatch.cpp index 2f99da74f3c..7a6a1dc42d3 100644 --- a/aws-cpp-sdk-cognito-sync/source/model/RecordPatch.cpp +++ b/aws-cpp-sdk-cognito-sync/source/model/RecordPatch.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CognitoSync::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CognitoSync +{ +namespace Model +{ + RecordPatch::RecordPatch() : m_opHasBeenSet(false), m_keyHasBeenSet(false), @@ -115,4 +121,8 @@ JsonValue RecordPatch::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CognitoSync +} // namespace Aws diff --git a/aws-cpp-sdk-cognito-sync/source/model/StreamingStatus.cpp b/aws-cpp-sdk-cognito-sync/source/model/StreamingStatus.cpp index 2bc80d31d21..5b9d89feac2 100644 --- a/aws-cpp-sdk-cognito-sync/source/model/StreamingStatus.cpp +++ b/aws-cpp-sdk-cognito-sync/source/model/StreamingStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ENABLED_HASH = HashingUtils::HashString("ENABLED"); -static const int DISABLED_HASH = HashingUtils::HashString("DISABLED"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace StreamingStatusMapper { + static const int ENABLED_HASH = HashingUtils::HashString("ENABLED"); + static const int DISABLED_HASH = HashingUtils::HashString("DISABLED"); + StreamingStatus GetStreamingStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-config/CMakeLists.txt b/aws-cpp-sdk-config/CMakeLists.txt index c49295f48c9..3b80f011c9b 100644 --- a/aws-cpp-sdk-config/CMakeLists.txt +++ b/aws-cpp-sdk-config/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-config) "source/model/*.cpp" ) - file(GLOB CONFIG_SRC + file(GLOB CONFIG_UNIFIED_HEADERS ${AWS_CONFIG_HEADERS} ${AWS_CONFIG_MODEL_HEADERS} + ) + + file(GLOB CONFIG_UNITY_SRC ${AWS_CONFIG_SOURCE} ${AWS_CONFIG_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("CONFIG" CONFIG_UNITY_SRC) + endif() + + file(GLOB CONFIG_SRC + ${CONFIG_UNIFIED_HEADERS} + ${CONFIG_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-config/source/ConfigServiceErrors.cpp b/aws-cpp-sdk-config/source/ConfigServiceErrors.cpp index eab4f488b91..364269dbe4d 100644 --- a/aws-cpp-sdk-config/source/ConfigServiceErrors.cpp +++ b/aws-cpp-sdk-config/source/ConfigServiceErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::ConfigService; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace ConfigServiceErrorMapper +{ + static const int RESOURCE_IN_USE_HASH = HashingUtils::HashString("ResourceInUseException"); static const int INVALID_RECORDING_GROUP_HASH = HashingUtils::HashString("InvalidRecordingGroupException"); static const int MAX_NUMBER_OF_CONFIG_RULES_EXCEEDED_HASH = HashingUtils::HashString("MaxNumberOfConfigRulesExceededException"); @@ -46,12 +53,6 @@ static const int INVALID_DELIVERY_CHANNEL_NAME_HASH = HashingUtils::HashString(" static const int INSUFFICIENT_PERMISSIONS_HASH = HashingUtils::HashString("InsufficientPermissionsException"); static const int INVALID_S_N_S_TOPIC_A_R_N_HASH = HashingUtils::HashString("InvalidSNSTopicARNException"); -namespace Aws -{ -namespace ConfigService -{ -namespace ConfigServiceErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-config/source/model/ChronologicalOrder.cpp b/aws-cpp-sdk-config/source/model/ChronologicalOrder.cpp index abd4ad31115..fd3fb95e38a 100644 --- a/aws-cpp-sdk-config/source/model/ChronologicalOrder.cpp +++ b/aws-cpp-sdk-config/source/model/ChronologicalOrder.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Reverse_HASH = HashingUtils::HashString("Reverse"); -static const int Forward_HASH = HashingUtils::HashString("Forward"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ChronologicalOrderMapper { + static const int Reverse_HASH = HashingUtils::HashString("Reverse"); + static const int Forward_HASH = HashingUtils::HashString("Forward"); + ChronologicalOrder GetChronologicalOrderForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-config/source/model/Compliance.cpp b/aws-cpp-sdk-config/source/model/Compliance.cpp index 786f5b8d989..f358cfb591b 100644 --- a/aws-cpp-sdk-config/source/model/Compliance.cpp +++ b/aws-cpp-sdk-config/source/model/Compliance.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + Compliance::Compliance() : m_complianceTypeHasBeenSet(false), m_complianceContributorCountHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue Compliance::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/ComplianceByConfigRule.cpp b/aws-cpp-sdk-config/source/model/ComplianceByConfigRule.cpp index ff95e090a4a..02be025676e 100644 --- a/aws-cpp-sdk-config/source/model/ComplianceByConfigRule.cpp +++ b/aws-cpp-sdk-config/source/model/ComplianceByConfigRule.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + ComplianceByConfigRule::ComplianceByConfigRule() : m_configRuleNameHasBeenSet(false), m_complianceHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue ComplianceByConfigRule::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/ComplianceByResource.cpp b/aws-cpp-sdk-config/source/model/ComplianceByResource.cpp index 232cd0ad1db..9eecd4a5055 100644 --- a/aws-cpp-sdk-config/source/model/ComplianceByResource.cpp +++ b/aws-cpp-sdk-config/source/model/ComplianceByResource.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + ComplianceByResource::ComplianceByResource() : m_resourceTypeHasBeenSet(false), m_resourceIdHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue ComplianceByResource::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/ComplianceContributorCount.cpp b/aws-cpp-sdk-config/source/model/ComplianceContributorCount.cpp index a98a376a5ac..c54a69a1e8c 100644 --- a/aws-cpp-sdk-config/source/model/ComplianceContributorCount.cpp +++ b/aws-cpp-sdk-config/source/model/ComplianceContributorCount.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + ComplianceContributorCount::ComplianceContributorCount() : m_cappedCount(0), m_cappedCountHasBeenSet(false), @@ -74,4 +80,8 @@ JsonValue ComplianceContributorCount::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/ComplianceSummary.cpp b/aws-cpp-sdk-config/source/model/ComplianceSummary.cpp index b484ffd0ca7..6e2680d6c64 100644 --- a/aws-cpp-sdk-config/source/model/ComplianceSummary.cpp +++ b/aws-cpp-sdk-config/source/model/ComplianceSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + ComplianceSummary::ComplianceSummary() : m_compliantResourceCountHasBeenSet(false), m_nonCompliantResourceCountHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue ComplianceSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws diff --git a/aws-cpp-sdk-config/source/model/ComplianceSummaryByResourceType.cpp b/aws-cpp-sdk-config/source/model/ComplianceSummaryByResourceType.cpp index 240b115df61..e9f4931e937 100644 --- a/aws-cpp-sdk-config/source/model/ComplianceSummaryByResourceType.cpp +++ b/aws-cpp-sdk-config/source/model/ComplianceSummaryByResourceType.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + ComplianceSummaryByResourceType::ComplianceSummaryByResourceType() : m_resourceTypeHasBeenSet(false), m_complianceSummaryHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue ComplianceSummaryByResourceType::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/ComplianceType.cpp b/aws-cpp-sdk-config/source/model/ComplianceType.cpp index fca0eea9c24..cfb7dffb489 100644 --- a/aws-cpp-sdk-config/source/model/ComplianceType.cpp +++ b/aws-cpp-sdk-config/source/model/ComplianceType.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int COMPLIANT_HASH = HashingUtils::HashString("COMPLIANT"); -static const int NON_COMPLIANT_HASH = HashingUtils::HashString("NON_COMPLIANT"); -static const int NOT_APPLICABLE_HASH = HashingUtils::HashString("NOT_APPLICABLE"); -static const int INSUFFICIENT_DATA_HASH = HashingUtils::HashString("INSUFFICIENT_DATA"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace ComplianceTypeMapper { + static const int COMPLIANT_HASH = HashingUtils::HashString("COMPLIANT"); + static const int NON_COMPLIANT_HASH = HashingUtils::HashString("NON_COMPLIANT"); + static const int NOT_APPLICABLE_HASH = HashingUtils::HashString("NOT_APPLICABLE"); + static const int INSUFFICIENT_DATA_HASH = HashingUtils::HashString("INSUFFICIENT_DATA"); + ComplianceType GetComplianceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-config/source/model/ConfigExportDeliveryInfo.cpp b/aws-cpp-sdk-config/source/model/ConfigExportDeliveryInfo.cpp index d53163454eb..713dcc3723b 100644 --- a/aws-cpp-sdk-config/source/model/ConfigExportDeliveryInfo.cpp +++ b/aws-cpp-sdk-config/source/model/ConfigExportDeliveryInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + ConfigExportDeliveryInfo::ConfigExportDeliveryInfo() : m_lastStatusHasBeenSet(false), m_lastErrorCodeHasBeenSet(false), @@ -126,4 +132,8 @@ JsonValue ConfigExportDeliveryInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws diff --git a/aws-cpp-sdk-config/source/model/ConfigRule.cpp b/aws-cpp-sdk-config/source/model/ConfigRule.cpp index 06a08f3e358..ba93e079b3e 100644 --- a/aws-cpp-sdk-config/source/model/ConfigRule.cpp +++ b/aws-cpp-sdk-config/source/model/ConfigRule.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + ConfigRule::ConfigRule() : m_configRuleNameHasBeenSet(false), m_configRuleArnHasBeenSet(false), @@ -173,4 +179,8 @@ JsonValue ConfigRule::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/ConfigRuleEvaluationStatus.cpp b/aws-cpp-sdk-config/source/model/ConfigRuleEvaluationStatus.cpp index d8be5535ba3..ce52abc9b5c 100644 --- a/aws-cpp-sdk-config/source/model/ConfigRuleEvaluationStatus.cpp +++ b/aws-cpp-sdk-config/source/model/ConfigRuleEvaluationStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + ConfigRuleEvaluationStatus::ConfigRuleEvaluationStatus() : m_configRuleNameHasBeenSet(false), m_configRuleArnHasBeenSet(false), @@ -202,4 +208,8 @@ JsonValue ConfigRuleEvaluationStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws diff --git a/aws-cpp-sdk-config/source/model/ConfigRuleState.cpp b/aws-cpp-sdk-config/source/model/ConfigRuleState.cpp index 6faa7106a83..fc9f7551840 100644 --- a/aws-cpp-sdk-config/source/model/ConfigRuleState.cpp +++ b/aws-cpp-sdk-config/source/model/ConfigRuleState.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); -static const int DELETING_HASH = HashingUtils::HashString("DELETING"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ConfigRuleStateMapper { + static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); + static const int DELETING_HASH = HashingUtils::HashString("DELETING"); + ConfigRuleState GetConfigRuleStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-config/source/model/ConfigSnapshotDeliveryProperties.cpp b/aws-cpp-sdk-config/source/model/ConfigSnapshotDeliveryProperties.cpp index 39083a776b1..e2d442f6eb7 100644 --- a/aws-cpp-sdk-config/source/model/ConfigSnapshotDeliveryProperties.cpp +++ b/aws-cpp-sdk-config/source/model/ConfigSnapshotDeliveryProperties.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + ConfigSnapshotDeliveryProperties::ConfigSnapshotDeliveryProperties() : m_deliveryFrequencyHasBeenSet(false) { @@ -54,4 +60,8 @@ JsonValue ConfigSnapshotDeliveryProperties::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/ConfigStreamDeliveryInfo.cpp b/aws-cpp-sdk-config/source/model/ConfigStreamDeliveryInfo.cpp index 5161d5ffc33..8628bdfb494 100644 --- a/aws-cpp-sdk-config/source/model/ConfigStreamDeliveryInfo.cpp +++ b/aws-cpp-sdk-config/source/model/ConfigStreamDeliveryInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + ConfigStreamDeliveryInfo::ConfigStreamDeliveryInfo() : m_lastStatusHasBeenSet(false), m_lastErrorCodeHasBeenSet(false), @@ -98,4 +104,8 @@ JsonValue ConfigStreamDeliveryInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws diff --git a/aws-cpp-sdk-config/source/model/ConfigurationItem.cpp b/aws-cpp-sdk-config/source/model/ConfigurationItem.cpp index eef2cc106f5..86a0befbb2e 100644 --- a/aws-cpp-sdk-config/source/model/ConfigurationItem.cpp +++ b/aws-cpp-sdk-config/source/model/ConfigurationItem.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + ConfigurationItem::ConfigurationItem() : m_versionHasBeenSet(false), m_accountIdHasBeenSet(false), @@ -315,4 +321,8 @@ JsonValue ConfigurationItem::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws diff --git a/aws-cpp-sdk-config/source/model/ConfigurationItemStatus.cpp b/aws-cpp-sdk-config/source/model/ConfigurationItemStatus.cpp index 9723b934f28..d42c94ae5d1 100644 --- a/aws-cpp-sdk-config/source/model/ConfigurationItemStatus.cpp +++ b/aws-cpp-sdk-config/source/model/ConfigurationItemStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int Ok_HASH = HashingUtils::HashString("Ok"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); -static const int Discovered_HASH = HashingUtils::HashString("Discovered"); -static const int Deleted_HASH = HashingUtils::HashString("Deleted"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace ConfigurationItemStatusMapper { + static const int Ok_HASH = HashingUtils::HashString("Ok"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + static const int Discovered_HASH = HashingUtils::HashString("Discovered"); + static const int Deleted_HASH = HashingUtils::HashString("Deleted"); + ConfigurationItemStatus GetConfigurationItemStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-config/source/model/ConfigurationRecorder.cpp b/aws-cpp-sdk-config/source/model/ConfigurationRecorder.cpp index f596b5940b8..99c8eebbe2d 100644 --- a/aws-cpp-sdk-config/source/model/ConfigurationRecorder.cpp +++ b/aws-cpp-sdk-config/source/model/ConfigurationRecorder.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + ConfigurationRecorder::ConfigurationRecorder() : m_nameHasBeenSet(false), m_roleARNHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue ConfigurationRecorder::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/ConfigurationRecorderStatus.cpp b/aws-cpp-sdk-config/source/model/ConfigurationRecorderStatus.cpp index 8cd2a34708d..f323dcb8314 100644 --- a/aws-cpp-sdk-config/source/model/ConfigurationRecorderStatus.cpp +++ b/aws-cpp-sdk-config/source/model/ConfigurationRecorderStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + ConfigurationRecorderStatus::ConfigurationRecorderStatus() : m_nameHasBeenSet(false), m_lastStartTimeHasBeenSet(false), @@ -158,4 +164,8 @@ JsonValue ConfigurationRecorderStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws diff --git a/aws-cpp-sdk-config/source/model/DeliveryChannel.cpp b/aws-cpp-sdk-config/source/model/DeliveryChannel.cpp index 5b019011d00..67c23a1b919 100644 --- a/aws-cpp-sdk-config/source/model/DeliveryChannel.cpp +++ b/aws-cpp-sdk-config/source/model/DeliveryChannel.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + DeliveryChannel::DeliveryChannel() : m_nameHasBeenSet(false), m_s3BucketNameHasBeenSet(false), @@ -115,4 +121,8 @@ JsonValue DeliveryChannel::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/DeliveryChannelStatus.cpp b/aws-cpp-sdk-config/source/model/DeliveryChannelStatus.cpp index bae09457f49..a05c92da24c 100644 --- a/aws-cpp-sdk-config/source/model/DeliveryChannelStatus.cpp +++ b/aws-cpp-sdk-config/source/model/DeliveryChannelStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + DeliveryChannelStatus::DeliveryChannelStatus() : m_nameHasBeenSet(false), m_configSnapshotDeliveryInfoHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue DeliveryChannelStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/DeliveryStatus.cpp b/aws-cpp-sdk-config/source/model/DeliveryStatus.cpp index 50b402ea142..873c11ab271 100644 --- a/aws-cpp-sdk-config/source/model/DeliveryStatus.cpp +++ b/aws-cpp-sdk-config/source/model/DeliveryStatus.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int Success_HASH = HashingUtils::HashString("Success"); -static const int Failure_HASH = HashingUtils::HashString("Failure"); -static const int Not_Applicable_HASH = HashingUtils::HashString("Not_Applicable"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace DeliveryStatusMapper { + static const int Success_HASH = HashingUtils::HashString("Success"); + static const int Failure_HASH = HashingUtils::HashString("Failure"); + static const int Not_Applicable_HASH = HashingUtils::HashString("Not_Applicable"); + DeliveryStatus GetDeliveryStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-config/source/model/Evaluation.cpp b/aws-cpp-sdk-config/source/model/Evaluation.cpp index add8dce7f53..15c584ce868 100644 --- a/aws-cpp-sdk-config/source/model/Evaluation.cpp +++ b/aws-cpp-sdk-config/source/model/Evaluation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + Evaluation::Evaluation() : m_complianceResourceTypeHasBeenSet(false), m_complianceResourceIdHasBeenSet(false), @@ -113,4 +119,8 @@ JsonValue Evaluation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws diff --git a/aws-cpp-sdk-config/source/model/EvaluationResult.cpp b/aws-cpp-sdk-config/source/model/EvaluationResult.cpp index 27a465ae183..3dad170599a 100644 --- a/aws-cpp-sdk-config/source/model/EvaluationResult.cpp +++ b/aws-cpp-sdk-config/source/model/EvaluationResult.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + EvaluationResult::EvaluationResult() : m_evaluationResultIdentifierHasBeenSet(false), m_complianceTypeHasBeenSet(false), @@ -127,4 +133,8 @@ JsonValue EvaluationResult::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws diff --git a/aws-cpp-sdk-config/source/model/EvaluationResultIdentifier.cpp b/aws-cpp-sdk-config/source/model/EvaluationResultIdentifier.cpp index fbdc2314193..22d9282269c 100644 --- a/aws-cpp-sdk-config/source/model/EvaluationResultIdentifier.cpp +++ b/aws-cpp-sdk-config/source/model/EvaluationResultIdentifier.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + EvaluationResultIdentifier::EvaluationResultIdentifier() : m_evaluationResultQualifierHasBeenSet(false), m_orderingTimestampHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue EvaluationResultIdentifier::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws diff --git a/aws-cpp-sdk-config/source/model/EvaluationResultQualifier.cpp b/aws-cpp-sdk-config/source/model/EvaluationResultQualifier.cpp index eb1dccc105c..93794b67277 100644 --- a/aws-cpp-sdk-config/source/model/EvaluationResultQualifier.cpp +++ b/aws-cpp-sdk-config/source/model/EvaluationResultQualifier.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + EvaluationResultQualifier::EvaluationResultQualifier() : m_configRuleNameHasBeenSet(false), m_resourceTypeHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue EvaluationResultQualifier::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/EventSource.cpp b/aws-cpp-sdk-config/source/model/EventSource.cpp index 8dfd09d588b..2e92b771c4a 100644 --- a/aws-cpp-sdk-config/source/model/EventSource.cpp +++ b/aws-cpp-sdk-config/source/model/EventSource.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int aws_config_HASH = HashingUtils::HashString("aws.config"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace EventSourceMapper { + static const int aws_config_HASH = HashingUtils::HashString("aws.config"); + EventSource GetEventSourceForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-config/source/model/MaximumExecutionFrequency.cpp b/aws-cpp-sdk-config/source/model/MaximumExecutionFrequency.cpp index 3199bf51d88..9314f1e6c33 100644 --- a/aws-cpp-sdk-config/source/model/MaximumExecutionFrequency.cpp +++ b/aws-cpp-sdk-config/source/model/MaximumExecutionFrequency.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int One_Hour_HASH = HashingUtils::HashString("One_Hour"); -static const int Three_Hours_HASH = HashingUtils::HashString("Three_Hours"); -static const int Six_Hours_HASH = HashingUtils::HashString("Six_Hours"); -static const int Twelve_Hours_HASH = HashingUtils::HashString("Twelve_Hours"); -static const int TwentyFour_Hours_HASH = HashingUtils::HashString("TwentyFour_Hours"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace MaximumExecutionFrequencyMapper { + static const int One_Hour_HASH = HashingUtils::HashString("One_Hour"); + static const int Three_Hours_HASH = HashingUtils::HashString("Three_Hours"); + static const int Six_Hours_HASH = HashingUtils::HashString("Six_Hours"); + static const int Twelve_Hours_HASH = HashingUtils::HashString("Twelve_Hours"); + static const int TwentyFour_Hours_HASH = HashingUtils::HashString("TwentyFour_Hours"); + MaximumExecutionFrequency GetMaximumExecutionFrequencyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-config/source/model/MessageType.cpp b/aws-cpp-sdk-config/source/model/MessageType.cpp index ce2a1ee2c81..904f541143f 100644 --- a/aws-cpp-sdk-config/source/model/MessageType.cpp +++ b/aws-cpp-sdk-config/source/model/MessageType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ConfigurationItemChangeNotification_HASH = HashingUtils::HashString("ConfigurationItemChangeNotification"); -static const int ConfigurationSnapshotDeliveryCompleted_HASH = HashingUtils::HashString("ConfigurationSnapshotDeliveryCompleted"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace MessageTypeMapper { + static const int ConfigurationItemChangeNotification_HASH = HashingUtils::HashString("ConfigurationItemChangeNotification"); + static const int ConfigurationSnapshotDeliveryCompleted_HASH = HashingUtils::HashString("ConfigurationSnapshotDeliveryCompleted"); + MessageType GetMessageTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-config/source/model/Owner.cpp b/aws-cpp-sdk-config/source/model/Owner.cpp index 451cc0be398..5206d0c30e0 100644 --- a/aws-cpp-sdk-config/source/model/Owner.cpp +++ b/aws-cpp-sdk-config/source/model/Owner.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int CUSTOM_LAMBDA_HASH = HashingUtils::HashString("CUSTOM_LAMBDA"); -static const int AWS_HASH = HashingUtils::HashString("AWS"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace OwnerMapper { + static const int CUSTOM_LAMBDA_HASH = HashingUtils::HashString("CUSTOM_LAMBDA"); + static const int AWS_HASH = HashingUtils::HashString("AWS"); + Owner GetOwnerForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-config/source/model/RecorderStatus.cpp b/aws-cpp-sdk-config/source/model/RecorderStatus.cpp index 25e461ca572..4f62c3cea40 100644 --- a/aws-cpp-sdk-config/source/model/RecorderStatus.cpp +++ b/aws-cpp-sdk-config/source/model/RecorderStatus.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int Pending_HASH = HashingUtils::HashString("Pending"); -static const int Success_HASH = HashingUtils::HashString("Success"); -static const int Failure_HASH = HashingUtils::HashString("Failure"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace RecorderStatusMapper { + static const int Pending_HASH = HashingUtils::HashString("Pending"); + static const int Success_HASH = HashingUtils::HashString("Success"); + static const int Failure_HASH = HashingUtils::HashString("Failure"); + RecorderStatus GetRecorderStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-config/source/model/RecordingGroup.cpp b/aws-cpp-sdk-config/source/model/RecordingGroup.cpp index 2f078afe38d..5e7fc6cf039 100644 --- a/aws-cpp-sdk-config/source/model/RecordingGroup.cpp +++ b/aws-cpp-sdk-config/source/model/RecordingGroup.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + RecordingGroup::RecordingGroup() : m_allSupported(false), m_allSupportedHasBeenSet(false), @@ -97,4 +103,8 @@ JsonValue RecordingGroup::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/Relationship.cpp b/aws-cpp-sdk-config/source/model/Relationship.cpp index 991e2c572b9..dcbd1494577 100644 --- a/aws-cpp-sdk-config/source/model/Relationship.cpp +++ b/aws-cpp-sdk-config/source/model/Relationship.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + Relationship::Relationship() : m_resourceTypeHasBeenSet(false), m_resourceIdHasBeenSet(false), @@ -99,4 +105,8 @@ JsonValue Relationship::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/ResourceIdentifier.cpp b/aws-cpp-sdk-config/source/model/ResourceIdentifier.cpp index f9280763e67..7291b444ea1 100644 --- a/aws-cpp-sdk-config/source/model/ResourceIdentifier.cpp +++ b/aws-cpp-sdk-config/source/model/ResourceIdentifier.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + ResourceIdentifier::ResourceIdentifier() : m_resourceTypeHasBeenSet(false), m_resourceIdHasBeenSet(false), @@ -98,4 +104,8 @@ JsonValue ResourceIdentifier::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws diff --git a/aws-cpp-sdk-config/source/model/ResourceType.cpp b/aws-cpp-sdk-config/source/model/ResourceType.cpp index 3a3d41b73e5..94f22807094 100644 --- a/aws-cpp-sdk-config/source/model/ResourceType.cpp +++ b/aws-cpp-sdk-config/source/model/ResourceType.cpp @@ -19,25 +19,6 @@ using namespace Aws::Utils; -static const int AWS_EC2_CustomerGateway_HASH = HashingUtils::HashString("AWS::EC2::CustomerGateway"); -static const int AWS_EC2_EIP_HASH = HashingUtils::HashString("AWS::EC2::EIP"); -static const int AWS_EC2_Host_HASH = HashingUtils::HashString("AWS::EC2::Host"); -static const int AWS_EC2_Instance_HASH = HashingUtils::HashString("AWS::EC2::Instance"); -static const int AWS_EC2_InternetGateway_HASH = HashingUtils::HashString("AWS::EC2::InternetGateway"); -static const int AWS_EC2_NetworkAcl_HASH = HashingUtils::HashString("AWS::EC2::NetworkAcl"); -static const int AWS_EC2_NetworkInterface_HASH = HashingUtils::HashString("AWS::EC2::NetworkInterface"); -static const int AWS_EC2_RouteTable_HASH = HashingUtils::HashString("AWS::EC2::RouteTable"); -static const int AWS_EC2_SecurityGroup_HASH = HashingUtils::HashString("AWS::EC2::SecurityGroup"); -static const int AWS_EC2_Subnet_HASH = HashingUtils::HashString("AWS::EC2::Subnet"); -static const int AWS_CloudTrail_Trail_HASH = HashingUtils::HashString("AWS::CloudTrail::Trail"); -static const int AWS_EC2_Volume_HASH = HashingUtils::HashString("AWS::EC2::Volume"); -static const int AWS_EC2_VPC_HASH = HashingUtils::HashString("AWS::EC2::VPC"); -static const int AWS_EC2_VPNConnection_HASH = HashingUtils::HashString("AWS::EC2::VPNConnection"); -static const int AWS_EC2_VPNGateway_HASH = HashingUtils::HashString("AWS::EC2::VPNGateway"); -static const int AWS_IAM_Group_HASH = HashingUtils::HashString("AWS::IAM::Group"); -static const int AWS_IAM_Policy_HASH = HashingUtils::HashString("AWS::IAM::Policy"); -static const int AWS_IAM_Role_HASH = HashingUtils::HashString("AWS::IAM::Role"); -static const int AWS_IAM_User_HASH = HashingUtils::HashString("AWS::IAM::User"); namespace Aws { @@ -48,6 +29,26 @@ namespace Aws namespace ResourceTypeMapper { + static const int AWS_EC2_CustomerGateway_HASH = HashingUtils::HashString("AWS::EC2::CustomerGateway"); + static const int AWS_EC2_EIP_HASH = HashingUtils::HashString("AWS::EC2::EIP"); + static const int AWS_EC2_Host_HASH = HashingUtils::HashString("AWS::EC2::Host"); + static const int AWS_EC2_Instance_HASH = HashingUtils::HashString("AWS::EC2::Instance"); + static const int AWS_EC2_InternetGateway_HASH = HashingUtils::HashString("AWS::EC2::InternetGateway"); + static const int AWS_EC2_NetworkAcl_HASH = HashingUtils::HashString("AWS::EC2::NetworkAcl"); + static const int AWS_EC2_NetworkInterface_HASH = HashingUtils::HashString("AWS::EC2::NetworkInterface"); + static const int AWS_EC2_RouteTable_HASH = HashingUtils::HashString("AWS::EC2::RouteTable"); + static const int AWS_EC2_SecurityGroup_HASH = HashingUtils::HashString("AWS::EC2::SecurityGroup"); + static const int AWS_EC2_Subnet_HASH = HashingUtils::HashString("AWS::EC2::Subnet"); + static const int AWS_CloudTrail_Trail_HASH = HashingUtils::HashString("AWS::CloudTrail::Trail"); + static const int AWS_EC2_Volume_HASH = HashingUtils::HashString("AWS::EC2::Volume"); + static const int AWS_EC2_VPC_HASH = HashingUtils::HashString("AWS::EC2::VPC"); + static const int AWS_EC2_VPNConnection_HASH = HashingUtils::HashString("AWS::EC2::VPNConnection"); + static const int AWS_EC2_VPNGateway_HASH = HashingUtils::HashString("AWS::EC2::VPNGateway"); + static const int AWS_IAM_Group_HASH = HashingUtils::HashString("AWS::IAM::Group"); + static const int AWS_IAM_Policy_HASH = HashingUtils::HashString("AWS::IAM::Policy"); + static const int AWS_IAM_Role_HASH = HashingUtils::HashString("AWS::IAM::Role"); + static const int AWS_IAM_User_HASH = HashingUtils::HashString("AWS::IAM::User"); + ResourceType GetResourceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-config/source/model/Scope.cpp b/aws-cpp-sdk-config/source/model/Scope.cpp index 62b28287572..997a8156a79 100644 --- a/aws-cpp-sdk-config/source/model/Scope.cpp +++ b/aws-cpp-sdk-config/source/model/Scope.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + Scope::Scope() : m_complianceResourceTypesHasBeenSet(false), m_tagKeyHasBeenSet(false), @@ -108,4 +114,8 @@ JsonValue Scope::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/Source.cpp b/aws-cpp-sdk-config/source/model/Source.cpp index b2e00bd7c5c..d5bda85c52b 100644 --- a/aws-cpp-sdk-config/source/model/Source.cpp +++ b/aws-cpp-sdk-config/source/model/Source.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + Source::Source() : m_ownerHasBeenSet(false), m_sourceIdentifierHasBeenSet(false), @@ -92,4 +98,8 @@ JsonValue Source::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-config/source/model/SourceDetail.cpp b/aws-cpp-sdk-config/source/model/SourceDetail.cpp index ba1450c7bf5..f6092a92eb0 100644 --- a/aws-cpp-sdk-config/source/model/SourceDetail.cpp +++ b/aws-cpp-sdk-config/source/model/SourceDetail.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ConfigService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ConfigService +{ +namespace Model +{ + SourceDetail::SourceDetail() : m_eventSourceHasBeenSet(false), m_messageTypeHasBeenSet(false) @@ -68,4 +74,8 @@ JsonValue SourceDetail::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ConfigService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp b/aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp index 0bf8fcc4735..a344da23217 100644 --- a/aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp +++ b/aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp @@ -1,366 +1,380 @@ -/* - * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://aws.amazon.com/apache2.0 - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#ifndef _WIN32 - #include - #include - #include - - Aws::String GetEnv(const char *variableName) - { - char* envValue = std::getenv(variableName); - if(envValue) - { - return Aws::String(envValue); - } - - return ""; - } - -#else - #include - - void setenv(const char* name, const char* value, unsigned overwrite) - { - AWS_UNREFERENCED_PARAM(overwrite); - Aws::StringStream ss; - ss << name << "=" << value; - _putenv(ss.str().c_str()); - } - - void unsetenv(const char* name) - { - setenv(name, "", 1); - } - - /* - using std::getenv generates a warning on windows so we use _dupenv_s instead. The character array returned by this function is our responsibility to clean up, so rather than returning raw strings - that would need to be manually freed in all the client functions, just copy it into a Aws::String instead, freeing it here. - */ - Aws::String GetEnv(const char *variableName) - { - char* variableValue = nullptr; - std::size_t valueSize = 0; - auto queryResult = _dupenv_s(&variableValue, &valueSize, variableName); - - Aws::String result; - if(queryResult == 0 && variableValue != nullptr && valueSize > 0) - { - result.assign(variableValue, valueSize - 1); // don't copy the c-string terminator byte - free(variableValue); - } - - return result; - } - - -#endif // _WIN32 - -static const char *AllocationTag = "AWSCredentialsProviderTest"; - -using namespace Aws::Auth; -using namespace Aws::Utils; - -#ifndef __ANDROID__ - -TEST(ProfileConfigFileAWSCredentialsProviderTest, TestDefaultConfig) -{ - AWS_BEGIN_MEMORY_TEST(16, 10) - FileSystemUtils::CreateDirectoryIfNotExists(ProfileConfigFileAWSCredentialsProvider::GetProfileDirectory().c_str()); - - Aws::String configFileName = ProfileConfigFileAWSCredentialsProvider::GetProfileFilename(); - Aws::String tempFileName = configFileName + "_tempMv"; - - FileSystemUtils::RelocateFileOrDirectory(configFileName.c_str(), tempFileName.c_str()); - - Aws::OFStream configFile(configFileName.c_str(), Aws::OFStream::out | Aws::OFStream::trunc); - - configFile << std::endl; - configFile << "[Somebody Else ]" << std::endl; - configFile << "aws_access_key_id = SomebodyElseAccessId" << std::endl; - configFile << "something else to break the parser" << std::endl; - configFile << "#test comment" << std::endl; - configFile << "[default]" << std::endl; - configFile << "aws_access_key_id = DefaultAccessKey" << std::endl; - configFile << "aws_secret_access_key=DefaultSecretKey " << std::endl; - configFile << "aws_session_token=DefaultSessionToken" << std::endl; - configFile << std::endl; - configFile << " [Somebody Else Again]" << std::endl; - configFile << "aws_secret_access_key = SomebodyElseAgainAccessId" << std::endl; - configFile << " aws_secret_access_key=SomebodyElseAgainSecretKey" << std::endl; - configFile << "aws_session_token=SomebodyElseAgainSessionToken" << std::endl; - - configFile.flush(); - configFile.close(); - - - ProfileConfigFileAWSCredentialsProvider provider(10); - EXPECT_STREQ("DefaultAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId().c_str()); - EXPECT_STREQ("DefaultSecretKey", provider.GetAWSCredentials().GetAWSSecretKey().c_str()); - - FileSystemUtils::RemoveFileIfExists(configFileName.c_str()); - std::this_thread::sleep_for(std::chrono::milliseconds(1000)); - - EXPECT_STREQ("", provider.GetAWSCredentials().GetAWSAccessKeyId().c_str()); - EXPECT_STREQ("", provider.GetAWSCredentials().GetAWSSecretKey().c_str()); - - FileSystemUtils::RelocateFileOrDirectory(tempFileName.c_str(), configFileName.c_str()); - - AWS_END_MEMORY_TEST -} - - -TEST(ProfileConfigFileAWSCredentialsProviderTest, TestWithEnvVars) -{ - AWS_BEGIN_MEMORY_TEST(16, 10) - - FileSystemUtils::CreateDirectoryIfNotExists(ProfileConfigFileAWSCredentialsProvider::GetProfileDirectory().c_str()); - - Aws::String configFileName = ProfileConfigFileAWSCredentialsProvider::GetProfileFilename() + "_blah"; - - Aws::String oldValue = GetEnv("AWS_SHARED_CREDENTIALS_FILE"); - setenv("AWS_SHARED_CREDENTIALS_FILE", configFileName.c_str(), 1); - Aws::String oldProfileValue = GetEnv("AWS_DEFAULT_PROFILE"); - const char* profile = "someProfile"; - setenv("AWS_DEFAULT_PROFILE", profile, 1); - Aws::OFStream configFile(configFileName.c_str(), Aws::OFStream::out | Aws::OFStream::trunc); - - configFile << "[ someProfile]" << std::endl; - configFile << " aws_access_key_id = SomeProfileAccessKey " << std::endl; - configFile << "aws_secret_access_key =SomeProfileSecretKey" << std::endl; - configFile << "aws_session_token=SomeProfileSessionToken " << std::endl; - configFile << std::endl; - - configFile.flush(); - configFile.close(); - - ProfileConfigFileAWSCredentialsProvider provider(10); - if (!oldValue.empty()) - setenv("AWS_SHARED_CREDENTIALS_FILE", oldValue.c_str(), 1); - else - unsetenv("AWS_SHARED_CREDENTIALS_FILE"); - - if (!oldProfileValue.empty()) - setenv("AWS_DEFAULT_PROFILE", oldProfileValue.c_str(), 1); - else - unsetenv("AWS_DEFAULT_PROFILE"); - - ASSERT_STREQ("SomeProfileAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId().c_str()); - ASSERT_STREQ("SomeProfileSecretKey", provider.GetAWSCredentials().GetAWSSecretKey().c_str()); - - AWS_END_MEMORY_TEST -} - -TEST(ProfileConfigFileAWSCredentialsProviderTest, TestWithEnvVarsButSpecifiedProfile) -{ - AWS_BEGIN_MEMORY_TEST(16, 10) - - FileSystemUtils::CreateDirectoryIfNotExists(ProfileConfigFileAWSCredentialsProvider::GetProfileDirectory().c_str()); - - Aws::String configFileName = ProfileConfigFileAWSCredentialsProvider::GetProfileFilename() + "_blah"; - - Aws::String oldValue = GetEnv("AWS_SHARED_CREDENTIALS_FILE"); - setenv("AWS_SHARED_CREDENTIALS_FILE", configFileName.c_str(), 1); - Aws::String oldProfileValue = GetEnv("AWS_DEFAULT_PROFILE"); - const char* profile = "someProfile"; - setenv("AWS_DEFAULT_PROFILE", profile, 1); - Aws::OFStream configFile(configFileName.c_str(), Aws::OFStream::out | Aws::OFStream::trunc); - - configFile << " [ someProfile]" << std::endl; - configFile << " aws_access_key_id = SomeProfileAccessKey" << std::endl; - configFile << "aws_secret_access_key=SomeProfileSecretKey " << std::endl; - configFile << "aws_session_token= SomeProfileSessionToken" << std::endl; - configFile << std::endl; - configFile << "[customProfile]" << std::endl; - configFile << "aws_access_key_id =customProfileAccessKey" << std::endl; - configFile << "aws_secret_access_key=customProfileSecretKey " << std::endl; - configFile << " aws_session_token=customProfileSessionToken" << std::endl; - configFile << std::endl; - - configFile.flush(); - configFile.close(); - - ProfileConfigFileAWSCredentialsProvider provider("customProfile", 10); - - if (!oldValue.empty()) - setenv("AWS_SHARED_CREDENTIALS_FILE", oldValue.c_str(), 1); - - if (!oldProfileValue.empty()) - setenv("AWS_DEFAULT_PROFILE", oldProfileValue.c_str(), 1); - - ASSERT_STREQ("customProfileAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId().c_str()); - ASSERT_STREQ("customProfileSecretKey", provider.GetAWSCredentials().GetAWSSecretKey().c_str()); - - AWS_END_MEMORY_TEST -} - - -TEST(ProfileConfigFileAWSCredentialsProviderTest, TestNotSetup) -{ - AWS_BEGIN_MEMORY_TEST(16, 10) - - Aws::String oldProfileFile = GetEnv("AWS_SHARED_CREDENTIALS_FILE"); - Aws::String oldProfileValue = GetEnv("AWS_DEFAULT_PROFILE"); - Aws::String oldAWSAccessKeyValue = GetEnv("AWS_ACCESS_KEY_ID"); - Aws::String oldSecretKeyValue = GetEnv("AWS_SECRET_ACCESS_KEY"); - - unsetenv("AWS_ACCESS_KEY_ID"); - unsetenv("AWS_SECRET_ACCESS_KEY"); - unsetenv("AWS_SHARED_CREDENTIALS_FILE"); - - ProfileConfigFileAWSCredentialsProvider provider; - if (!oldProfileFile.empty()) - setenv("AWS_SHARED_CREDENTIALS_FILE", oldProfileFile.c_str(), 1); - if (!oldProfileValue.empty()) - setenv("AWS_DEFAULT_PROFILE", oldProfileValue.c_str(), 1); - if (!oldAWSAccessKeyValue.empty()) - setenv("AWS_ACCESS_KEY_ID", oldAWSAccessKeyValue.c_str(), 1); - if (!oldSecretKeyValue.empty()) - setenv("AWS_SECRET_ACCESS_KEY", oldSecretKeyValue.c_str(), 1); - - ASSERT_STREQ("", provider.GetAWSCredentials().GetAWSAccessKeyId().c_str()); - ASSERT_STREQ("", provider.GetAWSCredentials().GetAWSSecretKey().c_str()); - - AWS_END_MEMORY_TEST -} - -#endif // __ANDROID__ - - -TEST(EnvironmentAWSCredentialsProviderTest, TestEnvironmentVariablesExist) -{ - AWS_BEGIN_MEMORY_TEST(16, 10) - - setenv("AWS_ACCESS_KEY_ID", "Access Key", 1); - setenv("AWS_SECRET_ACCESS_KEY", "Secret Key", 1); - setenv("AWS_SESSION_TOKEN", "Session Token", 1); - - EnvironmentAWSCredentialsProvider provider; - ASSERT_EQ("Access Key", provider.GetAWSCredentials().GetAWSAccessKeyId()); - ASSERT_EQ("Secret Key", provider.GetAWSCredentials().GetAWSSecretKey()); - ASSERT_EQ("Session Token", provider.GetAWSCredentials().GetSessionToken()); - - AWS_END_MEMORY_TEST -} - - -TEST(EnvironmentAWSCredentialsProviderTest, TestEnvironmentVariablesDoNotExist) -{ - AWS_BEGIN_MEMORY_TEST(16, 10) - - unsetenv("AWS_ACCESS_KEY_ID"); - unsetenv("AWS_SECRET_ACCESS_KEY"); - - EnvironmentAWSCredentialsProvider provider; - ASSERT_EQ("", provider.GetAWSCredentials().GetAWSAccessKeyId()); - ASSERT_EQ("", provider.GetAWSCredentials().GetAWSSecretKey()); - - AWS_END_MEMORY_TEST -} - - -TEST(InstanceProfileCredentialsProviderTest, TestEC2MetadataClientReturnsGoodData) -{ - AWS_BEGIN_MEMORY_TEST(16, 10) - - auto mockClient = Aws::MakeShared(AllocationTag); - - const char* validCredentials = "{ \"AccessKeyId\": \"goodAccessKey\", \"SecretAccessKey\": \"goodSecretKey\", \"Token\": \"goodToken\" }"; - mockClient->SetMockedCredentialsValue(validCredentials); - - InstanceProfileCredentialsProvider provider(mockClient, 1000 * 60 * 15); - ASSERT_EQ("goodAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId()); - ASSERT_EQ("goodSecretKey", provider.GetAWSCredentials().GetAWSSecretKey()); - - AWS_END_MEMORY_TEST -} - - -TEST(InstanceProfileCredentialsProviderTest, TestThatProviderRefreshes) -{ - AWS_BEGIN_MEMORY_TEST(16, 10) - - auto mockClient = Aws::MakeShared(AllocationTag); - - const char* validCredentials = "{ \"AccessKeyId\": \"goodAccessKey\", \"SecretAccessKey\": \"goodSecretKey\", \"Token\": \"goodToken\" }"; - mockClient->SetMockedCredentialsValue(validCredentials); - - InstanceProfileCredentialsProvider provider(mockClient, 10); - ASSERT_EQ("goodAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId()); - ASSERT_EQ("goodSecretKey", provider.GetAWSCredentials().GetAWSSecretKey()); - - const char* nextSetOfCredentials = "{ \"AccessKeyId\": \"betterAccessKey\", \"SecretAccessKey\": \"betterSecretKey\", \"Token\": \"betterToken\" }"; - mockClient->SetMockedCredentialsValue(nextSetOfCredentials); - ASSERT_EQ("goodAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId()); - ASSERT_EQ("goodSecretKey", provider.GetAWSCredentials().GetAWSSecretKey()); - - std::this_thread::sleep_for(std::chrono::milliseconds(100)); - ASSERT_EQ("betterAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId()); - ASSERT_EQ("betterSecretKey", provider.GetAWSCredentials().GetAWSSecretKey()); - - AWS_END_MEMORY_TEST -} - -TEST(InstanceProfileCredentialsProviderTest, TestEC2MetadataClientCouldntFindCredentials) -{ - AWS_BEGIN_MEMORY_TEST(16, 10) - - auto mockClient = Aws::MakeShared(AllocationTag); - const char* emptyCredentials = ""; - mockClient->SetMockedCredentialsValue(emptyCredentials); - - InstanceProfileCredentialsProvider provider(mockClient, 1000 * 60 * 15); - ASSERT_EQ("", provider.GetAWSCredentials().GetAWSAccessKeyId()); - ASSERT_EQ("", provider.GetAWSCredentials().GetAWSSecretKey()); - - const char* missingInfo = "{ }"; - mockClient->SetMockedCredentialsValue(missingInfo); - ASSERT_EQ("", provider.GetAWSCredentials().GetAWSAccessKeyId()); - ASSERT_EQ("", provider.GetAWSCredentials().GetAWSSecretKey()); - - AWS_END_MEMORY_TEST -} - -TEST(InstanceProfileCredentialsProviderTest, TestEC2MetadataClientReturnsBadData) -{ - AWS_BEGIN_MEMORY_TEST(16, 10) - - auto mockClient = Aws::MakeShared(AllocationTag); - const char* badData = "blah blah blah, I'm bad"; - mockClient->SetMockedCredentialsValue(badData); - - InstanceProfileCredentialsProvider provider(mockClient, 1000 * 60 * 15); - ASSERT_EQ("", provider.GetAWSCredentials().GetAWSAccessKeyId()); - ASSERT_EQ("", provider.GetAWSCredentials().GetAWSSecretKey()); - - AWS_END_MEMORY_TEST -} - - +/* + * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#ifndef _WIN32 + #include + #include + #include + + Aws::String GetEnv(const char *variableName) + { + char* envValue = std::getenv(variableName); + if(envValue) + { + return Aws::String(envValue); + } + + return ""; + } + +#else + #include + + void setenv(const char* name, const char* value, unsigned overwrite) + { + AWS_UNREFERENCED_PARAM(overwrite); + Aws::StringStream ss; + ss << name << "=" << value; + _putenv(ss.str().c_str()); + } + + void unsetenv(const char* name) + { + setenv(name, "", 1); + } + + /* + using std::getenv generates a warning on windows so we use _dupenv_s instead. The character array returned by this function is our responsibility to clean up, so rather than returning raw strings + that would need to be manually freed in all the client functions, just copy it into a Aws::String instead, freeing it here. + */ + Aws::String GetEnv(const char *variableName) + { + char* variableValue = nullptr; + std::size_t valueSize = 0; + auto queryResult = _dupenv_s(&variableValue, &valueSize, variableName); + + Aws::String result; + if(queryResult == 0 && variableValue != nullptr && valueSize > 0) + { + result.assign(variableValue, valueSize - 1); // don't copy the c-string terminator byte + free(variableValue); + } + + return result; + } + + +#endif // _WIN32 + +static const char *AllocationTag = "AWSCredentialsProviderTest"; + +using namespace Aws::Auth; +using namespace Aws::Utils; + +TEST(ProfileConfigFileAWSCredentialsProviderTest, TestDefaultConfig) +{ + AWS_BEGIN_MEMORY_TEST(16, 10) + auto profileDirectory = ProfileConfigFileAWSCredentialsProvider::GetProfileDirectory(); + + FileSystemUtils::CreateDirectoryIfNotExists(profileDirectory.c_str()); + + Aws::String configFileName = ProfileConfigFileAWSCredentialsProvider::GetProfileFilename(); + Aws::String tempFileName = configFileName + "_tempMv"; + + FileSystemUtils::RelocateFileOrDirectory(configFileName.c_str(), tempFileName.c_str()); + + Aws::OFStream configFile(configFileName.c_str(), Aws::OFStream::out | Aws::OFStream::trunc); + + configFile << std::endl; + configFile << "[Somebody Else ]" << std::endl; + configFile << "aws_access_key_id = SomebodyElseAccessId" << std::endl; + configFile << "something else to break the parser" << std::endl; + configFile << "#test comment" << std::endl; + configFile << "[default]" << std::endl; + configFile << "aws_access_key_id = DefaultAccessKey" << std::endl; + configFile << "aws_secret_access_key=DefaultSecretKey " << std::endl; + configFile << "aws_session_token=DefaultSessionToken" << std::endl; + configFile << std::endl; + configFile << " [Somebody Else Again]" << std::endl; + configFile << "aws_secret_access_key = SomebodyElseAgainAccessId" << std::endl; + configFile << " aws_secret_access_key=SomebodyElseAgainSecretKey" << std::endl; + configFile << "aws_session_token=SomebodyElseAgainSessionToken" << std::endl; + + configFile.flush(); + configFile.close(); + + + ProfileConfigFileAWSCredentialsProvider provider(10); + EXPECT_STREQ("DefaultAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId().c_str()); + EXPECT_STREQ("DefaultSecretKey", provider.GetAWSCredentials().GetAWSSecretKey().c_str()); + + FileSystemUtils::RemoveFileIfExists(configFileName.c_str()); + std::this_thread::sleep_for(std::chrono::milliseconds(1000)); + + EXPECT_STREQ("", provider.GetAWSCredentials().GetAWSAccessKeyId().c_str()); + EXPECT_STREQ("", provider.GetAWSCredentials().GetAWSSecretKey().c_str()); + + FileSystemUtils::RelocateFileOrDirectory(tempFileName.c_str(), configFileName.c_str()); + + AWS_END_MEMORY_TEST +} + +class EnvironmentModifyingTest : public ::testing::Test +{ +public: + + static void SetUpTestCase() + { + FileSystemUtils::CreateDirectoryIfNotExists(ProfileConfigFileAWSCredentialsProvider::GetProfileDirectory().c_str()); + } + + static void TearDownTestCase() + { + } + + void SetUp() + { + SaveVariable("AWS_SHARED_CREDENTIALS_FILE"); + SaveVariable("AWS_DEFAULT_PROFILE"); + SaveVariable("AWS_ACCESS_KEY_ID"); + SaveVariable("AWS_SECRET_ACCESS_KEY"); + } + + void TearDown() + { + for(const auto& iter : m_environment) + { + if(iter.second.empty()) + { + unsetenv(iter.first.c_str()); + } + else + { + setenv(iter.first.c_str(), iter.second.c_str(), 1); + } + } + } + + void SaveVariable(const char* variableName) + { + auto variableValue = GetEnv(variableName); + m_environment[ Aws::String( variableName ) ] = GetEnv(variableName); + } + + Aws::Map m_environment; +}; + +TEST_F(EnvironmentModifyingTest, ProfileConfigTestWithEnvVars) +{ + AWS_BEGIN_MEMORY_TEST(16, 10) + + Aws::String configFileName = ProfileConfigFileAWSCredentialsProvider::GetProfileFilename() + "_blah"; + + Aws::String oldValue = GetEnv("AWS_SHARED_CREDENTIALS_FILE"); + setenv("AWS_SHARED_CREDENTIALS_FILE", configFileName.c_str(), 1); + Aws::String oldProfileValue = GetEnv("AWS_DEFAULT_PROFILE"); + const char* profile = "someProfile"; + setenv("AWS_DEFAULT_PROFILE", profile, 1); + Aws::OFStream configFile(configFileName.c_str(), Aws::OFStream::out | Aws::OFStream::trunc); + + configFile << "[ someProfile]" << std::endl; + configFile << " aws_access_key_id = SomeProfileAccessKey " << std::endl; + configFile << "aws_secret_access_key =SomeProfileSecretKey" << std::endl; + configFile << "aws_session_token=SomeProfileSessionToken " << std::endl; + configFile << std::endl; + + configFile.flush(); + configFile.close(); + + ProfileConfigFileAWSCredentialsProvider provider(10); + EXPECT_STREQ("SomeProfileAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId().c_str()); + EXPECT_STREQ("SomeProfileSecretKey", provider.GetAWSCredentials().GetAWSSecretKey().c_str()); + + FileSystemUtils::RemoveFileIfExists(configFileName.c_str()); + + AWS_END_MEMORY_TEST +} + +TEST_F(EnvironmentModifyingTest, ProfileConfigTestWithEnvVarsButSpecifiedProfile) +{ + AWS_BEGIN_MEMORY_TEST(16, 10) + + Aws::String configFileName = ProfileConfigFileAWSCredentialsProvider::GetProfileFilename() + "_blah"; + + setenv("AWS_SHARED_CREDENTIALS_FILE", configFileName.c_str(), 1); + const char* profile = "someProfile"; + setenv("AWS_DEFAULT_PROFILE", profile, 1); + Aws::OFStream configFile(configFileName.c_str(), Aws::OFStream::out | Aws::OFStream::trunc); + + configFile << " [ someProfile]" << std::endl; + configFile << " aws_access_key_id = SomeProfileAccessKey" << std::endl; + configFile << "aws_secret_access_key=SomeProfileSecretKey " << std::endl; + configFile << "aws_session_token= SomeProfileSessionToken" << std::endl; + configFile << std::endl; + configFile << "[customProfile]" << std::endl; + configFile << "aws_access_key_id =customProfileAccessKey" << std::endl; + configFile << "aws_secret_access_key=customProfileSecretKey " << std::endl; + configFile << " aws_session_token=customProfileSessionToken" << std::endl; + configFile << std::endl; + + configFile.flush(); + configFile.close(); + + ProfileConfigFileAWSCredentialsProvider provider("customProfile", 10); + EXPECT_STREQ("customProfileAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId().c_str()); + EXPECT_STREQ("customProfileSecretKey", provider.GetAWSCredentials().GetAWSSecretKey().c_str()); + + FileSystemUtils::RemoveFileIfExists(configFileName.c_str()); + + AWS_END_MEMORY_TEST +} + + +TEST_F(EnvironmentModifyingTest, ProfileConfigTestNotSetup) +{ + AWS_BEGIN_MEMORY_TEST(16, 10) + + Aws::String configFileName = ProfileConfigFileAWSCredentialsProvider::GetProfileFilename(); + Aws::String tempFileName = configFileName + "_tempNotSetup"; + + FileSystemUtils::RelocateFileOrDirectory(configFileName.c_str(), tempFileName.c_str()); + + unsetenv("AWS_ACCESS_KEY_ID"); + unsetenv("AWS_SECRET_ACCESS_KEY"); + unsetenv("AWS_SHARED_CREDENTIALS_FILE"); + + ProfileConfigFileAWSCredentialsProvider provider; + EXPECT_STREQ("", provider.GetAWSCredentials().GetAWSAccessKeyId().c_str()); + EXPECT_STREQ("", provider.GetAWSCredentials().GetAWSSecretKey().c_str()); + + FileSystemUtils::RelocateFileOrDirectory(tempFileName.c_str(), configFileName.c_str()); + + AWS_END_MEMORY_TEST +} + +TEST_F(EnvironmentModifyingTest, TestEnvironmentVariablesExist) +{ + AWS_BEGIN_MEMORY_TEST(16, 10) + + setenv("AWS_ACCESS_KEY_ID", "Access Key", 1); + setenv("AWS_SECRET_ACCESS_KEY", "Secret Key", 1); + setenv("AWS_SESSION_TOKEN", "Session Token", 1); + + EnvironmentAWSCredentialsProvider provider; + ASSERT_EQ("Access Key", provider.GetAWSCredentials().GetAWSAccessKeyId()); + ASSERT_EQ("Secret Key", provider.GetAWSCredentials().GetAWSSecretKey()); + ASSERT_EQ("Session Token", provider.GetAWSCredentials().GetSessionToken()); + + AWS_END_MEMORY_TEST +} + + +TEST_F(EnvironmentModifyingTest, TestEnvironmentVariablesDoNotExist) +{ + AWS_BEGIN_MEMORY_TEST(16, 10) + + unsetenv("AWS_ACCESS_KEY_ID"); + unsetenv("AWS_SECRET_ACCESS_KEY"); + + EnvironmentAWSCredentialsProvider provider; + ASSERT_EQ("", provider.GetAWSCredentials().GetAWSAccessKeyId()); + ASSERT_EQ("", provider.GetAWSCredentials().GetAWSSecretKey()); + + AWS_END_MEMORY_TEST +} + + + +TEST(InstanceProfileCredentialsProviderTest, TestEC2MetadataClientReturnsGoodData) +{ + AWS_BEGIN_MEMORY_TEST(16, 10) + + auto mockClient = Aws::MakeShared(AllocationTag); + + const char* validCredentials = "{ \"AccessKeyId\": \"goodAccessKey\", \"SecretAccessKey\": \"goodSecretKey\", \"Token\": \"goodToken\" }"; + mockClient->SetMockedCredentialsValue(validCredentials); + + InstanceProfileCredentialsProvider provider(mockClient, 1000 * 60 * 15); + ASSERT_EQ("goodAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId()); + ASSERT_EQ("goodSecretKey", provider.GetAWSCredentials().GetAWSSecretKey()); + + AWS_END_MEMORY_TEST +} + + +TEST(InstanceProfileCredentialsProviderTest, TestThatProviderRefreshes) +{ + AWS_BEGIN_MEMORY_TEST(16, 10) + + auto mockClient = Aws::MakeShared(AllocationTag); + + const char* validCredentials = "{ \"AccessKeyId\": \"goodAccessKey\", \"SecretAccessKey\": \"goodSecretKey\", \"Token\": \"goodToken\" }"; + mockClient->SetMockedCredentialsValue(validCredentials); + + InstanceProfileCredentialsProvider provider(mockClient, 10); + ASSERT_EQ("goodAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId()); + ASSERT_EQ("goodSecretKey", provider.GetAWSCredentials().GetAWSSecretKey()); + + const char* nextSetOfCredentials = "{ \"AccessKeyId\": \"betterAccessKey\", \"SecretAccessKey\": \"betterSecretKey\", \"Token\": \"betterToken\" }"; + mockClient->SetMockedCredentialsValue(nextSetOfCredentials); + + std::this_thread::sleep_for(std::chrono::milliseconds(100)); + ASSERT_EQ("betterAccessKey", provider.GetAWSCredentials().GetAWSAccessKeyId()); + ASSERT_EQ("betterSecretKey", provider.GetAWSCredentials().GetAWSSecretKey()); + + AWS_END_MEMORY_TEST +} + +TEST(InstanceProfileCredentialsProviderTest, TestEC2MetadataClientCouldntFindCredentials) +{ + AWS_BEGIN_MEMORY_TEST(16, 10) + + auto mockClient = Aws::MakeShared(AllocationTag); + const char* emptyCredentials = ""; + mockClient->SetMockedCredentialsValue(emptyCredentials); + + InstanceProfileCredentialsProvider provider(mockClient, 1000 * 60 * 15); + ASSERT_EQ("", provider.GetAWSCredentials().GetAWSAccessKeyId()); + ASSERT_EQ("", provider.GetAWSCredentials().GetAWSSecretKey()); + + const char* missingInfo = "{ }"; + mockClient->SetMockedCredentialsValue(missingInfo); + ASSERT_EQ("", provider.GetAWSCredentials().GetAWSAccessKeyId()); + ASSERT_EQ("", provider.GetAWSCredentials().GetAWSSecretKey()); + + AWS_END_MEMORY_TEST +} + +TEST(InstanceProfileCredentialsProviderTest, TestEC2MetadataClientReturnsBadData) +{ + AWS_BEGIN_MEMORY_TEST(16, 10) + + auto mockClient = Aws::MakeShared(AllocationTag); + const char* badData = "blah blah blah, I'm bad"; + mockClient->SetMockedCredentialsValue(badData); + + InstanceProfileCredentialsProvider provider(mockClient, 1000 * 60 * 15); + ASSERT_EQ("", provider.GetAWSCredentials().GetAWSAccessKeyId()); + ASSERT_EQ("", provider.GetAWSCredentials().GetAWSSecretKey()); + + AWS_END_MEMORY_TEST +} + + diff --git a/aws-cpp-sdk-core-tests/utils/FileSystemUtilsTest.cpp b/aws-cpp-sdk-core-tests/utils/FileSystemUtilsTest.cpp new file mode 100644 index 00000000000..4166c53745e --- /dev/null +++ b/aws-cpp-sdk-core-tests/utils/FileSystemUtilsTest.cpp @@ -0,0 +1,49 @@ +/* + * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +#include +#include +#include + +#include + +using namespace Aws::Utils; + + +TEST(FileTest, HomeDirectory) +{ + auto homeDirectory = Aws::Utils::FileSystemUtils::GetHomeDirectory(); + + ASSERT_TRUE(homeDirectory.size() > 0); +} + +TEST(FileTest, TempFile) +{ + auto tempFilePath = Aws::Utils::FileSystemUtils::CreateTempFilePath(); + ASSERT_TRUE(tempFilePath.size() > 0); + + std::ofstream testFile(tempFilePath.c_str()); + testFile << "1" << std::endl; + ASSERT_TRUE(testFile.good()); + + testFile.close(); + + int32_t test = 0; + std::ifstream testIn(tempFilePath.c_str()); + testIn >> test; + testIn.close(); + + ASSERT_EQ(test, 1); +} diff --git a/aws-cpp-sdk-core-tests/utils/OSVersionInfoTest.cpp b/aws-cpp-sdk-core-tests/utils/OSVersionInfoTest.cpp index 87a7d827dbc..37e68c260d0 100644 --- a/aws-cpp-sdk-core-tests/utils/OSVersionInfoTest.cpp +++ b/aws-cpp-sdk-core-tests/utils/OSVersionInfoTest.cpp @@ -23,8 +23,7 @@ TEST(OSVersionInfoTest, TestComputeVersionString) { AWS_BEGIN_MEMORY_TEST(16, 10) - OSVersionInfo osVersionInfo; - Aws::String versionString = osVersionInfo.ComputeOSVersionString(); + Aws::String versionString = Aws::Utils::ComputeOSVersionString(); ASSERT_TRUE(versionString.length() > 0); AWS_END_MEMORY_TEST diff --git a/aws-cpp-sdk-core-tests/utils/logging/LoggingTest.cpp b/aws-cpp-sdk-core-tests/utils/logging/LoggingTest.cpp index 9daabbfde97..7bb52b17858 100644 --- a/aws-cpp-sdk-core-tests/utils/logging/LoggingTest.cpp +++ b/aws-cpp-sdk-core-tests/utils/logging/LoggingTest.cpp @@ -30,6 +30,21 @@ using namespace Aws::Utils::Logging; static const char* AllocationTag = "LoggingTests"; +class ScopedLogger +{ + public: + ScopedLogger(const std::shared_ptr& logger) + { + Aws::Utils::Logging::PushLogger(logger); + } + + ~ScopedLogger() + { + Aws::Utils::Logging::PopLogger(); + } + +}; + void LogAllPossibilities(const char* tag) { AWS_LOG_FATAL(tag, "test fatal level"); @@ -86,11 +101,11 @@ void DoLogTest(LogLevel logLevel, const char *testTag) { auto ss = Aws::MakeShared(AllocationTag); - Aws::Utils::Logging::InitializeAWSLogging(Aws::MakeShared(AllocationTag, logLevel, ss)); - - LogAllPossibilities(testTag); + { + ScopedLogger loggingScope(Aws::MakeShared(AllocationTag, logLevel, ss)); - Aws::Utils::Logging::ShutdownAWSLogging(); + LogAllPossibilities(testTag); + } Aws::Vector loggedStatements = StringUtils::SplitOnLine(ss->str()); VerifyAllLogsAtOrBelow(logLevel, testTag, loggedStatements); diff --git a/aws-cpp-sdk-core/CMakeLists.txt b/aws-cpp-sdk-core/CMakeLists.txt index f80c884f78c..3e829e0fc45 100644 --- a/aws-cpp-sdk-core/CMakeLists.txt +++ b/aws-cpp-sdk-core/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 2.8.5) project(aws-cpp-sdk-core) -find_package(Git) - if(GIT_FOUND) execute_process(COMMAND ${GIT_EXECUTABLE} describe --abbrev=0 --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} @@ -24,6 +22,19 @@ if(GIT_FOUND) endif() endif() +# If building shared libraries, custom memory management enabled is the default, otherwise regular memory management is the default. +# We make custom memory management the default on shared library builds because it is safer and much more difficult to accidentally +# allocate in one DLLs heap while freeing in another (which will lead to runtime crashes) +if(("${CUSTOM_MEMORY_MANAGEMENT}" STREQUAL "1") OR (BUILD_SHARED_LIBS AND NOT ("${CUSTOM_MEMORY_MANAGEMENT}" STREQUAL "0"))) + set(USE_AWS_MEMORY_MANAGEMENT ON) + message(STATUS "Custom memory management enabled; stl objects now using custom allocators") +else() + set(USE_AWS_MEMORY_MANAGEMENT OFF) + message(STATUS "Custom memory management disabled") +endif() + +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/aws/core/SDKConfig.h.in" + "${CMAKE_CURRENT_SOURCE_DIR}/include/aws/core/SDKConfig.h") # Pretty sure we can use a regex here... # Go ahead and glob every directory so we can work around Visual Studio's crap. @@ -33,6 +44,7 @@ file(GLOB AWS_CLIENT_HEADERS "include/aws/core/client/*.h") file(GLOB AWS_INTERNAL_HEADERS "include/aws/core/internal/*.h") file(GLOB HTTP_HEADERS "include/aws/core/http/*.h") file(GLOB HTTP_STANDARD_HEADERS "include/aws/core/http/standard/*.h") +file(GLOB PLATFORM_HEADERS "include/aws/core/platform/*.h") file(GLOB UTILS_HEADERS "include/aws/core/utils/*.h") file(GLOB UTILS_EVENT_HEADERS "include/aws/core/utils/event/*.h") file(GLOB UTILS_BASE64_HEADERS "include/aws/core/utils/base64/*.h") @@ -67,6 +79,7 @@ file(GLOB UTILS_XML_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/utils/xml/*.cpp") file(GLOB UTILS_LOGGING_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/utils/logging/*.cpp") file(GLOB UTILS_MEMORY_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/utils/memory/*.cpp") file(GLOB UTILS_STREAM_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/utils/stream/*.cpp") +file(GLOB UTILS_CRYPTO_FACTORY_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/utils/crypto/factory/*.cpp") # http client implementations if(ENABLE_CURL_CLIENT) @@ -90,7 +103,33 @@ elseif(ENABLE_COMMONCRYPTO_ENCRYPTION) endif() -file(GLOB AWSNativeSDK_SHARED_SRC +file(GLOB AWS_NATIVE_SDK_COMMON_SRC + ${AWS_SOURCE} + ${AWS_TINYXML2_SOURCE} + ${AWS_JSONCPP_SOURCE} + ${AWS_AUTH_SOURCE} + ${AWS_CLIENT_SOURCE} + ${AWS_INTERNAL_SOURCE} + ${HTTP_SOURCE} + ${HTTP_STANDARD_SOURCE} + ${HTTP_CLIENT_SOURCE} + ${UTILS_SOURCE} + ${UTILS_EVENT_SOURCE} + ${UTILS_BASE64_SOURCE} + ${UTILS_CRYPTO_SOURCE} + ${UTILS_JSON_SOURCE} + ${UTILS_THREADING_SOURCE} + ${UTILS_RETRY_SOURCE} + ${UTILS_XML_SOURCE} + ${UTILS_STREAM_SOURCE} + ${UTILS_LOGGING_SOURCE} + ${UTILS_MEMORY_SOURCE} + ${HTTP_CURL_CLIENT_SOURCE} + ${UTILS_CRYPTO_OPENSSL_SOURCE} + ${UTILS_CRYPTO_COMMONCRYPTO_SOURCE} +) + +file(GLOB AWS_NATIVE_SDK_COMMON_HEADERS ${AWS_HEADERS} ${AWS_AUTH_HEADERS} ${AWS_CLIENT_HEADERS} @@ -98,6 +137,7 @@ file(GLOB AWSNativeSDK_SHARED_SRC ${HTTP_HEADERS} ${HTTP_STANDARD_HEADERS} ${HTTP_CLIENT_HEADERS} + ${PLATFORM_HEADERS} ${UTILS_HEADERS} ${UTILS_EVENT_HEADERS} ${UTILS_BASE64_HEADERS} @@ -118,73 +158,66 @@ file(GLOB AWSNativeSDK_SHARED_SRC ${UTILS_CRYPTO_BCRYPT_HEADERS} ${UTILS_CRYPTO_OPENSSL_HEADERS} ${UTILS_CRYPTO_COMMONCRYPTO_HEADERS} - - ${AWS_SOURCE} - ${AWS_TINYXML2_SOURCE} - ${AWS_JSONCPP_SOURCE} - ${AWS_AUTH_SOURCE} - ${AWS_CLIENT_SOURCE} - ${AWS_INTERNAL_SOURCE} - ${HTTP_SOURCE} - ${HTTP_STANDARD_SOURCE} - ${HTTP_CLIENT_SOURCE} - ${UTILS_SOURCE} - ${UTILS_EVENT_SOURCE} - ${UTILS_BASE64_SOURCE} - ${UTILS_CRYPTO_SOURCE} - ${UTILS_JSON_SOURCE} - ${UTILS_THREADING_SOURCE} - ${UTILS_RETRY_SOURCE} - ${UTILS_XML_SOURCE} - ${UTILS_STREAM_SOURCE} - ${UTILS_LOGGING_SOURCE} - ${UTILS_MEMORY_SOURCE} - ${UTILS_STREAM_SOURCE} - ${HTTP_CURL_CLIENT_SOURCE} - ${HTTP_WINDOWS_CLIENT_SOURCE} - ${UTILS_CRYPTO_BCRYPT_SOURCE} - ${UTILS_CRYPTO_OPENSSL_SOURCE} - ${UTILS_CRYPTO_COMMONCRYPTO_SOURCE} ) # misc platform-specific, not related to features (encryption/http clients) if(PLATFORM_WINDOWS) #add your windows specific impl stuff here. - file(GLOB UTILS_WINDOWS_SOURCE = "${CMAKE_CURRENT_SOURCE_DIR}/source/utils/windows/*.cpp") + file(GLOB PLATFORM_WINDOWS_SOURCE = "${CMAKE_CURRENT_SOURCE_DIR}/source/platform/windows/*.cpp") - file(GLOB AWSNativeSDK_WINDOWS_SRC - ${UTILS_WINDOWS_SOURCE} + file(GLOB AWS_NATIVE_SDK_WINDOWS_SRC + ${PLATFORM_WINDOWS_SOURCE} ) -endif() - -if(PLATFORM_LINUX OR PLATFORM_ANDROID OR PLATFORM_APPLE) +elseif(PLATFORM_LINUX OR PLATFORM_APPLE) #add unix specific impl stuff here. - file(GLOB UTILS_UNIX_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/utils/unix/*.cpp") + file(GLOB PLATFORM_LINUX_SHARED_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/platform/linux-shared/*.cpp") - file(GLOB AWSNativeSDK_UNIX_SRC - ${UTILS_UNIX_SOURCE} + file(GLOB AWS_NATIVE_SDK_LINUX_SHARED_SRC + ${PLATFORM_LINUX_SHARED_SOURCE} ) -endif() - -if(PLATFORM_ANDROID) - file(GLOB UTILS_LOGGING_ANDROID_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/utils/logging/android/*.cpp") - file(GLOB UTILS_LOGGING_ANDROID_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/include/aws/core/utils/logging/android/*.h") +elseif(PLATFORM_ANDROID) + file(GLOB UTILS_LOGGING_ANDROID_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/include/aws/core/utils/logging/android/*.h") + file(GLOB PLATFORM_ANDROID_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/source/platform/android/*.cpp") - file(GLOB AWSNativeSDK_ANDROID_SRC - ${UTILS_LOGGING_ANDROID_SOURCE} + file(GLOB AWS_NATIVE_SDK_ANDROID_SRC + ${PLATFORM_ANDROID_SOURCE} + ) + file(GLOB AWS_NATIVE_SDK_ANDROID_HEADERS ${UTILS_LOGGING_ANDROID_HEADERS} ) endif() +file(GLOB AWS_NATIVE_SDK_NON_UNITY_SRC + ${HTTP_WINDOWS_CLIENT_SOURCE} + ${UTILS_CRYPTO_BCRYPT_SOURCE} + ${AWS_NATIVE_SDK_WINDOWS_SRC} + ${UTILS_CRYPTO_FACTORY_SOURCE} +) + +file(GLOB AWS_NATIVE_SDK_UNITY_SRC + ${AWS_NATIVE_SDK_COMMON_SRC} + ${AWS_NATIVE_SDK_LINUX_SHARED_SRC} + ${AWS_NATIVE_SDK_ANDROID_SRC} +) + +if(ENABLE_UNITY_BUILD) + enable_unity_build("core" AWS_NATIVE_SDK_UNITY_SRC) +endif() -file(GLOB AWSNativeSDK_SRC - ${AWSNativeSDK_SHARED_SRC} - ${AWSNativeSDK_WINDOWS_SRC} - ${AWSNativeSDK_UNIX_SRC} - ${AWSNativeSDK_ANDROID_SRC} +file(GLOB AWS_NATIVE_SDK_UNIFIED_HEADERS + ${AWS_NATIVE_SDK_COMMON_HEADERS} + ${AWS_NATIVE_SDK_WINDOWS_HEADERS} + ${AWS_NATIVE_SDK_UNIX_HEADERS} + ${AWS_NATIVE_SDK_ANDROID_HEADERS} +) + +file(GLOB AWS_NATIVE_SDK_SRC + ${AWS_NATIVE_SDK_UNIFIED_HEADERS} + ${AWS_NATIVE_SDK_UNITY_SRC} + ${AWS_NATIVE_SDK_NON_UNITY_SRC} ) # Visual studio project directory structure @@ -195,6 +228,7 @@ if(MSVC) source_group("Header Files\\aws\\core\\internal" FILES ${AWS_INTERNAL_HEADERS}) source_group("Header Files\\aws\\core\\http" FILES ${HTTP_HEADERS}) source_group("Header Files\\aws\\core\\http\\standard" FILES ${HTTP_STANDARD_HEADERS}) + source_group("Header Files\\aws\\core\\platform" FILES ${PLATFORM_HEADERS}) source_group("Header Files\\aws\\core\\utils" FILES ${UTILS_HEADERS}) source_group("Header Files\\aws\\core\\utils\\base64" FILES ${UTILS_BASE64_HEADERS}) source_group("Header Files\\aws\\core\\utils\\crypto" FILES ${UTILS_CRYPTO_HEADERS}) @@ -234,6 +268,7 @@ if(MSVC) source_group("Source Files\\internal" FILES ${AWS_INTERNAL_SOURCE}) source_group("Source Files\\http" FILES ${HTTP_SOURCE}) source_group("Source Files\\http\\standard" FILES ${HTTP_STANDARD_SOURCE}) + source_group("Source Files\\platform\\windows" FILES ${PLATFORM_WINDOWS_SOURCE}) source_group("Source Files\\utils" FILES ${UTILS_SOURCE}) source_group("Source Files\\utils\\base64" FILES ${UTILS_BASE64_SOURCE}) source_group("Source Files\\utils\\crypto" FILES ${UTILS_CRYPTO_SOURCE}) @@ -260,6 +295,8 @@ if(MSVC) elseif(ENABLE_COMMONCRYPTO_ENCRYPTION) source_group("Source Files\\utils\\crypto\\commoncrypto" FILES ${UTILS_CRYPTO_COMMONCRYPTO_SOURCE}) endif() + + endif(MSVC) set(Core_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/include/") @@ -278,7 +315,7 @@ if(PLATFORM_ANDROID) endif() -add_library(aws-cpp-sdk-core ${LIBTYPE} ${AWSNativeSDK_SRC}) +add_library(aws-cpp-sdk-core ${LIBTYPE} ${AWS_NATIVE_SDK_SRC}) if(PLATFORM_ANDROID) if(ENABLE_CURL_CLIENT) @@ -292,21 +329,11 @@ endif() target_include_directories(aws-cpp-sdk-core PUBLIC $ $) -target_link_libraries(aws-cpp-sdk-core ${PLATFORM_DEP_LIBS} ${CRYPTO_LIBS} ${CLIENT_LIBS}) +target_link_libraries(aws-cpp-sdk-core ${PLATFORM_DEP_LIBS} ${CLIENT_LIBS} ${CRYPTO_LIBS}) target_compile_definitions(aws-cpp-sdk-core PUBLIC -DJSON_USE_EXCEPTION=0) -# If building shared libraries, custom memory management enabled is the default, otherwise regular memory management is the default. -# We make custom memory management the default on shared library builds because it is safer and much more difficult to accidentally -# allocate in one DLLs heap while freeing in another (which will lead to runtime crashes) -if(("${CUSTOM_MEMORY_MANAGEMENT}" STREQUAL "1") OR (BUILD_SHARED_LIBS AND NOT ("${CUSTOM_MEMORY_MANAGEMENT}" STREQUAL "0"))) - target_compile_definitions(aws-cpp-sdk-core PUBLIC -DAWS_CUSTOM_MEMORY_MANAGEMENT) - message(STATUS "Custom memory management enabled; stl objects now using custom allocators") -else() - message(STATUS "Custom memory management disabled") -endif() - if(NOT PLATFORM_WINDOWS) target_compile_options(aws-cpp-sdk-core PUBLIC -std=c++11) if(NOT BUILD_SHARED_LIBS) @@ -348,6 +375,7 @@ install (FILES ${AWS_CLIENT_HEADERS} DESTINATION include/aws/core/client) install (FILES ${AWS_INTERNAL_HEADERS} DESTINATION include/aws/core/internal) install (FILES ${HTTP_HEADERS} DESTINATION include/aws/core/http) install (FILES ${HTTP_STANDARD_HEADERS} DESTINATION include/aws/core/http/standard) +install (FILES ${PLATFORM_HEADERS} DESTINATION include/aws/core/platform) install (FILES ${UTILS_HEADERS} DESTINATION include/aws/core/utils) install (FILES ${UTILS_EVENT_HEADERS} DESTINATION include/aws/core/utils/event) install (FILES ${UTILS_BASE64_HEADERS} DESTINATION include/aws/core/utils/base64) diff --git a/aws-cpp-sdk-core/include/aws/core/AmazonWebServiceResult.h b/aws-cpp-sdk-core/include/aws/core/AmazonWebServiceResult.h index cee13a5185c..ac907709909 100644 --- a/aws-cpp-sdk-core/include/aws/core/AmazonWebServiceResult.h +++ b/aws-cpp-sdk-core/include/aws/core/AmazonWebServiceResult.h @@ -12,6 +12,9 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ + +#pragma once + #include #include #include diff --git a/aws-cpp-sdk-core/include/aws/core/SDKConfig.h.in b/aws-cpp-sdk-core/include/aws/core/SDKConfig.h.in new file mode 100644 index 00000000000..ffab46ae1cd --- /dev/null +++ b/aws-cpp-sdk-core/include/aws/core/SDKConfig.h.in @@ -0,0 +1,17 @@ +/* + * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +#cmakedefine USE_AWS_MEMORY_MANAGEMENT + diff --git a/aws-cpp-sdk-core/include/aws/core/platform/Platform.h b/aws-cpp-sdk-core/include/aws/core/platform/Platform.h new file mode 100644 index 00000000000..41a7e22e01f --- /dev/null +++ b/aws-cpp-sdk-core/include/aws/core/platform/Platform.h @@ -0,0 +1,19 @@ +/* + * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +#include + +#include + diff --git a/aws-cpp-sdk-core/include/aws/core/platform/PlatformAndroid.h b/aws-cpp-sdk-core/include/aws/core/platform/PlatformAndroid.h new file mode 100644 index 00000000000..bb1477de375 --- /dev/null +++ b/aws-cpp-sdk-core/include/aws/core/platform/PlatformAndroid.h @@ -0,0 +1,39 @@ +/* + * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +#ifdef __ANDROID__ + +#include + +#include + +#include + +namespace Aws +{ +namespace Platform +{ + +// must be called before any other native SDK functions when running on Android +AWS_CORE_API void InitAndroid(JNIEnv* env, jobject context); + +// helper functions for functionality requiring JNI calls; not valid until InitAndroid has been called +AWS_CORE_API JavaVM* GetJavaVM(); +AWS_CORE_API const char* GetCacheDirectory(); + +} //namespace Platform +} //namespace Aws + +#endif // __ANDROID__ diff --git a/aws-cpp-sdk-core/include/aws/core/utils/DateTime.h b/aws-cpp-sdk-core/include/aws/core/utils/DateTime.h index cb00ac2e854..30a4b89efd3 100644 --- a/aws-cpp-sdk-core/include/aws/core/utils/DateTime.h +++ b/aws-cpp-sdk-core/include/aws/core/utils/DateTime.h @@ -226,6 +226,11 @@ namespace Aws */ static double ComputeCurrentTimestampInAmazonFormat(); + /* + * A platform-agnostic implementation of the timegm function from gnu extensions + */ + static time_t TimeGM(tm* const t); + private: std::chrono::system_clock::time_point m_time; bool m_valid; diff --git a/aws-cpp-sdk-core/include/aws/core/utils/FileSystemUtils.h b/aws-cpp-sdk-core/include/aws/core/utils/FileSystemUtils.h index 807e286f8de..e9558a68226 100644 --- a/aws-cpp-sdk-core/include/aws/core/utils/FileSystemUtils.h +++ b/aws-cpp-sdk-core/include/aws/core/utils/FileSystemUtils.h @@ -57,6 +57,12 @@ namespace Aws * Gets path delimiter for the current platform */ static char GetPathDelimiter() { return PATH_DELIM; } + + /** + * Computes a unique tmp file path + */ + static Aws::String CreateTempFilePath(); + }; } } diff --git a/aws-cpp-sdk-core/include/aws/core/utils/OSVersionInfo.h b/aws-cpp-sdk-core/include/aws/core/utils/OSVersionInfo.h index 6898f1a3e83..66d0699b67e 100644 --- a/aws-cpp-sdk-core/include/aws/core/utils/OSVersionInfo.h +++ b/aws-cpp-sdk-core/include/aws/core/utils/OSVersionInfo.h @@ -14,25 +14,25 @@ */ #pragma once + #include #include -#include namespace Aws { namespace Utils { /** - * Class for computing the version string for the current running operating system. + * computing the version string for the current running operating system. */ - class AWS_CORE_API OSVersionInfo - { - public: - /** - * computing the version string for the current running operating system. - */ - Aws::String ComputeOSVersionString() const; - }; + AWS_CORE_API Aws::String ComputeOSVersionString(); + + /** + * runs a (shell) command string and returns the output; not needed on windows currently + */ +#ifndef _WIN32 + AWS_CORE_API Aws::String GetSysCommandOutput(const char* command); +#endif // _WIN32 } //namespace Utils } //namespace Aws diff --git a/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h b/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h index 3fd12e1cf52..dcc9bc3303b 100644 --- a/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h +++ b/aws-cpp-sdk-core/include/aws/core/utils/crypto/bcrypt/CryptoImpl.h @@ -20,11 +20,13 @@ #include #include -#ifdef AWS_SDK_PLATFORM_WINDOWS +#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)) + #define WIN32_NO_STATUS #include -#undef WIN32_NO_STATUS -#endif // AWS_SDK_PLATFORM_WINDOWS +#undef WIN32_NO_STATUS + +#endif // WIN32 namespace Aws { diff --git a/aws-cpp-sdk-core/include/aws/core/utils/logging/AWSLogging.h b/aws-cpp-sdk-core/include/aws/core/utils/logging/AWSLogging.h index b4547595913..6fbb41a6abe 100644 --- a/aws-cpp-sdk-core/include/aws/core/utils/logging/AWSLogging.h +++ b/aws-cpp-sdk-core/include/aws/core/utils/logging/AWSLogging.h @@ -26,6 +26,8 @@ namespace Aws { class LogSystemInterface; + // Standard interface + /** * Call this at the beginning of your program, prior to any AWS calls. */ @@ -41,6 +43,18 @@ namespace Aws */ AWS_CORE_API LogSystemInterface* GetLogSystem(); + // Testing interface + + /** + * Replaces the current logger with a new one, while pushing the old one onto a stack; primarily for testing + */ + AWS_CORE_API void PushLogger(const std::shared_ptr &logSystem); + + /** + * Pops the top logger off the logger stack and replaces the current logger with it. Disables logging if the top logger is actually a nullptr + */ + AWS_CORE_API void PopLogger(); + } // namespace Logging } // namespace Utils } // namespace Aws diff --git a/aws-cpp-sdk-core/include/aws/core/utils/memory/stl/AWSAllocator.h b/aws-cpp-sdk-core/include/aws/core/utils/memory/stl/AWSAllocator.h index 9a326effbc8..a92988313d2 100644 --- a/aws-cpp-sdk-core/include/aws/core/utils/memory/stl/AWSAllocator.h +++ b/aws-cpp-sdk-core/include/aws/core/utils/memory/stl/AWSAllocator.h @@ -17,6 +17,7 @@ #include +#include #include #include @@ -25,7 +26,7 @@ namespace Aws { -#ifdef AWS_CUSTOM_MEMORY_MANAGEMENT +#ifdef USE_AWS_MEMORY_MANAGEMENT /** * Std allocator interface that is used for all STL types in the event that Custom Memory Management is being used. */ @@ -76,19 +77,23 @@ namespace Aws }; #ifdef __ANDROID__ - +#if _GLIBCXX_FULLY_DYNAMIC_STRING == 0 template< typename T > bool operator ==(const Allocator< T >& lhs, const Allocator< T >& rhs) { + AWS_UNREFERENCED_PARAM(lhs); + AWS_UNREFERENCED_PARAM(rhs); + return false; } +#endif // _GLIBCXX_FULLY_DYNAMIC_STRING == 0 #endif // __ANDROID__ #else template< typename T > using Allocator = std::allocator; -#endif // AWS_CUSTOM_MEMORY_MANAGEMENT +#endif // USE_AWS_MEMORY_MANAGEMENT /** * Creates a shared_ptr using AWS Allocator hooks. * allocationTag is for memory tracking purposes. diff --git a/aws-cpp-sdk-core/include/aws/core/utils/memory/stl/AWSString.h b/aws-cpp-sdk-core/include/aws/core/utils/memory/stl/AWSString.h index fc842b830e6..b71148dcea1 100644 --- a/aws-cpp-sdk-core/include/aws/core/utils/memory/stl/AWSString.h +++ b/aws-cpp-sdk-core/include/aws/core/utils/memory/stl/AWSString.h @@ -19,12 +19,14 @@ #include +#include #include namespace Aws { -#ifdef __ANDROID__ +#if _GLIBCXX_FULLY_DYNAMIC_STRING == 0 && defined(__ANDROID__) + /* using std::string with shared libraries is broken on android due to the platform-level decision to set _GLIBCXX_FULLY_DYNAMIC_STRING to 0 @@ -101,6 +103,6 @@ using WString = std::basic_string< wchar_t, std::char_traits< wchar_t >, Aws::Al #endif // __ANDROID } // namespace Aws -/* -#endif // __ANDROID__ -*/ + + + diff --git a/aws-cpp-sdk-core/source/auth/AWSCredentialsProvider.cpp b/aws-cpp-sdk-core/source/auth/AWSCredentialsProvider.cpp index 112abcdfd55..17d61df195f 100644 --- a/aws-cpp-sdk-core/source/auth/AWSCredentialsProvider.cpp +++ b/aws-cpp-sdk-core/source/auth/AWSCredentialsProvider.cpp @@ -114,11 +114,7 @@ AWSCredentials EnvironmentAWSCredentialsProvider::GetAWSCredentials() static Aws::String GetBaseDirectory() { -#ifdef __ANDROID__ - return "/data/data/aws.coretests"; - #else return FileSystemUtils::GetHomeDirectory(); -#endif // __ANDROID__ } Aws::String ProfileConfigFileAWSCredentialsProvider::GetProfileFilename() diff --git a/aws-cpp-sdk-core/source/client/AWSClient.cpp b/aws-cpp-sdk-core/source/client/AWSClient.cpp index 8ab5ac4d11e..b08d53e2926 100644 --- a/aws-cpp-sdk-core/source/client/AWSClient.cpp +++ b/aws-cpp-sdk-core/source/client/AWSClient.cpp @@ -47,7 +47,8 @@ using namespace Aws::Utils::Xml; static const int SUCCESS_RESPONSE_MIN = 200; static const int SUCCESS_RESPONSE_MAX = 299; -static const char* LOG_TAG = "AWSClient"; + +static const char* AWS_CLIENT_LOG_TAG = "AWSClient"; std::atomic AWSClient::s_refCount(0); @@ -58,7 +59,7 @@ void AWSClient::InitializeGlobalStatics() { int expectedRefCount = 0; Utils::EnumParseOverflowContainer* expectedPtrValue = nullptr; - Utils::EnumParseOverflowContainer* container = Aws::New(LOG_TAG); + Utils::EnumParseOverflowContainer* container = Aws::New(AWS_CLIENT_LOG_TAG); if (!s_refCount.compare_exchange_strong(expectedRefCount, 1) || !Aws::CheckAndSwapEnumOverflowContainer(expectedPtrValue, container)) { @@ -131,18 +132,18 @@ HttpResponseOutcome AWSClient::AttemptExhaustively(const Aws::String& uri, HttpResponseOutcome outcome = AttemptOneRequest(uri, request, method); if (outcome.IsSuccess() || !m_retryStrategy->ShouldRetry(outcome.GetError(), retries)) { - AWS_LOG_TRACE(LOG_TAG, "Request was either successful, or we are now out of retries."); + AWS_LOG_TRACE(AWS_CLIENT_LOG_TAG, "Request was either successful, or we are now out of retries."); return outcome; } else if(!m_httpClient->IsRequestProcessingEnabled()) { - AWS_LOG_TRACE(LOG_TAG, "Request was cancelled externally."); + AWS_LOG_TRACE(AWS_CLIENT_LOG_TAG, "Request was cancelled externally."); return outcome; } else { long sleepMillis = m_retryStrategy->CalculateDelayBeforeNextRetry(outcome.GetError(), retries); - AWS_LOG_WARN(LOG_TAG, "Request failed, now waiting %d ms before attempting again.", sleepMillis); + AWS_LOG_WARN(AWS_CLIENT_LOG_TAG, "Request failed, now waiting %d ms before attempting again.", sleepMillis); m_httpClient->RetryRequestSleep(std::chrono::milliseconds(sleepMillis)); } } @@ -179,26 +180,28 @@ HttpResponseOutcome AWSClient::AttemptOneRequest(const Aws::String& uri, const Aws::AmazonWebServiceRequest& request, HttpMethod method) const { + AWS_LOGSTREAM_TRACE(AWS_CLIENT_LOG_TAG, "Starting single request") + std::shared_ptr httpRequest(m_clientFactory->CreateHttpRequest(uri, method, request.GetResponseStreamFactory())); BuildHttpRequest(request, httpRequest); if (!m_signer->SignRequest(*httpRequest)) { - AWS_LOG_ERROR(LOG_TAG, "Request signing failed. Returning error."); + AWS_LOG_ERROR(AWS_CLIENT_LOG_TAG, "Request signing failed. Returning error."); return HttpResponseOutcome(); // TODO: make a real error when error revamp reaches branch (SIGNING_ERROR) } - AWS_LOG_DEBUG(LOG_TAG, "Request Successfully signed"); + AWS_LOG_DEBUG(AWS_CLIENT_LOG_TAG, "Request Successfully signed"); std::shared_ptr httpResponse( m_httpClient->MakeRequest(*httpRequest, m_readRateLimiter.get(), m_writeRateLimiter.get())); if (DoesResponseGenerateError(httpResponse)) { - AWS_LOG_DEBUG(LOG_TAG, "Request returned error. Attempting to generate appropriate error codes from response"); + AWS_LOG_DEBUG(AWS_CLIENT_LOG_TAG, "Request returned error. Attempting to generate appropriate error codes from response"); return HttpResponseOutcome(BuildAWSError(httpResponse)); } - AWS_LOG_DEBUG(LOG_TAG, "Request returned successful response."); + AWS_LOG_DEBUG(AWS_CLIENT_LOG_TAG, "Request returned successful response."); return HttpResponseOutcome(httpResponse); } @@ -210,21 +213,21 @@ HttpResponseOutcome AWSClient::AttemptOneRequest(const Aws::String& uri, HttpMet if (!m_signer->SignRequest(*httpRequest)) { - AWS_LOG_ERROR(LOG_TAG, "Request signing failed. Returning error."); + AWS_LOG_ERROR(AWS_CLIENT_LOG_TAG, "Request signing failed. Returning error."); return HttpResponseOutcome(); // TODO: make a real error when error revamp reaches branch (SIGNING_ERROR) } - AWS_LOG_DEBUG(LOG_TAG, "Request Successfully signed"); + AWS_LOG_DEBUG(AWS_CLIENT_LOG_TAG, "Request Successfully signed"); std::shared_ptr httpResponse( m_httpClient->MakeRequest(*httpRequest, m_readRateLimiter.get(), m_writeRateLimiter.get())); if (DoesResponseGenerateError(httpResponse)) { - AWS_LOG_DEBUG(LOG_TAG, "Request returned error. Attempting to generate appropriate error codes from response"); + AWS_LOG_DEBUG(AWS_CLIENT_LOG_TAG, "Request returned error. Attempting to generate appropriate error codes from response"); return HttpResponseOutcome(BuildAWSError(httpResponse)); } - AWS_LOG_DEBUG(LOG_TAG, "Request returned successful response."); + AWS_LOG_DEBUG(AWS_CLIENT_LOG_TAG, "Request returned successful response."); return HttpResponseOutcome(httpResponse); } @@ -264,7 +267,7 @@ void AWSClient::AddContentBodyToRequest(const std::shared_ptrDeleteHeader(Http::CONTENT_LENGTH_HEADER); httpRequest->DeleteHeader(Http::CONTENT_TYPE_HEADER); } @@ -272,7 +275,7 @@ void AWSClient::AddContentBodyToRequest(const std::shared_ptrHasHeader(Http::CONTENT_LENGTH_HEADER)) { - AWS_LOG_TRACE(LOG_TAG, "Found body, but content-length has not been set, attempting to compute content-length"); + AWS_LOG_TRACE(AWS_CLIENT_LOG_TAG, "Found body, but content-length has not been set, attempting to compute content-length"); body->seekg(0, body->end); auto streamSize = body->tellg(); body->seekg(0, body->beg); @@ -409,7 +412,7 @@ AWSError AWSJsonClient::BuildAWSError( { Aws::StringStream ss; ss << "No response body. Response code: " << httpResponse->GetResponseCode(); - AWS_LOG_ERROR(LOG_TAG, ss.str().c_str()); + AWS_LOG_ERROR(AWS_CLIENT_LOG_TAG, ss.str().c_str()); return AWSError(CoreErrors::UNKNOWN, "", ss.str(), false); } @@ -417,7 +420,7 @@ AWSError AWSJsonClient::BuildAWSError( //this is stupid, but gcc doesn't pick up the covariant on the dereference so we have to give it a little hint. JsonValue exceptionPayload(httpResponse->GetResponseBody()); - AWS_LOGSTREAM_TRACE(LOG_TAG, "Error response is " << exceptionPayload.WriteReadable()); + AWS_LOGSTREAM_TRACE(AWS_CLIENT_LOG_TAG, "Error response is " << exceptionPayload.WriteReadable()); Aws::String message(exceptionPayload.ValueExists(MESSAGE_CAMEL_CASE) ? exceptionPayload.GetString(MESSAGE_CAMEL_CASE) : exceptionPayload.ValueExists(MESSAGE_LOWER_CASE) ? exceptionPayload.GetString(MESSAGE_LOWER_CASE) : ""); @@ -461,7 +464,7 @@ XmlOutcome AWSXMLClient::MakeRequest(const Aws::String& uri, if (!xmlDoc.WasParseSuccessful()) { - AWS_LOG_ERROR(LOG_TAG, "Xml parsing for error failed with message %s", xmlDoc.GetErrorMessage().c_str()); + AWS_LOG_ERROR(AWS_CLIENT_LOG_TAG, "Xml parsing for error failed with message %s", xmlDoc.GetErrorMessage().c_str()); return AWSError(CoreErrors::UNKNOWN, "Xml Parse Error", xmlDoc.GetErrorMessage(), false); } @@ -502,7 +505,7 @@ AWSError AWSXMLClient::BuildAWSError(const std::shared_ptrGetResponseCode(); - AWS_LOG_ERROR(LOG_TAG, ss.str().c_str()); + AWS_LOG_ERROR(AWS_CLIENT_LOG_TAG, ss.str().c_str()); return AWSError(CoreErrors::UNKNOWN, "", ss.str(), false); } @@ -517,7 +520,7 @@ AWSError AWSXMLClient::BuildAWSError(const std::shared_ptrGetResponseBody()); - AWS_LOGSTREAM_TRACE(LOG_TAG, "Error response is " << doc.ConvertToString()); + AWS_LOGSTREAM_TRACE(AWS_CLIENT_LOG_TAG, "Error response is " << doc.ConvertToString()); if (doc.WasParseSuccessful()) { XmlNode errorNode = doc.GetRootElement(); diff --git a/aws-cpp-sdk-core/source/client/AWSErrorMarshaller.cpp b/aws-cpp-sdk-core/source/client/AWSErrorMarshaller.cpp index ddaa0985709..eeed89d3943 100644 --- a/aws-cpp-sdk-core/source/client/AWSErrorMarshaller.cpp +++ b/aws-cpp-sdk-core/source/client/AWSErrorMarshaller.cpp @@ -21,7 +21,7 @@ using namespace Aws::Utils::Logging; using namespace Aws::Client; -static const char* logTag = "AWSErrorMarshaller"; +static const char* AWS_ERROR_MARSHALLER_LOG_TAG = "AWSErrorMarshaller"; AWSError AWSErrorMarshaller::Marshall(const Aws::String& exceptionName, const Aws::String& message) const { @@ -45,13 +45,13 @@ AWSError AWSErrorMarshaller::Marshall(const Aws::String& exceptionNa AWSError error = FindErrorByName(formalExceptionName.c_str()); if (error.GetErrorType() != CoreErrors::UNKNOWN) { - AWS_LOG_WARN(logTag, "Encountered AWSError\n%s\n%s:", formalExceptionName.c_str(), message.c_str()); + AWS_LOG_WARN(AWS_ERROR_MARSHALLER_LOG_TAG, "Encountered AWSError\n%s\n%s:", formalExceptionName.c_str(), message.c_str()); error.SetExceptionName(formalExceptionName); error.SetMessage(message); return error; } - AWS_LOG_WARN(logTag, "Encountered Unknown AWSError\n%s\n%s:", exceptionName.c_str(), message.c_str()); + AWS_LOG_WARN(AWS_ERROR_MARSHALLER_LOG_TAG, "Encountered Unknown AWSError\n%s\n%s:", exceptionName.c_str(), message.c_str()); return AWSError(CoreErrors::UNKNOWN, exceptionName, "Unable to parse ExceptionName: " + exceptionName + " Message: " + message, false); } diff --git a/aws-cpp-sdk-core/source/client/ClientConfiguration.cpp b/aws-cpp-sdk-core/source/client/ClientConfiguration.cpp index 52eac91d9a6..324d4060600 100644 --- a/aws-cpp-sdk-core/source/client/ClientConfiguration.cpp +++ b/aws-cpp-sdk-core/source/client/ClientConfiguration.cpp @@ -27,13 +27,12 @@ namespace Aws namespace Client { -static const char* allocationTag = "ClientConfiguration"; +static const char* CLIENT_CONFIGURATION_ALLOCATION_TAG = "ClientConfiguration"; static Aws::String ComputeUserAgentString() { - Utils::OSVersionInfo versionInfo; Aws::StringStream ss; - ss << "aws-sdk-cpp/" << Version::GetVersionString() << " " << versionInfo.ComputeOSVersionString(); + ss << "aws-sdk-cpp/" << Version::GetVersionString() << " " << Aws::Utils::ComputeOSVersionString(); return ss.str(); } @@ -44,9 +43,9 @@ ClientConfiguration::ClientConfiguration() : maxConnections(25), requestTimeoutMs(3000), connectTimeoutMs(1000), - retryStrategy(Aws::MakeShared(allocationTag)), + retryStrategy(Aws::MakeShared(CLIENT_CONFIGURATION_ALLOCATION_TAG)), proxyPort(0), - executor(Aws::MakeShared(allocationTag)), + executor(Aws::MakeShared(CLIENT_CONFIGURATION_ALLOCATION_TAG)), verifySSL(true), writeRateLimiter(nullptr), readRateLimiter(nullptr), diff --git a/aws-cpp-sdk-core/source/external/json-cpp/jsoncpp.cpp b/aws-cpp-sdk-core/source/external/json-cpp/jsoncpp.cpp index f4f35afee3d..b9bf56609b2 100644 --- a/aws-cpp-sdk-core/source/external/json-cpp/jsoncpp.cpp +++ b/aws-cpp-sdk-core/source/external/json-cpp/jsoncpp.cpp @@ -224,7 +224,7 @@ namespace Aws { namespace External { namespace Json { -static const char* allocationTag = "JsonCpp"; +static const char* JSON_CPP_ALLOCATION_TAG = "JsonCpp"; // Implementation of class Features // //////////////////////////////// @@ -1216,7 +1216,7 @@ class BatchAllocator { const unsigned int mallocSize = sizeof(BatchInfo) - sizeof(AllocatedType) * objectPerAllocation + sizeof(AllocatedType) * objectPerAllocation * objectsPerPage; - BatchInfo* batch = static_cast(Aws::Malloc(allocationTag, mallocSize)); + BatchInfo* batch = static_cast(Aws::Malloc(JSON_CPP_ALLOCATION_TAG, mallocSize)); batch->next_ = 0; batch->used_ = batch->buffer_; batch->end_ = batch->buffer_ + objectsPerPage; @@ -1607,7 +1607,7 @@ static inline char* duplicateStringValue(const char* value, if (length >= (unsigned)Value::maxInt) length = Value::maxInt - 1; - char* newString = static_cast(Aws::Malloc(allocationTag, length + 1)); + char* newString = static_cast(Aws::Malloc(JSON_CPP_ALLOCATION_TAG, length + 1)); JSON_ASSERT_MESSAGE(newString != 0, "in Json::Value::duplicateStringValue(): " "Failed to allocate string value buffer"); @@ -1764,7 +1764,7 @@ Value::Value(ValueType type) { #ifndef JSON_VALUE_USE_INTERNAL_MAP case arrayValue: case objectValue: - value_.map_ = Aws::New(allocationTag); + value_.map_ = Aws::New(JSON_CPP_ALLOCATION_TAG); break; #else case arrayValue: @@ -1869,7 +1869,7 @@ Value::Value(const Value& other) #ifndef JSON_VALUE_USE_INTERNAL_MAP case arrayValue: case objectValue: - value_.map_ = Aws::New(allocationTag, *other.value_.map_); + value_.map_ = Aws::New(JSON_CPP_ALLOCATION_TAG, *other.value_.map_); break; #else case arrayValue: @@ -1883,7 +1883,7 @@ Value::Value(const Value& other) JSON_ASSERT_UNREACHABLE; } if (other.comments_) { - comments_ = Aws::NewArray(numberOfCommentPlacement, allocationTag); + comments_ = Aws::NewArray(numberOfCommentPlacement, JSON_CPP_ALLOCATION_TAG); for (int comment = 0; comment < numberOfCommentPlacement; ++comment) { const CommentInfo& otherComment = other.comments_[comment]; if (otherComment.comment_) @@ -2748,7 +2748,7 @@ bool Value::isObject() const { return type_ == objectValue; } void Value::setComment(const char* comment, size_t len, CommentPlacement placement) { if (!comments_) - comments_ = Aws::NewArray(numberOfCommentPlacement, allocationTag); + comments_ = Aws::NewArray(numberOfCommentPlacement, JSON_CPP_ALLOCATION_TAG); if ((len > 0) && (comment[len-1] == '\n')) { // Always discard trailing newline, to aid indentation. len -= 1; @@ -4042,7 +4042,7 @@ StreamWriter* StreamWriterBuilder::newStreamWriter(Aws::OStream* stream) const } Aws::String nullSymbol = "null"; Aws::String endingLineFeedSymbol = ""; - return Aws::New(allocationTag, stream, + return Aws::New(JSON_CPP_ALLOCATION_TAG, stream, indentation_, cs_, colonSymbol, nullSymbol, endingLineFeedSymbol); } @@ -4079,7 +4079,7 @@ StreamWriter* OldCompressingStreamWriterBuilder::newStreamWriter( if (omitEndingLineFeed_) { endingLineFeedSymbol = ""; } - return Aws::New(allocationTag, stream, + return Aws::New(JSON_CPP_ALLOCATION_TAG, stream, "", StreamWriter::CommentStyle::None, colonSymbol, nullSymbol, endingLineFeedSymbol); } diff --git a/aws-cpp-sdk-core/source/http/HttpClientFactory.cpp b/aws-cpp-sdk-core/source/http/HttpClientFactory.cpp index 2a0ec18d2ea..6a487b44da1 100644 --- a/aws-cpp-sdk-core/source/http/HttpClientFactory.cpp +++ b/aws-cpp-sdk-core/source/http/HttpClientFactory.cpp @@ -31,7 +31,7 @@ using namespace Aws::Client; using namespace Aws::Http; using namespace Aws::Utils::Logging; -static const char* allocationTag = "HttpClientFactory"; +static const char* HTTP_CLIENT_FACTORY_ALLOCATION_TAG = "HttpClientFactory"; std::shared_ptr HttpClientFactory::CreateHttpClient(const ClientConfiguration& clientConfiguration) const { @@ -42,13 +42,13 @@ std::shared_ptr HttpClientFactory::CreateHttpClient(const ClientConf switch (clientConfiguration.httpLibOverride) { case TransferLibType::WIN_INET_CLIENT: - return Aws::MakeShared(allocationTag, clientConfiguration); + return Aws::MakeShared(HTTP_CLIENT_FACTORY_ALLOCATION_TAG, clientConfiguration); default: - return Aws::MakeShared(allocationTag, clientConfiguration); + return Aws::MakeShared(HTTP_CLIENT_FACTORY_ALLOCATION_TAG, clientConfiguration); } #elif ENABLE_CURL_CLIENT - return Aws::MakeShared(allocationTag, clientConfiguration); + return Aws::MakeShared(HTTP_CLIENT_FACTORY_ALLOCATION_TAG, clientConfiguration); #else // When neither of these clients is enabled, gcc gives a warning (converted // to error by -Werror) about the unused clientConfiguration parameter. We @@ -66,7 +66,7 @@ std::shared_ptr HttpClientFactory::CreateHttpRequest(const Aws::Str std::shared_ptr HttpClientFactory::CreateHttpRequest(const URI& uri, HttpMethod method, const Aws::IOStreamFactory& streamFactory) const { - auto request = Aws::MakeShared(allocationTag, uri, method); + auto request = Aws::MakeShared(HTTP_CLIENT_FACTORY_ALLOCATION_TAG, uri, method); request->SetResponseStreamFactory(streamFactory); return request; diff --git a/aws-cpp-sdk-core/source/http/curl/CurlHandleContainer.cpp b/aws-cpp-sdk-core/source/http/curl/CurlHandleContainer.cpp index 3c567c195d2..5afb8190331 100644 --- a/aws-cpp-sdk-core/source/http/curl/CurlHandleContainer.cpp +++ b/aws-cpp-sdk-core/source/http/curl/CurlHandleContainer.cpp @@ -21,7 +21,7 @@ using namespace Aws::Utils::Logging; using namespace Aws::Http; -static const char* CurlTag = "CurlHandleContainer"; +static const char* CURL_HANDLE_CONTAINER_TAG = "CurlHandleContainer"; bool CurlHandleContainer::isInit = false; @@ -29,12 +29,11 @@ bool CurlHandleContainer::isInit = false; #include -static const char* MemTag = "libcurl"; static size_t offset = sizeof(size_t); static void* malloc_callback(size_t size) { - char* newMem = reinterpret_cast(Aws::Malloc(MemTag, size + offset)); + char* newMem = reinterpret_cast(Aws::Malloc(CURL_HANDLE_CONTAINER_TAG, size + offset)); std::size_t* pointerToSize = reinterpret_cast(newMem); *pointerToSize = size; return reinterpret_cast(newMem + offset); @@ -66,7 +65,7 @@ static void* realloc_callback(void* ptr, size_t size) char* originalLenCharPtr = reinterpret_cast(ptr) - offset; size_t originalLen = *reinterpret_cast(originalLenCharPtr); - char* rawMemory = reinterpret_cast(Aws::Malloc(MemTag, size + offset)); + char* rawMemory = reinterpret_cast(Aws::Malloc(CURL_HANDLE_CONTAINER_TAG, size + offset)); if(rawMemory) { std::size_t* pointerToSize = reinterpret_cast(rawMemory); @@ -91,7 +90,7 @@ static void* realloc_callback(void* ptr, size_t size) static void* calloc_callback(size_t nmemb, size_t size) { size_t dataSize = nmemb * size; - char* newMem = reinterpret_cast(Aws::Malloc(MemTag, dataSize + offset)); + char* newMem = reinterpret_cast(Aws::Malloc(CURL_HANDLE_CONTAINER_TAG, dataSize + offset)); std::size_t* pointerToSize = reinterpret_cast(newMem); *pointerToSize = dataSize; #ifdef _MSC_VER @@ -107,7 +106,7 @@ static char* strdup_callback(const char* str) { size_t len = strlen(str) + 1; size_t newLen = len + offset; - char* newMem = reinterpret_cast(Aws::Malloc(MemTag, newLen)); + char* newMem = reinterpret_cast(Aws::Malloc(CURL_HANDLE_CONTAINER_TAG, newLen)); if(newMem) { @@ -131,10 +130,10 @@ CurlHandleContainer::CurlHandleContainer(unsigned maxSize, long requestTimeout, m_maxPoolSize(maxSize), m_requestTimeout(requestTimeout), m_connectTimeout(connectTimeout), m_poolSize(0) { - AWS_LOGSTREAM_INFO(CurlTag, "Initializing CurlHandleContainer with size " << maxSize); + AWS_LOGSTREAM_INFO(CURL_HANDLE_CONTAINER_TAG, "Initializing CurlHandleContainer with size " << maxSize); if (!isInit) { - AWS_LOG_INFO(CurlTag, "Initializing Curl library"); + AWS_LOG_INFO(CURL_HANDLE_CONTAINER_TAG, "Initializing Curl library"); isInit = true; #ifdef AWS_CUSTOM_MEMORY_MANAGEMENT curl_global_init_mem(CURL_GLOBAL_ALL, &malloc_callback, &free_callback, &realloc_callback, &strdup_callback, &calloc_callback); @@ -146,10 +145,10 @@ CurlHandleContainer::CurlHandleContainer(unsigned maxSize, long requestTimeout, CurlHandleContainer::~CurlHandleContainer() { - AWS_LOG_INFO(CurlTag, "Cleaning up CurlHandleContainer."); + AWS_LOG_INFO(CURL_HANDLE_CONTAINER_TAG, "Cleaning up CurlHandleContainer."); while (m_handleContainer.size() > 0) { - AWS_LOG_DEBUG(CurlTag, "Cleaning up %p.", m_handleContainer.top()); + AWS_LOG_DEBUG(CURL_HANDLE_CONTAINER_TAG, "Cleaning up %p.", m_handleContainer.top()); curl_easy_cleanup(m_handleContainer.top()); m_handleContainer.pop(); } @@ -157,22 +156,22 @@ CurlHandleContainer::~CurlHandleContainer() CURL* CurlHandleContainer::AcquireCurlHandle() { - AWS_LOG_DEBUG(CurlTag, "Attempting to acquire curl connection."); + AWS_LOG_DEBUG(CURL_HANDLE_CONTAINER_TAG, "Attempting to acquire curl connection."); std::unique_lock locker(m_handleContainerMutex); while (m_handleContainer.size() == 0) { - AWS_LOG_DEBUG(CurlTag, "No current connections available in pool. Attempting to create new connections."); + AWS_LOG_DEBUG(CURL_HANDLE_CONTAINER_TAG, "No current connections available in pool. Attempting to create new connections."); if (!CheckAndGrowPool()) { - AWS_LOG_INFO(CurlTag, "Connection pool has reached its max size. Waiting on connection to be freed."); + AWS_LOG_INFO(CURL_HANDLE_CONTAINER_TAG, "Connection pool has reached its max size. Waiting on connection to be freed."); m_conditionVariable.wait(locker); - AWS_LOG_INFO(CurlTag, "Connection has been released. Continuing."); + AWS_LOG_INFO(CURL_HANDLE_CONTAINER_TAG, "Connection has been released. Continuing."); } } CURL* handle = m_handleContainer.top(); - AWS_LOGSTREAM_DEBUG(CurlTag, "Returning connection handle " << handle); + AWS_LOGSTREAM_DEBUG(CURL_HANDLE_CONTAINER_TAG, "Returning connection handle " << handle); m_handleContainer.pop(); return handle; } @@ -183,11 +182,11 @@ void CurlHandleContainer::ReleaseCurlHandle(CURL* handle) { curl_easy_reset(handle); SetDefaultOptionsOnHandle(handle); - AWS_LOGSTREAM_DEBUG(CurlTag, "Releasing curl handle " << handle); + AWS_LOGSTREAM_DEBUG(CURL_HANDLE_CONTAINER_TAG, "Releasing curl handle " << handle); std::unique_lock locker(m_handleContainerMutex); m_handleContainer.push(handle); locker.unlock(); - AWS_LOG_DEBUG(CurlTag, "Notifying waiting threads."); + AWS_LOG_DEBUG(CURL_HANDLE_CONTAINER_TAG, "Notifying waiting threads."); m_conditionVariable.notify_one(); } } @@ -198,7 +197,7 @@ bool CurlHandleContainer::CheckAndGrowPool() { unsigned multiplier = m_poolSize > 0 ? m_poolSize : 1; unsigned amountToAdd = std::min(multiplier * 2, m_maxPoolSize - m_poolSize); - AWS_LOGSTREAM_DEBUG(CurlTag, "attempting to grow pool size by " << amountToAdd); + AWS_LOGSTREAM_DEBUG(CURL_HANDLE_CONTAINER_TAG, "attempting to grow pool size by " << amountToAdd); unsigned actuallyAdded = 0; for (unsigned i = 0; i < amountToAdd; ++i) @@ -213,17 +212,17 @@ bool CurlHandleContainer::CheckAndGrowPool() } else { - AWS_LOG_ERROR(CurlTag, "curl_easy_init failed to allocate. Will continue retrying until amount to add has exhausted."); + AWS_LOG_ERROR(CURL_HANDLE_CONTAINER_TAG, "curl_easy_init failed to allocate. Will continue retrying until amount to add has exhausted."); } } - AWS_LOGSTREAM_INFO(CurlTag, "Pool successfully grown by " << actuallyAdded); + AWS_LOGSTREAM_INFO(CURL_HANDLE_CONTAINER_TAG, "Pool successfully grown by " << actuallyAdded); m_poolSize += actuallyAdded; return actuallyAdded > 0; } - AWS_LOG_INFO(CurlTag, "Pool cannot be grown any further, already at max size."); + AWS_LOG_INFO(CURL_HANDLE_CONTAINER_TAG, "Pool cannot be grown any further, already at max size."); return false; } diff --git a/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp b/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp index 9b7ec3d0eda..d4e0e8f9ca6 100644 --- a/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp +++ b/aws-cpp-sdk-core/source/http/curl/CurlHttpClient.cpp @@ -1,377 +1,426 @@ -/* - * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://aws.amazon.com/apache2.0 - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -#include - - -#include -#include -#include -#include -#include -#include -#include - - -using namespace Aws::Client; -using namespace Aws::Http; -using namespace Aws::Http::Standard; -using namespace Aws::Utils; -using namespace Aws::Utils::Logging; - - -struct CurlWriteCallbackContext -{ - CurlWriteCallbackContext(const CurlHttpClient* client, - HttpRequest* request, - HttpResponse* response, - Aws::Utils::RateLimits::RateLimiterInterface* rateLimiter) : - m_client(client), - m_request(request), - m_response(response), - m_rateLimiter(rateLimiter) - {} - - const CurlHttpClient* m_client; - HttpRequest* m_request; - HttpResponse* m_response; - Aws::Utils::RateLimits::RateLimiterInterface* m_rateLimiter; -}; - -struct CurlReadCallbackContext -{ - CurlReadCallbackContext(const CurlHttpClient* client, HttpRequest* request) : - m_client(client), - m_request(request) - {} - - const CurlHttpClient* m_client; - HttpRequest* m_request; -}; - -static const char* CurlTag = "CurlHttpClient"; - -void SetOptCodeForHttpMethod(CURL* requestHandle, const HttpRequest& request) -{ - switch (request.GetMethod()) - { - case HttpMethod::HTTP_GET: - curl_easy_setopt(requestHandle, CURLOPT_HTTPGET, 1L); - break; - case HttpMethod::HTTP_POST: - - if (!request.HasHeader(Aws::Http::CONTENT_LENGTH_HEADER)) - { - curl_easy_setopt(requestHandle, CURLOPT_CUSTOMREQUEST, "POST"); - } - else - { - curl_easy_setopt(requestHandle, CURLOPT_POST, 1L); - } - break; - case HttpMethod::HTTP_PUT: - if (!request.HasHeader(Aws::Http::CONTENT_LENGTH_HEADER)) - { - curl_easy_setopt(requestHandle, CURLOPT_CUSTOMREQUEST, "PUT"); - } - else - { - curl_easy_setopt(requestHandle, CURLOPT_PUT, 1L); - } - break; - case HttpMethod::HTTP_HEAD: - curl_easy_setopt(requestHandle, CURLOPT_HTTPGET, 1L); - curl_easy_setopt(requestHandle, CURLOPT_NOBODY, 1L); - break; - case HttpMethod::HTTP_PATCH: - curl_easy_setopt(requestHandle, CURLOPT_CUSTOMREQUEST, "PATCH"); - break; - case HttpMethod::HTTP_DELETE: - curl_easy_setopt(requestHandle, CURLOPT_CUSTOMREQUEST, "DELETE"); - curl_easy_setopt(requestHandle, CURLOPT_NOBODY, 1L); - break; - default: - assert(0); - curl_easy_setopt(requestHandle, CURLOPT_CUSTOMREQUEST, "GET"); - break; - } -} - -CurlHttpClient::CurlHttpClient(const ClientConfiguration& clientConfig) : - Base(), - m_curlHandleContainer(clientConfig.maxConnections, clientConfig.requestTimeoutMs, clientConfig.connectTimeoutMs), - m_isUsingProxy(!clientConfig.proxyHost.empty()), m_proxyUserName(clientConfig.proxyUserName), - m_proxyPassword(clientConfig.proxyPassword), m_proxyHost(clientConfig.proxyHost), - m_proxyPort(clientConfig.proxyPort), m_verifySSL(clientConfig.verifySSL), m_caPath(clientConfig.caPath), m_allowRedirects(clientConfig.followRedirects) -{ -} - - -std::shared_ptr CurlHttpClient::MakeRequest(HttpRequest& request, Aws::Utils::RateLimits::RateLimiterInterface* readLimiter, - Aws::Utils::RateLimits::RateLimiterInterface* writeLimiter) const -{ - //handle uri encoding at last second. Otherwise, the signer and the http layer will mismatch. - URI uri = request.GetUri(); - uri.SetPath(URI::URLEncodePath(uri.GetPath())); - Aws::String url = uri.GetURIString(); - - AWS_LOGSTREAM_TRACE(CurlTag, "Making request to " << url); - struct curl_slist* headers = NULL; - - if (writeLimiter != nullptr) - { - writeLimiter->ApplyAndPayForCost(request.GetSize()); - } - - Aws::StringStream headerStream; - HeaderValueCollection requestHeaders = request.GetHeaders(); - - AWS_LOG_TRACE(CurlTag, "Including headers:"); - for (auto& requestHeader : requestHeaders) - { - headerStream.str(""); - headerStream << requestHeader.first << ": " << requestHeader.second; - Aws::String headerString = headerStream.str(); - AWS_LOGSTREAM_TRACE(CurlTag, headerString); - headers = curl_slist_append(headers, headerString.c_str()); - } - headers = curl_slist_append(headers, "transfer-encoding:"); - - if (!request.HasHeader(Http::CONTENT_LENGTH_HEADER)) - { - headers = curl_slist_append(headers, "content-length:"); - } - - if (!request.HasHeader(Http::CONTENT_TYPE_HEADER)) - { - headers = curl_slist_append(headers, "content-type:"); - } - - std::shared_ptr response(nullptr); - CURL* connectionHandle = m_curlHandleContainer.AcquireCurlHandle(); - - if (connectionHandle) - { - AWS_LOGSTREAM_DEBUG(CurlTag, "Obtained connection handle " << connectionHandle); - - if (headers) - { - curl_easy_setopt(connectionHandle, CURLOPT_HTTPHEADER, headers); - } - - response = Aws::MakeShared(CurlTag, request); - CurlWriteCallbackContext writeContext(this, &request, response.get(), readLimiter); - CurlReadCallbackContext readContext(this, &request); - - SetOptCodeForHttpMethod(connectionHandle, request); - - curl_easy_setopt(connectionHandle, CURLOPT_URL, url.c_str()); - curl_easy_setopt(connectionHandle, CURLOPT_WRITEFUNCTION, &CurlHttpClient::WriteData); - curl_easy_setopt(connectionHandle, CURLOPT_WRITEDATA, &writeContext); - curl_easy_setopt(connectionHandle, CURLOPT_HEADERFUNCTION, &CurlHttpClient::WriteHeader); - curl_easy_setopt(connectionHandle, CURLOPT_HEADERDATA, response.get()); - - //we only want to override the default path if someone has explicitly told us to. - if(!m_caPath.empty()) - { - curl_easy_setopt(connectionHandle, CURLOPT_CAPATH, m_caPath.c_str()); - } - - // only set by android test builds because the emulator is missing a cert needed for aws services -#ifdef TEST_CERT_PATH - curl_easy_setopt(connectionHandle, CURLOPT_CAPATH, TEST_CERT_PATH); -#endif // TEST_CERT_PATH - - if (m_verifySSL) - { - curl_easy_setopt(connectionHandle, CURLOPT_SSL_VERIFYPEER, 1L); - curl_easy_setopt(connectionHandle, CURLOPT_SSL_VERIFYHOST, 2L); - -#if LIBCURL_VERSION_MAJOR >= 7 -#if LIBCURL_VERSION_MINOR >= 34 - curl_easy_setopt(connectionHandle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); -#endif //LIBCURL_VERSION_MINOR -#endif //LIBCURL_VERSION_MAJOR - } - else - { - curl_easy_setopt(connectionHandle, CURLOPT_SSL_VERIFYPEER, 0L); - curl_easy_setopt(connectionHandle, CURLOPT_SSL_VERIFYHOST, 0L); - } - - if (m_allowRedirects) - { - curl_easy_setopt(connectionHandle, CURLOPT_FOLLOWLOCATION, 1L); - } - else - { - curl_easy_setopt(connectionHandle, CURLOPT_FOLLOWLOCATION, 0L); - } - //curl_easy_setopt(connectionHandle, CURLOPT_VERBOSE, 1); - - if (m_isUsingProxy) - { - curl_easy_setopt(connectionHandle, CURLOPT_PROXY, m_proxyHost.c_str()); - curl_easy_setopt(connectionHandle, CURLOPT_PROXYPORT, (long) m_proxyPort); - curl_easy_setopt(connectionHandle, CURLOPT_PROXYUSERNAME, m_proxyUserName.c_str()); - curl_easy_setopt(connectionHandle, CURLOPT_PROXYPASSWORD, m_proxyPassword.c_str()); - } - - if (request.GetContentBody()) - { - curl_easy_setopt(connectionHandle, CURLOPT_READFUNCTION, &CurlHttpClient::ReadBody); - curl_easy_setopt(connectionHandle, CURLOPT_READDATA, &readContext); - } - - CURLcode curlResponseCode = curl_easy_perform(connectionHandle); - if (curlResponseCode != CURLE_OK) - { - response = nullptr; - AWS_LOGSTREAM_ERROR(CurlTag, "Curl returned error code " << curlResponseCode); - } - else - { - long responseCode; - curl_easy_getinfo(connectionHandle, CURLINFO_RESPONSE_CODE, &responseCode); - response->SetResponseCode(static_cast(responseCode)); - AWS_LOGSTREAM_DEBUG(CurlTag, "Returned http response code " << responseCode); - - char* contentType = nullptr; - curl_easy_getinfo(connectionHandle, CURLINFO_CONTENT_TYPE, &contentType); - if (contentType) - { - response->SetContentType(contentType); - AWS_LOGSTREAM_DEBUG(CurlTag, "Returned content type " << contentType); - } - - AWS_LOGSTREAM_DEBUG(CurlTag, "Releasing curl handle " << connectionHandle); - } - - m_curlHandleContainer.ReleaseCurlHandle(connectionHandle); - //go ahead and flush the response body stream - if(response) - { - response->GetResponseBody().flush(); - } - } - - if (headers) - { - curl_slist_free_all(headers); - } - - return response; -} - - -size_t CurlHttpClient::WriteData(char* ptr, size_t size, size_t nmemb, void* userdata) -{ - if (ptr) - { - CurlWriteCallbackContext* context = reinterpret_cast(userdata); - - const CurlHttpClient* client = context->m_client; - if(!client->IsRequestProcessingEnabled()) - { - return 0; - } - - HttpResponse* response = context->m_response; - size_t sizeToWrite = size * nmemb; - if (context->m_rateLimiter) - { - context->m_rateLimiter->ApplyAndPayForCost(static_cast(sizeToWrite)); - } - - response->GetResponseBody().write(ptr, static_cast(sizeToWrite)); - auto& receivedHandler = context->m_request->GetDataReceivedEventHandler(); - if (receivedHandler) - { - receivedHandler(context->m_request, context->m_response, static_cast(sizeToWrite)); - } - - AWS_LOGSTREAM_TRACE(CurlTag, sizeToWrite << " bytes written to response."); - return sizeToWrite; - } - return 0; -} - -size_t CurlHttpClient::WriteHeader(char* ptr, size_t size, size_t nmemb, void* userdata) -{ - if (ptr) - { - AWS_LOGSTREAM_TRACE(CurlTag, ptr); - HttpResponse* response = (HttpResponse*) userdata; - Aws::String headerLine(ptr); - Aws::Vector keyValuePair = StringUtils::Split(headerLine, ':'); - - - if (keyValuePair.size() > 1) - { - Aws::String headerName = keyValuePair[0]; - headerName = StringUtils::Trim(headerName.c_str()); - - - Aws::String headerValue = headerLine.substr(headerName.length() + 1).c_str(); - headerValue = StringUtils::Trim(headerValue.c_str()); - - - response->AddHeader(headerName, headerValue); - } - return size * nmemb; - } - return 0; -} - - -size_t CurlHttpClient::ReadBody(char* ptr, size_t size, size_t nmemb, void* userdata) -{ - CurlReadCallbackContext* context = reinterpret_cast(userdata); - if(context == nullptr) - { - return 0; - } - - const CurlHttpClient* client = context->m_client; - if(!client->IsRequestProcessingEnabled()) - { - return 0; - } - - HttpRequest* request = context->m_request; - std::shared_ptr ioStream = request->GetContentBody(); - - if (ioStream != nullptr && size * nmemb) - { - auto currentPos = ioStream->tellg(); - ioStream->seekg(0, ioStream->end); - auto length = ioStream->tellg(); - ioStream->seekg(currentPos, ioStream->beg); - size_t amountToRead = static_cast< size_t >(std::min(length - currentPos, size * nmemb)); - - ioStream->read(ptr, amountToRead); - auto& sentHandler = request->GetDataSentEventHandler(); - if (sentHandler) - { - sentHandler(request, amountToRead); - } - - return amountToRead; - } - - return 0; -} - - +/* + * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +#include + + +#include +#include +#include +#include +#include +#include +#include + + +using namespace Aws::Client; +using namespace Aws::Http; +using namespace Aws::Http::Standard; +using namespace Aws::Utils; +using namespace Aws::Utils::Logging; + + +struct CurlWriteCallbackContext +{ + CurlWriteCallbackContext(const CurlHttpClient* client, + HttpRequest* request, + HttpResponse* response, + Aws::Utils::RateLimits::RateLimiterInterface* rateLimiter) : + m_client(client), + m_request(request), + m_response(response), + m_rateLimiter(rateLimiter) + {} + + const CurlHttpClient* m_client; + HttpRequest* m_request; + HttpResponse* m_response; + Aws::Utils::RateLimits::RateLimiterInterface* m_rateLimiter; +}; + +struct CurlReadCallbackContext +{ + CurlReadCallbackContext(const CurlHttpClient* client, HttpRequest* request) : + m_client(client), + m_request(request) + {} + + const CurlHttpClient* m_client; + HttpRequest* m_request; +}; + +static const char* CURL_HTTP_CLIENT_TAG = "CurlHttpClient"; + +void SetOptCodeForHttpMethod(CURL* requestHandle, const HttpRequest& request) +{ + switch (request.GetMethod()) + { + case HttpMethod::HTTP_GET: + curl_easy_setopt(requestHandle, CURLOPT_HTTPGET, 1L); + break; + case HttpMethod::HTTP_POST: + + if (!request.HasHeader(Aws::Http::CONTENT_LENGTH_HEADER)) + { + curl_easy_setopt(requestHandle, CURLOPT_CUSTOMREQUEST, "POST"); + } + else + { + curl_easy_setopt(requestHandle, CURLOPT_POST, 1L); + } + break; + case HttpMethod::HTTP_PUT: + if (!request.HasHeader(Aws::Http::CONTENT_LENGTH_HEADER)) + { + curl_easy_setopt(requestHandle, CURLOPT_CUSTOMREQUEST, "PUT"); + } + else + { + curl_easy_setopt(requestHandle, CURLOPT_PUT, 1L); + } + break; + case HttpMethod::HTTP_HEAD: + curl_easy_setopt(requestHandle, CURLOPT_HTTPGET, 1L); + curl_easy_setopt(requestHandle, CURLOPT_NOBODY, 1L); + break; + case HttpMethod::HTTP_PATCH: + curl_easy_setopt(requestHandle, CURLOPT_CUSTOMREQUEST, "PATCH"); + break; + case HttpMethod::HTTP_DELETE: + curl_easy_setopt(requestHandle, CURLOPT_CUSTOMREQUEST, "DELETE"); + //curl_easy_setopt(requestHandle, CURLOPT_NOBODY, 1L); + break; + default: + assert(0); + curl_easy_setopt(requestHandle, CURLOPT_CUSTOMREQUEST, "GET"); + break; + } +} + +Aws::String CurlInfoTypeToString(curl_infotype type) +{ + switch(type) + { + case CURLINFO_TEXT: + return "Text"; + + case CURLINFO_HEADER_IN: + return "HeaderIn"; + + case CURLINFO_HEADER_OUT: + return "HeaderOut"; + + case CURLINFO_DATA_IN: + return "DataIn"; + + case CURLINFO_DATA_OUT: + return "DataOut"; + + case CURLINFO_SSL_DATA_IN: + return "SSLDataIn"; + + case CURLINFO_SSL_DATA_OUT: + return "SSLDataOut"; + + default: + return "Unknown"; + } +} + +int CurlDebugCallback(CURL *handle, curl_infotype type, char *data, size_t size, void *userptr) +{ + AWS_UNREFERENCED_PARAM(handle); + AWS_UNREFERENCED_PARAM(userptr); + + if(type == CURLINFO_SSL_DATA_IN || type == CURLINFO_SSL_DATA_OUT) + { + AWS_LOGSTREAM_DEBUG("CURL", "(" << CurlInfoTypeToString(type) << ") " << size << "bytes"); + } + else + { + Aws::String debugString(data, size); + AWS_LOGSTREAM_DEBUG("CURL", "(" << CurlInfoTypeToString(type) << ") " << debugString); + } + + return 0; +} + + +CurlHttpClient::CurlHttpClient(const ClientConfiguration& clientConfig) : + Base(), + m_curlHandleContainer(clientConfig.maxConnections, clientConfig.requestTimeoutMs, clientConfig.connectTimeoutMs), + m_isUsingProxy(!clientConfig.proxyHost.empty()), m_proxyUserName(clientConfig.proxyUserName), + m_proxyPassword(clientConfig.proxyPassword), m_proxyHost(clientConfig.proxyHost), + m_proxyPort(clientConfig.proxyPort), m_verifySSL(clientConfig.verifySSL), m_caPath(clientConfig.caPath), m_allowRedirects(clientConfig.followRedirects) +{ +} + + +std::shared_ptr CurlHttpClient::MakeRequest(HttpRequest& request, Aws::Utils::RateLimits::RateLimiterInterface* readLimiter, + Aws::Utils::RateLimits::RateLimiterInterface* writeLimiter) const +{ + //handle uri encoding at last second. Otherwise, the signer and the http layer will mismatch. + URI uri = request.GetUri(); + uri.SetPath(URI::URLEncodePath(uri.GetPath())); + Aws::String url = uri.GetURIString(); + + AWS_LOGSTREAM_TRACE(CURL_HTTP_CLIENT_TAG, "Making request to " << url); + struct curl_slist* headers = NULL; + + if (writeLimiter != nullptr) + { + writeLimiter->ApplyAndPayForCost(request.GetSize()); + } + + Aws::StringStream headerStream; + HeaderValueCollection requestHeaders = request.GetHeaders(); + + AWS_LOG_TRACE(CURL_HTTP_CLIENT_TAG, "Including headers:"); + for (auto& requestHeader : requestHeaders) + { + headerStream.str(""); + headerStream << requestHeader.first << ": " << requestHeader.second; + Aws::String headerString = headerStream.str(); + AWS_LOGSTREAM_TRACE(CURL_HTTP_CLIENT_TAG, headerString); + headers = curl_slist_append(headers, headerString.c_str()); + } + headers = curl_slist_append(headers, "transfer-encoding:"); + + if (!request.HasHeader(Http::CONTENT_LENGTH_HEADER)) + { + headers = curl_slist_append(headers, "content-length:"); + } + + if (!request.HasHeader(Http::CONTENT_TYPE_HEADER)) + { + headers = curl_slist_append(headers, "content-type:"); + } + + std::shared_ptr response(nullptr); + CURL* connectionHandle = m_curlHandleContainer.AcquireCurlHandle(); + + if (connectionHandle) + { + AWS_LOGSTREAM_DEBUG(CURL_HTTP_CLIENT_TAG, "Obtained connection handle " << connectionHandle); + + if (headers) + { + curl_easy_setopt(connectionHandle, CURLOPT_HTTPHEADER, headers); + } + + response = Aws::MakeShared(CURL_HTTP_CLIENT_TAG, request); + CurlWriteCallbackContext writeContext(this, &request, response.get(), readLimiter); + CurlReadCallbackContext readContext(this, &request); + + SetOptCodeForHttpMethod(connectionHandle, request); + + curl_easy_setopt(connectionHandle, CURLOPT_URL, url.c_str()); + curl_easy_setopt(connectionHandle, CURLOPT_WRITEFUNCTION, &CurlHttpClient::WriteData); + curl_easy_setopt(connectionHandle, CURLOPT_WRITEDATA, &writeContext); + curl_easy_setopt(connectionHandle, CURLOPT_HEADERFUNCTION, &CurlHttpClient::WriteHeader); + curl_easy_setopt(connectionHandle, CURLOPT_HEADERDATA, response.get()); + + //we only want to override the default path if someone has explicitly told us to. + if(!m_caPath.empty()) + { + curl_easy_setopt(connectionHandle, CURLOPT_CAPATH, m_caPath.c_str()); + } + + // only set by android test builds because the emulator is missing a cert needed for aws services +#ifdef TEST_CERT_PATH + curl_easy_setopt(connectionHandle, CURLOPT_CAPATH, TEST_CERT_PATH); +#endif // TEST_CERT_PATH + + if (m_verifySSL) + { + curl_easy_setopt(connectionHandle, CURLOPT_SSL_VERIFYPEER, 1L); + curl_easy_setopt(connectionHandle, CURLOPT_SSL_VERIFYHOST, 2L); + +#if LIBCURL_VERSION_MAJOR >= 7 +#if LIBCURL_VERSION_MINOR >= 34 + curl_easy_setopt(connectionHandle, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); +#endif //LIBCURL_VERSION_MINOR +#endif //LIBCURL_VERSION_MAJOR + } + else + { + curl_easy_setopt(connectionHandle, CURLOPT_SSL_VERIFYPEER, 0L); + curl_easy_setopt(connectionHandle, CURLOPT_SSL_VERIFYHOST, 0L); + } + + if (m_allowRedirects) + { + curl_easy_setopt(connectionHandle, CURLOPT_FOLLOWLOCATION, 1L); + } + else + { + curl_easy_setopt(connectionHandle, CURLOPT_FOLLOWLOCATION, 0L); + } + //curl_easy_setopt(connectionHandle, CURLOPT_VERBOSE, 1); + //curl_easy_setopt(connectionHandle, CURLOPT_DEBUGFUNCTION, CurlDebugCallback); + + if (m_isUsingProxy) + { + curl_easy_setopt(connectionHandle, CURLOPT_PROXY, m_proxyHost.c_str()); + curl_easy_setopt(connectionHandle, CURLOPT_PROXYPORT, (long) m_proxyPort); + curl_easy_setopt(connectionHandle, CURLOPT_PROXYUSERNAME, m_proxyUserName.c_str()); + curl_easy_setopt(connectionHandle, CURLOPT_PROXYPASSWORD, m_proxyPassword.c_str()); + } + + if (request.GetContentBody()) + { + curl_easy_setopt(connectionHandle, CURLOPT_READFUNCTION, &CurlHttpClient::ReadBody); + curl_easy_setopt(connectionHandle, CURLOPT_READDATA, &readContext); + } + + CURLcode curlResponseCode = curl_easy_perform(connectionHandle); + if (curlResponseCode != CURLE_OK) + { + response = nullptr; + AWS_LOGSTREAM_ERROR(CURL_HTTP_CLIENT_TAG, "Curl returned error code " << curlResponseCode); + } + else + { + long responseCode; + curl_easy_getinfo(connectionHandle, CURLINFO_RESPONSE_CODE, &responseCode); + response->SetResponseCode(static_cast(responseCode)); + AWS_LOGSTREAM_DEBUG(CURL_HTTP_CLIENT_TAG, "Returned http response code " << responseCode); + + char* contentType = nullptr; + curl_easy_getinfo(connectionHandle, CURLINFO_CONTENT_TYPE, &contentType); + if (contentType) + { + response->SetContentType(contentType); + AWS_LOGSTREAM_DEBUG(CURL_HTTP_CLIENT_TAG, "Returned content type " << contentType); + } + + AWS_LOGSTREAM_DEBUG(CURL_HTTP_CLIENT_TAG, "Releasing curl handle " << connectionHandle); + } + + m_curlHandleContainer.ReleaseCurlHandle(connectionHandle); + //go ahead and flush the response body stream + if(response) + { + response->GetResponseBody().flush(); + } + } + + if (headers) + { + curl_slist_free_all(headers); + } + + return response; +} + + +size_t CurlHttpClient::WriteData(char* ptr, size_t size, size_t nmemb, void* userdata) +{ + if (ptr) + { + CurlWriteCallbackContext* context = reinterpret_cast(userdata); + + const CurlHttpClient* client = context->m_client; + if(!client->IsRequestProcessingEnabled()) + { + return 0; + } + + HttpResponse* response = context->m_response; + size_t sizeToWrite = size * nmemb; + if (context->m_rateLimiter) + { + context->m_rateLimiter->ApplyAndPayForCost(static_cast(sizeToWrite)); + } + + response->GetResponseBody().write(ptr, static_cast(sizeToWrite)); + auto& receivedHandler = context->m_request->GetDataReceivedEventHandler(); + if (receivedHandler) + { + receivedHandler(context->m_request, context->m_response, static_cast(sizeToWrite)); + } + + AWS_LOGSTREAM_TRACE(CURL_HTTP_CLIENT_TAG, sizeToWrite << " bytes written to response."); + return sizeToWrite; + } + return 0; +} + +size_t CurlHttpClient::WriteHeader(char* ptr, size_t size, size_t nmemb, void* userdata) +{ + if (ptr) + { + AWS_LOGSTREAM_TRACE(CURL_HTTP_CLIENT_TAG, ptr); + HttpResponse* response = (HttpResponse*) userdata; + Aws::String headerLine(ptr); + Aws::Vector keyValuePair = StringUtils::Split(headerLine, ':'); + + + if (keyValuePair.size() > 1) + { + Aws::String headerName = keyValuePair[0]; + headerName = StringUtils::Trim(headerName.c_str()); + + + Aws::String headerValue = headerLine.substr(headerName.length() + 1).c_str(); + headerValue = StringUtils::Trim(headerValue.c_str()); + + + response->AddHeader(headerName, headerValue); + } + return size * nmemb; + } + return 0; +} + + +size_t CurlHttpClient::ReadBody(char* ptr, size_t size, size_t nmemb, void* userdata) +{ + CurlReadCallbackContext* context = reinterpret_cast(userdata); + if(context == nullptr) + { + return 0; + } + + const CurlHttpClient* client = context->m_client; + if(!client->IsRequestProcessingEnabled()) + { + return 0; + } + + HttpRequest* request = context->m_request; + std::shared_ptr ioStream = request->GetContentBody(); + + if (ioStream != nullptr && size * nmemb) + { + auto currentPos = ioStream->tellg(); + ioStream->seekg(0, ioStream->end); + auto length = ioStream->tellg(); + ioStream->seekg(currentPos, ioStream->beg); + size_t amountToRead = static_cast< size_t >(std::min(length - currentPos, size * nmemb)); + + ioStream->read(ptr, amountToRead); + auto& sentHandler = request->GetDataSentEventHandler(); + if (sentHandler) + { + sentHandler(request, amountToRead); + } + + return amountToRead; + } + + return 0; +} + diff --git a/aws-cpp-sdk-core/source/internal/EC2MetadataClient.cpp b/aws-cpp-sdk-core/source/internal/EC2MetadataClient.cpp index 0be3bbd6dd6..2e22d2b3254 100644 --- a/aws-cpp-sdk-core/source/internal/EC2MetadataClient.cpp +++ b/aws-cpp-sdk-core/source/internal/EC2MetadataClient.cpp @@ -32,14 +32,14 @@ using namespace Aws::Internal; static const char* SECURITY_CREDENTIALS_RESOURCE = "/latest/meta-data/iam/security-credentials/"; -static const char* logTag = "EC2MetadataClient"; +static const char* EC2_METADATA_CLIENT_LOG_TAG = "EC2MetadataClient"; EC2MetadataClient::EC2MetadataClient(const char* endpoint, std::shared_ptr httpClientFactory) : m_httpClient(nullptr), - m_httpClientFactory((httpClientFactory != nullptr) ? httpClientFactory : Aws::MakeShared(logTag)), + m_httpClientFactory((httpClientFactory != nullptr) ? httpClientFactory : Aws::MakeShared(EC2_METADATA_CLIENT_LOG_TAG)), m_endpoint(endpoint) { - AWS_LOG_INFO(logTag, "Creating HttpClient with max connections %d and scheme %s", 2, "http"); + AWS_LOG_INFO(EC2_METADATA_CLIENT_LOG_TAG, "Creating HttpClient with max connections %d and scheme %s", 2, "http"); ClientConfiguration clientConfiguration; clientConfiguration.maxConnections = 2; clientConfiguration.scheme = Scheme::HTTP; @@ -53,24 +53,24 @@ EC2MetadataClient::~EC2MetadataClient() Aws::String EC2MetadataClient::GetDefaultCredentials() const { - AWS_LOG_TRACE(logTag, "Getting default credentials for ec2 instance"); + AWS_LOG_TRACE(EC2_METADATA_CLIENT_LOG_TAG, "Getting default credentials for ec2 instance"); Aws::String credentialsString = GetResource(SECURITY_CREDENTIALS_RESOURCE); if (!credentialsString.empty()) { Aws::String trimmedCredentialsString = StringUtils::Trim(credentialsString.c_str()); Aws::Vector securityCredentials = StringUtils::Split(trimmedCredentialsString, '\n'); - AWS_LOG_DEBUG(logTag, "Calling EC2MetatadaService resource %s, returned credential string %s", SECURITY_CREDENTIALS_RESOURCE, credentialsString.c_str()); + AWS_LOG_DEBUG(EC2_METADATA_CLIENT_LOG_TAG, "Calling EC2MetatadaService resource %s, returned credential string %s", SECURITY_CREDENTIALS_RESOURCE, credentialsString.c_str()); if (securityCredentials.size() == 0) { - AWS_LOG_WARN(logTag, "Initial call to ec2Metadataservice to get credentials failed"); + AWS_LOG_WARN(EC2_METADATA_CLIENT_LOG_TAG, "Initial call to ec2Metadataservice to get credentials failed"); return ""; } Aws::StringStream ss; ss << SECURITY_CREDENTIALS_RESOURCE << securityCredentials[0]; - AWS_LOG_DEBUG(logTag, "Calling EC2MetatadaService resource %s", ss.str().c_str()); + AWS_LOG_DEBUG(EC2_METADATA_CLIENT_LOG_TAG, "Calling EC2MetatadaService resource %s", ss.str().c_str()); return GetResource(ss.str().c_str()); } @@ -81,18 +81,18 @@ Aws::String EC2MetadataClient::GetResource(const char* resource) const { Aws::StringStream ss; ss << m_endpoint << resource; - AWS_LOG_TRACE(logTag, "Calling Ec2MetadataService at %s", ss.str().c_str()); + AWS_LOG_TRACE(EC2_METADATA_CLIENT_LOG_TAG, "Calling Ec2MetadataService at %s", ss.str().c_str()); std::shared_ptr request(m_httpClientFactory->CreateHttpRequest(ss.str(), HttpMethod::HTTP_GET, Aws::Utils::Stream::DefaultResponseStreamFactoryMethod)); std::shared_ptr response(m_httpClient->MakeRequest(*request)); if (response == nullptr) { - AWS_LOG_ERROR(logTag, "Http request to Ec2MetadataService failed."); + AWS_LOG_ERROR(EC2_METADATA_CLIENT_LOG_TAG, "Http request to Ec2MetadataService failed."); } else if (response->GetResponseCode() != HttpResponseCode::OK) { - AWS_LOG_ERROR(logTag, "Http request failed with error code %d", (int) response->GetResponseCode()); + AWS_LOG_ERROR(EC2_METADATA_CLIENT_LOG_TAG, "Http request failed with error code %d", (int) response->GetResponseCode()); } else { diff --git a/aws-cpp-sdk-core/source/platform/android/FileSystemUtils.cpp b/aws-cpp-sdk-core/source/platform/android/FileSystemUtils.cpp new file mode 100644 index 00000000000..a4de24dab80 --- /dev/null +++ b/aws-cpp-sdk-core/source/platform/android/FileSystemUtils.cpp @@ -0,0 +1,80 @@ +/* + * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +#include + +#include +#include +#include + +#include +#include +#include + +#include + +using namespace Aws::Utils; + +static const char* FILE_SYSTEM_UTILS_LOG_TAG = "FileSystemUtils"; + +Aws::String FileSystemUtils::GetHomeDirectory() +{ + return Aws::Platform::GetCacheDirectory(); +} + +bool FileSystemUtils::CreateDirectoryIfNotExists(const char* path) +{ + AWS_LOGSTREAM_INFO(FILE_SYSTEM_UTILS_LOG_TAG, "Creating directory " << path); + + int errorCode = mkdir(path, S_IRWXU | S_IRWXG | S_IRWXO); + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "Creation of directory " << path << " returned code: " << errno); + return errorCode == 0 || errno == EEXIST; +} + +bool FileSystemUtils::RemoveFileIfExists(const char* path) +{ + AWS_LOGSTREAM_INFO(FILE_SYSTEM_UTILS_LOG_TAG, "Deleting file: " << path); + + int errorCode = unlink(path); + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "Deletion of file: " << path << " Returned error code: " << errno); + return errorCode == 0 || errno == ENOENT; +} + +bool FileSystemUtils::RelocateFileOrDirectory(const char* from, const char* to) +{ + AWS_LOGSTREAM_INFO(FILE_SYSTEM_UTILS_LOG_TAG, "Moving file at " << from << " to " << to); + + int errorCode = rename(from, to); + + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "The moving operation of file at " << from << " to " << to << " Returned error code of " << errno); + return errorCode == 0; +} + +std::mutex tempFileMutex; +uint32_t tempFileIndex(0); + +Aws::String FileSystemUtils::CreateTempFilePath() +{ + std::lock_guard tempFileLock(tempFileMutex); + + Aws::StringStream pathStream; + pathStream << Aws::Platform::GetCacheDirectory(); + pathStream << PATH_DELIM << "temp" << tempFileIndex; + ++tempFileIndex; + + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "CreateTempFilePath generated: " << pathStream.str()); + + return pathStream.str(); +} + diff --git a/aws-cpp-sdk-core/source/utils/logging/android/LogcatLogSystem.cpp b/aws-cpp-sdk-core/source/platform/android/LogcatLogSystem.cpp similarity index 100% rename from aws-cpp-sdk-core/source/utils/logging/android/LogcatLogSystem.cpp rename to aws-cpp-sdk-core/source/platform/android/LogcatLogSystem.cpp diff --git a/aws-cpp-sdk-core/source/platform/android/OSVersionInfo.cpp b/aws-cpp-sdk-core/source/platform/android/OSVersionInfo.cpp new file mode 100644 index 00000000000..603d4e8eb8c --- /dev/null +++ b/aws-cpp-sdk-core/source/platform/android/OSVersionInfo.cpp @@ -0,0 +1,45 @@ +/* + * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +#include +#include +#include + +namespace Aws +{ +namespace Utils +{ + +Aws::String ComputeOSVersionString() +{ + // regex is not allocator-aware, so technically we're breaking our memory contract here (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3254.pdf) + // Since it's internal, nothing escapes, and what gets allocated/deallocated is very small, I think that's acceptable for now + + std::string androidBuildVersion = GetSysCommandOutput("cat /proc/version 2>&1").c_str(); + std::regex versionRegex("version (\\S+)\\s"); + + std::smatch versionMatchResults; + std::regex_search(androidBuildVersion, versionMatchResults, versionRegex); + + if(versionMatchResults.size() >= 2) + { + return Aws::String("Android/") + versionMatchResults[1].str().c_str(); + } + + return Aws::String("Android/Unknown"); +} + +} // namespace Utils +} // namespace Aws diff --git a/aws-cpp-sdk-core/source/platform/android/Platform.cpp b/aws-cpp-sdk-core/source/platform/android/Platform.cpp new file mode 100644 index 00000000000..66f46e70dbe --- /dev/null +++ b/aws-cpp-sdk-core/source/platform/android/Platform.cpp @@ -0,0 +1,71 @@ +/* +* Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. +* +* Licensed under the Apache License, Version 2.0 (the "License"). +* You may not use this file except in compliance with the License. +* A copy of the License is located at +* +* http://aws.amazon.com/apache2.0 +* +* or in the "license" file accompanying this file. This file is distributed +* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either +* express or implied. See the License for the specific language governing +* permissions and limitations under the License. +*/ + +#include + +#include +#include +#include + +namespace Aws +{ +namespace Platform +{ + +JavaVM* g_javaVM(nullptr); + +Aws::String g_cacheDirectory; + +static void InitCacheDirectory(JNIEnv* env, jobject context) +{ + jclass contextClass = env->FindClass( "android/content/Context" ); + jmethodID getCacheDir = env->GetMethodID( contextClass, "getCacheDir", "()Ljava/io/File;" ); + jobject cache_dir = env->CallObjectMethod( context, getCacheDir ); + + jclass fileClass = env->FindClass( "java/io/File" ); + jmethodID getPath = env->GetMethodID( fileClass, "getPath", "()Ljava/lang/String;" ); + jstring path_string = (jstring)env->CallObjectMethod( cache_dir, getPath ); + + const char *path_chars = env->GetStringUTFChars( path_string, NULL ); + g_cacheDirectory = path_chars; + g_cacheDirectory.append("/"); + + env->ReleaseStringUTFChars( path_string, path_chars ); +} + +/* +We intentionally don't use JNI_OnLoad to do this because that wouldn't work if the sdk is linked statically into external user code. + */ +void InitAndroid(JNIEnv* env, jobject context) +{ + // save off the vm + env->GetJavaVM(&g_javaVM); + + // cache anything else we need + InitCacheDirectory(env, context); +} + +JavaVM* GetJavaVM() +{ + return g_javaVM; +} + +const char* GetCacheDirectory() +{ + return g_cacheDirectory.c_str(); +} + +} // namespace Platform +} // namespace Aws diff --git a/aws-cpp-sdk-core/source/platform/linux-shared/FileSystemUtils.cpp b/aws-cpp-sdk-core/source/platform/linux-shared/FileSystemUtils.cpp new file mode 100644 index 00000000000..e9f7456b43f --- /dev/null +++ b/aws-cpp-sdk-core/source/platform/linux-shared/FileSystemUtils.cpp @@ -0,0 +1,135 @@ +/* + * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +#include +#include +#include +#include + +#include +#include +#include + +using namespace Aws::Utils; + +static const char* FILE_SYSTEM_UTILS_LOG_TAG = "FileSystemUtils"; + +Aws::String FileSystemUtils::GetHomeDirectory() +{ + static const char* HOME_DIR_ENV_VAR = "HOME"; + + AWS_LOGSTREAM_TRACE(FILE_SYSTEM_UTILS_LOG_TAG, "Checking " << HOME_DIR_ENV_VAR << " for the home directory."); + + const char* homeEnvDir = std::getenv(HOME_DIR_ENV_VAR); + Aws::String homeDir(homeEnvDir ? homeEnvDir : ""); + + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "Environment value for variable " << HOME_DIR_ENV_VAR << " is " << homeDir); + + if(homeDir.empty()) + { + AWS_LOG_WARN(FILE_SYSTEM_UTILS_LOG_TAG, "Home dir not stored in environment, trying to fetch manually from the OS."); + + passwd pw; + passwd *p_pw = nullptr; + char pw_buffer[4096]; + getpwuid_r(getuid(), &pw, pw_buffer, sizeof(pw_buffer), &p_pw); + if(p_pw && p_pw->pw_dir) + { + homeDir = p_pw->pw_dir; + } + + AWS_LOGSTREAM_INFO(FILE_SYSTEM_UTILS_LOG_TAG, "Pulled " << homeDir << " as home directory from the OS."); + } + + Aws::String retVal = homeDir.size() > 0 ? StringUtils::Trim(homeDir.c_str()) : ""; + if(!retVal.empty()) + { + if(retVal.at(retVal.length() - 1) != PATH_DELIM) + { + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "Home directory is missing the final " << PATH_DELIM << " appending one to normalize"); + retVal += PATH_DELIM; + } + } + + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "Final Home Directory is " << retVal); + + return retVal; +} + +bool FileSystemUtils::CreateDirectoryIfNotExists(const char* path) +{ + AWS_LOGSTREAM_INFO(FILE_SYSTEM_UTILS_LOG_TAG, "Creating directory " << path); + + int errorCode = mkdir(path, S_IRWXU | S_IRWXG | S_IRWXO); + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "Creation of directory " << path << " returned code: " << errno); + return errorCode == 0 || errno == EEXIST; +} + +bool FileSystemUtils::RemoveFileIfExists(const char* path) +{ + AWS_LOGSTREAM_INFO(FILE_SYSTEM_UTILS_LOG_TAG, "Deleting file: " << path); + + int errorCode = unlink(path); + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "Deletion of file: " << path << " Returned error code: " << errno); + return errorCode == 0 || errno == ENOENT; +} + +bool FileSystemUtils::RelocateFileOrDirectory(const char* from, const char* to) +{ + AWS_LOGSTREAM_INFO(FILE_SYSTEM_UTILS_LOG_TAG, "Moving file at " << from << " to " << to); + + int errorCode = std::rename(from, to); + + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "The moving operation of file at " << from << " to " << to << " Returned error code of " << errno); + return errorCode == 0; +} + +Aws::String FileSystemUtils::CreateTempFilePath() +{ +//since MAC isn't posix compliant, it likes to complain about std::tmpnam. Also, it the std:: function is supposed +//to be different than the posix defined function. +//turn it off because there isn't a better way to do it anyways. +#ifdef __APPLE__ + +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#endif // __clang__ + +#ifdef __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif // __GNUC__ + +#endif // __APPLE__ + +Aws::String tempFile(std::tmpnam(nullptr)); + +AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "CreateTempFilePath generated: " << tempFile); + +return tempFile; + +#ifdef __APPLE__ + +#ifdef __clang__ +#pragma clang diagnostic pop +#endif // __clang__ + +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif // __GNUC__ + +#endif // __APPLE__ +} + diff --git a/aws-cpp-sdk-core/source/platform/linux-shared/OSVersionInfo.cpp b/aws-cpp-sdk-core/source/platform/linux-shared/OSVersionInfo.cpp new file mode 100644 index 00000000000..fdc3548883d --- /dev/null +++ b/aws-cpp-sdk-core/source/platform/linux-shared/OSVersionInfo.cpp @@ -0,0 +1,37 @@ +/* + * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +#include + +namespace Aws +{ +namespace Utils +{ + +Aws::String ComputeOSVersionString() +{ + Aws::String kernelName = GetSysCommandOutput("uname -s 2>&1"); + Aws::String releaseAndMachineName = GetSysCommandOutput("uname -rm 2>&1"); + + if(!kernelName.empty()) + { + return kernelName + "/" + releaseAndMachineName; + } + + return "non-windows/unknown"; +} + +} // namespace Utils +} // namespace Aws diff --git a/aws-cpp-sdk-core/source/platform/windows/FileSystemUtils.cpp b/aws-cpp-sdk-core/source/platform/windows/FileSystemUtils.cpp new file mode 100644 index 00000000000..091236e9bf7 --- /dev/null +++ b/aws-cpp-sdk-core/source/platform/windows/FileSystemUtils.cpp @@ -0,0 +1,142 @@ +/* + * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +#include +#include +#include + +#include + +#pragma warning( disable : 4996) + +using namespace Aws::Utils; + +static const char* FILE_SYSTEM_UTILS_LOG_TAG = "FileSystemUtils"; + +Aws::String FileSystemUtils::GetHomeDirectory() +{ + static const char* HOME_DIR_ENV_VAR = "USERPROFILE"; + + AWS_LOGSTREAM_TRACE(FILE_SYSTEM_UTILS_LOG_TAG, "Checking " << HOME_DIR_ENV_VAR << " for the home directory."); + char* homeDir = std::getenv(HOME_DIR_ENV_VAR); + CHAR path[MAX_PATH]; + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "Environment value for variable " << HOME_DIR_ENV_VAR << " is " << homeDir); + if(!homeDir) + { + AWS_LOG_WARN(FILE_SYSTEM_UTILS_LOG_TAG, "Home dir not stored in environment, trying to fetch manually from the OS."); + HANDLE hToken; + + if (OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &hToken)) + { + DWORD len = MAX_PATH; + if (GetUserProfileDirectoryA(hToken, path, &len)) + { + homeDir = path; + } + CloseHandle(hToken); + } + + AWS_LOGSTREAM_INFO(FILE_SYSTEM_UTILS_LOG_TAG, "Pulled " << homeDir << " as home directory from the OS."); + } + + Aws::String retVal = homeDir ? StringUtils::Trim(static_cast(homeDir)) : ""; + + if (!retVal.empty()) + { + if (retVal.at(retVal.length() - 1) != PATH_DELIM) + { + retVal += PATH_DELIM; + } + } + + return retVal; +} + +bool FileSystemUtils::CreateDirectoryIfNotExists(const char* path) +{ + AWS_LOGSTREAM_INFO(FILE_SYSTEM_UTILS_LOG_TAG, "Creating directory " << path); + + if (CreateDirectoryA(path, nullptr)) + { + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "Creation of directory " << path << " succeeded.") + return true; + } + else + { + DWORD errorCode = GetLastError(); + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, " Creation of directory " << path << " returned code: " << errorCode); + return errorCode == ERROR_ALREADY_EXISTS; + } +} + +bool FileSystemUtils::RemoveFileIfExists(const char* path) +{ + AWS_LOGSTREAM_INFO(FILE_SYSTEM_UTILS_LOG_TAG, "Deleting file: " << path); + + if(DeleteFileA(path)) + { + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "Successfully deleted file: " << path); + return true; + } + else + { + DWORD errorCode = GetLastError(); + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "Deletion of file: " << path << " Returned error code: " << errorCode); + return errorCode == ERROR_FILE_NOT_FOUND; + } +} + +bool FileSystemUtils::RelocateFileOrDirectory(const char* from, const char* to) +{ + AWS_LOGSTREAM_INFO(FILE_SYSTEM_UTILS_LOG_TAG, "Moving file at " << from << " to " << to); + + if(MoveFileA(from, to)) + { + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "The moving operation of file at " << from << " to " << to << " Succeeded."); + return true; + } + else + { + int errorCode = GetLastError(); + AWS_LOGSTREAM_DEBUG(FILE_SYSTEM_UTILS_LOG_TAG, "The moving operation of file at " << from << " to " << to << " Returned error code of " << errorCode); + return false; + } +} + +Aws::String FileSystemUtils::CreateTempFilePath() +{ +#ifdef _MSC_VER +#pragma warning(disable: 4996) // _CRT_SECURE_NO_WARNINGS +#endif + char s_tempName[L_tmpnam_s+1]; + + /* + Prior to VS 2014, tmpnam/tmpnam_s generated root level files ("\filename") which were not appropriate for our usage, so for the windows version, we prepended a '.' to make it a + tempfile in the current directory. Starting with VS2014, the behavior of tmpnam/tmpnam_s was changed to be a full, valid filepath based on the + current user ("C:\Users\username\AppData\Local\Temp\..."). + + See the tmpnam section in http://blogs.msdn.com/b/vcblog/archive/2014/06/18/crt-features-fixes-and-breaking-changes-in-visual-studio-14-ctp1.aspx + for more details. + */ + +#if _MSC_VER >= 1900 + tmpnam_s(s_tempName, L_tmpnam_s); +#else + s_tempName[0] = '.'; + tmpnam_s(s_tempName + 1, L_tmpnam_s); +#endif // _MSC_VER + + + return s_tempName; +} diff --git a/aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp b/aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp new file mode 100644 index 00000000000..21ef53e3936 --- /dev/null +++ b/aws-cpp-sdk-core/source/platform/windows/OSVersionInfo.cpp @@ -0,0 +1,67 @@ +/* + * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +#include +#include + +#include +#include + +#pragma warning(disable: 4996) +#include +#include + +namespace Aws +{ +namespace Utils +{ + +Aws::String ComputeOSVersionString() +{ + OSVERSIONINFO versionInfo; + ZeroMemory(&versionInfo, sizeof(OSVERSIONINFO)); + versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionExA(&versionInfo); + Aws::StringStream ss; + ss << "Windows/" << versionInfo.dwMajorVersion << "." << versionInfo.dwMinorVersion << "." << versionInfo.dwBuildNumber << "-" << versionInfo.szCSDVersion; + + SYSTEM_INFO sysInfo; + ZeroMemory(&sysInfo, sizeof(SYSTEM_INFO)); + GetSystemInfo(&sysInfo); + + switch (sysInfo.wProcessorArchitecture) + { + //PROCESSOR_ARCHIECTURE_AMD64 + case 0x09: + ss << " AMD64"; + break; + //PROCESSOR_ARCHITECTURE_IA64 + case 0x06: + ss << " IA64"; + break; + //PROCESSOR_ARCHITECTURE_INTEL + case 0x00: + ss << " x86"; + break; + default: + ss << " Unknown Processor Architecture"; + break; + } + + return ss.str(); +} + +} // namespace Utils +} // namespace Aws diff --git a/aws-cpp-sdk-core/source/utils/DateTime.cpp b/aws-cpp-sdk-core/source/utils/DateTime.cpp index fc6eb63af6a..afb7f13c7e3 100644 --- a/aws-cpp-sdk-core/source/utils/DateTime.cpp +++ b/aws-cpp-sdk-core/source/utils/DateTime.cpp @@ -28,6 +28,7 @@ static const char* ISO_8601_LONG_DATE_FORMAT_STR = "%Y-%m-%dT%H:%M:%SZ"; using namespace Aws::Utils; + std::tm CreateZeroedTm() { std::tm timeStruct; @@ -451,7 +452,7 @@ static bool IsUtcTimeZone(const char* str) c = str[++index]; switch (c) { - case '0': + case '0': c = str[++index]; switch (c) { @@ -459,7 +460,7 @@ static bool IsUtcTimeZone(const char* str) c = str[++index]; switch (c) { - case '0': + case '0': return true; default: return false; @@ -1109,11 +1110,7 @@ void DateTime::ConvertTimestampStringToTimePoint(const char* timestamp, DateForm std::time_t tt; if(isUtc) { -#if (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)) - tt = _mkgmtime(&timeStruct); -#else - tt = timegm(&timeStruct); -#endif + tt = TimeGM(&timeStruct); } else { @@ -1155,3 +1152,79 @@ tm DateTime::ConvertTimestampToGmtStruct() const return gmtTimeStamp; } +namespace Aws +{ +namespace Utils +{ + +#if defined(__ANDROID__) && !defined(__LP64__) + +// timegm doesn't exist for some forms of android. Chromium has a substitute +// implementation that we cut-and-paste here, +// including the full license notice from Chromium + +// Copyright 2014 The Chromium Authors. All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// From src/base/os_compat_android.cc: + +#include + +// 32-bit Android has only timegm64() and not timegm(). +// We replicate the behaviour of timegm() when the result overflows time_t. +time_t DateTime::TimeGM(struct tm* const t) +{ + // time_t is signed on Android. + static const time_t kTimeMax = ~(1L << (sizeof(time_t) * CHAR_BIT - 1)); + static const time_t kTimeMin = (1L << (sizeof(time_t) * CHAR_BIT - 1)); + time64_t result = timegm64(t); + if (result < kTimeMin || result > kTimeMax) + { + return -1; + } + return result; +} + +#elif (defined(WIN32) || defined(_WIN32) || defined(__WIN32__)) + +time_t DateTime::TimeGM(struct tm* const t) +{ + return _mkgmtime(t); +} + +#else + +time_t DateTime::TimeGM(struct tm* const t) +{ + return timegm(t); +} + +#endif + +} // namespace Utils +} // namespace Aws diff --git a/aws-cpp-sdk-core/source/utils/OSVersionInfo.cpp b/aws-cpp-sdk-core/source/utils/OSVersionInfo.cpp deleted file mode 100644 index 59145160652..00000000000 --- a/aws-cpp-sdk-core/source/utils/OSVersionInfo.cpp +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://aws.amazon.com/apache2.0 - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -#include -#include -#ifdef __ANDROID__ -#include -#endif /*__ANDROID__*/ - -#include -#include - -using namespace Aws::Utils; - -#ifdef _WIN32 -#pragma warning(disable: 4996) -#include -#include -#else -Aws::String getSysCommandOutput(const char* command) -{ - Aws::String outputStr; - FILE* outputStream; - const int maxBufferSize = 256; - char outputBuffer[maxBufferSize]; - - outputStream = popen(command, "r"); - - if (outputStream) - { - while (!feof(outputStream)) - { - if (fgets(outputBuffer, maxBufferSize, outputStream) != nullptr) - { - outputStr.append(outputBuffer); - } - } - - pclose(outputStream); - - return StringUtils::Trim(outputStr.c_str()); - } - - return ""; -} -#endif - - - -Aws::String OSVersionInfo::ComputeOSVersionString() const -{ -#ifdef __ANDROID__ - // regex is not allocator-aware, so technically we're breaking our memory contract here (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3254.pdf) - // Since it's internal, nothing escapes, and what gets allocated/deallocated is very small, I think that's acceptable for now - - std::string androidBuildVersion = getSysCommandOutput("cat /proc/version 2>&1").c_str(); - std::regex versionRegex("version (\\S+)\\s"); - - std::smatch versionMatchResults; - std::regex_search(androidBuildVersion, versionMatchResults, versionRegex); - - if(versionMatchResults.size() >= 2) - { - return Aws::String("Android/") + versionMatchResults[1].str().c_str(); - } - - return Aws::String("Android/Unknown"); - -#elif __linux__ || __APPLE__ - Aws::String kernelName = getSysCommandOutput("uname -s 2>&1"); - Aws::String releaseAndMachineName = getSysCommandOutput("uname -rm 2>&1"); - - if(!kernelName.empty()) - { - return kernelName + "/" + releaseAndMachineName; - } - - return "non-windows/unknown"; - -#else - OSVERSIONINFOA versionInfo; - ZeroMemory(&versionInfo, sizeof(OSVERSIONINFOA)); - versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); - GetVersionExA(&versionInfo); - Aws::StringStream ss; - ss << "Windows/" << versionInfo.dwMajorVersion << "." << versionInfo.dwMinorVersion << "." << versionInfo.dwBuildNumber << "-" << versionInfo.szCSDVersion; - - SYSTEM_INFO sysInfo; - ZeroMemory(&sysInfo, sizeof(SYSTEM_INFO)); - GetSystemInfo(&sysInfo); - - switch (sysInfo.wProcessorArchitecture) - { - //PROCESSOR_ARCHIECTURE_AMD64 - case 0x09: - ss << " AMD64"; - break; - //PROCESSOR_ARCHITECTURE_IA64 - case 0x06: - ss << " IA64"; - break; - //PROCESSOR_ARCHITECTURE_INTEL - case 0x00: - ss << " x86"; - break; - default: - ss << " Unknown Processor Architecture"; - break; - } - - return ss.str(); -#endif -} diff --git a/aws-cpp-sdk-core/source/utils/OSVersionInfoCommon.cpp b/aws-cpp-sdk-core/source/utils/OSVersionInfoCommon.cpp new file mode 100644 index 00000000000..a56fef11225 --- /dev/null +++ b/aws-cpp-sdk-core/source/utils/OSVersionInfoCommon.cpp @@ -0,0 +1,55 @@ +/* + * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +#ifndef _WIN32 + +#include + +namespace Aws +{ +namespace Utils +{ + +Aws::String GetSysCommandOutput(const char* command) +{ + Aws::String outputStr; + FILE* outputStream; + const int maxBufferSize = 256; + char outputBuffer[maxBufferSize]; + + outputStream = popen(command, "r"); + + if (outputStream) + { + while (!feof(outputStream)) + { + if (fgets(outputBuffer, maxBufferSize, outputStream) != nullptr) + { + outputStr.append(outputBuffer); + } + } + + pclose(outputStream); + + return StringUtils::Trim(outputStr.c_str()); + } + + return ""; +} + +} // namespace Utils +} // namespace Aws + +#endif // _WIN32 diff --git a/aws-cpp-sdk-core/source/utils/base64/Base64.cpp b/aws-cpp-sdk-core/source/utils/base64/Base64.cpp index d9d514a8767..c1b8bfe06fb 100644 --- a/aws-cpp-sdk-core/source/utils/base64/Base64.cpp +++ b/aws-cpp-sdk-core/source/utils/base64/Base64.cpp @@ -21,6 +21,13 @@ using namespace Aws::Utils::Base64; static const uint8_t SENTINEL_VALUE = 255; static const char BASE64_ENCODING_TABLE_MIME[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; +namespace Aws +{ +namespace Utils +{ +namespace Base64 +{ + Base64::Base64(const char *encodingTable) { if(encodingTable == nullptr) @@ -145,3 +152,7 @@ size_t Base64::CalculateBase64EncodedLength(const Aws::Utils::ByteBuffer& buffer { return 4 * ((buffer.GetLength() + 2) / 3); } + +} // namespace Base64 +} // namespace Utils +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-core/source/utils/crypto/bcrypt/CryptoImpl.cpp b/aws-cpp-sdk-core/source/utils/crypto/bcrypt/CryptoImpl.cpp index cfd9cf22dfc..b7b5aebe723 100644 --- a/aws-cpp-sdk-core/source/utils/crypto/bcrypt/CryptoImpl.cpp +++ b/aws-cpp-sdk-core/source/utils/crypto/bcrypt/CryptoImpl.cpp @@ -35,7 +35,7 @@ namespace Utils namespace Crypto { -static const char* logTag = "CryptoHash"; +static const char* BCRYPT_LOG_TAG = "CryptoHash"; // RAII class for one-use-per-hash-call data used in Windows cryptographic hash implementations // Useful so we don't have to call a Cleanup function for every failure point @@ -84,7 +84,7 @@ BCryptHashImpl::BCryptHashImpl(LPCWSTR algorithmName, bool isHMAC) : NTSTATUS status = BCryptOpenAlgorithmProvider(&m_algorithmHandle, algorithmName, MS_PRIMITIVE_PROVIDER, isHMAC ? BCRYPT_ALG_HANDLE_HMAC_FLAG : 0); if (!NT_SUCCESS(status)) { - AWS_LOGSTREAM_ERROR(logTag, "Failed initializing BCryptOpenAlgorithmProvider for " << algorithmName); + AWS_LOG_ERROR(BCRYPT_LOG_TAG, "Failed initializing BCryptOpenAlgorithmProvider for ", algorithmName); return; } @@ -92,14 +92,14 @@ BCryptHashImpl::BCryptHashImpl(LPCWSTR algorithmName, bool isHMAC) : status = BCryptGetProperty(m_algorithmHandle, BCRYPT_HASH_LENGTH, (PBYTE)&m_hashBufferLength, sizeof(m_hashBufferLength), &resultLength, 0); if (!NT_SUCCESS(status) || m_hashBufferLength <= 0) { - AWS_LOG_ERROR(logTag, "Error computing hash buffer length."); + AWS_LOG_ERROR(BCRYPT_LOG_TAG, "Error computing hash buffer length."); return; } - m_hashBuffer = Aws::NewArray(m_hashBufferLength, logTag); + m_hashBuffer = Aws::NewArray(m_hashBufferLength, BCRYPT_LOG_TAG); if (!m_hashBuffer) { - AWS_LOG_ERROR(logTag, "Error allocating hash buffer."); + AWS_LOG_ERROR(BCRYPT_LOG_TAG, "Error allocating hash buffer."); return; } @@ -107,14 +107,14 @@ BCryptHashImpl::BCryptHashImpl(LPCWSTR algorithmName, bool isHMAC) : status = BCryptGetProperty(m_algorithmHandle, BCRYPT_OBJECT_LENGTH, (PBYTE)&m_hashObjectLength, sizeof(m_hashObjectLength), &resultLength, 0); if (!NT_SUCCESS(status) || m_hashObjectLength <= 0) { - AWS_LOG_ERROR(logTag, "Error computing hash object length."); + AWS_LOG_ERROR(BCRYPT_LOG_TAG, "Error computing hash object length."); return; } - m_hashObject = Aws::NewArray(m_hashObjectLength, logTag); + m_hashObject = Aws::NewArray(m_hashObjectLength, BCRYPT_LOG_TAG); if (!m_hashObject) { - AWS_LOG_ERROR(logTag, "Error allocating hash object."); + AWS_LOG_ERROR(BCRYPT_LOG_TAG, "Error allocating hash object."); return; } } @@ -135,14 +135,14 @@ HashResult BCryptHashImpl::HashData(const BCryptHashContext& context, PBYTE data NTSTATUS status = BCryptHashData(context.m_hashHandle, data, dataLength, 0); if (!NT_SUCCESS(status)) { - AWS_LOG_ERROR(logTag, "Error computing hash."); + AWS_LOG_ERROR(BCRYPT_LOG_TAG, "Error computing hash."); return HashResult(); } status = BCryptFinishHash(context.m_hashHandle, m_hashBuffer, m_hashBufferLength, 0); if (!NT_SUCCESS(status)) { - AWS_LOG_ERROR(logTag, "Error obtaining computed hash"); + AWS_LOG_ERROR(BCRYPT_LOG_TAG, "Error obtaining computed hash"); return HashResult(); } @@ -161,7 +161,7 @@ HashResult BCryptHashImpl::Calculate(const Aws::String& str) BCryptHashContext context(m_algorithmHandle, m_hashObject, m_hashObjectLength); if (!context.IsValid()) { - AWS_LOG_ERROR(logTag, "Error creating hash handle."); + AWS_LOG_ERROR(BCRYPT_LOG_TAG, "Error creating hash handle."); return HashResult(); } @@ -180,7 +180,7 @@ HashResult BCryptHashImpl::Calculate(const ByteBuffer& toHash, const ByteBuffer& BCryptHashContext context(m_algorithmHandle, m_hashObject, m_hashObjectLength, secret); if (!context.IsValid()) { - AWS_LOG_ERROR(logTag, "Error creating hash handle."); + AWS_LOG_ERROR(BCRYPT_LOG_TAG, "Error creating hash handle."); return HashResult(); } @@ -197,7 +197,7 @@ bool BCryptHashImpl::HashStream(Aws::IStream& stream) BCryptHashContext context(m_algorithmHandle, m_hashObject, m_hashObjectLength); if (!context.IsValid()) { - AWS_LOG_ERROR(logTag, "Error creating hash handle."); + AWS_LOG_ERROR(BCRYPT_LOG_TAG, "Error creating hash handle."); return false; } @@ -213,7 +213,7 @@ bool BCryptHashImpl::HashStream(Aws::IStream& stream) status = BCryptHashData(context.m_hashHandle, (PBYTE)streamBuffer, (ULONG) bytesRead, 0); if (!NT_SUCCESS(status)) { - AWS_LOG_ERROR(logTag, "Error computing hash."); + AWS_LOG_ERROR(BCRYPT_LOG_TAG, "Error computing hash."); return false; } } @@ -227,7 +227,7 @@ bool BCryptHashImpl::HashStream(Aws::IStream& stream) status = BCryptFinishHash(context.m_hashHandle, m_hashBuffer, m_hashBufferLength, 0); if (!NT_SUCCESS(status)) { - AWS_LOG_ERROR(logTag, "Error obtaining computed hash"); + AWS_LOG_ERROR(BCRYPT_LOG_TAG, "Error obtaining computed hash"); return false; } diff --git a/aws-cpp-sdk-core/source/utils/crypto/Factories.cpp b/aws-cpp-sdk-core/source/utils/crypto/factory/Factories.cpp similarity index 100% rename from aws-cpp-sdk-core/source/utils/crypto/Factories.cpp rename to aws-cpp-sdk-core/source/utils/crypto/factory/Factories.cpp diff --git a/aws-cpp-sdk-core/source/utils/logging/AWSLogging.cpp b/aws-cpp-sdk-core/source/utils/logging/AWSLogging.cpp index c4ebe295610..fdf9f244757 100644 --- a/aws-cpp-sdk-core/source/utils/logging/AWSLogging.cpp +++ b/aws-cpp-sdk-core/source/utils/logging/AWSLogging.cpp @@ -16,6 +16,7 @@ #include #include +#include #include @@ -23,29 +24,43 @@ using namespace Aws::Utils; using namespace Aws::Utils::Logging; static std::shared_ptr AWSLogSystem(nullptr); +static Aws::Stack< std::shared_ptr< LogSystemInterface > > LoggerStack; namespace Aws { namespace Utils { -namespace Logging -{ +namespace Logging { -void InitializeAWSLogging(const std::shared_ptr& logSystem) -{ +void InitializeAWSLogging(const std::shared_ptr &logSystem) { AWSLogSystem = logSystem; } -void ShutdownAWSLogging(void) -{ +void ShutdownAWSLogging(void) { InitializeAWSLogging(nullptr); } -LogSystemInterface* GetLogSystem() -{ +LogSystemInterface *GetLogSystem() { return AWSLogSystem.get(); } +void PushLogger(const std::shared_ptr &logSystem) +{ + LoggerStack.push(AWSLogSystem); + AWSLogSystem = logSystem; +} + +void PopLogger() +{ + if(LoggerStack.size() > 0) + { + auto nextLogger = LoggerStack.top(); + LoggerStack.pop(); + + AWSLogSystem = nextLogger; + } +} + } // namespace Logging } // namespace Utils } // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-core/source/utils/logging/DefaultLogSystem.cpp b/aws-cpp-sdk-core/source/utils/logging/DefaultLogSystem.cpp index b222d5f3c5f..4f5e086e8ab 100644 --- a/aws-cpp-sdk-core/source/utils/logging/DefaultLogSystem.cpp +++ b/aws-cpp-sdk-core/source/utils/logging/DefaultLogSystem.cpp @@ -41,7 +41,10 @@ static void LogThread(DefaultLogSystem::LogSynchronizationData* syncData, const while(!done) { std::unique_lock locker(syncData->m_logQueueMutex); - syncData->m_queueSignal.wait(locker, [&](){ return syncData->m_stopLogging.load() == true || syncData->m_queuedLogMessages.size() > 0; } ); + if(syncData->m_stopLogging.load() == false && syncData->m_queuedLogMessages.size() == 0) + { + syncData->m_queueSignal.wait(locker, [&](){ return syncData->m_stopLogging.load() == true || syncData->m_queuedLogMessages.size() > 0; } ); + } Aws::Vector messages; while(!syncData->m_queuedLogMessages.empty()) @@ -92,7 +95,11 @@ DefaultLogSystem::DefaultLogSystem(LogLevel logLevel, const Aws::String& filenam DefaultLogSystem::~DefaultLogSystem() { - m_syncData.m_stopLogging.store(true); + { + std::lock_guard locker(m_syncData.m_logQueueMutex); + m_syncData.m_stopLogging.store(true); + } + m_syncData.m_queueSignal.notify_one(); m_loggingThread.join(); diff --git a/aws-cpp-sdk-core/source/utils/unix/FileSystemUtils.cpp b/aws-cpp-sdk-core/source/utils/unix/FileSystemUtils.cpp deleted file mode 100644 index b7e27244bd8..00000000000 --- a/aws-cpp-sdk-core/source/utils/unix/FileSystemUtils.cpp +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://aws.amazon.com/apache2.0 - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -#include -#include -#include - -#include -#include -#include - -#if __ANDROID__ -#include -#endif - -using namespace Aws::Utils; - -static const char* LOG_TAG = "FileSystemUtils"; - -Aws::String FileSystemUtils::GetHomeDirectory() -{ - static const char* HOME_DIR_ENV_VAR = "HOME"; - - AWS_LOGSTREAM_TRACE(LOG_TAG, "Checking " << HOME_DIR_ENV_VAR << " for the home directory."); - char* homeDir = std::getenv(HOME_DIR_ENV_VAR); - AWS_LOGSTREAM_DEBUG(LOG_TAG, "Environment value for variable " << HOME_DIR_ENV_VAR << " is " << homeDir); - if(!homeDir) - { - AWS_LOG_WARN(LOG_TAG, "Home dir not stored in environment, trying to fetch manually from the OS."); -#if !defined(__ANDROID__) - struct passwd *pw = getpwuid(getuid()); - homeDir = pw->pw_dir; -#endif - AWS_LOGSTREAM_INFO(LOG_TAG, "Pulled " << homeDir << " as home directory from the OS."); - } - - Aws::String retVal = homeDir ? StringUtils::Trim(static_cast(homeDir)) : ""; - if(!retVal.empty()) - { - if(retVal.at(retVal.length() - 1) != PATH_DELIM) - { - AWS_LOGSTREAM_DEBUG(LOG_TAG, "Home directory is missing the final " << PATH_DELIM << " appending one to normalize"); - retVal += PATH_DELIM; - } - } - - AWS_LOGSTREAM_DEBUG(LOG_TAG, "Final Home Directory is " << retVal); - - return retVal; -} - -bool FileSystemUtils::CreateDirectoryIfNotExists(const char* path) -{ - AWS_LOGSTREAM_INFO(LOG_TAG, "Creating directory " << path); - - int errorCode = mkdir(path, S_IRWXU | S_IRWXG | S_IRWXO); - AWS_LOGSTREAM_DEBUG(LOG_TAG, "Creation of directory " << path << " returned code: " << errno); - return errorCode == 0 || errno == EEXIST; -} - -bool FileSystemUtils::RemoveFileIfExists(const char* path) -{ - AWS_LOGSTREAM_INFO(LOG_TAG, "Deleting file: " << path); - - int errorCode = unlink(path); - AWS_LOGSTREAM_DEBUG(LOG_TAG, "Deletion of file: " << path << " Returned error code: " << errno); - return errorCode == 0 || errno == ENOENT; -} - -bool FileSystemUtils::RelocateFileOrDirectory(const char* from, const char* to) -{ - AWS_LOGSTREAM_INFO(LOG_TAG, "Moving file at " << from << " to " << to); - -#if __ANDROID__ - int errorCode = rename(from, to); -#else - int errorCode = std::rename(from, to); -#endif // __ANDROID__ - - AWS_LOGSTREAM_DEBUG(LOG_TAG, "The moving operation of file at " << from << " to " << to << " Returned error code of " << errno); - return errorCode == 0; -} diff --git a/aws-cpp-sdk-core/source/utils/windows/FileSystemUtils.cpp b/aws-cpp-sdk-core/source/utils/windows/FileSystemUtils.cpp deleted file mode 100644 index 7a406dc512b..00000000000 --- a/aws-cpp-sdk-core/source/utils/windows/FileSystemUtils.cpp +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"). - * You may not use this file except in compliance with the License. - * A copy of the License is located at - * - * http://aws.amazon.com/apache2.0 - * - * or in the "license" file accompanying this file. This file is distributed - * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -#include -#include -#include - -#include - -#pragma warning( disable : 4996) - -using namespace Aws::Utils; - -static const char* LOG_TAG = "FileSystemUtils"; - -Aws::String FileSystemUtils::GetHomeDirectory() -{ - static const char* HOME_DIR_ENV_VAR = "USERPROFILE"; - - AWS_LOGSTREAM_TRACE(LOG_TAG, "Checking " << HOME_DIR_ENV_VAR << " for the home directory."); - char* homeDir = std::getenv(HOME_DIR_ENV_VAR); - CHAR path[MAX_PATH]; - AWS_LOGSTREAM_DEBUG(LOG_TAG, "Environment value for variable " << HOME_DIR_ENV_VAR << " is " << homeDir); - if(!homeDir) - { - AWS_LOG_WARN(LOG_TAG, "Home dir not stored in environment, trying to fetch manually from the OS."); - HANDLE hToken; - - if (OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &hToken)) - { - DWORD len = MAX_PATH; - if (GetUserProfileDirectoryA(hToken, path, &len)) - { - homeDir = path; - } - CloseHandle(hToken); - } - - AWS_LOGSTREAM_INFO(LOG_TAG, "Pulled " << homeDir << " as home directory from the OS."); - } - - Aws::String retVal = homeDir ? StringUtils::Trim(static_cast(homeDir)) : ""; - - if (!retVal.empty()) - { - if (retVal.at(retVal.length() - 1) != PATH_DELIM) - { - retVal += PATH_DELIM; - } - } - - return retVal; -} - -bool FileSystemUtils::CreateDirectoryIfNotExists(const char* path) -{ - AWS_LOGSTREAM_INFO(LOG_TAG, "Creating directory " << path); - - if (CreateDirectoryA(path, nullptr)) - { - AWS_LOGSTREAM_DEBUG(LOG_TAG, "Creation of directory " << path << " succeeded.") - return true; - } - else - { - DWORD errorCode = GetLastError(); - AWS_LOGSTREAM_DEBUG(LOG_TAG, " Creation of directory " << path << " returned code: " << errorCode); - return errorCode == ERROR_ALREADY_EXISTS; - } -} - -bool FileSystemUtils::RemoveFileIfExists(const char* path) -{ - AWS_LOGSTREAM_INFO(LOG_TAG, "Deleting file: " << path); - - if(DeleteFileA(path)) - { - AWS_LOGSTREAM_DEBUG(LOG_TAG, "Successfully deleted file: " << path); - return true; - } - else - { - DWORD errorCode = GetLastError(); - AWS_LOGSTREAM_DEBUG(LOG_TAG, "Deletion of file: " << path << " Returned error code: " << errorCode); - return errorCode == ERROR_FILE_NOT_FOUND; - } -} - -bool FileSystemUtils::RelocateFileOrDirectory(const char* from, const char* to) -{ - AWS_LOGSTREAM_INFO(LOG_TAG, "Moving file at " << from << " to " << to); - - if(MoveFileA(from, to)) - { - AWS_LOGSTREAM_DEBUG(LOG_TAG, "The moving operation of file at " << from << " to " << to << " Succeeded."); - return true; - } - else - { - int errorCode = GetLastError(); - AWS_LOGSTREAM_DEBUG(LOG_TAG, "The moving operation of file at " << from << " to " << to << " Returned error code of " << errorCode); - return false; - } -} \ No newline at end of file diff --git a/aws-cpp-sdk-core/source/utils/xml/XmlSerializer.cpp b/aws-cpp-sdk-core/source/utils/xml/XmlSerializer.cpp index 78cadd7a898..0e3f2de074e 100644 --- a/aws-cpp-sdk-core/source/utils/xml/XmlSerializer.cpp +++ b/aws-cpp-sdk-core/source/utils/xml/XmlSerializer.cpp @@ -163,11 +163,11 @@ bool XmlNode::IsNull() return m_node == nullptr; } -static const char* allocationTag = "XmlDocument"; +static const char* XML_SERIALIZER_ALLOCATION_TAG = "XmlDocument"; XmlDocument::XmlDocument() { - m_doc = Aws::New(allocationTag, true, Aws::External::tinyxml2::Whitespace::PRESERVE_WHITESPACE); + m_doc = Aws::New(XML_SERIALIZER_ALLOCATION_TAG, true, Aws::External::tinyxml2::Whitespace::PRESERVE_WHITESPACE); } XmlDocument::XmlDocument(XmlDocument&& doc) : m_doc{ std::move(doc.m_doc) } // take the innards diff --git a/aws-cpp-sdk-datapipeline/CMakeLists.txt b/aws-cpp-sdk-datapipeline/CMakeLists.txt index 00114c7b807..48b9b8fbc33 100644 --- a/aws-cpp-sdk-datapipeline/CMakeLists.txt +++ b/aws-cpp-sdk-datapipeline/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-datapipeline) "source/model/*.cpp" ) - file(GLOB DATAPIPELINE_SRC + file(GLOB DATAPIPELINE_UNIFIED_HEADERS ${AWS_DATAPIPELINE_HEADERS} ${AWS_DATAPIPELINE_MODEL_HEADERS} + ) + + file(GLOB DATAPIPELINE_UNITY_SRC ${AWS_DATAPIPELINE_SOURCE} ${AWS_DATAPIPELINE_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("DATAPIPELINE" DATAPIPELINE_UNITY_SRC) + endif() + + file(GLOB DATAPIPELINE_SRC + ${DATAPIPELINE_UNIFIED_HEADERS} + ${DATAPIPELINE_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-datapipeline/source/DataPipelineErrors.cpp b/aws-cpp-sdk-datapipeline/source/DataPipelineErrors.cpp index d700d02de7f..5ab26384663 100644 --- a/aws-cpp-sdk-datapipeline/source/DataPipelineErrors.cpp +++ b/aws-cpp-sdk-datapipeline/source/DataPipelineErrors.cpp @@ -20,12 +20,6 @@ using namespace Aws::Client; using namespace Aws::DataPipeline; using namespace Aws::Utils; -static const int PIPELINE_DELETED_HASH = HashingUtils::HashString("PipelineDeletedException"); -static const int PIPELINE_NOT_FOUND_HASH = HashingUtils::HashString("PipelineNotFoundException"); -static const int INVALID_REQUEST_HASH = HashingUtils::HashString("InvalidRequestException"); -static const int INTERNAL_SERVICE_HASH = HashingUtils::HashString("InternalServiceError"); -static const int TASK_NOT_FOUND_HASH = HashingUtils::HashString("TaskNotFoundException"); - namespace Aws { namespace DataPipeline @@ -33,6 +27,13 @@ namespace DataPipeline namespace DataPipelineErrorMapper { +static const int PIPELINE_DELETED_HASH = HashingUtils::HashString("PipelineDeletedException"); +static const int PIPELINE_NOT_FOUND_HASH = HashingUtils::HashString("PipelineNotFoundException"); +static const int INVALID_REQUEST_HASH = HashingUtils::HashString("InvalidRequestException"); +static const int INTERNAL_SERVICE_HASH = HashingUtils::HashString("InternalServiceError"); +static const int TASK_NOT_FOUND_HASH = HashingUtils::HashString("TaskNotFoundException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-datapipeline/source/model/Field.cpp b/aws-cpp-sdk-datapipeline/source/model/Field.cpp index 1b8e112c724..47203b949a1 100644 --- a/aws-cpp-sdk-datapipeline/source/model/Field.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/Field.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + Field::Field() : m_keyHasBeenSet(false), m_stringValueHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue Field::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-datapipeline/source/model/InstanceIdentity.cpp b/aws-cpp-sdk-datapipeline/source/model/InstanceIdentity.cpp index cd947abc1ee..22ff8eeddc0 100644 --- a/aws-cpp-sdk-datapipeline/source/model/InstanceIdentity.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/InstanceIdentity.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + InstanceIdentity::InstanceIdentity() : m_documentHasBeenSet(false), m_signatureHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue InstanceIdentity::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-datapipeline/source/model/Operator.cpp b/aws-cpp-sdk-datapipeline/source/model/Operator.cpp index 8c605028c82..af8921a50e4 100644 --- a/aws-cpp-sdk-datapipeline/source/model/Operator.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/Operator.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + Operator::Operator() : m_typeHasBeenSet(false), m_valuesHasBeenSet(false) @@ -77,4 +83,8 @@ JsonValue Operator::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-datapipeline/source/model/OperatorType.cpp b/aws-cpp-sdk-datapipeline/source/model/OperatorType.cpp index 34605a55764..c10c64dbc82 100644 --- a/aws-cpp-sdk-datapipeline/source/model/OperatorType.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/OperatorType.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int EQ_HASH = HashingUtils::HashString("EQ"); -static const int REF_EQ_HASH = HashingUtils::HashString("REF_EQ"); -static const int LE_HASH = HashingUtils::HashString("LE"); -static const int GE_HASH = HashingUtils::HashString("GE"); -static const int BETWEEN_HASH = HashingUtils::HashString("BETWEEN"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace OperatorTypeMapper { + static const int EQ_HASH = HashingUtils::HashString("EQ"); + static const int REF_EQ_HASH = HashingUtils::HashString("REF_EQ"); + static const int LE_HASH = HashingUtils::HashString("LE"); + static const int GE_HASH = HashingUtils::HashString("GE"); + static const int BETWEEN_HASH = HashingUtils::HashString("BETWEEN"); + OperatorType GetOperatorTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-datapipeline/source/model/ParameterAttribute.cpp b/aws-cpp-sdk-datapipeline/source/model/ParameterAttribute.cpp index 4a092f870cd..b2143b35de9 100644 --- a/aws-cpp-sdk-datapipeline/source/model/ParameterAttribute.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/ParameterAttribute.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + ParameterAttribute::ParameterAttribute() : m_keyHasBeenSet(false), m_stringValueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue ParameterAttribute::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-datapipeline/source/model/ParameterObject.cpp b/aws-cpp-sdk-datapipeline/source/model/ParameterObject.cpp index 577ed4cfbbc..d5ebb89ab03 100644 --- a/aws-cpp-sdk-datapipeline/source/model/ParameterObject.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/ParameterObject.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + ParameterObject::ParameterObject() : m_idHasBeenSet(false), m_attributesHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue ParameterObject::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-datapipeline/source/model/ParameterValue.cpp b/aws-cpp-sdk-datapipeline/source/model/ParameterValue.cpp index 5044cd166aa..b807808f635 100644 --- a/aws-cpp-sdk-datapipeline/source/model/ParameterValue.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/ParameterValue.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + ParameterValue::ParameterValue() : m_idHasBeenSet(false), m_stringValueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue ParameterValue::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-datapipeline/source/model/PipelineDescription.cpp b/aws-cpp-sdk-datapipeline/source/model/PipelineDescription.cpp index c42ce8c7cd8..79753918db4 100644 --- a/aws-cpp-sdk-datapipeline/source/model/PipelineDescription.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/PipelineDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + PipelineDescription::PipelineDescription() : m_pipelineIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -131,4 +137,8 @@ JsonValue PipelineDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-datapipeline/source/model/PipelineIdName.cpp b/aws-cpp-sdk-datapipeline/source/model/PipelineIdName.cpp index 10cb85a02c0..3b9ba8cb617 100644 --- a/aws-cpp-sdk-datapipeline/source/model/PipelineIdName.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/PipelineIdName.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + PipelineIdName::PipelineIdName() : m_idHasBeenSet(false), m_nameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue PipelineIdName::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-datapipeline/source/model/PipelineObject.cpp b/aws-cpp-sdk-datapipeline/source/model/PipelineObject.cpp index 25c84c44883..882896e84b4 100644 --- a/aws-cpp-sdk-datapipeline/source/model/PipelineObject.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/PipelineObject.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + PipelineObject::PipelineObject() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -93,4 +99,8 @@ JsonValue PipelineObject::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-datapipeline/source/model/Query.cpp b/aws-cpp-sdk-datapipeline/source/model/Query.cpp index 99b9f87508b..3e09108921b 100644 --- a/aws-cpp-sdk-datapipeline/source/model/Query.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/Query.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + Query::Query() : m_selectorsHasBeenSet(false) { @@ -63,4 +69,8 @@ JsonValue Query::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-datapipeline/source/model/Selector.cpp b/aws-cpp-sdk-datapipeline/source/model/Selector.cpp index 121ff024de5..aacbe4f022d 100644 --- a/aws-cpp-sdk-datapipeline/source/model/Selector.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/Selector.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + Selector::Selector() : m_fieldNameHasBeenSet(false), m_operatorHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Selector::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-datapipeline/source/model/Tag.cpp b/aws-cpp-sdk-datapipeline/source/model/Tag.cpp index 1b17c6a561f..3ec8ce462dd 100644 --- a/aws-cpp-sdk-datapipeline/source/model/Tag.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/Tag.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Tag::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-datapipeline/source/model/TaskObject.cpp b/aws-cpp-sdk-datapipeline/source/model/TaskObject.cpp index 12e62a63c2d..0100b9ba494 100644 --- a/aws-cpp-sdk-datapipeline/source/model/TaskObject.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/TaskObject.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + TaskObject::TaskObject() : m_taskIdHasBeenSet(false), m_pipelineIdHasBeenSet(false), @@ -108,4 +114,8 @@ JsonValue TaskObject::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-datapipeline/source/model/TaskStatus.cpp b/aws-cpp-sdk-datapipeline/source/model/TaskStatus.cpp index 536faa6e6d8..1c05450658c 100644 --- a/aws-cpp-sdk-datapipeline/source/model/TaskStatus.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/TaskStatus.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int FINISHED_HASH = HashingUtils::HashString("FINISHED"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); -static const int FALSE_HASH = HashingUtils::HashString("FALSE"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace TaskStatusMapper { + static const int FINISHED_HASH = HashingUtils::HashString("FINISHED"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + static const int FALSE_HASH = HashingUtils::HashString("FALSE"); + TaskStatus GetTaskStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-datapipeline/source/model/ValidationError.cpp b/aws-cpp-sdk-datapipeline/source/model/ValidationError.cpp index 677662a2f9f..6dcc805df4c 100644 --- a/aws-cpp-sdk-datapipeline/source/model/ValidationError.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/ValidationError.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + ValidationError::ValidationError() : m_idHasBeenSet(false), m_errorsHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue ValidationError::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-datapipeline/source/model/ValidationWarning.cpp b/aws-cpp-sdk-datapipeline/source/model/ValidationWarning.cpp index d920babc176..c9eafd4044e 100644 --- a/aws-cpp-sdk-datapipeline/source/model/ValidationWarning.cpp +++ b/aws-cpp-sdk-datapipeline/source/model/ValidationWarning.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DataPipeline::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DataPipeline +{ +namespace Model +{ + ValidationWarning::ValidationWarning() : m_idHasBeenSet(false), m_warningsHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue ValidationWarning::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DataPipeline +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/CMakeLists.txt b/aws-cpp-sdk-devicefarm/CMakeLists.txt index dc0a10c96d3..c59e2eaeae9 100644 --- a/aws-cpp-sdk-devicefarm/CMakeLists.txt +++ b/aws-cpp-sdk-devicefarm/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-devicefarm) "source/model/*.cpp" ) - file(GLOB DEVICEFARM_SRC + file(GLOB DEVICEFARM_UNIFIED_HEADERS ${AWS_DEVICEFARM_HEADERS} ${AWS_DEVICEFARM_MODEL_HEADERS} + ) + + file(GLOB DEVICEFARM_UNITY_SRC ${AWS_DEVICEFARM_SOURCE} ${AWS_DEVICEFARM_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("DEVICEFARM" DEVICEFARM_UNITY_SRC) + endif() + + file(GLOB DEVICEFARM_SRC + ${DEVICEFARM_UNIFIED_HEADERS} + ${DEVICEFARM_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-devicefarm/include/aws/devicefarm/model/DevicePlatform.h b/aws-cpp-sdk-devicefarm/include/aws/devicefarm/model/DevicePlatform.h index 15be90facce..80d10cf25b7 100644 --- a/aws-cpp-sdk-devicefarm/include/aws/devicefarm/model/DevicePlatform.h +++ b/aws-cpp-sdk-devicefarm/include/aws/devicefarm/model/DevicePlatform.h @@ -25,7 +25,7 @@ namespace Model enum class DevicePlatform { NOT_SET, - ANDROID, + ANDROID_, IOS }; diff --git a/aws-cpp-sdk-devicefarm/source/DeviceFarmErrors.cpp b/aws-cpp-sdk-devicefarm/source/DeviceFarmErrors.cpp index a9880b31359..056ca70b557 100644 --- a/aws-cpp-sdk-devicefarm/source/DeviceFarmErrors.cpp +++ b/aws-cpp-sdk-devicefarm/source/DeviceFarmErrors.cpp @@ -20,13 +20,6 @@ using namespace Aws::Client; using namespace Aws::DeviceFarm; using namespace Aws::Utils; -static const int ARGUMENT_HASH = HashingUtils::HashString("ArgumentException"); -static const int NOT_ELIGIBLE_HASH = HashingUtils::HashString("NotEligibleException"); -static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); -static const int SERVICE_ACCOUNT_HASH = HashingUtils::HashString("ServiceAccountException"); -static const int IDEMPOTENCY_HASH = HashingUtils::HashString("IdempotencyException"); -static const int NOT_FOUND_HASH = HashingUtils::HashString("NotFoundException"); - namespace Aws { namespace DeviceFarm @@ -34,6 +27,13 @@ namespace DeviceFarm namespace DeviceFarmErrorMapper { +static const int ARGUMENT_HASH = HashingUtils::HashString("ArgumentException"); +static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); +static const int SERVICE_ACCOUNT_HASH = HashingUtils::HashString("ServiceAccountException"); +static const int IDEMPOTENCY_HASH = HashingUtils::HashString("IdempotencyException"); +static const int NOT_FOUND_HASH = HashingUtils::HashString("NotFoundException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); @@ -42,10 +42,6 @@ AWSError GetErrorForName(const char* errorName) { return AWSError(static_cast(DeviceFarmErrors::ARGUMENT), false); } - else if (hashCode == NOT_ELIGIBLE_HASH) - { - return AWSError(static_cast(DeviceFarmErrors::NOT_ELIGIBLE), false); - } else if (hashCode == LIMIT_EXCEEDED_HASH) { return AWSError(static_cast(DeviceFarmErrors::LIMIT_EXCEEDED), false); diff --git a/aws-cpp-sdk-devicefarm/source/model/AccountSettings.cpp b/aws-cpp-sdk-devicefarm/source/model/AccountSettings.cpp index ccd28f6ca70..d36681661bb 100644 --- a/aws-cpp-sdk-devicefarm/source/model/AccountSettings.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/AccountSettings.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + AccountSettings::AccountSettings() : m_awsAccountNumberHasBeenSet(false), m_unmeteredDevicesHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue AccountSettings::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/Artifact.cpp b/aws-cpp-sdk-devicefarm/source/model/Artifact.cpp index c1e3f36c2be..179722c68b7 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Artifact.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Artifact.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Artifact::Artifact() : m_arnHasBeenSet(false), m_nameHasBeenSet(false), @@ -114,4 +120,8 @@ JsonValue Artifact::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/ArtifactCategory.cpp b/aws-cpp-sdk-devicefarm/source/model/ArtifactCategory.cpp index 68745730110..2fb3d7377b1 100644 --- a/aws-cpp-sdk-devicefarm/source/model/ArtifactCategory.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/ArtifactCategory.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int SCREENSHOT_HASH = HashingUtils::HashString("SCREENSHOT"); -static const int FILE_HASH = HashingUtils::HashString("FILE"); -static const int LOG_HASH = HashingUtils::HashString("LOG"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ArtifactCategoryMapper { + static const int SCREENSHOT_HASH = HashingUtils::HashString("SCREENSHOT"); + static const int FILE_HASH = HashingUtils::HashString("FILE"); + static const int LOG_HASH = HashingUtils::HashString("LOG"); + ArtifactCategory GetArtifactCategoryForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-devicefarm/source/model/ArtifactType.cpp b/aws-cpp-sdk-devicefarm/source/model/ArtifactType.cpp index 439a6cb4284..be7601d5e99 100644 --- a/aws-cpp-sdk-devicefarm/source/model/ArtifactType.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/ArtifactType.cpp @@ -15,33 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int UNKNOWN_HASH = HashingUtils::HashString("UNKNOWN"); -static const int SCREENSHOT_HASH = HashingUtils::HashString("SCREENSHOT"); -static const int DEVICE_LOG_HASH = HashingUtils::HashString("DEVICE_LOG"); -static const int MESSAGE_LOG_HASH = HashingUtils::HashString("MESSAGE_LOG"); -static const int RESULT_LOG_HASH = HashingUtils::HashString("RESULT_LOG"); -static const int SERVICE_LOG_HASH = HashingUtils::HashString("SERVICE_LOG"); -static const int WEBKIT_LOG_HASH = HashingUtils::HashString("WEBKIT_LOG"); -static const int INSTRUMENTATION_OUTPUT_HASH = HashingUtils::HashString("INSTRUMENTATION_OUTPUT"); -static const int EXERCISER_MONKEY_OUTPUT_HASH = HashingUtils::HashString("EXERCISER_MONKEY_OUTPUT"); -static const int CALABASH_JSON_OUTPUT_HASH = HashingUtils::HashString("CALABASH_JSON_OUTPUT"); -static const int CALABASH_PRETTY_OUTPUT_HASH = HashingUtils::HashString("CALABASH_PRETTY_OUTPUT"); -static const int CALABASH_STANDARD_OUTPUT_HASH = HashingUtils::HashString("CALABASH_STANDARD_OUTPUT"); -static const int CALABASH_JAVA_XML_OUTPUT_HASH = HashingUtils::HashString("CALABASH_JAVA_XML_OUTPUT"); -static const int AUTOMATION_OUTPUT_HASH = HashingUtils::HashString("AUTOMATION_OUTPUT"); -static const int APPIUM_SERVER_OUTPUT_HASH = HashingUtils::HashString("APPIUM_SERVER_OUTPUT"); -static const int APPIUM_JAVA_OUTPUT_HASH = HashingUtils::HashString("APPIUM_JAVA_OUTPUT"); -static const int APPIUM_JAVA_XML_OUTPUT_HASH = HashingUtils::HashString("APPIUM_JAVA_XML_OUTPUT"); -static const int APPIUM_PYTHON_OUTPUT_HASH = HashingUtils::HashString("APPIUM_PYTHON_OUTPUT"); -static const int APPIUM_PYTHON_XML_OUTPUT_HASH = HashingUtils::HashString("APPIUM_PYTHON_XML_OUTPUT"); -static const int EXPLORER_EVENT_LOG_HASH = HashingUtils::HashString("EXPLORER_EVENT_LOG"); -static const int EXPLORER_SUMMARY_LOG_HASH = HashingUtils::HashString("EXPLORER_SUMMARY_LOG"); -static const int APPLICATION_CRASH_REPORT_HASH = HashingUtils::HashString("APPLICATION_CRASH_REPORT"); -static const int XCTEST_LOG_HASH = HashingUtils::HashString("XCTEST_LOG"); namespace Aws { @@ -52,6 +28,29 @@ namespace Aws namespace ArtifactTypeMapper { + static const int UNKNOWN_HASH = HashingUtils::HashString("UNKNOWN"); + static const int SCREENSHOT_HASH = HashingUtils::HashString("SCREENSHOT"); + static const int DEVICE_LOG_HASH = HashingUtils::HashString("DEVICE_LOG"); + static const int MESSAGE_LOG_HASH = HashingUtils::HashString("MESSAGE_LOG"); + static const int RESULT_LOG_HASH = HashingUtils::HashString("RESULT_LOG"); + static const int SERVICE_LOG_HASH = HashingUtils::HashString("SERVICE_LOG"); + static const int WEBKIT_LOG_HASH = HashingUtils::HashString("WEBKIT_LOG"); + static const int INSTRUMENTATION_OUTPUT_HASH = HashingUtils::HashString("INSTRUMENTATION_OUTPUT"); + static const int EXERCISER_MONKEY_OUTPUT_HASH = HashingUtils::HashString("EXERCISER_MONKEY_OUTPUT"); + static const int CALABASH_JSON_OUTPUT_HASH = HashingUtils::HashString("CALABASH_JSON_OUTPUT"); + static const int CALABASH_PRETTY_OUTPUT_HASH = HashingUtils::HashString("CALABASH_PRETTY_OUTPUT"); + static const int CALABASH_STANDARD_OUTPUT_HASH = HashingUtils::HashString("CALABASH_STANDARD_OUTPUT"); + static const int CALABASH_JAVA_XML_OUTPUT_HASH = HashingUtils::HashString("CALABASH_JAVA_XML_OUTPUT"); + static const int AUTOMATION_OUTPUT_HASH = HashingUtils::HashString("AUTOMATION_OUTPUT"); + static const int APPIUM_SERVER_OUTPUT_HASH = HashingUtils::HashString("APPIUM_SERVER_OUTPUT"); + static const int APPIUM_JAVA_OUTPUT_HASH = HashingUtils::HashString("APPIUM_JAVA_OUTPUT"); + static const int APPIUM_JAVA_XML_OUTPUT_HASH = HashingUtils::HashString("APPIUM_JAVA_XML_OUTPUT"); + static const int APPIUM_PYTHON_OUTPUT_HASH = HashingUtils::HashString("APPIUM_PYTHON_OUTPUT"); + static const int APPIUM_PYTHON_XML_OUTPUT_HASH = HashingUtils::HashString("APPIUM_PYTHON_XML_OUTPUT"); + static const int EXPLORER_EVENT_LOG_HASH = HashingUtils::HashString("EXPLORER_EVENT_LOG"); + static const int EXPLORER_SUMMARY_LOG_HASH = HashingUtils::HashString("EXPLORER_SUMMARY_LOG"); + static const int APPLICATION_CRASH_REPORT_HASH = HashingUtils::HashString("APPLICATION_CRASH_REPORT"); + ArtifactType GetArtifactTypeForName(const Aws::String& name) { @@ -144,11 +143,7 @@ namespace Aws { return ArtifactType::APPLICATION_CRASH_REPORT; } - else if (hashCode == XCTEST_LOG_HASH) - { - return ArtifactType::XCTEST_LOG; - } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -206,10 +201,8 @@ namespace Aws return "EXPLORER_SUMMARY_LOG"; case ArtifactType::APPLICATION_CRASH_REPORT: return "APPLICATION_CRASH_REPORT"; - case ArtifactType::XCTEST_LOG: - return "XCTEST_LOG"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-devicefarm/source/model/BillingMethod.cpp b/aws-cpp-sdk-devicefarm/source/model/BillingMethod.cpp index 93ee4ed38e3..c749fd23c68 100644 --- a/aws-cpp-sdk-devicefarm/source/model/BillingMethod.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/BillingMethod.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int METERED_HASH = HashingUtils::HashString("METERED"); -static const int UNMETERED_HASH = HashingUtils::HashString("UNMETERED"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace BillingMethodMapper { + static const int METERED_HASH = HashingUtils::HashString("METERED"); + static const int UNMETERED_HASH = HashingUtils::HashString("UNMETERED"); + BillingMethod GetBillingMethodForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-devicefarm/source/model/CPU.cpp b/aws-cpp-sdk-devicefarm/source/model/CPU.cpp index 3860a56917a..c122b40295a 100644 --- a/aws-cpp-sdk-devicefarm/source/model/CPU.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/CPU.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + CPU::CPU() : m_frequencyHasBeenSet(false), m_architectureHasBeenSet(false), @@ -87,4 +93,8 @@ JsonValue CPU::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/Counters.cpp b/aws-cpp-sdk-devicefarm/source/model/Counters.cpp index 2b02dfc56e0..f331eb0ac6a 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Counters.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Counters.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Counters::Counters() : m_total(0), m_totalHasBeenSet(false), @@ -159,4 +165,8 @@ JsonValue Counters::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/Device.cpp b/aws-cpp-sdk-devicefarm/source/model/Device.cpp index 05bdd8ff026..98fa950bef3 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Device.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Device.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Device::Device() : m_arnHasBeenSet(false), m_nameHasBeenSet(false), @@ -252,4 +258,8 @@ JsonValue Device::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/DeviceAttribute.cpp b/aws-cpp-sdk-devicefarm/source/model/DeviceAttribute.cpp index caef511ee30..0e7bc04c5c7 100644 --- a/aws-cpp-sdk-devicefarm/source/model/DeviceAttribute.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/DeviceAttribute.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int ARN_HASH = HashingUtils::HashString("ARN"); -static const int PLATFORM_HASH = HashingUtils::HashString("PLATFORM"); -static const int FORM_FACTOR_HASH = HashingUtils::HashString("FORM_FACTOR"); -static const int MANUFACTURER_HASH = HashingUtils::HashString("MANUFACTURER"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace DeviceAttributeMapper { + static const int ARN_HASH = HashingUtils::HashString("ARN"); + static const int PLATFORM_HASH = HashingUtils::HashString("PLATFORM"); + static const int FORM_FACTOR_HASH = HashingUtils::HashString("FORM_FACTOR"); + static const int MANUFACTURER_HASH = HashingUtils::HashString("MANUFACTURER"); + DeviceAttribute GetDeviceAttributeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-devicefarm/source/model/DeviceFormFactor.cpp b/aws-cpp-sdk-devicefarm/source/model/DeviceFormFactor.cpp index bf48762282b..763b8822de2 100644 --- a/aws-cpp-sdk-devicefarm/source/model/DeviceFormFactor.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/DeviceFormFactor.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int PHONE_HASH = HashingUtils::HashString("PHONE"); -static const int TABLET_HASH = HashingUtils::HashString("TABLET"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace DeviceFormFactorMapper { + static const int PHONE_HASH = HashingUtils::HashString("PHONE"); + static const int TABLET_HASH = HashingUtils::HashString("TABLET"); + DeviceFormFactor GetDeviceFormFactorForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-devicefarm/source/model/DeviceMinutes.cpp b/aws-cpp-sdk-devicefarm/source/model/DeviceMinutes.cpp index 22b39e10cf8..01eb492eed1 100644 --- a/aws-cpp-sdk-devicefarm/source/model/DeviceMinutes.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/DeviceMinutes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + DeviceMinutes::DeviceMinutes() : m_total(0.0), m_totalHasBeenSet(false), @@ -91,4 +97,8 @@ JsonValue DeviceMinutes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/DevicePlatform.cpp b/aws-cpp-sdk-devicefarm/source/model/DevicePlatform.cpp index b74b477fdd1..c7dd181528f 100644 --- a/aws-cpp-sdk-devicefarm/source/model/DevicePlatform.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/DevicePlatform.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ANDROID_HASH = HashingUtils::HashString("ANDROID"); -static const int IOS_HASH = HashingUtils::HashString("IOS"); namespace Aws { @@ -31,13 +29,16 @@ namespace Aws namespace DevicePlatformMapper { + static const int ANDROID_HASH = HashingUtils::HashString("ANDROID"); + static const int IOS_HASH = HashingUtils::HashString("IOS"); + DevicePlatform GetDevicePlatformForName(const Aws::String& name) { int hashCode = HashingUtils::HashString(name.c_str()); - if (hashCode == ANDROID_HASH) + if (hashCode == ANDROID__HASH) { - return DevicePlatform::ANDROID; + return DevicePlatform::ANDROID_; } else if (hashCode == IOS_HASH) { @@ -57,7 +58,7 @@ namespace Aws { switch(enumValue) { - case DevicePlatform::ANDROID: + case DevicePlatform::ANDROID_: return "ANDROID"; case DevicePlatform::IOS: return "IOS"; diff --git a/aws-cpp-sdk-devicefarm/source/model/DevicePool.cpp b/aws-cpp-sdk-devicefarm/source/model/DevicePool.cpp index a896d902931..731aab2dd02 100644 --- a/aws-cpp-sdk-devicefarm/source/model/DevicePool.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/DevicePool.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + DevicePool::DevicePool() : m_arnHasBeenSet(false), m_nameHasBeenSet(false), @@ -122,4 +128,8 @@ JsonValue DevicePool::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/DevicePoolCompatibilityResult.cpp b/aws-cpp-sdk-devicefarm/source/model/DevicePoolCompatibilityResult.cpp index f869b73969e..226315525e0 100644 --- a/aws-cpp-sdk-devicefarm/source/model/DevicePoolCompatibilityResult.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/DevicePoolCompatibilityResult.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + DevicePoolCompatibilityResult::DevicePoolCompatibilityResult() : m_deviceHasBeenSet(false), m_compatible(false), @@ -95,4 +101,8 @@ JsonValue DevicePoolCompatibilityResult::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/DevicePoolType.cpp b/aws-cpp-sdk-devicefarm/source/model/DevicePoolType.cpp index 914332d36d8..b1ca920290b 100644 --- a/aws-cpp-sdk-devicefarm/source/model/DevicePoolType.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/DevicePoolType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int CURATED_HASH = HashingUtils::HashString("CURATED"); -static const int PRIVATE__HASH = HashingUtils::HashString("PRIVATE"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace DevicePoolTypeMapper { + static const int CURATED_HASH = HashingUtils::HashString("CURATED"); + static const int PRIVATE__HASH = HashingUtils::HashString("PRIVATE"); + DevicePoolType GetDevicePoolTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-devicefarm/source/model/ExecutionResult.cpp b/aws-cpp-sdk-devicefarm/source/model/ExecutionResult.cpp index aa228930064..45c3fc1225a 100644 --- a/aws-cpp-sdk-devicefarm/source/model/ExecutionResult.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/ExecutionResult.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int PENDING_HASH = HashingUtils::HashString("PENDING"); -static const int PASSED_HASH = HashingUtils::HashString("PASSED"); -static const int WARNED_HASH = HashingUtils::HashString("WARNED"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); -static const int SKIPPED_HASH = HashingUtils::HashString("SKIPPED"); -static const int ERRORED_HASH = HashingUtils::HashString("ERRORED"); -static const int STOPPED_HASH = HashingUtils::HashString("STOPPED"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace ExecutionResultMapper { + static const int PENDING_HASH = HashingUtils::HashString("PENDING"); + static const int PASSED_HASH = HashingUtils::HashString("PASSED"); + static const int WARNED_HASH = HashingUtils::HashString("WARNED"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + static const int SKIPPED_HASH = HashingUtils::HashString("SKIPPED"); + static const int ERRORED_HASH = HashingUtils::HashString("ERRORED"); + static const int STOPPED_HASH = HashingUtils::HashString("STOPPED"); + ExecutionResult GetExecutionResultForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-devicefarm/source/model/ExecutionStatus.cpp b/aws-cpp-sdk-devicefarm/source/model/ExecutionStatus.cpp index 7d4a0fd684a..04afb366b4a 100644 --- a/aws-cpp-sdk-devicefarm/source/model/ExecutionStatus.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/ExecutionStatus.cpp @@ -15,16 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int PENDING_HASH = HashingUtils::HashString("PENDING"); -static const int PROCESSING_HASH = HashingUtils::HashString("PROCESSING"); -static const int SCHEDULING_HASH = HashingUtils::HashString("SCHEDULING"); -static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); -static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); -static const int STOPPING_HASH = HashingUtils::HashString("STOPPING"); namespace Aws { @@ -35,6 +28,12 @@ namespace Aws namespace ExecutionStatusMapper { + static const int PENDING_HASH = HashingUtils::HashString("PENDING"); + static const int PROCESSING_HASH = HashingUtils::HashString("PROCESSING"); + static const int SCHEDULING_HASH = HashingUtils::HashString("SCHEDULING"); + static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); + static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); + ExecutionStatus GetExecutionStatusForName(const Aws::String& name) { @@ -59,11 +58,7 @@ namespace Aws { return ExecutionStatus::COMPLETED; } - else if (hashCode == STOPPING_HASH) - { - return ExecutionStatus::STOPPING; - } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -87,10 +82,8 @@ namespace Aws return "RUNNING"; case ExecutionStatus::COMPLETED: return "COMPLETED"; - case ExecutionStatus::STOPPING: - return "STOPPING"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-devicefarm/source/model/IncompatibilityMessage.cpp b/aws-cpp-sdk-devicefarm/source/model/IncompatibilityMessage.cpp index 7250b048191..8a9d131be1f 100644 --- a/aws-cpp-sdk-devicefarm/source/model/IncompatibilityMessage.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/IncompatibilityMessage.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + IncompatibilityMessage::IncompatibilityMessage() : m_messageHasBeenSet(false), m_typeHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue IncompatibilityMessage::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/Job.cpp b/aws-cpp-sdk-devicefarm/source/model/Job.cpp index 3675febeceb..1a2f2c88760 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Job.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Job.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Job::Job() : m_arnHasBeenSet(false), m_nameHasBeenSet(false), @@ -214,4 +220,8 @@ JsonValue Job::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws diff --git a/aws-cpp-sdk-devicefarm/source/model/Location.cpp b/aws-cpp-sdk-devicefarm/source/model/Location.cpp index b765a09587b..fa900b0f6f9 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Location.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Location.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Location::Location() : m_latitude(0.0), m_latitudeHasBeenSet(false), @@ -74,4 +80,8 @@ JsonValue Location::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/Problem.cpp b/aws-cpp-sdk-devicefarm/source/model/Problem.cpp index ded3cf53a5c..b53e4464ab8 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Problem.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Problem.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Problem::Problem() : m_runHasBeenSet(false), m_jobHasBeenSet(false), @@ -144,4 +150,8 @@ JsonValue Problem::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/ProblemDetail.cpp b/aws-cpp-sdk-devicefarm/source/model/ProblemDetail.cpp index 5574e281d8a..ab1d264dc31 100644 --- a/aws-cpp-sdk-devicefarm/source/model/ProblemDetail.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/ProblemDetail.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + ProblemDetail::ProblemDetail() : m_arnHasBeenSet(false), m_nameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue ProblemDetail::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/Project.cpp b/aws-cpp-sdk-devicefarm/source/model/Project.cpp index df212091417..7b7b1af9812 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Project.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Project.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Project::Project() : m_arnHasBeenSet(false), m_nameHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue Project::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws diff --git a/aws-cpp-sdk-devicefarm/source/model/Radios.cpp b/aws-cpp-sdk-devicefarm/source/model/Radios.cpp index ffeaf35895a..b0c73f823ce 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Radios.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Radios.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Radios::Radios() : m_wifi(false), m_wifiHasBeenSet(false), @@ -108,4 +114,8 @@ JsonValue Radios::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/Resolution.cpp b/aws-cpp-sdk-devicefarm/source/model/Resolution.cpp index 5f6d51475da..42e7d77d14b 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Resolution.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Resolution.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Resolution::Resolution() : m_width(0), m_widthHasBeenSet(false), @@ -74,4 +80,8 @@ JsonValue Resolution::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/Rule.cpp b/aws-cpp-sdk-devicefarm/source/model/Rule.cpp index 57c84076c97..5c4734280e5 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Rule.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Rule.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Rule::Rule() : m_attributeHasBeenSet(false), m_operatorHasBeenSet(false), @@ -83,4 +89,8 @@ JsonValue Rule::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/RuleOperator.cpp b/aws-cpp-sdk-devicefarm/source/model/RuleOperator.cpp index 4b78f7ccd3c..cf5563f6fad 100644 --- a/aws-cpp-sdk-devicefarm/source/model/RuleOperator.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/RuleOperator.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int EQUALS_HASH = HashingUtils::HashString("EQUALS"); -static const int LESS_THAN_HASH = HashingUtils::HashString("LESS_THAN"); -static const int GREATER_THAN_HASH = HashingUtils::HashString("GREATER_THAN"); -static const int IN_HASH = HashingUtils::HashString("IN"); -static const int NOT_IN_HASH = HashingUtils::HashString("NOT_IN"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace RuleOperatorMapper { + static const int EQUALS_HASH = HashingUtils::HashString("EQUALS"); + static const int LESS_THAN_HASH = HashingUtils::HashString("LESS_THAN"); + static const int GREATER_THAN_HASH = HashingUtils::HashString("GREATER_THAN"); + static const int IN_HASH = HashingUtils::HashString("IN"); + static const int NOT_IN_HASH = HashingUtils::HashString("NOT_IN"); + RuleOperator GetRuleOperatorForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-devicefarm/source/model/Run.cpp b/aws-cpp-sdk-devicefarm/source/model/Run.cpp index fb93099691d..730f60a6c4b 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Run.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Run.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Run::Run() : m_arnHasBeenSet(false), m_nameHasBeenSet(false), @@ -261,4 +267,8 @@ JsonValue Run::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws diff --git a/aws-cpp-sdk-devicefarm/source/model/Sample.cpp b/aws-cpp-sdk-devicefarm/source/model/Sample.cpp index cfa33b22c02..ecf8e8f39cf 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Sample.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Sample.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Sample::Sample() : m_arnHasBeenSet(false), m_typeHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue Sample::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/SampleType.cpp b/aws-cpp-sdk-devicefarm/source/model/SampleType.cpp index bf5b51c5561..038b26fe5df 100644 --- a/aws-cpp-sdk-devicefarm/source/model/SampleType.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/SampleType.cpp @@ -19,23 +19,6 @@ using namespace Aws::Utils; -static const int CPU_HASH = HashingUtils::HashString("CPU"); -static const int MEMORY_HASH = HashingUtils::HashString("MEMORY"); -static const int THREADS_HASH = HashingUtils::HashString("THREADS"); -static const int RX_RATE_HASH = HashingUtils::HashString("RX_RATE"); -static const int TX_RATE_HASH = HashingUtils::HashString("TX_RATE"); -static const int RX_HASH = HashingUtils::HashString("RX"); -static const int TX_HASH = HashingUtils::HashString("TX"); -static const int NATIVE_FRAMES_HASH = HashingUtils::HashString("NATIVE_FRAMES"); -static const int NATIVE_FPS_HASH = HashingUtils::HashString("NATIVE_FPS"); -static const int NATIVE_MIN_DRAWTIME_HASH = HashingUtils::HashString("NATIVE_MIN_DRAWTIME"); -static const int NATIVE_AVG_DRAWTIME_HASH = HashingUtils::HashString("NATIVE_AVG_DRAWTIME"); -static const int NATIVE_MAX_DRAWTIME_HASH = HashingUtils::HashString("NATIVE_MAX_DRAWTIME"); -static const int OPENGL_FRAMES_HASH = HashingUtils::HashString("OPENGL_FRAMES"); -static const int OPENGL_FPS_HASH = HashingUtils::HashString("OPENGL_FPS"); -static const int OPENGL_MIN_DRAWTIME_HASH = HashingUtils::HashString("OPENGL_MIN_DRAWTIME"); -static const int OPENGL_AVG_DRAWTIME_HASH = HashingUtils::HashString("OPENGL_AVG_DRAWTIME"); -static const int OPENGL_MAX_DRAWTIME_HASH = HashingUtils::HashString("OPENGL_MAX_DRAWTIME"); namespace Aws { @@ -46,6 +29,24 @@ namespace Aws namespace SampleTypeMapper { + static const int CPU_HASH = HashingUtils::HashString("CPU"); + static const int MEMORY_HASH = HashingUtils::HashString("MEMORY"); + static const int THREADS_HASH = HashingUtils::HashString("THREADS"); + static const int RX_RATE_HASH = HashingUtils::HashString("RX_RATE"); + static const int TX_RATE_HASH = HashingUtils::HashString("TX_RATE"); + static const int RX_HASH = HashingUtils::HashString("RX"); + static const int TX_HASH = HashingUtils::HashString("TX"); + static const int NATIVE_FRAMES_HASH = HashingUtils::HashString("NATIVE_FRAMES"); + static const int NATIVE_FPS_HASH = HashingUtils::HashString("NATIVE_FPS"); + static const int NATIVE_MIN_DRAWTIME_HASH = HashingUtils::HashString("NATIVE_MIN_DRAWTIME"); + static const int NATIVE_AVG_DRAWTIME_HASH = HashingUtils::HashString("NATIVE_AVG_DRAWTIME"); + static const int NATIVE_MAX_DRAWTIME_HASH = HashingUtils::HashString("NATIVE_MAX_DRAWTIME"); + static const int OPENGL_FRAMES_HASH = HashingUtils::HashString("OPENGL_FRAMES"); + static const int OPENGL_FPS_HASH = HashingUtils::HashString("OPENGL_FPS"); + static const int OPENGL_MIN_DRAWTIME_HASH = HashingUtils::HashString("OPENGL_MIN_DRAWTIME"); + static const int OPENGL_AVG_DRAWTIME_HASH = HashingUtils::HashString("OPENGL_AVG_DRAWTIME"); + static const int OPENGL_MAX_DRAWTIME_HASH = HashingUtils::HashString("OPENGL_MAX_DRAWTIME"); + SampleType GetSampleTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-devicefarm/source/model/ScheduleRunConfiguration.cpp b/aws-cpp-sdk-devicefarm/source/model/ScheduleRunConfiguration.cpp index e3633997a0b..1e10c2b859c 100644 --- a/aws-cpp-sdk-devicefarm/source/model/ScheduleRunConfiguration.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/ScheduleRunConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + ScheduleRunConfiguration::ScheduleRunConfiguration() : m_extraDataPackageArnHasBeenSet(false), m_networkProfileArnHasBeenSet(false), @@ -152,4 +158,8 @@ JsonValue ScheduleRunConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/ScheduleRunTest.cpp b/aws-cpp-sdk-devicefarm/source/model/ScheduleRunTest.cpp index 9ce94705b21..32348b8dc57 100644 --- a/aws-cpp-sdk-devicefarm/source/model/ScheduleRunTest.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/ScheduleRunTest.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + ScheduleRunTest::ScheduleRunTest() : m_typeHasBeenSet(false), m_testPackageArnHasBeenSet(false), @@ -107,4 +113,8 @@ JsonValue ScheduleRunTest::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/Suite.cpp b/aws-cpp-sdk-devicefarm/source/model/Suite.cpp index d78f2c886be..289a32e0384 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Suite.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Suite.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Suite::Suite() : m_arnHasBeenSet(false), m_nameHasBeenSet(false), @@ -199,4 +205,8 @@ JsonValue Suite::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws diff --git a/aws-cpp-sdk-devicefarm/source/model/Test.cpp b/aws-cpp-sdk-devicefarm/source/model/Test.cpp index 77d2f91d96c..c96be9a2cb7 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Test.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Test.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Test::Test() : m_arnHasBeenSet(false), m_nameHasBeenSet(false), @@ -199,4 +205,8 @@ JsonValue Test::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws diff --git a/aws-cpp-sdk-devicefarm/source/model/TestType.cpp b/aws-cpp-sdk-devicefarm/source/model/TestType.cpp index 7ba3e04ef5a..90eac97712a 100644 --- a/aws-cpp-sdk-devicefarm/source/model/TestType.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/TestType.cpp @@ -15,24 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int BUILTIN_FUZZ_HASH = HashingUtils::HashString("BUILTIN_FUZZ"); -static const int BUILTIN_EXPLORER_HASH = HashingUtils::HashString("BUILTIN_EXPLORER"); -static const int APPIUM_JAVA_JUNIT_HASH = HashingUtils::HashString("APPIUM_JAVA_JUNIT"); -static const int APPIUM_JAVA_TESTNG_HASH = HashingUtils::HashString("APPIUM_JAVA_TESTNG"); -static const int APPIUM_PYTHON_HASH = HashingUtils::HashString("APPIUM_PYTHON"); -static const int APPIUM_WEB_JAVA_JUNIT_HASH = HashingUtils::HashString("APPIUM_WEB_JAVA_JUNIT"); -static const int APPIUM_WEB_JAVA_TESTNG_HASH = HashingUtils::HashString("APPIUM_WEB_JAVA_TESTNG"); -static const int APPIUM_WEB_PYTHON_HASH = HashingUtils::HashString("APPIUM_WEB_PYTHON"); -static const int CALABASH_HASH = HashingUtils::HashString("CALABASH"); -static const int INSTRUMENTATION_HASH = HashingUtils::HashString("INSTRUMENTATION"); -static const int UIAUTOMATION_HASH = HashingUtils::HashString("UIAUTOMATION"); -static const int UIAUTOMATOR_HASH = HashingUtils::HashString("UIAUTOMATOR"); -static const int XCTEST_HASH = HashingUtils::HashString("XCTEST"); -static const int XCTEST_UI_HASH = HashingUtils::HashString("XCTEST_UI"); namespace Aws { @@ -43,6 +28,20 @@ namespace Aws namespace TestTypeMapper { + static const int BUILTIN_FUZZ_HASH = HashingUtils::HashString("BUILTIN_FUZZ"); + static const int BUILTIN_EXPLORER_HASH = HashingUtils::HashString("BUILTIN_EXPLORER"); + static const int APPIUM_JAVA_JUNIT_HASH = HashingUtils::HashString("APPIUM_JAVA_JUNIT"); + static const int APPIUM_JAVA_TESTNG_HASH = HashingUtils::HashString("APPIUM_JAVA_TESTNG"); + static const int APPIUM_PYTHON_HASH = HashingUtils::HashString("APPIUM_PYTHON"); + static const int APPIUM_WEB_JAVA_JUNIT_HASH = HashingUtils::HashString("APPIUM_WEB_JAVA_JUNIT"); + static const int APPIUM_WEB_JAVA_TESTNG_HASH = HashingUtils::HashString("APPIUM_WEB_JAVA_TESTNG"); + static const int APPIUM_WEB_PYTHON_HASH = HashingUtils::HashString("APPIUM_WEB_PYTHON"); + static const int CALABASH_HASH = HashingUtils::HashString("CALABASH"); + static const int INSTRUMENTATION_HASH = HashingUtils::HashString("INSTRUMENTATION"); + static const int UIAUTOMATION_HASH = HashingUtils::HashString("UIAUTOMATION"); + static const int UIAUTOMATOR_HASH = HashingUtils::HashString("UIAUTOMATOR"); + static const int XCTEST_HASH = HashingUtils::HashString("XCTEST"); + TestType GetTestTypeForName(const Aws::String& name) { @@ -99,11 +98,7 @@ namespace Aws { return TestType::XCTEST; } - else if (hashCode == XCTEST_UI_HASH) - { - return TestType::XCTEST_UI; - } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -143,10 +138,8 @@ namespace Aws return "UIAUTOMATOR"; case TestType::XCTEST: return "XCTEST"; - case TestType::XCTEST_UI: - return "XCTEST_UI"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-devicefarm/source/model/UniqueProblem.cpp b/aws-cpp-sdk-devicefarm/source/model/UniqueProblem.cpp index 66ce17e1604..dbcee298b31 100644 --- a/aws-cpp-sdk-devicefarm/source/model/UniqueProblem.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/UniqueProblem.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + UniqueProblem::UniqueProblem() : m_messageHasBeenSet(false), m_problemsHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue UniqueProblem::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-devicefarm/source/model/Upload.cpp b/aws-cpp-sdk-devicefarm/source/model/Upload.cpp index 5e7dbaa84c5..0386ee75965 100644 --- a/aws-cpp-sdk-devicefarm/source/model/Upload.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/Upload.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DeviceFarm::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DeviceFarm +{ +namespace Model +{ + Upload::Upload() : m_arnHasBeenSet(false), m_nameHasBeenSet(false), @@ -172,4 +178,8 @@ JsonValue Upload::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DeviceFarm +} // namespace Aws diff --git a/aws-cpp-sdk-devicefarm/source/model/UploadStatus.cpp b/aws-cpp-sdk-devicefarm/source/model/UploadStatus.cpp index 4e9e139e255..687481043e7 100644 --- a/aws-cpp-sdk-devicefarm/source/model/UploadStatus.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/UploadStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int INITIALIZED_HASH = HashingUtils::HashString("INITIALIZED"); -static const int PROCESSING_HASH = HashingUtils::HashString("PROCESSING"); -static const int SUCCEEDED_HASH = HashingUtils::HashString("SUCCEEDED"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace UploadStatusMapper { + static const int INITIALIZED_HASH = HashingUtils::HashString("INITIALIZED"); + static const int PROCESSING_HASH = HashingUtils::HashString("PROCESSING"); + static const int SUCCEEDED_HASH = HashingUtils::HashString("SUCCEEDED"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + UploadStatus GetUploadStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-devicefarm/source/model/UploadType.cpp b/aws-cpp-sdk-devicefarm/source/model/UploadType.cpp index dea49667080..590a5084403 100644 --- a/aws-cpp-sdk-devicefarm/source/model/UploadType.cpp +++ b/aws-cpp-sdk-devicefarm/source/model/UploadType.cpp @@ -15,26 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int ANDROID_APP_HASH = HashingUtils::HashString("ANDROID_APP"); -static const int IOS_APP_HASH = HashingUtils::HashString("IOS_APP"); -static const int WEB_APP_HASH = HashingUtils::HashString("WEB_APP"); -static const int EXTERNAL_DATA_HASH = HashingUtils::HashString("EXTERNAL_DATA"); -static const int APPIUM_JAVA_JUNIT_TEST_PACKAGE_HASH = HashingUtils::HashString("APPIUM_JAVA_JUNIT_TEST_PACKAGE"); -static const int APPIUM_JAVA_TESTNG_TEST_PACKAGE_HASH = HashingUtils::HashString("APPIUM_JAVA_TESTNG_TEST_PACKAGE"); -static const int APPIUM_PYTHON_TEST_PACKAGE_HASH = HashingUtils::HashString("APPIUM_PYTHON_TEST_PACKAGE"); -static const int APPIUM_WEB_JAVA_JUNIT_TEST_PACKAGE_HASH = HashingUtils::HashString("APPIUM_WEB_JAVA_JUNIT_TEST_PACKAGE"); -static const int APPIUM_WEB_JAVA_TESTNG_TEST_PACKAGE_HASH = HashingUtils::HashString("APPIUM_WEB_JAVA_TESTNG_TEST_PACKAGE"); -static const int APPIUM_WEB_PYTHON_TEST_PACKAGE_HASH = HashingUtils::HashString("APPIUM_WEB_PYTHON_TEST_PACKAGE"); -static const int CALABASH_TEST_PACKAGE_HASH = HashingUtils::HashString("CALABASH_TEST_PACKAGE"); -static const int INSTRUMENTATION_TEST_PACKAGE_HASH = HashingUtils::HashString("INSTRUMENTATION_TEST_PACKAGE"); -static const int UIAUTOMATION_TEST_PACKAGE_HASH = HashingUtils::HashString("UIAUTOMATION_TEST_PACKAGE"); -static const int UIAUTOMATOR_TEST_PACKAGE_HASH = HashingUtils::HashString("UIAUTOMATOR_TEST_PACKAGE"); -static const int XCTEST_TEST_PACKAGE_HASH = HashingUtils::HashString("XCTEST_TEST_PACKAGE"); -static const int XCTEST_UI_TEST_PACKAGE_HASH = HashingUtils::HashString("XCTEST_UI_TEST_PACKAGE"); namespace Aws { @@ -45,6 +28,22 @@ namespace Aws namespace UploadTypeMapper { + static const int ANDROID_APP_HASH = HashingUtils::HashString("ANDROID_APP"); + static const int IOS_APP_HASH = HashingUtils::HashString("IOS_APP"); + static const int WEB_APP_HASH = HashingUtils::HashString("WEB_APP"); + static const int EXTERNAL_DATA_HASH = HashingUtils::HashString("EXTERNAL_DATA"); + static const int APPIUM_JAVA_JUNIT_TEST_PACKAGE_HASH = HashingUtils::HashString("APPIUM_JAVA_JUNIT_TEST_PACKAGE"); + static const int APPIUM_JAVA_TESTNG_TEST_PACKAGE_HASH = HashingUtils::HashString("APPIUM_JAVA_TESTNG_TEST_PACKAGE"); + static const int APPIUM_PYTHON_TEST_PACKAGE_HASH = HashingUtils::HashString("APPIUM_PYTHON_TEST_PACKAGE"); + static const int APPIUM_WEB_JAVA_JUNIT_TEST_PACKAGE_HASH = HashingUtils::HashString("APPIUM_WEB_JAVA_JUNIT_TEST_PACKAGE"); + static const int APPIUM_WEB_JAVA_TESTNG_TEST_PACKAGE_HASH = HashingUtils::HashString("APPIUM_WEB_JAVA_TESTNG_TEST_PACKAGE"); + static const int APPIUM_WEB_PYTHON_TEST_PACKAGE_HASH = HashingUtils::HashString("APPIUM_WEB_PYTHON_TEST_PACKAGE"); + static const int CALABASH_TEST_PACKAGE_HASH = HashingUtils::HashString("CALABASH_TEST_PACKAGE"); + static const int INSTRUMENTATION_TEST_PACKAGE_HASH = HashingUtils::HashString("INSTRUMENTATION_TEST_PACKAGE"); + static const int UIAUTOMATION_TEST_PACKAGE_HASH = HashingUtils::HashString("UIAUTOMATION_TEST_PACKAGE"); + static const int UIAUTOMATOR_TEST_PACKAGE_HASH = HashingUtils::HashString("UIAUTOMATOR_TEST_PACKAGE"); + static const int XCTEST_TEST_PACKAGE_HASH = HashingUtils::HashString("XCTEST_TEST_PACKAGE"); + UploadType GetUploadTypeForName(const Aws::String& name) { @@ -109,11 +108,7 @@ namespace Aws { return UploadType::XCTEST_TEST_PACKAGE; } - else if (hashCode == XCTEST_UI_TEST_PACKAGE_HASH) - { - return UploadType::XCTEST_UI_TEST_PACKAGE; - } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -157,10 +152,8 @@ namespace Aws return "UIAUTOMATOR_TEST_PACKAGE"; case UploadType::XCTEST_TEST_PACKAGE: return "XCTEST_TEST_PACKAGE"; - case UploadType::XCTEST_UI_TEST_PACKAGE: - return "XCTEST_UI_TEST_PACKAGE"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-directconnect/CMakeLists.txt b/aws-cpp-sdk-directconnect/CMakeLists.txt index 96f0bc06ad9..6b019461865 100644 --- a/aws-cpp-sdk-directconnect/CMakeLists.txt +++ b/aws-cpp-sdk-directconnect/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-directconnect) "source/model/*.cpp" ) - file(GLOB DIRECTCONNECT_SRC + file(GLOB DIRECTCONNECT_UNIFIED_HEADERS ${AWS_DIRECTCONNECT_HEADERS} ${AWS_DIRECTCONNECT_MODEL_HEADERS} + ) + + file(GLOB DIRECTCONNECT_UNITY_SRC ${AWS_DIRECTCONNECT_SOURCE} ${AWS_DIRECTCONNECT_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("DIRECTCONNECT" DIRECTCONNECT_UNITY_SRC) + endif() + + file(GLOB DIRECTCONNECT_SRC + ${DIRECTCONNECT_UNIFIED_HEADERS} + ${DIRECTCONNECT_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-directconnect/source/DirectConnectErrors.cpp b/aws-cpp-sdk-directconnect/source/DirectConnectErrors.cpp index 8c4bc0ddf0e..a0a9904b46f 100644 --- a/aws-cpp-sdk-directconnect/source/DirectConnectErrors.cpp +++ b/aws-cpp-sdk-directconnect/source/DirectConnectErrors.cpp @@ -20,9 +20,6 @@ using namespace Aws::Client; using namespace Aws::DirectConnect; using namespace Aws::Utils; -static const int DIRECT_CONNECT_CLIENT_HASH = HashingUtils::HashString("DirectConnectClientException"); -static const int DIRECT_CONNECT_SERVER_HASH = HashingUtils::HashString("DirectConnectServerException"); - namespace Aws { namespace DirectConnect @@ -30,6 +27,10 @@ namespace DirectConnect namespace DirectConnectErrorMapper { +static const int DIRECT_CONNECT_CLIENT_HASH = HashingUtils::HashString("DirectConnectClientException"); +static const int DIRECT_CONNECT_SERVER_HASH = HashingUtils::HashString("DirectConnectServerException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-directconnect/source/model/Connection.cpp b/aws-cpp-sdk-directconnect/source/model/Connection.cpp index 15a084ed941..3a7612d8c4a 100644 --- a/aws-cpp-sdk-directconnect/source/model/Connection.cpp +++ b/aws-cpp-sdk-directconnect/source/model/Connection.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectConnect::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectConnect +{ +namespace Model +{ + Connection::Connection() : m_ownerAccountHasBeenSet(false), m_connectionIdHasBeenSet(false), @@ -176,4 +182,8 @@ JsonValue Connection::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectConnect +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-directconnect/source/model/ConnectionState.cpp b/aws-cpp-sdk-directconnect/source/model/ConnectionState.cpp index 366a3efa8b2..802d78bfe23 100644 --- a/aws-cpp-sdk-directconnect/source/model/ConnectionState.cpp +++ b/aws-cpp-sdk-directconnect/source/model/ConnectionState.cpp @@ -19,14 +19,6 @@ using namespace Aws::Utils; -static const int ordering_HASH = HashingUtils::HashString("ordering"); -static const int requested_HASH = HashingUtils::HashString("requested"); -static const int pending_HASH = HashingUtils::HashString("pending"); -static const int available_HASH = HashingUtils::HashString("available"); -static const int down_HASH = HashingUtils::HashString("down"); -static const int deleting_HASH = HashingUtils::HashString("deleting"); -static const int deleted_HASH = HashingUtils::HashString("deleted"); -static const int rejected_HASH = HashingUtils::HashString("rejected"); namespace Aws { @@ -37,6 +29,15 @@ namespace Aws namespace ConnectionStateMapper { + static const int ordering_HASH = HashingUtils::HashString("ordering"); + static const int requested_HASH = HashingUtils::HashString("requested"); + static const int pending_HASH = HashingUtils::HashString("pending"); + static const int available_HASH = HashingUtils::HashString("available"); + static const int down_HASH = HashingUtils::HashString("down"); + static const int deleting_HASH = HashingUtils::HashString("deleting"); + static const int deleted_HASH = HashingUtils::HashString("deleted"); + static const int rejected_HASH = HashingUtils::HashString("rejected"); + ConnectionState GetConnectionStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-directconnect/source/model/Interconnect.cpp b/aws-cpp-sdk-directconnect/source/model/Interconnect.cpp index 8012be4a338..b0ad4f3e89e 100644 --- a/aws-cpp-sdk-directconnect/source/model/Interconnect.cpp +++ b/aws-cpp-sdk-directconnect/source/model/Interconnect.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectConnect::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectConnect +{ +namespace Model +{ + Interconnect::Interconnect() : m_interconnectIdHasBeenSet(false), m_interconnectNameHasBeenSet(false), @@ -129,4 +135,8 @@ JsonValue Interconnect::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectConnect +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-directconnect/source/model/InterconnectState.cpp b/aws-cpp-sdk-directconnect/source/model/InterconnectState.cpp index 7464ec8a48c..7a0dac2c9d5 100644 --- a/aws-cpp-sdk-directconnect/source/model/InterconnectState.cpp +++ b/aws-cpp-sdk-directconnect/source/model/InterconnectState.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int requested_HASH = HashingUtils::HashString("requested"); -static const int pending_HASH = HashingUtils::HashString("pending"); -static const int available_HASH = HashingUtils::HashString("available"); -static const int down_HASH = HashingUtils::HashString("down"); -static const int deleting_HASH = HashingUtils::HashString("deleting"); -static const int deleted_HASH = HashingUtils::HashString("deleted"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace InterconnectStateMapper { + static const int requested_HASH = HashingUtils::HashString("requested"); + static const int pending_HASH = HashingUtils::HashString("pending"); + static const int available_HASH = HashingUtils::HashString("available"); + static const int down_HASH = HashingUtils::HashString("down"); + static const int deleting_HASH = HashingUtils::HashString("deleting"); + static const int deleted_HASH = HashingUtils::HashString("deleted"); + InterconnectState GetInterconnectStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-directconnect/source/model/Location.cpp b/aws-cpp-sdk-directconnect/source/model/Location.cpp index 36c9b400929..bc39c95b4a9 100644 --- a/aws-cpp-sdk-directconnect/source/model/Location.cpp +++ b/aws-cpp-sdk-directconnect/source/model/Location.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectConnect::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectConnect +{ +namespace Model +{ + Location::Location() : m_locationCodeHasBeenSet(false), m_locationNameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Location::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectConnect +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-directconnect/source/model/NewPrivateVirtualInterface.cpp b/aws-cpp-sdk-directconnect/source/model/NewPrivateVirtualInterface.cpp index 933c933619e..653cea0774f 100644 --- a/aws-cpp-sdk-directconnect/source/model/NewPrivateVirtualInterface.cpp +++ b/aws-cpp-sdk-directconnect/source/model/NewPrivateVirtualInterface.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectConnect::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectConnect +{ +namespace Model +{ + NewPrivateVirtualInterface::NewPrivateVirtualInterface() : m_virtualInterfaceNameHasBeenSet(false), m_vlan(0), @@ -149,4 +155,8 @@ JsonValue NewPrivateVirtualInterface::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectConnect +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-directconnect/source/model/NewPrivateVirtualInterfaceAllocation.cpp b/aws-cpp-sdk-directconnect/source/model/NewPrivateVirtualInterfaceAllocation.cpp index 95f6d568343..497a4fd90b2 100644 --- a/aws-cpp-sdk-directconnect/source/model/NewPrivateVirtualInterfaceAllocation.cpp +++ b/aws-cpp-sdk-directconnect/source/model/NewPrivateVirtualInterfaceAllocation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectConnect::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectConnect +{ +namespace Model +{ + NewPrivateVirtualInterfaceAllocation::NewPrivateVirtualInterfaceAllocation() : m_virtualInterfaceNameHasBeenSet(false), m_vlan(0), @@ -134,4 +140,8 @@ JsonValue NewPrivateVirtualInterfaceAllocation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectConnect +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-directconnect/source/model/NewPublicVirtualInterface.cpp b/aws-cpp-sdk-directconnect/source/model/NewPublicVirtualInterface.cpp index 164888c56ca..59d046b7069 100644 --- a/aws-cpp-sdk-directconnect/source/model/NewPublicVirtualInterface.cpp +++ b/aws-cpp-sdk-directconnect/source/model/NewPublicVirtualInterface.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectConnect::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectConnect +{ +namespace Model +{ + NewPublicVirtualInterface::NewPublicVirtualInterface() : m_virtualInterfaceNameHasBeenSet(false), m_vlan(0), @@ -157,4 +163,8 @@ JsonValue NewPublicVirtualInterface::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectConnect +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-directconnect/source/model/NewPublicVirtualInterfaceAllocation.cpp b/aws-cpp-sdk-directconnect/source/model/NewPublicVirtualInterfaceAllocation.cpp index 7d07217491e..fe093271bd3 100644 --- a/aws-cpp-sdk-directconnect/source/model/NewPublicVirtualInterfaceAllocation.cpp +++ b/aws-cpp-sdk-directconnect/source/model/NewPublicVirtualInterfaceAllocation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectConnect::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectConnect +{ +namespace Model +{ + NewPublicVirtualInterfaceAllocation::NewPublicVirtualInterfaceAllocation() : m_virtualInterfaceNameHasBeenSet(false), m_vlan(0), @@ -157,4 +163,8 @@ JsonValue NewPublicVirtualInterfaceAllocation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectConnect +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-directconnect/source/model/RouteFilterPrefix.cpp b/aws-cpp-sdk-directconnect/source/model/RouteFilterPrefix.cpp index 11480966223..e9a97de96a5 100644 --- a/aws-cpp-sdk-directconnect/source/model/RouteFilterPrefix.cpp +++ b/aws-cpp-sdk-directconnect/source/model/RouteFilterPrefix.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectConnect::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectConnect +{ +namespace Model +{ + RouteFilterPrefix::RouteFilterPrefix() : m_cidrHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue RouteFilterPrefix::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectConnect +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-directconnect/source/model/VirtualGateway.cpp b/aws-cpp-sdk-directconnect/source/model/VirtualGateway.cpp index 701aa1f1723..fcac262e96b 100644 --- a/aws-cpp-sdk-directconnect/source/model/VirtualGateway.cpp +++ b/aws-cpp-sdk-directconnect/source/model/VirtualGateway.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectConnect::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectConnect +{ +namespace Model +{ + VirtualGateway::VirtualGateway() : m_virtualGatewayIdHasBeenSet(false), m_virtualGatewayStateHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue VirtualGateway::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectConnect +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-directconnect/source/model/VirtualInterface.cpp b/aws-cpp-sdk-directconnect/source/model/VirtualInterface.cpp index 026bc178a9f..c65169aa988 100644 --- a/aws-cpp-sdk-directconnect/source/model/VirtualInterface.cpp +++ b/aws-cpp-sdk-directconnect/source/model/VirtualInterface.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectConnect::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectConnect +{ +namespace Model +{ + VirtualInterface::VirtualInterface() : m_ownerAccountHasBeenSet(false), m_virtualInterfaceIdHasBeenSet(false), @@ -276,4 +282,8 @@ JsonValue VirtualInterface::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectConnect +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-directconnect/source/model/VirtualInterfaceState.cpp b/aws-cpp-sdk-directconnect/source/model/VirtualInterfaceState.cpp index fc3da89a22d..6a98706a610 100644 --- a/aws-cpp-sdk-directconnect/source/model/VirtualInterfaceState.cpp +++ b/aws-cpp-sdk-directconnect/source/model/VirtualInterfaceState.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int confirming_HASH = HashingUtils::HashString("confirming"); -static const int verifying_HASH = HashingUtils::HashString("verifying"); -static const int pending_HASH = HashingUtils::HashString("pending"); -static const int available_HASH = HashingUtils::HashString("available"); -static const int deleting_HASH = HashingUtils::HashString("deleting"); -static const int deleted_HASH = HashingUtils::HashString("deleted"); -static const int rejected_HASH = HashingUtils::HashString("rejected"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace VirtualInterfaceStateMapper { + static const int confirming_HASH = HashingUtils::HashString("confirming"); + static const int verifying_HASH = HashingUtils::HashString("verifying"); + static const int pending_HASH = HashingUtils::HashString("pending"); + static const int available_HASH = HashingUtils::HashString("available"); + static const int deleting_HASH = HashingUtils::HashString("deleting"); + static const int deleted_HASH = HashingUtils::HashString("deleted"); + static const int rejected_HASH = HashingUtils::HashString("rejected"); + VirtualInterfaceState GetVirtualInterfaceStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ds/CMakeLists.txt b/aws-cpp-sdk-ds/CMakeLists.txt index d1c7607fd54..c8a6a60b37f 100644 --- a/aws-cpp-sdk-ds/CMakeLists.txt +++ b/aws-cpp-sdk-ds/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-ds) "source/model/*.cpp" ) - file(GLOB DS_SRC + file(GLOB DS_UNIFIED_HEADERS ${AWS_DS_HEADERS} ${AWS_DS_MODEL_HEADERS} + ) + + file(GLOB DS_UNITY_SRC ${AWS_DS_SOURCE} ${AWS_DS_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("DS" DS_UNITY_SRC) + endif() + + file(GLOB DS_SRC + ${DS_UNIFIED_HEADERS} + ${DS_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-ds/source/DirectoryServiceErrors.cpp b/aws-cpp-sdk-ds/source/DirectoryServiceErrors.cpp index 02691352416..6d4a5db993d 100644 --- a/aws-cpp-sdk-ds/source/DirectoryServiceErrors.cpp +++ b/aws-cpp-sdk-ds/source/DirectoryServiceErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::DirectoryService; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectoryService +{ +namespace DirectoryServiceErrorMapper +{ + static const int ENTITY_DOES_NOT_EXIST_HASH = HashingUtils::HashString("EntityDoesNotExistException"); static const int SNAPSHOT_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("SnapshotLimitExceededException"); static const int CLIENT_HASH = HashingUtils::HashString("ClientException"); @@ -33,12 +40,6 @@ static const int INSUFFICIENT_PERMISSIONS_HASH = HashingUtils::HashString("Insuf static const int INVALID_PARAMETER_HASH = HashingUtils::HashString("InvalidParameterException"); static const int UNSUPPORTED_OPERATION_HASH = HashingUtils::HashString("UnsupportedOperationException"); -namespace Aws -{ -namespace DirectoryService -{ -namespace DirectoryServiceErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-ds/source/model/Attribute.cpp b/aws-cpp-sdk-ds/source/model/Attribute.cpp index 8ecf49a1f51..a6f70e04afa 100644 --- a/aws-cpp-sdk-ds/source/model/Attribute.cpp +++ b/aws-cpp-sdk-ds/source/model/Attribute.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectoryService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectoryService +{ +namespace Model +{ + Attribute::Attribute() : m_nameHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Attribute::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectoryService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ds/source/model/Computer.cpp b/aws-cpp-sdk-ds/source/model/Computer.cpp index 11d8136ef4c..71f755c6ea9 100644 --- a/aws-cpp-sdk-ds/source/model/Computer.cpp +++ b/aws-cpp-sdk-ds/source/model/Computer.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectoryService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectoryService +{ +namespace Model +{ + Computer::Computer() : m_computerIdHasBeenSet(false), m_computerNameHasBeenSet(false), @@ -93,4 +99,8 @@ JsonValue Computer::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectoryService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ds/source/model/DirectoryConnectSettings.cpp b/aws-cpp-sdk-ds/source/model/DirectoryConnectSettings.cpp index 34ebb27f859..1aff9bec7cd 100644 --- a/aws-cpp-sdk-ds/source/model/DirectoryConnectSettings.cpp +++ b/aws-cpp-sdk-ds/source/model/DirectoryConnectSettings.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectoryService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectoryService +{ +namespace Model +{ + DirectoryConnectSettings::DirectoryConnectSettings() : m_vpcIdHasBeenSet(false), m_subnetIdsHasBeenSet(false), @@ -116,4 +122,8 @@ JsonValue DirectoryConnectSettings::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectoryService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ds/source/model/DirectoryConnectSettingsDescription.cpp b/aws-cpp-sdk-ds/source/model/DirectoryConnectSettingsDescription.cpp index 878204a950f..03c959c7ef0 100644 --- a/aws-cpp-sdk-ds/source/model/DirectoryConnectSettingsDescription.cpp +++ b/aws-cpp-sdk-ds/source/model/DirectoryConnectSettingsDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectoryService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectoryService +{ +namespace Model +{ + DirectoryConnectSettingsDescription::DirectoryConnectSettingsDescription() : m_vpcIdHasBeenSet(false), m_subnetIdsHasBeenSet(false), @@ -154,4 +160,8 @@ JsonValue DirectoryConnectSettingsDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectoryService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ds/source/model/DirectoryDescription.cpp b/aws-cpp-sdk-ds/source/model/DirectoryDescription.cpp index 39508b64d50..01c7adb10a7 100644 --- a/aws-cpp-sdk-ds/source/model/DirectoryDescription.cpp +++ b/aws-cpp-sdk-ds/source/model/DirectoryDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectoryService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectoryService +{ +namespace Model +{ + DirectoryDescription::DirectoryDescription() : m_directoryIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -314,4 +320,8 @@ JsonValue DirectoryDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectoryService +} // namespace Aws diff --git a/aws-cpp-sdk-ds/source/model/DirectoryLimits.cpp b/aws-cpp-sdk-ds/source/model/DirectoryLimits.cpp index 6715931fe2b..4436e439e0f 100644 --- a/aws-cpp-sdk-ds/source/model/DirectoryLimits.cpp +++ b/aws-cpp-sdk-ds/source/model/DirectoryLimits.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectoryService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectoryService +{ +namespace Model +{ + DirectoryLimits::DirectoryLimits() : m_cloudOnlyDirectoriesLimit(0), m_cloudOnlyDirectoriesLimitHasBeenSet(false), @@ -193,4 +199,8 @@ JsonValue DirectoryLimits::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectoryService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ds/source/model/DirectorySize.cpp b/aws-cpp-sdk-ds/source/model/DirectorySize.cpp index bb340011f2b..d8eb8842024 100644 --- a/aws-cpp-sdk-ds/source/model/DirectorySize.cpp +++ b/aws-cpp-sdk-ds/source/model/DirectorySize.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Small_HASH = HashingUtils::HashString("Small"); -static const int Large_HASH = HashingUtils::HashString("Large"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace DirectorySizeMapper { + static const int Small_HASH = HashingUtils::HashString("Small"); + static const int Large_HASH = HashingUtils::HashString("Large"); + DirectorySize GetDirectorySizeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ds/source/model/DirectoryStage.cpp b/aws-cpp-sdk-ds/source/model/DirectoryStage.cpp index ce431839e53..ff24509157f 100644 --- a/aws-cpp-sdk-ds/source/model/DirectoryStage.cpp +++ b/aws-cpp-sdk-ds/source/model/DirectoryStage.cpp @@ -19,17 +19,6 @@ using namespace Aws::Utils; -static const int Requested_HASH = HashingUtils::HashString("Requested"); -static const int Creating_HASH = HashingUtils::HashString("Creating"); -static const int Created_HASH = HashingUtils::HashString("Created"); -static const int Active_HASH = HashingUtils::HashString("Active"); -static const int Inoperable_HASH = HashingUtils::HashString("Inoperable"); -static const int Impaired_HASH = HashingUtils::HashString("Impaired"); -static const int Restoring_HASH = HashingUtils::HashString("Restoring"); -static const int RestoreFailed_HASH = HashingUtils::HashString("RestoreFailed"); -static const int Deleting_HASH = HashingUtils::HashString("Deleting"); -static const int Deleted_HASH = HashingUtils::HashString("Deleted"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); namespace Aws { @@ -40,6 +29,18 @@ namespace Aws namespace DirectoryStageMapper { + static const int Requested_HASH = HashingUtils::HashString("Requested"); + static const int Creating_HASH = HashingUtils::HashString("Creating"); + static const int Created_HASH = HashingUtils::HashString("Created"); + static const int Active_HASH = HashingUtils::HashString("Active"); + static const int Inoperable_HASH = HashingUtils::HashString("Inoperable"); + static const int Impaired_HASH = HashingUtils::HashString("Impaired"); + static const int Restoring_HASH = HashingUtils::HashString("Restoring"); + static const int RestoreFailed_HASH = HashingUtils::HashString("RestoreFailed"); + static const int Deleting_HASH = HashingUtils::HashString("Deleting"); + static const int Deleted_HASH = HashingUtils::HashString("Deleted"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + DirectoryStage GetDirectoryStageForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ds/source/model/DirectoryType.cpp b/aws-cpp-sdk-ds/source/model/DirectoryType.cpp index 90195406015..41904d9ef71 100644 --- a/aws-cpp-sdk-ds/source/model/DirectoryType.cpp +++ b/aws-cpp-sdk-ds/source/model/DirectoryType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int SimpleAD_HASH = HashingUtils::HashString("SimpleAD"); -static const int ADConnector_HASH = HashingUtils::HashString("ADConnector"); -static const int MicrosoftAD_HASH = HashingUtils::HashString("MicrosoftAD"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace DirectoryTypeMapper { + static const int SimpleAD_HASH = HashingUtils::HashString("SimpleAD"); + static const int ADConnector_HASH = HashingUtils::HashString("ADConnector"); + static const int MicrosoftAD_HASH = HashingUtils::HashString("MicrosoftAD"); + DirectoryType GetDirectoryTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ds/source/model/DirectoryVpcSettings.cpp b/aws-cpp-sdk-ds/source/model/DirectoryVpcSettings.cpp index 79938c6e64b..37fc3af4fd9 100644 --- a/aws-cpp-sdk-ds/source/model/DirectoryVpcSettings.cpp +++ b/aws-cpp-sdk-ds/source/model/DirectoryVpcSettings.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectoryService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectoryService +{ +namespace Model +{ + DirectoryVpcSettings::DirectoryVpcSettings() : m_vpcIdHasBeenSet(false), m_subnetIdsHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue DirectoryVpcSettings::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectoryService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ds/source/model/DirectoryVpcSettingsDescription.cpp b/aws-cpp-sdk-ds/source/model/DirectoryVpcSettingsDescription.cpp index 617e3e194d4..0289750a179 100644 --- a/aws-cpp-sdk-ds/source/model/DirectoryVpcSettingsDescription.cpp +++ b/aws-cpp-sdk-ds/source/model/DirectoryVpcSettingsDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectoryService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectoryService +{ +namespace Model +{ + DirectoryVpcSettingsDescription::DirectoryVpcSettingsDescription() : m_vpcIdHasBeenSet(false), m_subnetIdsHasBeenSet(false), @@ -116,4 +122,8 @@ JsonValue DirectoryVpcSettingsDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectoryService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ds/source/model/RadiusAuthenticationProtocol.cpp b/aws-cpp-sdk-ds/source/model/RadiusAuthenticationProtocol.cpp index 3c8e6ffa21c..bdd108fdf59 100644 --- a/aws-cpp-sdk-ds/source/model/RadiusAuthenticationProtocol.cpp +++ b/aws-cpp-sdk-ds/source/model/RadiusAuthenticationProtocol.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int PAP_HASH = HashingUtils::HashString("PAP"); -static const int CHAP_HASH = HashingUtils::HashString("CHAP"); -static const int MS_CHAPv1_HASH = HashingUtils::HashString("MS-CHAPv1"); -static const int MS_CHAPv2_HASH = HashingUtils::HashString("MS-CHAPv2"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace RadiusAuthenticationProtocolMapper { + static const int PAP_HASH = HashingUtils::HashString("PAP"); + static const int CHAP_HASH = HashingUtils::HashString("CHAP"); + static const int MS_CHAPv1_HASH = HashingUtils::HashString("MS-CHAPv1"); + static const int MS_CHAPv2_HASH = HashingUtils::HashString("MS-CHAPv2"); + RadiusAuthenticationProtocol GetRadiusAuthenticationProtocolForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ds/source/model/RadiusSettings.cpp b/aws-cpp-sdk-ds/source/model/RadiusSettings.cpp index 31aa35ad8c3..ddaf62acd27 100644 --- a/aws-cpp-sdk-ds/source/model/RadiusSettings.cpp +++ b/aws-cpp-sdk-ds/source/model/RadiusSettings.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectoryService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectoryService +{ +namespace Model +{ + RadiusSettings::RadiusSettings() : m_radiusServersHasBeenSet(false), m_radiusPort(0), @@ -175,4 +181,8 @@ JsonValue RadiusSettings::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectoryService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ds/source/model/RadiusStatus.cpp b/aws-cpp-sdk-ds/source/model/RadiusStatus.cpp index 032dfcc37c3..970ee7c5011 100644 --- a/aws-cpp-sdk-ds/source/model/RadiusStatus.cpp +++ b/aws-cpp-sdk-ds/source/model/RadiusStatus.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int Creating_HASH = HashingUtils::HashString("Creating"); -static const int Completed_HASH = HashingUtils::HashString("Completed"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace RadiusStatusMapper { + static const int Creating_HASH = HashingUtils::HashString("Creating"); + static const int Completed_HASH = HashingUtils::HashString("Completed"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + RadiusStatus GetRadiusStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ds/source/model/Snapshot.cpp b/aws-cpp-sdk-ds/source/model/Snapshot.cpp index f9d811d8b78..e0dac19e295 100644 --- a/aws-cpp-sdk-ds/source/model/Snapshot.cpp +++ b/aws-cpp-sdk-ds/source/model/Snapshot.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectoryService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectoryService +{ +namespace Model +{ + Snapshot::Snapshot() : m_directoryIdHasBeenSet(false), m_snapshotIdHasBeenSet(false), @@ -127,4 +133,8 @@ JsonValue Snapshot::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectoryService +} // namespace Aws diff --git a/aws-cpp-sdk-ds/source/model/SnapshotLimits.cpp b/aws-cpp-sdk-ds/source/model/SnapshotLimits.cpp index 080028bcf7b..7e414575f09 100644 --- a/aws-cpp-sdk-ds/source/model/SnapshotLimits.cpp +++ b/aws-cpp-sdk-ds/source/model/SnapshotLimits.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectoryService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectoryService +{ +namespace Model +{ + SnapshotLimits::SnapshotLimits() : m_manualSnapshotsLimit(0), m_manualSnapshotsLimitHasBeenSet(false), @@ -91,4 +97,8 @@ JsonValue SnapshotLimits::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectoryService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ds/source/model/SnapshotStatus.cpp b/aws-cpp-sdk-ds/source/model/SnapshotStatus.cpp index 18d4f6c9fd3..d2832291108 100644 --- a/aws-cpp-sdk-ds/source/model/SnapshotStatus.cpp +++ b/aws-cpp-sdk-ds/source/model/SnapshotStatus.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int Creating_HASH = HashingUtils::HashString("Creating"); -static const int Completed_HASH = HashingUtils::HashString("Completed"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace SnapshotStatusMapper { + static const int Creating_HASH = HashingUtils::HashString("Creating"); + static const int Completed_HASH = HashingUtils::HashString("Completed"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + SnapshotStatus GetSnapshotStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ds/source/model/SnapshotType.cpp b/aws-cpp-sdk-ds/source/model/SnapshotType.cpp index 2d8a5a51e70..93975075ac4 100644 --- a/aws-cpp-sdk-ds/source/model/SnapshotType.cpp +++ b/aws-cpp-sdk-ds/source/model/SnapshotType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Auto_HASH = HashingUtils::HashString("Auto"); -static const int Manual_HASH = HashingUtils::HashString("Manual"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace SnapshotTypeMapper { + static const int Auto_HASH = HashingUtils::HashString("Auto"); + static const int Manual_HASH = HashingUtils::HashString("Manual"); + SnapshotType GetSnapshotTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ds/source/model/Trust.cpp b/aws-cpp-sdk-ds/source/model/Trust.cpp index d9745553585..bbf705d2366 100644 --- a/aws-cpp-sdk-ds/source/model/Trust.cpp +++ b/aws-cpp-sdk-ds/source/model/Trust.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DirectoryService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DirectoryService +{ +namespace Model +{ + Trust::Trust() : m_directoryIdHasBeenSet(false), m_trustIdHasBeenSet(false), @@ -184,4 +190,8 @@ JsonValue Trust::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DirectoryService +} // namespace Aws diff --git a/aws-cpp-sdk-ds/source/model/TrustDirection.cpp b/aws-cpp-sdk-ds/source/model/TrustDirection.cpp index 89149163acc..1de96c55847 100644 --- a/aws-cpp-sdk-ds/source/model/TrustDirection.cpp +++ b/aws-cpp-sdk-ds/source/model/TrustDirection.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int One_Way_Outgoing_HASH = HashingUtils::HashString("One-Way: Outgoing"); -static const int One_Way_Incoming_HASH = HashingUtils::HashString("One-Way: Incoming"); -static const int Two_Way_HASH = HashingUtils::HashString("Two-Way"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace TrustDirectionMapper { + static const int One_Way_Outgoing_HASH = HashingUtils::HashString("One-Way: Outgoing"); + static const int One_Way_Incoming_HASH = HashingUtils::HashString("One-Way: Incoming"); + static const int Two_Way_HASH = HashingUtils::HashString("Two-Way"); + TrustDirection GetTrustDirectionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ds/source/model/TrustState.cpp b/aws-cpp-sdk-ds/source/model/TrustState.cpp index db03ebc4d4e..6d08632069e 100644 --- a/aws-cpp-sdk-ds/source/model/TrustState.cpp +++ b/aws-cpp-sdk-ds/source/model/TrustState.cpp @@ -19,14 +19,6 @@ using namespace Aws::Utils; -static const int Creating_HASH = HashingUtils::HashString("Creating"); -static const int Created_HASH = HashingUtils::HashString("Created"); -static const int Verifying_HASH = HashingUtils::HashString("Verifying"); -static const int VerifyFailed_HASH = HashingUtils::HashString("VerifyFailed"); -static const int Verified_HASH = HashingUtils::HashString("Verified"); -static const int Deleting_HASH = HashingUtils::HashString("Deleting"); -static const int Deleted_HASH = HashingUtils::HashString("Deleted"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); namespace Aws { @@ -37,6 +29,15 @@ namespace Aws namespace TrustStateMapper { + static const int Creating_HASH = HashingUtils::HashString("Creating"); + static const int Created_HASH = HashingUtils::HashString("Created"); + static const int Verifying_HASH = HashingUtils::HashString("Verifying"); + static const int VerifyFailed_HASH = HashingUtils::HashString("VerifyFailed"); + static const int Verified_HASH = HashingUtils::HashString("Verified"); + static const int Deleting_HASH = HashingUtils::HashString("Deleting"); + static const int Deleted_HASH = HashingUtils::HashString("Deleted"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + TrustState GetTrustStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ds/source/model/TrustType.cpp b/aws-cpp-sdk-ds/source/model/TrustType.cpp index 596a38d5187..e791d4db1c7 100644 --- a/aws-cpp-sdk-ds/source/model/TrustType.cpp +++ b/aws-cpp-sdk-ds/source/model/TrustType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int Forest_HASH = HashingUtils::HashString("Forest"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace TrustTypeMapper { + static const int Forest_HASH = HashingUtils::HashString("Forest"); + TrustType GetTrustTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp b/aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp index ee12a097973..f8191a564f3 100644 --- a/aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp +++ b/aws-cpp-sdk-dynamodb-integration-tests/TableOperationTest.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -291,6 +292,8 @@ std::shared_ptr TableOperationTest TEST_F(TableOperationTest, TestListTable) { + AWS_LOGSTREAM_TRACE(ALLOCATION_TAG, "TestListTable") + DeleteAllTables(); CreateTable(SIMPLE_TABLE, 10, 10); @@ -324,6 +327,8 @@ TEST_F(TableOperationTest, TestListTable) TEST_F(TableOperationTest, TestUpdateThroughput) { + AWS_LOGSTREAM_TRACE(ALLOCATION_TAG, "TestUpdateThroughput") + CreateTable(SIMPLE_TABLE, 10, 10); // Update the table and make sure it works. @@ -345,6 +350,8 @@ TEST_F(TableOperationTest, TestUpdateThroughput) TEST_F(TableOperationTest, TestConditionalCheckFailure) { + AWS_LOGSTREAM_TRACE(ALLOCATION_TAG, "TestConditionalCheckFailure") + CreateTable(SIMPLE_TABLE, 10, 10); AttributeValue homer; @@ -381,6 +388,8 @@ TEST_F(TableOperationTest, TestConditionalCheckFailure) TEST_F(TableOperationTest, TestValidationError) { + AWS_LOGSTREAM_TRACE(ALLOCATION_TAG, "TestValidationError") + CreateTable(SIMPLE_TABLE, 10, 10); AttributeValue hashKeyAttribute; @@ -398,6 +407,8 @@ TEST_F(TableOperationTest, TestValidationError) TEST_F(TableOperationTest, TestThrottling) { + AWS_LOGSTREAM_TRACE(ALLOCATION_TAG, "TestThrottling") + CreateTable(THROTTLED_TEST_TABLE, 1, 1); // Blast the table until it throttles @@ -450,6 +461,8 @@ TEST_F(TableOperationTest, TestThrottling) TEST_F(TableOperationTest, TestCrudOperations) { + AWS_LOGSTREAM_TRACE(ALLOCATION_TAG, "TestCrudOperations") + CreateTable(CRUD_TEST_TABLE, 50, 50); //now put 50 items in the table asynchronously @@ -617,6 +630,8 @@ TEST_F(TableOperationTest, TestCrudOperations) TEST_F(TableOperationTest, TestCrudOperationsWithCallbacks) { + AWS_LOGSTREAM_TRACE(ALLOCATION_TAG, "TestCrudOperationsWithCallbacks") + CreateTable(CRUD_CALLBACKS_TEST_TABLE, 50, 50); //registering a member function is ugly business even in modern c++ @@ -847,6 +862,8 @@ void PutBlobs(DynamoDBClient* client, uint32_t blobRowStartIndex) TEST_F(TableOperationTest, TestLimiter) { + AWS_LOGSTREAM_TRACE(ALLOCATION_TAG, "TestLimiter") + using CLOCK = std::chrono::high_resolution_clock; CreateTable(LIMITER_TEST_TABLE, 100, 100); @@ -883,6 +900,8 @@ TEST_F(TableOperationTest, TestLimiter) TEST_F(TableOperationTest, TestAttributeValues) { + AWS_LOGSTREAM_TRACE(ALLOCATION_TAG, "TestAttributeValues") + CreateTable(ATTRIBUTEVALUE_TEST_TABLE, 50, 50); unsigned char buffer1[6] = { 20, 34, 54, 67, 10, 5 }; diff --git a/aws-cpp-sdk-dynamodb/CMakeLists.txt b/aws-cpp-sdk-dynamodb/CMakeLists.txt index 1fcbebde5b1..c2115cbd1e6 100644 --- a/aws-cpp-sdk-dynamodb/CMakeLists.txt +++ b/aws-cpp-sdk-dynamodb/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-dynamodb) "source/model/*.cpp" ) - file(GLOB DYNAMODB_SRC + file(GLOB DYNAMODB_UNIFIED_HEADERS ${AWS_DYNAMODB_HEADERS} ${AWS_DYNAMODB_MODEL_HEADERS} + ) + + file(GLOB DYNAMODB_UNITY_SRC ${AWS_DYNAMODB_SOURCE} ${AWS_DYNAMODB_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("DYNAMODB" DYNAMODB_UNITY_SRC) + endif() + + file(GLOB DYNAMODB_SRC + ${DYNAMODB_UNIFIED_HEADERS} + ${DYNAMODB_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-dynamodb/source/DynamoDBErrors.cpp b/aws-cpp-sdk-dynamodb/source/DynamoDBErrors.cpp index cf5bdfaa75d..6529ab8cc4b 100644 --- a/aws-cpp-sdk-dynamodb/source/DynamoDBErrors.cpp +++ b/aws-cpp-sdk-dynamodb/source/DynamoDBErrors.cpp @@ -20,12 +20,6 @@ using namespace Aws::Client; using namespace Aws::DynamoDB; using namespace Aws::Utils; -static const int CONDITIONAL_CHECK_FAILED_HASH = HashingUtils::HashString("ConditionalCheckFailedException"); -static const int PROVISIONED_THROUGHPUT_EXCEEDED_HASH = HashingUtils::HashString("ProvisionedThroughputExceededException"); -static const int RESOURCE_IN_USE_HASH = HashingUtils::HashString("ResourceInUseException"); -static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); -static const int ITEM_COLLECTION_SIZE_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("ItemCollectionSizeLimitExceededException"); - namespace Aws { namespace DynamoDB @@ -33,15 +27,18 @@ namespace DynamoDB namespace DynamoDBErrorMapper { +static const int PROVISIONED_THROUGHPUT_EXCEEDED_HASH = HashingUtils::HashString("ProvisionedThroughputExceededException"); +static const int RESOURCE_IN_USE_HASH = HashingUtils::HashString("ResourceInUseException"); +static const int ITEM_COLLECTION_SIZE_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("ItemCollectionSizeLimitExceededException"); +static const int CONDITIONAL_CHECK_FAILED_HASH = HashingUtils::HashString("ConditionalCheckFailedException"); +static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); - if (hashCode == CONDITIONAL_CHECK_FAILED_HASH) - { - return AWSError(static_cast(DynamoDBErrors::CONDITIONAL_CHECK_FAILED), false); - } - else if (hashCode == PROVISIONED_THROUGHPUT_EXCEEDED_HASH) + if (hashCode == PROVISIONED_THROUGHPUT_EXCEEDED_HASH) { return AWSError(static_cast(DynamoDBErrors::PROVISIONED_THROUGHPUT_EXCEEDED), true); } @@ -49,14 +46,18 @@ AWSError GetErrorForName(const char* errorName) { return AWSError(static_cast(DynamoDBErrors::RESOURCE_IN_USE), true); } - else if (hashCode == LIMIT_EXCEEDED_HASH) - { - return AWSError(static_cast(DynamoDBErrors::LIMIT_EXCEEDED), true); - } else if (hashCode == ITEM_COLLECTION_SIZE_LIMIT_EXCEEDED_HASH) { return AWSError(static_cast(DynamoDBErrors::ITEM_COLLECTION_SIZE_LIMIT_EXCEEDED), false); } + else if (hashCode == CONDITIONAL_CHECK_FAILED_HASH) + { + return AWSError(static_cast(DynamoDBErrors::CONDITIONAL_CHECK_FAILED), false); + } + else if (hashCode == LIMIT_EXCEEDED_HASH) + { + return AWSError(static_cast(DynamoDBErrors::LIMIT_EXCEEDED), true); + } return AWSError(CoreErrors::UNKNOWN, false); } diff --git a/aws-cpp-sdk-dynamodb/source/model/AttributeAction.cpp b/aws-cpp-sdk-dynamodb/source/model/AttributeAction.cpp index 8d6bb4d50f7..d22147030ff 100644 --- a/aws-cpp-sdk-dynamodb/source/model/AttributeAction.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/AttributeAction.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int ADD_HASH = HashingUtils::HashString("ADD"); -static const int PUT_HASH = HashingUtils::HashString("PUT"); -static const int DELETE__HASH = HashingUtils::HashString("DELETE"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace AttributeActionMapper { + static const int ADD_HASH = HashingUtils::HashString("ADD"); + static const int PUT_HASH = HashingUtils::HashString("PUT"); + static const int DELETE__HASH = HashingUtils::HashString("DELETE"); + AttributeAction GetAttributeActionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-dynamodb/source/model/AttributeDefinition.cpp b/aws-cpp-sdk-dynamodb/source/model/AttributeDefinition.cpp index f0b079e59e4..26ce2b37059 100644 --- a/aws-cpp-sdk-dynamodb/source/model/AttributeDefinition.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/AttributeDefinition.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + AttributeDefinition::AttributeDefinition() : m_attributeNameHasBeenSet(false), m_attributeTypeHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue AttributeDefinition::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/AttributeValueUpdate.cpp b/aws-cpp-sdk-dynamodb/source/model/AttributeValueUpdate.cpp index ca4d77f3289..b7bb1982754 100644 --- a/aws-cpp-sdk-dynamodb/source/model/AttributeValueUpdate.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/AttributeValueUpdate.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + AttributeValueUpdate::AttributeValueUpdate() : m_valueHasBeenSet(false), m_actionHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue AttributeValueUpdate::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/Capacity.cpp b/aws-cpp-sdk-dynamodb/source/model/Capacity.cpp index 5c43b03bd2b..bbbc1684a1d 100644 --- a/aws-cpp-sdk-dynamodb/source/model/Capacity.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/Capacity.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + Capacity::Capacity() : m_capacityUnits(0.0), m_capacityUnitsHasBeenSet(false) @@ -57,4 +63,8 @@ JsonValue Capacity::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/ComparisonOperator.cpp b/aws-cpp-sdk-dynamodb/source/model/ComparisonOperator.cpp index 74873988110..d4a5e86d648 100644 --- a/aws-cpp-sdk-dynamodb/source/model/ComparisonOperator.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/ComparisonOperator.cpp @@ -19,19 +19,6 @@ using namespace Aws::Utils; -static const int EQ_HASH = HashingUtils::HashString("EQ"); -static const int NE_HASH = HashingUtils::HashString("NE"); -static const int IN_HASH = HashingUtils::HashString("IN"); -static const int LE_HASH = HashingUtils::HashString("LE"); -static const int LT_HASH = HashingUtils::HashString("LT"); -static const int GE_HASH = HashingUtils::HashString("GE"); -static const int GT_HASH = HashingUtils::HashString("GT"); -static const int BETWEEN_HASH = HashingUtils::HashString("BETWEEN"); -static const int NOT_NULL_HASH = HashingUtils::HashString("NOT_NULL"); -static const int NULL__HASH = HashingUtils::HashString("NULL"); -static const int CONTAINS_HASH = HashingUtils::HashString("CONTAINS"); -static const int NOT_CONTAINS_HASH = HashingUtils::HashString("NOT_CONTAINS"); -static const int BEGINS_WITH_HASH = HashingUtils::HashString("BEGINS_WITH"); namespace Aws { @@ -42,6 +29,20 @@ namespace Aws namespace ComparisonOperatorMapper { + static const int EQ_HASH = HashingUtils::HashString("EQ"); + static const int NE_HASH = HashingUtils::HashString("NE"); + static const int IN_HASH = HashingUtils::HashString("IN"); + static const int LE_HASH = HashingUtils::HashString("LE"); + static const int LT_HASH = HashingUtils::HashString("LT"); + static const int GE_HASH = HashingUtils::HashString("GE"); + static const int GT_HASH = HashingUtils::HashString("GT"); + static const int BETWEEN_HASH = HashingUtils::HashString("BETWEEN"); + static const int NOT_NULL_HASH = HashingUtils::HashString("NOT_NULL"); + static const int NULL__HASH = HashingUtils::HashString("NULL"); + static const int CONTAINS_HASH = HashingUtils::HashString("CONTAINS"); + static const int NOT_CONTAINS_HASH = HashingUtils::HashString("NOT_CONTAINS"); + static const int BEGINS_WITH_HASH = HashingUtils::HashString("BEGINS_WITH"); + ComparisonOperator GetComparisonOperatorForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-dynamodb/source/model/Condition.cpp b/aws-cpp-sdk-dynamodb/source/model/Condition.cpp index e5072b2c826..dff2a0adca3 100644 --- a/aws-cpp-sdk-dynamodb/source/model/Condition.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/Condition.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + Condition::Condition() : m_attributeValueListHasBeenSet(false), m_comparisonOperatorHasBeenSet(false) @@ -77,4 +83,8 @@ JsonValue Condition::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/ConditionalOperator.cpp b/aws-cpp-sdk-dynamodb/source/model/ConditionalOperator.cpp index ca9be5a1eca..8dea2929411 100644 --- a/aws-cpp-sdk-dynamodb/source/model/ConditionalOperator.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/ConditionalOperator.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int AND_HASH = HashingUtils::HashString("AND"); -static const int OR_HASH = HashingUtils::HashString("OR"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ConditionalOperatorMapper { + static const int AND_HASH = HashingUtils::HashString("AND"); + static const int OR_HASH = HashingUtils::HashString("OR"); + ConditionalOperator GetConditionalOperatorForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-dynamodb/source/model/ConsumedCapacity.cpp b/aws-cpp-sdk-dynamodb/source/model/ConsumedCapacity.cpp index 7318498dc36..b3e46066582 100644 --- a/aws-cpp-sdk-dynamodb/source/model/ConsumedCapacity.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/ConsumedCapacity.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + ConsumedCapacity::ConsumedCapacity() : m_tableNameHasBeenSet(false), m_capacityUnits(0.0), @@ -133,4 +139,8 @@ JsonValue ConsumedCapacity::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/CreateGlobalSecondaryIndexAction.cpp b/aws-cpp-sdk-dynamodb/source/model/CreateGlobalSecondaryIndexAction.cpp index e58024c7e7b..b549cfc4983 100644 --- a/aws-cpp-sdk-dynamodb/source/model/CreateGlobalSecondaryIndexAction.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/CreateGlobalSecondaryIndexAction.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + CreateGlobalSecondaryIndexAction::CreateGlobalSecondaryIndexAction() : m_indexNameHasBeenSet(false), m_keySchemaHasBeenSet(false), @@ -108,4 +114,8 @@ JsonValue CreateGlobalSecondaryIndexAction::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/DeleteGlobalSecondaryIndexAction.cpp b/aws-cpp-sdk-dynamodb/source/model/DeleteGlobalSecondaryIndexAction.cpp index c98d087c5ed..98523b00a7c 100644 --- a/aws-cpp-sdk-dynamodb/source/model/DeleteGlobalSecondaryIndexAction.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/DeleteGlobalSecondaryIndexAction.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + DeleteGlobalSecondaryIndexAction::DeleteGlobalSecondaryIndexAction() : m_indexNameHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue DeleteGlobalSecondaryIndexAction::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/DeleteRequest.cpp b/aws-cpp-sdk-dynamodb/source/model/DeleteRequest.cpp index d0d7141aea2..3c9a5176672 100644 --- a/aws-cpp-sdk-dynamodb/source/model/DeleteRequest.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/DeleteRequest.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + DeleteRequest::DeleteRequest() : m_keyHasBeenSet(false) { @@ -63,4 +69,8 @@ JsonValue DeleteRequest::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/ExpectedAttributeValue.cpp b/aws-cpp-sdk-dynamodb/source/model/ExpectedAttributeValue.cpp index 662e803d4ab..9c39b75a3c7 100644 --- a/aws-cpp-sdk-dynamodb/source/model/ExpectedAttributeValue.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/ExpectedAttributeValue.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + ExpectedAttributeValue::ExpectedAttributeValue() : m_valueHasBeenSet(false), m_exists(false), @@ -109,4 +115,8 @@ JsonValue ExpectedAttributeValue::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/GlobalSecondaryIndex.cpp b/aws-cpp-sdk-dynamodb/source/model/GlobalSecondaryIndex.cpp index 0e6a318a674..4c6e4ca1a83 100644 --- a/aws-cpp-sdk-dynamodb/source/model/GlobalSecondaryIndex.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/GlobalSecondaryIndex.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + GlobalSecondaryIndex::GlobalSecondaryIndex() : m_indexNameHasBeenSet(false), m_keySchemaHasBeenSet(false), @@ -108,4 +114,8 @@ JsonValue GlobalSecondaryIndex::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/GlobalSecondaryIndexDescription.cpp b/aws-cpp-sdk-dynamodb/source/model/GlobalSecondaryIndexDescription.cpp index 0fa0b09319d..f78e5de6024 100644 --- a/aws-cpp-sdk-dynamodb/source/model/GlobalSecondaryIndexDescription.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/GlobalSecondaryIndexDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + GlobalSecondaryIndexDescription::GlobalSecondaryIndexDescription() : m_indexNameHasBeenSet(false), m_keySchemaHasBeenSet(false), @@ -188,4 +194,8 @@ JsonValue GlobalSecondaryIndexDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/GlobalSecondaryIndexUpdate.cpp b/aws-cpp-sdk-dynamodb/source/model/GlobalSecondaryIndexUpdate.cpp index fad8af2f2d5..e304d592ddd 100644 --- a/aws-cpp-sdk-dynamodb/source/model/GlobalSecondaryIndexUpdate.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/GlobalSecondaryIndexUpdate.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + GlobalSecondaryIndexUpdate::GlobalSecondaryIndexUpdate() : m_updateHasBeenSet(false), m_createHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue GlobalSecondaryIndexUpdate::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/IndexStatus.cpp b/aws-cpp-sdk-dynamodb/source/model/IndexStatus.cpp index d769a7db665..e49d6b279fc 100644 --- a/aws-cpp-sdk-dynamodb/source/model/IndexStatus.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/IndexStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int CREATING_HASH = HashingUtils::HashString("CREATING"); -static const int UPDATING_HASH = HashingUtils::HashString("UPDATING"); -static const int DELETING_HASH = HashingUtils::HashString("DELETING"); -static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace IndexStatusMapper { + static const int CREATING_HASH = HashingUtils::HashString("CREATING"); + static const int UPDATING_HASH = HashingUtils::HashString("UPDATING"); + static const int DELETING_HASH = HashingUtils::HashString("DELETING"); + static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); + IndexStatus GetIndexStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-dynamodb/source/model/ItemCollectionMetrics.cpp b/aws-cpp-sdk-dynamodb/source/model/ItemCollectionMetrics.cpp index 87db5c9e9bc..acfebf090db 100644 --- a/aws-cpp-sdk-dynamodb/source/model/ItemCollectionMetrics.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/ItemCollectionMetrics.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + ItemCollectionMetrics::ItemCollectionMetrics() : m_itemCollectionKeyHasBeenSet(false), m_sizeEstimateRangeGBHasBeenSet(false) @@ -86,4 +92,8 @@ JsonValue ItemCollectionMetrics::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/KeySchemaElement.cpp b/aws-cpp-sdk-dynamodb/source/model/KeySchemaElement.cpp index d51d27d9f83..d2c39bc105c 100644 --- a/aws-cpp-sdk-dynamodb/source/model/KeySchemaElement.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/KeySchemaElement.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + KeySchemaElement::KeySchemaElement() : m_attributeNameHasBeenSet(false), m_keyTypeHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue KeySchemaElement::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/KeyType.cpp b/aws-cpp-sdk-dynamodb/source/model/KeyType.cpp index 13b24e64d93..cee10ec3c08 100644 --- a/aws-cpp-sdk-dynamodb/source/model/KeyType.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/KeyType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int HASH_HASH = HashingUtils::HashString("HASH"); -static const int RANGE_HASH = HashingUtils::HashString("RANGE"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace KeyTypeMapper { + static const int HASH_HASH = HashingUtils::HashString("HASH"); + static const int RANGE_HASH = HashingUtils::HashString("RANGE"); + KeyType GetKeyTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-dynamodb/source/model/KeysAndAttributes.cpp b/aws-cpp-sdk-dynamodb/source/model/KeysAndAttributes.cpp index eaba8d1753e..97de94104a2 100644 --- a/aws-cpp-sdk-dynamodb/source/model/KeysAndAttributes.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/KeysAndAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + KeysAndAttributes::KeysAndAttributes() : m_keysHasBeenSet(false), m_attributesToGetHasBeenSet(false), @@ -152,4 +158,8 @@ JsonValue KeysAndAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/LocalSecondaryIndex.cpp b/aws-cpp-sdk-dynamodb/source/model/LocalSecondaryIndex.cpp index 61ab9fc13aa..60c4cf34092 100644 --- a/aws-cpp-sdk-dynamodb/source/model/LocalSecondaryIndex.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/LocalSecondaryIndex.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + LocalSecondaryIndex::LocalSecondaryIndex() : m_indexNameHasBeenSet(false), m_keySchemaHasBeenSet(false), @@ -93,4 +99,8 @@ JsonValue LocalSecondaryIndex::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/LocalSecondaryIndexDescription.cpp b/aws-cpp-sdk-dynamodb/source/model/LocalSecondaryIndexDescription.cpp index 7a02e8db793..ae954d30c6d 100644 --- a/aws-cpp-sdk-dynamodb/source/model/LocalSecondaryIndexDescription.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/LocalSecondaryIndexDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + LocalSecondaryIndexDescription::LocalSecondaryIndexDescription() : m_indexNameHasBeenSet(false), m_keySchemaHasBeenSet(false), @@ -142,4 +148,8 @@ JsonValue LocalSecondaryIndexDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/Projection.cpp b/aws-cpp-sdk-dynamodb/source/model/Projection.cpp index 6e8a3c16725..fcd303f1117 100644 --- a/aws-cpp-sdk-dynamodb/source/model/Projection.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/Projection.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + Projection::Projection() : m_projectionTypeHasBeenSet(false), m_nonKeyAttributesHasBeenSet(false) @@ -77,4 +83,8 @@ JsonValue Projection::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/ProjectionType.cpp b/aws-cpp-sdk-dynamodb/source/model/ProjectionType.cpp index 1ae0f67fe10..9a5e63ffb9d 100644 --- a/aws-cpp-sdk-dynamodb/source/model/ProjectionType.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/ProjectionType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int ALL_HASH = HashingUtils::HashString("ALL"); -static const int KEYS_ONLY_HASH = HashingUtils::HashString("KEYS_ONLY"); -static const int INCLUDE_HASH = HashingUtils::HashString("INCLUDE"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ProjectionTypeMapper { + static const int ALL_HASH = HashingUtils::HashString("ALL"); + static const int KEYS_ONLY_HASH = HashingUtils::HashString("KEYS_ONLY"); + static const int INCLUDE_HASH = HashingUtils::HashString("INCLUDE"); + ProjectionType GetProjectionTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-dynamodb/source/model/ProvisionedThroughput.cpp b/aws-cpp-sdk-dynamodb/source/model/ProvisionedThroughput.cpp index e9443c243ca..87de0606ba3 100644 --- a/aws-cpp-sdk-dynamodb/source/model/ProvisionedThroughput.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/ProvisionedThroughput.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + ProvisionedThroughput::ProvisionedThroughput() : m_readCapacityUnits(0), m_readCapacityUnitsHasBeenSet(false), @@ -74,4 +80,8 @@ JsonValue ProvisionedThroughput::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/ProvisionedThroughputDescription.cpp b/aws-cpp-sdk-dynamodb/source/model/ProvisionedThroughputDescription.cpp index 1c1619882d4..bf4b4dc9f92 100644 --- a/aws-cpp-sdk-dynamodb/source/model/ProvisionedThroughputDescription.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/ProvisionedThroughputDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + ProvisionedThroughputDescription::ProvisionedThroughputDescription() : m_lastIncreaseDateTimeHasBeenSet(false), m_lastDecreaseDateTimeHasBeenSet(false), @@ -119,4 +125,8 @@ JsonValue ProvisionedThroughputDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws diff --git a/aws-cpp-sdk-dynamodb/source/model/PutRequest.cpp b/aws-cpp-sdk-dynamodb/source/model/PutRequest.cpp index cb9bb0ebe53..541f728bec4 100644 --- a/aws-cpp-sdk-dynamodb/source/model/PutRequest.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/PutRequest.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + PutRequest::PutRequest() : m_itemHasBeenSet(false) { @@ -63,4 +69,8 @@ JsonValue PutRequest::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/ReturnConsumedCapacity.cpp b/aws-cpp-sdk-dynamodb/source/model/ReturnConsumedCapacity.cpp index 87d54a277aa..2ded8deca9e 100644 --- a/aws-cpp-sdk-dynamodb/source/model/ReturnConsumedCapacity.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/ReturnConsumedCapacity.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int INDEXES_HASH = HashingUtils::HashString("INDEXES"); -static const int TOTAL_HASH = HashingUtils::HashString("TOTAL"); -static const int NONE_HASH = HashingUtils::HashString("NONE"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ReturnConsumedCapacityMapper { + static const int INDEXES_HASH = HashingUtils::HashString("INDEXES"); + static const int TOTAL_HASH = HashingUtils::HashString("TOTAL"); + static const int NONE_HASH = HashingUtils::HashString("NONE"); + ReturnConsumedCapacity GetReturnConsumedCapacityForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-dynamodb/source/model/ReturnItemCollectionMetrics.cpp b/aws-cpp-sdk-dynamodb/source/model/ReturnItemCollectionMetrics.cpp index 7931d81bb95..b26fc95bb15 100644 --- a/aws-cpp-sdk-dynamodb/source/model/ReturnItemCollectionMetrics.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/ReturnItemCollectionMetrics.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int SIZE_HASH = HashingUtils::HashString("SIZE"); -static const int NONE_HASH = HashingUtils::HashString("NONE"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ReturnItemCollectionMetricsMapper { + static const int SIZE_HASH = HashingUtils::HashString("SIZE"); + static const int NONE_HASH = HashingUtils::HashString("NONE"); + ReturnItemCollectionMetrics GetReturnItemCollectionMetricsForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-dynamodb/source/model/ReturnValue.cpp b/aws-cpp-sdk-dynamodb/source/model/ReturnValue.cpp index b1de4677b6c..6fd28179772 100644 --- a/aws-cpp-sdk-dynamodb/source/model/ReturnValue.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/ReturnValue.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int NONE_HASH = HashingUtils::HashString("NONE"); -static const int ALL_OLD_HASH = HashingUtils::HashString("ALL_OLD"); -static const int UPDATED_OLD_HASH = HashingUtils::HashString("UPDATED_OLD"); -static const int ALL_NEW_HASH = HashingUtils::HashString("ALL_NEW"); -static const int UPDATED_NEW_HASH = HashingUtils::HashString("UPDATED_NEW"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace ReturnValueMapper { + static const int NONE_HASH = HashingUtils::HashString("NONE"); + static const int ALL_OLD_HASH = HashingUtils::HashString("ALL_OLD"); + static const int UPDATED_OLD_HASH = HashingUtils::HashString("UPDATED_OLD"); + static const int ALL_NEW_HASH = HashingUtils::HashString("ALL_NEW"); + static const int UPDATED_NEW_HASH = HashingUtils::HashString("UPDATED_NEW"); + ReturnValue GetReturnValueForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-dynamodb/source/model/ScalarAttributeType.cpp b/aws-cpp-sdk-dynamodb/source/model/ScalarAttributeType.cpp index 42f84580eea..5f048ed4a5e 100644 --- a/aws-cpp-sdk-dynamodb/source/model/ScalarAttributeType.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/ScalarAttributeType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int S_HASH = HashingUtils::HashString("S"); -static const int N_HASH = HashingUtils::HashString("N"); -static const int B_HASH = HashingUtils::HashString("B"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ScalarAttributeTypeMapper { + static const int S_HASH = HashingUtils::HashString("S"); + static const int N_HASH = HashingUtils::HashString("N"); + static const int B_HASH = HashingUtils::HashString("B"); + ScalarAttributeType GetScalarAttributeTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-dynamodb/source/model/Select.cpp b/aws-cpp-sdk-dynamodb/source/model/Select.cpp index 9331f693920..95469c9a483 100644 --- a/aws-cpp-sdk-dynamodb/source/model/Select.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/Select.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int ALL_ATTRIBUTES_HASH = HashingUtils::HashString("ALL_ATTRIBUTES"); -static const int ALL_PROJECTED_ATTRIBUTES_HASH = HashingUtils::HashString("ALL_PROJECTED_ATTRIBUTES"); -static const int SPECIFIC_ATTRIBUTES_HASH = HashingUtils::HashString("SPECIFIC_ATTRIBUTES"); -static const int COUNT_HASH = HashingUtils::HashString("COUNT"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace SelectMapper { + static const int ALL_ATTRIBUTES_HASH = HashingUtils::HashString("ALL_ATTRIBUTES"); + static const int ALL_PROJECTED_ATTRIBUTES_HASH = HashingUtils::HashString("ALL_PROJECTED_ATTRIBUTES"); + static const int SPECIFIC_ATTRIBUTES_HASH = HashingUtils::HashString("SPECIFIC_ATTRIBUTES"); + static const int COUNT_HASH = HashingUtils::HashString("COUNT"); + Select GetSelectForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-dynamodb/source/model/StreamSpecification.cpp b/aws-cpp-sdk-dynamodb/source/model/StreamSpecification.cpp index e5edbaea9a2..d393a9ce24b 100644 --- a/aws-cpp-sdk-dynamodb/source/model/StreamSpecification.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/StreamSpecification.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + StreamSpecification::StreamSpecification() : m_streamEnabled(false), m_streamEnabledHasBeenSet(false), @@ -71,4 +77,8 @@ JsonValue StreamSpecification::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/StreamViewType.cpp b/aws-cpp-sdk-dynamodb/source/model/StreamViewType.cpp index f2e499e07a8..821c38d3afa 100644 --- a/aws-cpp-sdk-dynamodb/source/model/StreamViewType.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/StreamViewType.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int NEW_IMAGE_HASH = HashingUtils::HashString("NEW_IMAGE"); -static const int OLD_IMAGE_HASH = HashingUtils::HashString("OLD_IMAGE"); -static const int NEW_AND_OLD_IMAGES_HASH = HashingUtils::HashString("NEW_AND_OLD_IMAGES"); -static const int KEYS_ONLY_HASH = HashingUtils::HashString("KEYS_ONLY"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace StreamViewTypeMapper { + static const int NEW_IMAGE_HASH = HashingUtils::HashString("NEW_IMAGE"); + static const int OLD_IMAGE_HASH = HashingUtils::HashString("OLD_IMAGE"); + static const int NEW_AND_OLD_IMAGES_HASH = HashingUtils::HashString("NEW_AND_OLD_IMAGES"); + static const int KEYS_ONLY_HASH = HashingUtils::HashString("KEYS_ONLY"); + StreamViewType GetStreamViewTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-dynamodb/source/model/TableDescription.cpp b/aws-cpp-sdk-dynamodb/source/model/TableDescription.cpp index 47633115a74..21b49352e6f 100644 --- a/aws-cpp-sdk-dynamodb/source/model/TableDescription.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/TableDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + TableDescription::TableDescription() : m_attributeDefinitionsHasBeenSet(false), m_tableNameHasBeenSet(false), @@ -284,4 +290,8 @@ JsonValue TableDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws diff --git a/aws-cpp-sdk-dynamodb/source/model/TableStatus.cpp b/aws-cpp-sdk-dynamodb/source/model/TableStatus.cpp index aaca4cb03bd..ed0377e3a4e 100644 --- a/aws-cpp-sdk-dynamodb/source/model/TableStatus.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/TableStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int CREATING_HASH = HashingUtils::HashString("CREATING"); -static const int UPDATING_HASH = HashingUtils::HashString("UPDATING"); -static const int DELETING_HASH = HashingUtils::HashString("DELETING"); -static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace TableStatusMapper { + static const int CREATING_HASH = HashingUtils::HashString("CREATING"); + static const int UPDATING_HASH = HashingUtils::HashString("UPDATING"); + static const int DELETING_HASH = HashingUtils::HashString("DELETING"); + static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); + TableStatus GetTableStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-dynamodb/source/model/UpdateGlobalSecondaryIndexAction.cpp b/aws-cpp-sdk-dynamodb/source/model/UpdateGlobalSecondaryIndexAction.cpp index b35df411e53..212ce17496d 100644 --- a/aws-cpp-sdk-dynamodb/source/model/UpdateGlobalSecondaryIndexAction.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/UpdateGlobalSecondaryIndexAction.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + UpdateGlobalSecondaryIndexAction::UpdateGlobalSecondaryIndexAction() : m_indexNameHasBeenSet(false), m_provisionedThroughputHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue UpdateGlobalSecondaryIndexAction::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-dynamodb/source/model/WriteRequest.cpp b/aws-cpp-sdk-dynamodb/source/model/WriteRequest.cpp index 49e629618a2..35616f960ee 100644 --- a/aws-cpp-sdk-dynamodb/source/model/WriteRequest.cpp +++ b/aws-cpp-sdk-dynamodb/source/model/WriteRequest.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::DynamoDB::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace DynamoDB +{ +namespace Model +{ + WriteRequest::WriteRequest() : m_putRequestHasBeenSet(false), m_deleteRequestHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue WriteRequest::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace DynamoDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/CMakeLists.txt b/aws-cpp-sdk-ec2/CMakeLists.txt index 745d6ed8c35..56e24f257da 100644 --- a/aws-cpp-sdk-ec2/CMakeLists.txt +++ b/aws-cpp-sdk-ec2/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-ec2) "source/model/*.cpp" ) - file(GLOB EC2_SRC + file(GLOB EC2_UNIFIED_HEADERS ${AWS_EC2_HEADERS} ${AWS_EC2_MODEL_HEADERS} + ) + + file(GLOB EC2_UNITY_SRC ${AWS_EC2_SOURCE} ${AWS_EC2_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("EC2" EC2_UNITY_SRC) + endif() + + file(GLOB EC2_SRC + ${EC2_UNIFIED_HEADERS} + ${EC2_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-ec2/source/EC2Errors.cpp b/aws-cpp-sdk-ec2/source/EC2Errors.cpp index 4659dd2cb31..e4c61dc460b 100644 --- a/aws-cpp-sdk-ec2/source/EC2Errors.cpp +++ b/aws-cpp-sdk-ec2/source/EC2Errors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::EC2; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace EC2ErrorMapper +{ + static const int INVALID_ROUTE_TABLE_I_D__NOT_FOUND_HASH = HashingUtils::HashString("InvalidRouteTableID.NotFound"); static const int INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET_HASH = HashingUtils::HashString("InsufficientFreeAddressesInSubnet"); static const int INVALID_BUNDLE_I_D__NOT_FOUND_HASH = HashingUtils::HashString("InvalidBundleID.NotFound"); @@ -194,12 +201,6 @@ static const int INVALID_ATTACHMENT__NOT_FOUND_HASH = HashingUtils::HashString(" static const int SNAPSHOT_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("SnapshotLimitExceeded"); static const int MAX_SPOT_FLEET_REQUEST_COUNT_EXCEEDED_HASH = HashingUtils::HashString("MaxSpotFleetRequestCountExceeded"); -namespace Aws -{ -namespace EC2 -{ -namespace EC2ErrorMapper -{ /* The if-else chains in this file are converted into a jump table by the compiler, diff --git a/aws-cpp-sdk-ec2/source/model/AccountAttribute.cpp b/aws-cpp-sdk-ec2/source/model/AccountAttribute.cpp index 3a4e86d1296..f8ac6e3f53e 100644 --- a/aws-cpp-sdk-ec2/source/model/AccountAttribute.cpp +++ b/aws-cpp-sdk-ec2/source/model/AccountAttribute.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + AccountAttribute::AccountAttribute() : m_attributeNameHasBeenSet(false), m_attributeValuesHasBeenSet(false) @@ -100,3 +106,7 @@ void AccountAttribute::OutputToStream(Aws::OStream& oStream, const char* locatio } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/AccountAttributeName.cpp b/aws-cpp-sdk-ec2/source/model/AccountAttributeName.cpp index ff564e7b23f..3bfb02b6b44 100644 --- a/aws-cpp-sdk-ec2/source/model/AccountAttributeName.cpp +++ b/aws-cpp-sdk-ec2/source/model/AccountAttributeName.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int supported_platforms_HASH = HashingUtils::HashString("supported-platforms"); -static const int default_vpc_HASH = HashingUtils::HashString("default-vpc"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace AccountAttributeNameMapper { + static const int supported_platforms_HASH = HashingUtils::HashString("supported-platforms"); + static const int default_vpc_HASH = HashingUtils::HashString("default-vpc"); + AccountAttributeName GetAccountAttributeNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/AccountAttributeValue.cpp b/aws-cpp-sdk-ec2/source/model/AccountAttributeValue.cpp index 1895d5a347b..4aa5ac6fb58 100644 --- a/aws-cpp-sdk-ec2/source/model/AccountAttributeValue.cpp +++ b/aws-cpp-sdk-ec2/source/model/AccountAttributeValue.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + AccountAttributeValue::AccountAttributeValue() : m_attributeValueHasBeenSet(false) { @@ -66,3 +72,7 @@ void AccountAttributeValue::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".AttributeValue=" << StringUtils::URLEncode(m_attributeValue.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ActiveInstance.cpp b/aws-cpp-sdk-ec2/source/model/ActiveInstance.cpp index af464f73acd..9a1348668c3 100644 --- a/aws-cpp-sdk-ec2/source/model/ActiveInstance.cpp +++ b/aws-cpp-sdk-ec2/source/model/ActiveInstance.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ActiveInstance::ActiveInstance() : m_instanceTypeHasBeenSet(false), m_instanceIdHasBeenSet(false), @@ -98,3 +104,7 @@ void ActiveInstance::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".SpotInstanceRequestId=" << StringUtils::URLEncode(m_spotInstanceRequestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/Address.cpp b/aws-cpp-sdk-ec2/source/model/Address.cpp index 2d279ff299f..447f29051dc 100644 --- a/aws-cpp-sdk-ec2/source/model/Address.cpp +++ b/aws-cpp-sdk-ec2/source/model/Address.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Address::Address() : m_instanceIdHasBeenSet(false), m_publicIpHasBeenSet(false), @@ -178,3 +184,7 @@ void Address::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".PrivateIpAddress=" << StringUtils::URLEncode(m_privateIpAddress.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/Affinity.cpp b/aws-cpp-sdk-ec2/source/model/Affinity.cpp index 3d04ff1bd2f..fd70b034753 100644 --- a/aws-cpp-sdk-ec2/source/model/Affinity.cpp +++ b/aws-cpp-sdk-ec2/source/model/Affinity.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int default__HASH = HashingUtils::HashString("default"); -static const int host_HASH = HashingUtils::HashString("host"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace AffinityMapper { + static const int default__HASH = HashingUtils::HashString("default"); + static const int host_HASH = HashingUtils::HashString("host"); + Affinity GetAffinityForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/AllocationState.cpp b/aws-cpp-sdk-ec2/source/model/AllocationState.cpp index 56ea993b3e3..5a015b09a3c 100644 --- a/aws-cpp-sdk-ec2/source/model/AllocationState.cpp +++ b/aws-cpp-sdk-ec2/source/model/AllocationState.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int available_HASH = HashingUtils::HashString("available"); -static const int under_assessment_HASH = HashingUtils::HashString("under-assessment"); -static const int permanent_failure_HASH = HashingUtils::HashString("permanent-failure"); -static const int released_HASH = HashingUtils::HashString("released"); -static const int released_permanent_failure_HASH = HashingUtils::HashString("released-permanent-failure"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace AllocationStateMapper { + static const int available_HASH = HashingUtils::HashString("available"); + static const int under_assessment_HASH = HashingUtils::HashString("under-assessment"); + static const int permanent_failure_HASH = HashingUtils::HashString("permanent-failure"); + static const int released_HASH = HashingUtils::HashString("released"); + static const int released_permanent_failure_HASH = HashingUtils::HashString("released-permanent-failure"); + AllocationState GetAllocationStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/AllocationStrategy.cpp b/aws-cpp-sdk-ec2/source/model/AllocationStrategy.cpp index e222650d6e4..0bbdbdf7744 100644 --- a/aws-cpp-sdk-ec2/source/model/AllocationStrategy.cpp +++ b/aws-cpp-sdk-ec2/source/model/AllocationStrategy.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int lowestPrice_HASH = HashingUtils::HashString("lowestPrice"); -static const int diversified_HASH = HashingUtils::HashString("diversified"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace AllocationStrategyMapper { + static const int lowestPrice_HASH = HashingUtils::HashString("lowestPrice"); + static const int diversified_HASH = HashingUtils::HashString("diversified"); + AllocationStrategy GetAllocationStrategyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/ArchitectureValues.cpp b/aws-cpp-sdk-ec2/source/model/ArchitectureValues.cpp index e66f452acae..12dcee8f7b5 100644 --- a/aws-cpp-sdk-ec2/source/model/ArchitectureValues.cpp +++ b/aws-cpp-sdk-ec2/source/model/ArchitectureValues.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int i386_HASH = HashingUtils::HashString("i386"); -static const int x86_64_HASH = HashingUtils::HashString("x86_64"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ArchitectureValuesMapper { + static const int i386_HASH = HashingUtils::HashString("i386"); + static const int x86_64_HASH = HashingUtils::HashString("x86_64"); + ArchitectureValues GetArchitectureValuesForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/AttachmentStatus.cpp b/aws-cpp-sdk-ec2/source/model/AttachmentStatus.cpp index 4ac2515c7f7..fd9aa036c1c 100644 --- a/aws-cpp-sdk-ec2/source/model/AttachmentStatus.cpp +++ b/aws-cpp-sdk-ec2/source/model/AttachmentStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int attaching_HASH = HashingUtils::HashString("attaching"); -static const int attached_HASH = HashingUtils::HashString("attached"); -static const int detaching_HASH = HashingUtils::HashString("detaching"); -static const int detached_HASH = HashingUtils::HashString("detached"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace AttachmentStatusMapper { + static const int attaching_HASH = HashingUtils::HashString("attaching"); + static const int attached_HASH = HashingUtils::HashString("attached"); + static const int detaching_HASH = HashingUtils::HashString("detaching"); + static const int detached_HASH = HashingUtils::HashString("detached"); + AttachmentStatus GetAttachmentStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/AttributeBooleanValue.cpp b/aws-cpp-sdk-ec2/source/model/AttributeBooleanValue.cpp index 14807651b95..1264d5be0cd 100644 --- a/aws-cpp-sdk-ec2/source/model/AttributeBooleanValue.cpp +++ b/aws-cpp-sdk-ec2/source/model/AttributeBooleanValue.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + AttributeBooleanValue::AttributeBooleanValue() : m_value(false), m_valueHasBeenSet(false) @@ -68,3 +74,7 @@ void AttributeBooleanValue::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".Value=" << m_value << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/AttributeValue.cpp b/aws-cpp-sdk-ec2/source/model/AttributeValue.cpp index 3627a0fe17a..57329f939c5 100644 --- a/aws-cpp-sdk-ec2/source/model/AttributeValue.cpp +++ b/aws-cpp-sdk-ec2/source/model/AttributeValue.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + AttributeValue::AttributeValue() : m_valueHasBeenSet(false) { @@ -66,3 +72,7 @@ void AttributeValue::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/AutoPlacement.cpp b/aws-cpp-sdk-ec2/source/model/AutoPlacement.cpp index 2cf8ae2cdd6..771e5d6e99d 100644 --- a/aws-cpp-sdk-ec2/source/model/AutoPlacement.cpp +++ b/aws-cpp-sdk-ec2/source/model/AutoPlacement.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int on_HASH = HashingUtils::HashString("on"); -static const int off_HASH = HashingUtils::HashString("off"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace AutoPlacementMapper { + static const int on_HASH = HashingUtils::HashString("on"); + static const int off_HASH = HashingUtils::HashString("off"); + AutoPlacement GetAutoPlacementForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/AvailabilityZone.cpp b/aws-cpp-sdk-ec2/source/model/AvailabilityZone.cpp index 77350fa337c..a88a4449a8e 100644 --- a/aws-cpp-sdk-ec2/source/model/AvailabilityZone.cpp +++ b/aws-cpp-sdk-ec2/source/model/AvailabilityZone.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + AvailabilityZone::AvailabilityZone() : m_zoneNameHasBeenSet(false), m_stateHasBeenSet(false), @@ -132,3 +138,7 @@ void AvailabilityZone::OutputToStream(Aws::OStream& oStream, const char* locatio } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/AvailabilityZoneMessage.cpp b/aws-cpp-sdk-ec2/source/model/AvailabilityZoneMessage.cpp index 0731d755193..913d0765491 100644 --- a/aws-cpp-sdk-ec2/source/model/AvailabilityZoneMessage.cpp +++ b/aws-cpp-sdk-ec2/source/model/AvailabilityZoneMessage.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + AvailabilityZoneMessage::AvailabilityZoneMessage() : m_messageHasBeenSet(false) { @@ -66,3 +72,7 @@ void AvailabilityZoneMessage::OutputToStream(Aws::OStream& oStream, const char* oStream << location << ".Message=" << StringUtils::URLEncode(m_message.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/AvailabilityZoneState.cpp b/aws-cpp-sdk-ec2/source/model/AvailabilityZoneState.cpp index 06e3716efcd..1760e00252a 100644 --- a/aws-cpp-sdk-ec2/source/model/AvailabilityZoneState.cpp +++ b/aws-cpp-sdk-ec2/source/model/AvailabilityZoneState.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int available_HASH = HashingUtils::HashString("available"); -static const int information_HASH = HashingUtils::HashString("information"); -static const int impaired_HASH = HashingUtils::HashString("impaired"); -static const int unavailable_HASH = HashingUtils::HashString("unavailable"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace AvailabilityZoneStateMapper { + static const int available_HASH = HashingUtils::HashString("available"); + static const int information_HASH = HashingUtils::HashString("information"); + static const int impaired_HASH = HashingUtils::HashString("impaired"); + static const int unavailable_HASH = HashingUtils::HashString("unavailable"); + AvailabilityZoneState GetAvailabilityZoneStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/AvailableCapacity.cpp b/aws-cpp-sdk-ec2/source/model/AvailableCapacity.cpp index 4c8030909f2..c2be52fedd5 100644 --- a/aws-cpp-sdk-ec2/source/model/AvailableCapacity.cpp +++ b/aws-cpp-sdk-ec2/source/model/AvailableCapacity.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + AvailableCapacity::AvailableCapacity() : m_availableInstanceCapacityHasBeenSet(false), m_availableVCpus(0), @@ -102,3 +108,7 @@ void AvailableCapacity::OutputToStream(Aws::OStream& oStream, const char* locati oStream << location << ".AvailableVCpus=" << m_availableVCpus << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/BatchState.cpp b/aws-cpp-sdk-ec2/source/model/BatchState.cpp index 42d42f6d69e..15432876a46 100644 --- a/aws-cpp-sdk-ec2/source/model/BatchState.cpp +++ b/aws-cpp-sdk-ec2/source/model/BatchState.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int submitted_HASH = HashingUtils::HashString("submitted"); -static const int active_HASH = HashingUtils::HashString("active"); -static const int cancelled_HASH = HashingUtils::HashString("cancelled"); -static const int failed_HASH = HashingUtils::HashString("failed"); -static const int cancelled_running_HASH = HashingUtils::HashString("cancelled_running"); -static const int cancelled_terminating_HASH = HashingUtils::HashString("cancelled_terminating"); -static const int modifying_HASH = HashingUtils::HashString("modifying"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace BatchStateMapper { + static const int submitted_HASH = HashingUtils::HashString("submitted"); + static const int active_HASH = HashingUtils::HashString("active"); + static const int cancelled_HASH = HashingUtils::HashString("cancelled"); + static const int failed_HASH = HashingUtils::HashString("failed"); + static const int cancelled_running_HASH = HashingUtils::HashString("cancelled_running"); + static const int cancelled_terminating_HASH = HashingUtils::HashString("cancelled_terminating"); + static const int modifying_HASH = HashingUtils::HashString("modifying"); + BatchState GetBatchStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/BlobAttributeValue.cpp b/aws-cpp-sdk-ec2/source/model/BlobAttributeValue.cpp index c0d31d3c95b..83c45771023 100644 --- a/aws-cpp-sdk-ec2/source/model/BlobAttributeValue.cpp +++ b/aws-cpp-sdk-ec2/source/model/BlobAttributeValue.cpp @@ -20,10 +20,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + BlobAttributeValue::BlobAttributeValue() : m_valueHasBeenSet(false) { @@ -67,3 +73,7 @@ void BlobAttributeValue::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".Value=" << StringUtils::URLEncode(HashingUtils::Base64Encode(m_value).c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/BlockDeviceMapping.cpp b/aws-cpp-sdk-ec2/source/model/BlockDeviceMapping.cpp index 1238bb683eb..45b28bea271 100644 --- a/aws-cpp-sdk-ec2/source/model/BlockDeviceMapping.cpp +++ b/aws-cpp-sdk-ec2/source/model/BlockDeviceMapping.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + BlockDeviceMapping::BlockDeviceMapping() : m_virtualNameHasBeenSet(false), m_deviceNameHasBeenSet(false), @@ -118,3 +124,7 @@ void BlockDeviceMapping::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".NoDevice=" << StringUtils::URLEncode(m_noDevice.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/BundleTask.cpp b/aws-cpp-sdk-ec2/source/model/BundleTask.cpp index e9d1518c3f9..1fec95dd22f 100644 --- a/aws-cpp-sdk-ec2/source/model/BundleTask.cpp +++ b/aws-cpp-sdk-ec2/source/model/BundleTask.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + BundleTask::BundleTask() : m_instanceIdHasBeenSet(false), m_bundleIdHasBeenSet(false), @@ -186,3 +192,7 @@ void BundleTask::OutputToStream(Aws::OStream& oStream, const char* location) con m_bundleTaskError.OutputToStream(oStream, bundleTaskErrorLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/BundleTaskError.cpp b/aws-cpp-sdk-ec2/source/model/BundleTaskError.cpp index 1940d8bfc1e..9ec23d67ab0 100644 --- a/aws-cpp-sdk-ec2/source/model/BundleTaskError.cpp +++ b/aws-cpp-sdk-ec2/source/model/BundleTaskError.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + BundleTaskError::BundleTaskError() : m_codeHasBeenSet(false), m_messageHasBeenSet(false) @@ -82,3 +88,7 @@ void BundleTaskError::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".Message=" << StringUtils::URLEncode(m_message.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/BundleTaskState.cpp b/aws-cpp-sdk-ec2/source/model/BundleTaskState.cpp index 7e88cf06a8a..0e6de9b2872 100644 --- a/aws-cpp-sdk-ec2/source/model/BundleTaskState.cpp +++ b/aws-cpp-sdk-ec2/source/model/BundleTaskState.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int pending_HASH = HashingUtils::HashString("pending"); -static const int waiting_for_shutdown_HASH = HashingUtils::HashString("waiting-for-shutdown"); -static const int bundling_HASH = HashingUtils::HashString("bundling"); -static const int storing_HASH = HashingUtils::HashString("storing"); -static const int cancelling_HASH = HashingUtils::HashString("cancelling"); -static const int complete_HASH = HashingUtils::HashString("complete"); -static const int failed_HASH = HashingUtils::HashString("failed"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace BundleTaskStateMapper { + static const int pending_HASH = HashingUtils::HashString("pending"); + static const int waiting_for_shutdown_HASH = HashingUtils::HashString("waiting-for-shutdown"); + static const int bundling_HASH = HashingUtils::HashString("bundling"); + static const int storing_HASH = HashingUtils::HashString("storing"); + static const int cancelling_HASH = HashingUtils::HashString("cancelling"); + static const int complete_HASH = HashingUtils::HashString("complete"); + static const int failed_HASH = HashingUtils::HashString("failed"); + BundleTaskState GetBundleTaskStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/CancelBatchErrorCode.cpp b/aws-cpp-sdk-ec2/source/model/CancelBatchErrorCode.cpp index 7ba8451e6ef..64ac370ccda 100644 --- a/aws-cpp-sdk-ec2/source/model/CancelBatchErrorCode.cpp +++ b/aws-cpp-sdk-ec2/source/model/CancelBatchErrorCode.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int fleetRequestIdDoesNotExist_HASH = HashingUtils::HashString("fleetRequestIdDoesNotExist"); -static const int fleetRequestIdMalformed_HASH = HashingUtils::HashString("fleetRequestIdMalformed"); -static const int fleetRequestNotInCancellableState_HASH = HashingUtils::HashString("fleetRequestNotInCancellableState"); -static const int unexpectedError_HASH = HashingUtils::HashString("unexpectedError"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace CancelBatchErrorCodeMapper { + static const int fleetRequestIdDoesNotExist_HASH = HashingUtils::HashString("fleetRequestIdDoesNotExist"); + static const int fleetRequestIdMalformed_HASH = HashingUtils::HashString("fleetRequestIdMalformed"); + static const int fleetRequestNotInCancellableState_HASH = HashingUtils::HashString("fleetRequestNotInCancellableState"); + static const int unexpectedError_HASH = HashingUtils::HashString("unexpectedError"); + CancelBatchErrorCode GetCancelBatchErrorCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/CancelSpotFleetRequestsError.cpp b/aws-cpp-sdk-ec2/source/model/CancelSpotFleetRequestsError.cpp index d3ae7d942c5..fa6580028be 100644 --- a/aws-cpp-sdk-ec2/source/model/CancelSpotFleetRequestsError.cpp +++ b/aws-cpp-sdk-ec2/source/model/CancelSpotFleetRequestsError.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + CancelSpotFleetRequestsError::CancelSpotFleetRequestsError() : m_codeHasBeenSet(false), m_messageHasBeenSet(false) @@ -82,3 +88,7 @@ void CancelSpotFleetRequestsError::OutputToStream(Aws::OStream& oStream, const c oStream << location << ".Message=" << StringUtils::URLEncode(m_message.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/CancelSpotFleetRequestsErrorItem.cpp b/aws-cpp-sdk-ec2/source/model/CancelSpotFleetRequestsErrorItem.cpp index 0639b95ad4c..a212c6521a5 100644 --- a/aws-cpp-sdk-ec2/source/model/CancelSpotFleetRequestsErrorItem.cpp +++ b/aws-cpp-sdk-ec2/source/model/CancelSpotFleetRequestsErrorItem.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + CancelSpotFleetRequestsErrorItem::CancelSpotFleetRequestsErrorItem() : m_spotFleetRequestIdHasBeenSet(false), m_errorHasBeenSet(false) @@ -86,3 +92,7 @@ void CancelSpotFleetRequestsErrorItem::OutputToStream(Aws::OStream& oStream, con m_error.OutputToStream(oStream, errorLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/CancelSpotFleetRequestsSuccessItem.cpp b/aws-cpp-sdk-ec2/source/model/CancelSpotFleetRequestsSuccessItem.cpp index 5c94691d74d..d3b8c794dd0 100644 --- a/aws-cpp-sdk-ec2/source/model/CancelSpotFleetRequestsSuccessItem.cpp +++ b/aws-cpp-sdk-ec2/source/model/CancelSpotFleetRequestsSuccessItem.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + CancelSpotFleetRequestsSuccessItem::CancelSpotFleetRequestsSuccessItem() : m_spotFleetRequestIdHasBeenSet(false), m_currentSpotFleetRequestStateHasBeenSet(false), @@ -98,3 +104,7 @@ void CancelSpotFleetRequestsSuccessItem::OutputToStream(Aws::OStream& oStream, c oStream << location << ".PreviousSpotFleetRequestState=" << BatchStateMapper::GetNameForBatchState(m_previousSpotFleetRequestState) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/CancelSpotInstanceRequestState.cpp b/aws-cpp-sdk-ec2/source/model/CancelSpotInstanceRequestState.cpp index f22692184ea..1f30f88e1e4 100644 --- a/aws-cpp-sdk-ec2/source/model/CancelSpotInstanceRequestState.cpp +++ b/aws-cpp-sdk-ec2/source/model/CancelSpotInstanceRequestState.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int active_HASH = HashingUtils::HashString("active"); -static const int open_HASH = HashingUtils::HashString("open"); -static const int closed_HASH = HashingUtils::HashString("closed"); -static const int cancelled_HASH = HashingUtils::HashString("cancelled"); -static const int completed_HASH = HashingUtils::HashString("completed"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace CancelSpotInstanceRequestStateMapper { + static const int active_HASH = HashingUtils::HashString("active"); + static const int open_HASH = HashingUtils::HashString("open"); + static const int closed_HASH = HashingUtils::HashString("closed"); + static const int cancelled_HASH = HashingUtils::HashString("cancelled"); + static const int completed_HASH = HashingUtils::HashString("completed"); + CancelSpotInstanceRequestState GetCancelSpotInstanceRequestStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/CancelledSpotInstanceRequest.cpp b/aws-cpp-sdk-ec2/source/model/CancelledSpotInstanceRequest.cpp index d7326f47fdc..34a7f74b3ca 100644 --- a/aws-cpp-sdk-ec2/source/model/CancelledSpotInstanceRequest.cpp +++ b/aws-cpp-sdk-ec2/source/model/CancelledSpotInstanceRequest.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + CancelledSpotInstanceRequest::CancelledSpotInstanceRequest() : m_spotInstanceRequestIdHasBeenSet(false), m_stateHasBeenSet(false) @@ -82,3 +88,7 @@ void CancelledSpotInstanceRequest::OutputToStream(Aws::OStream& oStream, const c oStream << location << ".State=" << CancelSpotInstanceRequestStateMapper::GetNameForCancelSpotInstanceRequestState(m_state) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ClassicLinkDnsSupport.cpp b/aws-cpp-sdk-ec2/source/model/ClassicLinkDnsSupport.cpp index dda8a7c2a02..f40a16fc5df 100644 --- a/aws-cpp-sdk-ec2/source/model/ClassicLinkDnsSupport.cpp +++ b/aws-cpp-sdk-ec2/source/model/ClassicLinkDnsSupport.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ClassicLinkDnsSupport::ClassicLinkDnsSupport() : m_vpcIdHasBeenSet(false), m_classicLinkDnsSupported(false), @@ -84,3 +90,7 @@ void ClassicLinkDnsSupport::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".ClassicLinkDnsSupported=" << m_classicLinkDnsSupported << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ClassicLinkInstance.cpp b/aws-cpp-sdk-ec2/source/model/ClassicLinkInstance.cpp index fe1973b1841..4fe7b187fca 100644 --- a/aws-cpp-sdk-ec2/source/model/ClassicLinkInstance.cpp +++ b/aws-cpp-sdk-ec2/source/model/ClassicLinkInstance.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ClassicLinkInstance::ClassicLinkInstance() : m_instanceIdHasBeenSet(false), m_vpcIdHasBeenSet(false), @@ -150,3 +156,7 @@ void ClassicLinkInstance::OutputToStream(Aws::OStream& oStream, const char* loca } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ClientData.cpp b/aws-cpp-sdk-ec2/source/model/ClientData.cpp index 12431d08bc2..8ecac1a1379 100644 --- a/aws-cpp-sdk-ec2/source/model/ClientData.cpp +++ b/aws-cpp-sdk-ec2/source/model/ClientData.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ClientData::ClientData() : m_uploadStartHasBeenSet(false), m_uploadEndHasBeenSet(false), @@ -116,3 +122,7 @@ void ClientData::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".Comment=" << StringUtils::URLEncode(m_comment.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/ContainerFormat.cpp b/aws-cpp-sdk-ec2/source/model/ContainerFormat.cpp index 956491be3aa..d0548fbe96e 100644 --- a/aws-cpp-sdk-ec2/source/model/ContainerFormat.cpp +++ b/aws-cpp-sdk-ec2/source/model/ContainerFormat.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int ova_HASH = HashingUtils::HashString("ova"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace ContainerFormatMapper { + static const int ova_HASH = HashingUtils::HashString("ova"); + ContainerFormat GetContainerFormatForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/ConversionTask.cpp b/aws-cpp-sdk-ec2/source/model/ConversionTask.cpp index a0610cf543f..fbd2d51bbb7 100644 --- a/aws-cpp-sdk-ec2/source/model/ConversionTask.cpp +++ b/aws-cpp-sdk-ec2/source/model/ConversionTask.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ConversionTask::ConversionTask() : m_conversionTaskIdHasBeenSet(false), m_expirationTimeHasBeenSet(false), @@ -188,3 +194,7 @@ void ConversionTask::OutputToStream(Aws::OStream& oStream, const char* location) } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ConversionTaskState.cpp b/aws-cpp-sdk-ec2/source/model/ConversionTaskState.cpp index 9e851f4cfa9..2a4c3a36442 100644 --- a/aws-cpp-sdk-ec2/source/model/ConversionTaskState.cpp +++ b/aws-cpp-sdk-ec2/source/model/ConversionTaskState.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int active_HASH = HashingUtils::HashString("active"); -static const int cancelling_HASH = HashingUtils::HashString("cancelling"); -static const int cancelled_HASH = HashingUtils::HashString("cancelled"); -static const int completed_HASH = HashingUtils::HashString("completed"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace ConversionTaskStateMapper { + static const int active_HASH = HashingUtils::HashString("active"); + static const int cancelling_HASH = HashingUtils::HashString("cancelling"); + static const int cancelled_HASH = HashingUtils::HashString("cancelled"); + static const int completed_HASH = HashingUtils::HashString("completed"); + ConversionTaskState GetConversionTaskStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/CreateVolumePermission.cpp b/aws-cpp-sdk-ec2/source/model/CreateVolumePermission.cpp index e0974ececaf..11180b62e40 100644 --- a/aws-cpp-sdk-ec2/source/model/CreateVolumePermission.cpp +++ b/aws-cpp-sdk-ec2/source/model/CreateVolumePermission.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + CreateVolumePermission::CreateVolumePermission() : m_userIdHasBeenSet(false), m_groupHasBeenSet(false) @@ -82,3 +88,7 @@ void CreateVolumePermission::OutputToStream(Aws::OStream& oStream, const char* l oStream << location << ".Group=" << PermissionGroupMapper::GetNameForPermissionGroup(m_group) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/CreateVolumePermissionModifications.cpp b/aws-cpp-sdk-ec2/source/model/CreateVolumePermissionModifications.cpp index e65672647ad..cafa1200add 100644 --- a/aws-cpp-sdk-ec2/source/model/CreateVolumePermissionModifications.cpp +++ b/aws-cpp-sdk-ec2/source/model/CreateVolumePermissionModifications.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + CreateVolumePermissionModifications::CreateVolumePermissionModifications() : m_addHasBeenSet(false), m_removeHasBeenSet(false) @@ -118,3 +124,7 @@ void CreateVolumePermissionModifications::OutputToStream(Aws::OStream& oStream, } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/CurrencyCodeValues.cpp b/aws-cpp-sdk-ec2/source/model/CurrencyCodeValues.cpp index 5f44d1ba333..76c20d4aab1 100644 --- a/aws-cpp-sdk-ec2/source/model/CurrencyCodeValues.cpp +++ b/aws-cpp-sdk-ec2/source/model/CurrencyCodeValues.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int USD_HASH = HashingUtils::HashString("USD"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace CurrencyCodeValuesMapper { + static const int USD_HASH = HashingUtils::HashString("USD"); + CurrencyCodeValues GetCurrencyCodeValuesForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/CustomerGateway.cpp b/aws-cpp-sdk-ec2/source/model/CustomerGateway.cpp index a1cf2ffaec0..f7b1cc55fac 100644 --- a/aws-cpp-sdk-ec2/source/model/CustomerGateway.cpp +++ b/aws-cpp-sdk-ec2/source/model/CustomerGateway.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + CustomerGateway::CustomerGateway() : m_customerGatewayIdHasBeenSet(false), m_stateHasBeenSet(false), @@ -164,3 +170,7 @@ void CustomerGateway::OutputToStream(Aws::OStream& oStream, const char* location } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/DatafeedSubscriptionState.cpp b/aws-cpp-sdk-ec2/source/model/DatafeedSubscriptionState.cpp index 91259d3e012..4338d1994bb 100644 --- a/aws-cpp-sdk-ec2/source/model/DatafeedSubscriptionState.cpp +++ b/aws-cpp-sdk-ec2/source/model/DatafeedSubscriptionState.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Active_HASH = HashingUtils::HashString("Active"); -static const int Inactive_HASH = HashingUtils::HashString("Inactive"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace DatafeedSubscriptionStateMapper { + static const int Active_HASH = HashingUtils::HashString("Active"); + static const int Inactive_HASH = HashingUtils::HashString("Inactive"); + DatafeedSubscriptionState GetDatafeedSubscriptionStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/DeviceType.cpp b/aws-cpp-sdk-ec2/source/model/DeviceType.cpp index 6bb37a9621b..5570526fd8e 100644 --- a/aws-cpp-sdk-ec2/source/model/DeviceType.cpp +++ b/aws-cpp-sdk-ec2/source/model/DeviceType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ebs_HASH = HashingUtils::HashString("ebs"); -static const int instance_store_HASH = HashingUtils::HashString("instance-store"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace DeviceTypeMapper { + static const int ebs_HASH = HashingUtils::HashString("ebs"); + static const int instance_store_HASH = HashingUtils::HashString("instance-store"); + DeviceType GetDeviceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/DhcpConfiguration.cpp b/aws-cpp-sdk-ec2/source/model/DhcpConfiguration.cpp index e9d680abe78..ecab65a9e19 100644 --- a/aws-cpp-sdk-ec2/source/model/DhcpConfiguration.cpp +++ b/aws-cpp-sdk-ec2/source/model/DhcpConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + DhcpConfiguration::DhcpConfiguration() : m_keyHasBeenSet(false), m_valuesHasBeenSet(false) @@ -100,3 +106,7 @@ void DhcpConfiguration::OutputToStream(Aws::OStream& oStream, const char* locati } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/DhcpOptions.cpp b/aws-cpp-sdk-ec2/source/model/DhcpOptions.cpp index 420429267a7..c452e862c97 100644 --- a/aws-cpp-sdk-ec2/source/model/DhcpOptions.cpp +++ b/aws-cpp-sdk-ec2/source/model/DhcpOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + DhcpOptions::DhcpOptions() : m_dhcpOptionsIdHasBeenSet(false), m_dhcpConfigurationsHasBeenSet(false), @@ -134,3 +140,7 @@ void DhcpOptions::OutputToStream(Aws::OStream& oStream, const char* location) co } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/DiskImage.cpp b/aws-cpp-sdk-ec2/source/model/DiskImage.cpp index 052dd41557f..59daba17f19 100644 --- a/aws-cpp-sdk-ec2/source/model/DiskImage.cpp +++ b/aws-cpp-sdk-ec2/source/model/DiskImage.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + DiskImage::DiskImage() : m_imageHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -106,3 +112,7 @@ void DiskImage::OutputToStream(Aws::OStream& oStream, const char* location) cons m_volume.OutputToStream(oStream, volumeLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/DiskImageDescription.cpp b/aws-cpp-sdk-ec2/source/model/DiskImageDescription.cpp index d5848eb371d..2db6445e490 100644 --- a/aws-cpp-sdk-ec2/source/model/DiskImageDescription.cpp +++ b/aws-cpp-sdk-ec2/source/model/DiskImageDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + DiskImageDescription::DiskImageDescription() : m_formatHasBeenSet(false), m_size(0), @@ -116,3 +122,7 @@ void DiskImageDescription::OutputToStream(Aws::OStream& oStream, const char* loc oStream << location << ".Checksum=" << StringUtils::URLEncode(m_checksum.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/DiskImageDetail.cpp b/aws-cpp-sdk-ec2/source/model/DiskImageDetail.cpp index 426776645b4..9e713bf6f85 100644 --- a/aws-cpp-sdk-ec2/source/model/DiskImageDetail.cpp +++ b/aws-cpp-sdk-ec2/source/model/DiskImageDetail.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + DiskImageDetail::DiskImageDetail() : m_formatHasBeenSet(false), m_bytes(0), @@ -100,3 +106,7 @@ void DiskImageDetail::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".ImportManifestUrl=" << StringUtils::URLEncode(m_importManifestUrl.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/DiskImageFormat.cpp b/aws-cpp-sdk-ec2/source/model/DiskImageFormat.cpp index a73d3b7b99b..0f9adfb557c 100644 --- a/aws-cpp-sdk-ec2/source/model/DiskImageFormat.cpp +++ b/aws-cpp-sdk-ec2/source/model/DiskImageFormat.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int VMDK_HASH = HashingUtils::HashString("VMDK"); -static const int RAW_HASH = HashingUtils::HashString("RAW"); -static const int VHD_HASH = HashingUtils::HashString("VHD"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace DiskImageFormatMapper { + static const int VMDK_HASH = HashingUtils::HashString("VMDK"); + static const int RAW_HASH = HashingUtils::HashString("RAW"); + static const int VHD_HASH = HashingUtils::HashString("VHD"); + DiskImageFormat GetDiskImageFormatForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/DiskImageVolumeDescription.cpp b/aws-cpp-sdk-ec2/source/model/DiskImageVolumeDescription.cpp index 40cc076ece0..3b81512e3c1 100644 --- a/aws-cpp-sdk-ec2/source/model/DiskImageVolumeDescription.cpp +++ b/aws-cpp-sdk-ec2/source/model/DiskImageVolumeDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + DiskImageVolumeDescription::DiskImageVolumeDescription() : m_size(0), m_sizeHasBeenSet(false), @@ -84,3 +90,7 @@ void DiskImageVolumeDescription::OutputToStream(Aws::OStream& oStream, const cha oStream << location << ".Id=" << StringUtils::URLEncode(m_id.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/DomainType.cpp b/aws-cpp-sdk-ec2/source/model/DomainType.cpp index 234c55f2bc5..0da981b1597 100644 --- a/aws-cpp-sdk-ec2/source/model/DomainType.cpp +++ b/aws-cpp-sdk-ec2/source/model/DomainType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int vpc_HASH = HashingUtils::HashString("vpc"); -static const int standard_HASH = HashingUtils::HashString("standard"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace DomainTypeMapper { + static const int vpc_HASH = HashingUtils::HashString("vpc"); + static const int standard_HASH = HashingUtils::HashString("standard"); + DomainType GetDomainTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/EbsBlockDevice.cpp b/aws-cpp-sdk-ec2/source/model/EbsBlockDevice.cpp index e2c15a6d1c7..321103b442d 100644 --- a/aws-cpp-sdk-ec2/source/model/EbsBlockDevice.cpp +++ b/aws-cpp-sdk-ec2/source/model/EbsBlockDevice.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + EbsBlockDevice::EbsBlockDevice() : m_snapshotIdHasBeenSet(false), m_volumeSize(0), @@ -154,3 +160,7 @@ void EbsBlockDevice::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".Encrypted=" << m_encrypted << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/EbsInstanceBlockDevice.cpp b/aws-cpp-sdk-ec2/source/model/EbsInstanceBlockDevice.cpp index bee0e49b5c2..6b348916900 100644 --- a/aws-cpp-sdk-ec2/source/model/EbsInstanceBlockDevice.cpp +++ b/aws-cpp-sdk-ec2/source/model/EbsInstanceBlockDevice.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + EbsInstanceBlockDevice::EbsInstanceBlockDevice() : m_volumeIdHasBeenSet(false), m_statusHasBeenSet(false), @@ -116,3 +122,7 @@ void EbsInstanceBlockDevice::OutputToStream(Aws::OStream& oStream, const char* l oStream << location << ".DeleteOnTermination=" << m_deleteOnTermination << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/EbsInstanceBlockDeviceSpecification.cpp b/aws-cpp-sdk-ec2/source/model/EbsInstanceBlockDeviceSpecification.cpp index 4fe7eb8949c..c8591dd484e 100644 --- a/aws-cpp-sdk-ec2/source/model/EbsInstanceBlockDeviceSpecification.cpp +++ b/aws-cpp-sdk-ec2/source/model/EbsInstanceBlockDeviceSpecification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + EbsInstanceBlockDeviceSpecification::EbsInstanceBlockDeviceSpecification() : m_volumeIdHasBeenSet(false), m_deleteOnTermination(false), @@ -84,3 +90,7 @@ void EbsInstanceBlockDeviceSpecification::OutputToStream(Aws::OStream& oStream, oStream << location << ".DeleteOnTermination=" << m_deleteOnTermination << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/EventCode.cpp b/aws-cpp-sdk-ec2/source/model/EventCode.cpp index 2d21c5c360a..c3f0593fc38 100644 --- a/aws-cpp-sdk-ec2/source/model/EventCode.cpp +++ b/aws-cpp-sdk-ec2/source/model/EventCode.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int instance_reboot_HASH = HashingUtils::HashString("instance-reboot"); -static const int system_reboot_HASH = HashingUtils::HashString("system-reboot"); -static const int system_maintenance_HASH = HashingUtils::HashString("system-maintenance"); -static const int instance_retirement_HASH = HashingUtils::HashString("instance-retirement"); -static const int instance_stop_HASH = HashingUtils::HashString("instance-stop"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace EventCodeMapper { + static const int instance_reboot_HASH = HashingUtils::HashString("instance-reboot"); + static const int system_reboot_HASH = HashingUtils::HashString("system-reboot"); + static const int system_maintenance_HASH = HashingUtils::HashString("system-maintenance"); + static const int instance_retirement_HASH = HashingUtils::HashString("instance-retirement"); + static const int instance_stop_HASH = HashingUtils::HashString("instance-stop"); + EventCode GetEventCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/EventInformation.cpp b/aws-cpp-sdk-ec2/source/model/EventInformation.cpp index 49d535a1917..455449f6ac9 100644 --- a/aws-cpp-sdk-ec2/source/model/EventInformation.cpp +++ b/aws-cpp-sdk-ec2/source/model/EventInformation.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + EventInformation::EventInformation() : m_instanceIdHasBeenSet(false), m_eventSubTypeHasBeenSet(false), @@ -98,3 +104,7 @@ void EventInformation::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".EventDescription=" << StringUtils::URLEncode(m_eventDescription.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/EventType.cpp b/aws-cpp-sdk-ec2/source/model/EventType.cpp index 935aa499e9d..8c9a0a1ebc8 100644 --- a/aws-cpp-sdk-ec2/source/model/EventType.cpp +++ b/aws-cpp-sdk-ec2/source/model/EventType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int instanceChange_HASH = HashingUtils::HashString("instanceChange"); -static const int fleetRequestChange_HASH = HashingUtils::HashString("fleetRequestChange"); -static const int error_HASH = HashingUtils::HashString("error"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace EventTypeMapper { + static const int instanceChange_HASH = HashingUtils::HashString("instanceChange"); + static const int fleetRequestChange_HASH = HashingUtils::HashString("fleetRequestChange"); + static const int error_HASH = HashingUtils::HashString("error"); + EventType GetEventTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/ExcessCapacityTerminationPolicy.cpp b/aws-cpp-sdk-ec2/source/model/ExcessCapacityTerminationPolicy.cpp index b46fa309234..fccbd4452fc 100644 --- a/aws-cpp-sdk-ec2/source/model/ExcessCapacityTerminationPolicy.cpp +++ b/aws-cpp-sdk-ec2/source/model/ExcessCapacityTerminationPolicy.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int noTermination_HASH = HashingUtils::HashString("noTermination"); -static const int default__HASH = HashingUtils::HashString("default"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ExcessCapacityTerminationPolicyMapper { + static const int noTermination_HASH = HashingUtils::HashString("noTermination"); + static const int default__HASH = HashingUtils::HashString("default"); + ExcessCapacityTerminationPolicy GetExcessCapacityTerminationPolicyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/ExportEnvironment.cpp b/aws-cpp-sdk-ec2/source/model/ExportEnvironment.cpp index 0f84d4ef7c7..b70667818c8 100644 --- a/aws-cpp-sdk-ec2/source/model/ExportEnvironment.cpp +++ b/aws-cpp-sdk-ec2/source/model/ExportEnvironment.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int citrix_HASH = HashingUtils::HashString("citrix"); -static const int vmware_HASH = HashingUtils::HashString("vmware"); -static const int microsoft_HASH = HashingUtils::HashString("microsoft"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ExportEnvironmentMapper { + static const int citrix_HASH = HashingUtils::HashString("citrix"); + static const int vmware_HASH = HashingUtils::HashString("vmware"); + static const int microsoft_HASH = HashingUtils::HashString("microsoft"); + ExportEnvironment GetExportEnvironmentForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/ExportTask.cpp b/aws-cpp-sdk-ec2/source/model/ExportTask.cpp index 8138538e26c..25e7a245d01 100644 --- a/aws-cpp-sdk-ec2/source/model/ExportTask.cpp +++ b/aws-cpp-sdk-ec2/source/model/ExportTask.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ExportTask::ExportTask() : m_exportTaskIdHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -154,3 +160,7 @@ void ExportTask::OutputToStream(Aws::OStream& oStream, const char* location) con m_exportToS3Task.OutputToStream(oStream, exportToS3TaskLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ExportTaskState.cpp b/aws-cpp-sdk-ec2/source/model/ExportTaskState.cpp index 5c5cf9d1d61..dac70e12e8b 100644 --- a/aws-cpp-sdk-ec2/source/model/ExportTaskState.cpp +++ b/aws-cpp-sdk-ec2/source/model/ExportTaskState.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int active_HASH = HashingUtils::HashString("active"); -static const int cancelling_HASH = HashingUtils::HashString("cancelling"); -static const int cancelled_HASH = HashingUtils::HashString("cancelled"); -static const int completed_HASH = HashingUtils::HashString("completed"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace ExportTaskStateMapper { + static const int active_HASH = HashingUtils::HashString("active"); + static const int cancelling_HASH = HashingUtils::HashString("cancelling"); + static const int cancelled_HASH = HashingUtils::HashString("cancelled"); + static const int completed_HASH = HashingUtils::HashString("completed"); + ExportTaskState GetExportTaskStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/ExportToS3Task.cpp b/aws-cpp-sdk-ec2/source/model/ExportToS3Task.cpp index 41d9254f271..e13c5bbec02 100644 --- a/aws-cpp-sdk-ec2/source/model/ExportToS3Task.cpp +++ b/aws-cpp-sdk-ec2/source/model/ExportToS3Task.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ExportToS3Task::ExportToS3Task() : m_diskImageFormatHasBeenSet(false), m_containerFormatHasBeenSet(false), @@ -114,3 +120,7 @@ void ExportToS3Task::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".S3Key=" << StringUtils::URLEncode(m_s3Key.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ExportToS3TaskSpecification.cpp b/aws-cpp-sdk-ec2/source/model/ExportToS3TaskSpecification.cpp index 5f296fe6013..2bbe37e15e7 100644 --- a/aws-cpp-sdk-ec2/source/model/ExportToS3TaskSpecification.cpp +++ b/aws-cpp-sdk-ec2/source/model/ExportToS3TaskSpecification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ExportToS3TaskSpecification::ExportToS3TaskSpecification() : m_diskImageFormatHasBeenSet(false), m_containerFormatHasBeenSet(false), @@ -114,3 +120,7 @@ void ExportToS3TaskSpecification::OutputToStream(Aws::OStream& oStream, const ch oStream << location << ".S3Prefix=" << StringUtils::URLEncode(m_s3Prefix.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/Filter.cpp b/aws-cpp-sdk-ec2/source/model/Filter.cpp index 1aff4e247da..3b4db2846ae 100644 --- a/aws-cpp-sdk-ec2/source/model/Filter.cpp +++ b/aws-cpp-sdk-ec2/source/model/Filter.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Filter::Filter() : m_nameHasBeenSet(false), m_valuesHasBeenSet(false) @@ -96,3 +102,7 @@ void Filter::OutputToStream(Aws::OStream& oStream, const char* location) const } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/FlowLog.cpp b/aws-cpp-sdk-ec2/source/model/FlowLog.cpp index e76ac27878b..48f317a8f49 100644 --- a/aws-cpp-sdk-ec2/source/model/FlowLog.cpp +++ b/aws-cpp-sdk-ec2/source/model/FlowLog.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + FlowLog::FlowLog() : m_creationTimeHasBeenSet(false), m_flowLogIdHasBeenSet(false), @@ -194,3 +200,7 @@ void FlowLog::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".DeliverLogsPermissionArn=" << StringUtils::URLEncode(m_deliverLogsPermissionArn.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/FlowLogsResourceType.cpp b/aws-cpp-sdk-ec2/source/model/FlowLogsResourceType.cpp index 2933594839a..9f6f8666c6e 100644 --- a/aws-cpp-sdk-ec2/source/model/FlowLogsResourceType.cpp +++ b/aws-cpp-sdk-ec2/source/model/FlowLogsResourceType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int VPC_HASH = HashingUtils::HashString("VPC"); -static const int Subnet_HASH = HashingUtils::HashString("Subnet"); -static const int NetworkInterface_HASH = HashingUtils::HashString("NetworkInterface"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace FlowLogsResourceTypeMapper { + static const int VPC_HASH = HashingUtils::HashString("VPC"); + static const int Subnet_HASH = HashingUtils::HashString("Subnet"); + static const int NetworkInterface_HASH = HashingUtils::HashString("NetworkInterface"); + FlowLogsResourceType GetFlowLogsResourceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/GatewayType.cpp b/aws-cpp-sdk-ec2/source/model/GatewayType.cpp index b4d206c782c..48ec0e19da1 100644 --- a/aws-cpp-sdk-ec2/source/model/GatewayType.cpp +++ b/aws-cpp-sdk-ec2/source/model/GatewayType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int ipsec_1_HASH = HashingUtils::HashString("ipsec.1"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace GatewayTypeMapper { + static const int ipsec_1_HASH = HashingUtils::HashString("ipsec.1"); + GatewayType GetGatewayTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/GroupIdentifier.cpp b/aws-cpp-sdk-ec2/source/model/GroupIdentifier.cpp index ce97a8ecf9f..d2f8e3a68e7 100644 --- a/aws-cpp-sdk-ec2/source/model/GroupIdentifier.cpp +++ b/aws-cpp-sdk-ec2/source/model/GroupIdentifier.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + GroupIdentifier::GroupIdentifier() : m_groupNameHasBeenSet(false), m_groupIdHasBeenSet(false) @@ -82,3 +88,7 @@ void GroupIdentifier::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".GroupId=" << StringUtils::URLEncode(m_groupId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/HistoryRecord.cpp b/aws-cpp-sdk-ec2/source/model/HistoryRecord.cpp index b91b1cbfa94..3e787d8dfd9 100644 --- a/aws-cpp-sdk-ec2/source/model/HistoryRecord.cpp +++ b/aws-cpp-sdk-ec2/source/model/HistoryRecord.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + HistoryRecord::HistoryRecord() : m_timestampHasBeenSet(false), m_eventTypeHasBeenSet(false), @@ -102,3 +108,7 @@ void HistoryRecord::OutputToStream(Aws::OStream& oStream, const char* location) m_eventInformation.OutputToStream(oStream, eventInformationLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/Host.cpp b/aws-cpp-sdk-ec2/source/model/Host.cpp index 403506ee756..4e988cdfe7a 100644 --- a/aws-cpp-sdk-ec2/source/model/Host.cpp +++ b/aws-cpp-sdk-ec2/source/model/Host.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Host::Host() : m_hostIdHasBeenSet(false), m_autoPlacementHasBeenSet(false), @@ -220,3 +226,7 @@ void Host::OutputToStream(Aws::OStream& oStream, const char* location) const m_availableCapacity.OutputToStream(oStream, availableCapacityLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/HostInstance.cpp b/aws-cpp-sdk-ec2/source/model/HostInstance.cpp index 8bd27d37366..ab36db968c5 100644 --- a/aws-cpp-sdk-ec2/source/model/HostInstance.cpp +++ b/aws-cpp-sdk-ec2/source/model/HostInstance.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + HostInstance::HostInstance() : m_instanceIdHasBeenSet(false), m_instanceTypeHasBeenSet(false) @@ -82,3 +88,7 @@ void HostInstance::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".InstanceType=" << StringUtils::URLEncode(m_instanceType.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/HostProperties.cpp b/aws-cpp-sdk-ec2/source/model/HostProperties.cpp index b9e3521d8b7..a52d95d299a 100644 --- a/aws-cpp-sdk-ec2/source/model/HostProperties.cpp +++ b/aws-cpp-sdk-ec2/source/model/HostProperties.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + HostProperties::HostProperties() : m_sockets(0), m_socketsHasBeenSet(false), @@ -120,3 +126,7 @@ void HostProperties::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".InstanceType=" << StringUtils::URLEncode(m_instanceType.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/HostTenancy.cpp b/aws-cpp-sdk-ec2/source/model/HostTenancy.cpp index 6c4d7faf25b..a88b2f91c96 100644 --- a/aws-cpp-sdk-ec2/source/model/HostTenancy.cpp +++ b/aws-cpp-sdk-ec2/source/model/HostTenancy.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int dedicated_HASH = HashingUtils::HashString("dedicated"); -static const int host_HASH = HashingUtils::HashString("host"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace HostTenancyMapper { + static const int dedicated_HASH = HashingUtils::HashString("dedicated"); + static const int host_HASH = HashingUtils::HashString("host"); + HostTenancy GetHostTenancyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/HypervisorType.cpp b/aws-cpp-sdk-ec2/source/model/HypervisorType.cpp index 358b00a3b8e..8630eabdbf2 100644 --- a/aws-cpp-sdk-ec2/source/model/HypervisorType.cpp +++ b/aws-cpp-sdk-ec2/source/model/HypervisorType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ovm_HASH = HashingUtils::HashString("ovm"); -static const int xen_HASH = HashingUtils::HashString("xen"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace HypervisorTypeMapper { + static const int ovm_HASH = HashingUtils::HashString("ovm"); + static const int xen_HASH = HashingUtils::HashString("xen"); + HypervisorType GetHypervisorTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/IamInstanceProfile.cpp b/aws-cpp-sdk-ec2/source/model/IamInstanceProfile.cpp index 1583f1df4f6..cb2be9d0a15 100644 --- a/aws-cpp-sdk-ec2/source/model/IamInstanceProfile.cpp +++ b/aws-cpp-sdk-ec2/source/model/IamInstanceProfile.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + IamInstanceProfile::IamInstanceProfile() : m_arnHasBeenSet(false), m_idHasBeenSet(false) @@ -82,3 +88,7 @@ void IamInstanceProfile::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".Id=" << StringUtils::URLEncode(m_id.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/IamInstanceProfileSpecification.cpp b/aws-cpp-sdk-ec2/source/model/IamInstanceProfileSpecification.cpp index 96c48c738f4..4c51f47afcc 100644 --- a/aws-cpp-sdk-ec2/source/model/IamInstanceProfileSpecification.cpp +++ b/aws-cpp-sdk-ec2/source/model/IamInstanceProfileSpecification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + IamInstanceProfileSpecification::IamInstanceProfileSpecification() : m_arnHasBeenSet(false), m_nameHasBeenSet(false) @@ -82,3 +88,7 @@ void IamInstanceProfileSpecification::OutputToStream(Aws::OStream& oStream, cons oStream << location << ".Name=" << StringUtils::URLEncode(m_name.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/IcmpTypeCode.cpp b/aws-cpp-sdk-ec2/source/model/IcmpTypeCode.cpp index e8e24acb35d..0674a0e30f8 100644 --- a/aws-cpp-sdk-ec2/source/model/IcmpTypeCode.cpp +++ b/aws-cpp-sdk-ec2/source/model/IcmpTypeCode.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + IcmpTypeCode::IcmpTypeCode() : m_type(0), m_typeHasBeenSet(false), @@ -86,3 +92,7 @@ void IcmpTypeCode::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".Code=" << m_code << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/IdFormat.cpp b/aws-cpp-sdk-ec2/source/model/IdFormat.cpp index 372b00eae7e..a1b3c28c474 100644 --- a/aws-cpp-sdk-ec2/source/model/IdFormat.cpp +++ b/aws-cpp-sdk-ec2/source/model/IdFormat.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + IdFormat::IdFormat() : m_resourceHasBeenSet(false), m_useLongIds(false), @@ -100,3 +106,7 @@ void IdFormat::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Deadline=" << StringUtils::URLEncode(m_deadline.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/Image.cpp b/aws-cpp-sdk-ec2/source/model/Image.cpp index cc526ff005a..ac5b636ec77 100644 --- a/aws-cpp-sdk-ec2/source/model/Image.cpp +++ b/aws-cpp-sdk-ec2/source/model/Image.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Image::Image() : m_imageIdHasBeenSet(false), m_imageLocationHasBeenSet(false), @@ -478,3 +484,7 @@ void Image::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Hypervisor=" << HypervisorTypeMapper::GetNameForHypervisorType(m_hypervisor) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ImageAttributeName.cpp b/aws-cpp-sdk-ec2/source/model/ImageAttributeName.cpp index 88d84201b06..c1d2095c894 100644 --- a/aws-cpp-sdk-ec2/source/model/ImageAttributeName.cpp +++ b/aws-cpp-sdk-ec2/source/model/ImageAttributeName.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int description_HASH = HashingUtils::HashString("description"); -static const int kernel_HASH = HashingUtils::HashString("kernel"); -static const int ramdisk_HASH = HashingUtils::HashString("ramdisk"); -static const int launchPermission_HASH = HashingUtils::HashString("launchPermission"); -static const int productCodes_HASH = HashingUtils::HashString("productCodes"); -static const int blockDeviceMapping_HASH = HashingUtils::HashString("blockDeviceMapping"); -static const int sriovNetSupport_HASH = HashingUtils::HashString("sriovNetSupport"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace ImageAttributeNameMapper { + static const int description_HASH = HashingUtils::HashString("description"); + static const int kernel_HASH = HashingUtils::HashString("kernel"); + static const int ramdisk_HASH = HashingUtils::HashString("ramdisk"); + static const int launchPermission_HASH = HashingUtils::HashString("launchPermission"); + static const int productCodes_HASH = HashingUtils::HashString("productCodes"); + static const int blockDeviceMapping_HASH = HashingUtils::HashString("blockDeviceMapping"); + static const int sriovNetSupport_HASH = HashingUtils::HashString("sriovNetSupport"); + ImageAttributeName GetImageAttributeNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/ImageDiskContainer.cpp b/aws-cpp-sdk-ec2/source/model/ImageDiskContainer.cpp index 3ecc5eb6ec1..2080a6a2c87 100644 --- a/aws-cpp-sdk-ec2/source/model/ImageDiskContainer.cpp +++ b/aws-cpp-sdk-ec2/source/model/ImageDiskContainer.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ImageDiskContainer::ImageDiskContainer() : m_descriptionHasBeenSet(false), m_formatHasBeenSet(false), @@ -150,3 +156,7 @@ void ImageDiskContainer::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".SnapshotId=" << StringUtils::URLEncode(m_snapshotId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ImageState.cpp b/aws-cpp-sdk-ec2/source/model/ImageState.cpp index 3eb59953ed6..dc7bdb0886b 100644 --- a/aws-cpp-sdk-ec2/source/model/ImageState.cpp +++ b/aws-cpp-sdk-ec2/source/model/ImageState.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int pending_HASH = HashingUtils::HashString("pending"); -static const int available_HASH = HashingUtils::HashString("available"); -static const int invalid_HASH = HashingUtils::HashString("invalid"); -static const int deregistered_HASH = HashingUtils::HashString("deregistered"); -static const int transient_HASH = HashingUtils::HashString("transient"); -static const int failed_HASH = HashingUtils::HashString("failed"); -static const int error_HASH = HashingUtils::HashString("error"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace ImageStateMapper { + static const int pending_HASH = HashingUtils::HashString("pending"); + static const int available_HASH = HashingUtils::HashString("available"); + static const int invalid_HASH = HashingUtils::HashString("invalid"); + static const int deregistered_HASH = HashingUtils::HashString("deregistered"); + static const int transient_HASH = HashingUtils::HashString("transient"); + static const int failed_HASH = HashingUtils::HashString("failed"); + static const int error_HASH = HashingUtils::HashString("error"); + ImageState GetImageStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/ImageTypeValues.cpp b/aws-cpp-sdk-ec2/source/model/ImageTypeValues.cpp index 22a8064b335..a0bf1e3f41e 100644 --- a/aws-cpp-sdk-ec2/source/model/ImageTypeValues.cpp +++ b/aws-cpp-sdk-ec2/source/model/ImageTypeValues.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int machine_HASH = HashingUtils::HashString("machine"); -static const int kernel_HASH = HashingUtils::HashString("kernel"); -static const int ramdisk_HASH = HashingUtils::HashString("ramdisk"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ImageTypeValuesMapper { + static const int machine_HASH = HashingUtils::HashString("machine"); + static const int kernel_HASH = HashingUtils::HashString("kernel"); + static const int ramdisk_HASH = HashingUtils::HashString("ramdisk"); + ImageTypeValues GetImageTypeValuesForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/ImportImageTask.cpp b/aws-cpp-sdk-ec2/source/model/ImportImageTask.cpp index c49c09a8794..e4aa762f992 100644 --- a/aws-cpp-sdk-ec2/source/model/ImportImageTask.cpp +++ b/aws-cpp-sdk-ec2/source/model/ImportImageTask.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ImportImageTask::ImportImageTask() : m_importTaskIdHasBeenSet(false), m_architectureHasBeenSet(false), @@ -244,3 +250,7 @@ void ImportImageTask::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".Status=" << StringUtils::URLEncode(m_status.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ImportInstanceLaunchSpecification.cpp b/aws-cpp-sdk-ec2/source/model/ImportInstanceLaunchSpecification.cpp index d7c6f89b77d..cb4f3381810 100644 --- a/aws-cpp-sdk-ec2/source/model/ImportInstanceLaunchSpecification.cpp +++ b/aws-cpp-sdk-ec2/source/model/ImportInstanceLaunchSpecification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ImportInstanceLaunchSpecification::ImportInstanceLaunchSpecification() : m_architectureHasBeenSet(false), m_groupNamesHasBeenSet(false), @@ -264,3 +270,7 @@ void ImportInstanceLaunchSpecification::OutputToStream(Aws::OStream& oStream, co oStream << location << ".PrivateIpAddress=" << StringUtils::URLEncode(m_privateIpAddress.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ImportInstanceTaskDetails.cpp b/aws-cpp-sdk-ec2/source/model/ImportInstanceTaskDetails.cpp index 9090c34a599..87a06fe6696 100644 --- a/aws-cpp-sdk-ec2/source/model/ImportInstanceTaskDetails.cpp +++ b/aws-cpp-sdk-ec2/source/model/ImportInstanceTaskDetails.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ImportInstanceTaskDetails::ImportInstanceTaskDetails() : m_volumesHasBeenSet(false), m_instanceIdHasBeenSet(false), @@ -132,3 +138,7 @@ void ImportInstanceTaskDetails::OutputToStream(Aws::OStream& oStream, const char oStream << location << ".Description=" << StringUtils::URLEncode(m_description.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ImportInstanceVolumeDetailItem.cpp b/aws-cpp-sdk-ec2/source/model/ImportInstanceVolumeDetailItem.cpp index 9095d42040a..ed407d0911e 100644 --- a/aws-cpp-sdk-ec2/source/model/ImportInstanceVolumeDetailItem.cpp +++ b/aws-cpp-sdk-ec2/source/model/ImportInstanceVolumeDetailItem.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ImportInstanceVolumeDetailItem::ImportInstanceVolumeDetailItem() : m_bytesConverted(0), m_bytesConvertedHasBeenSet(false), @@ -172,3 +178,7 @@ void ImportInstanceVolumeDetailItem::OutputToStream(Aws::OStream& oStream, const oStream << location << ".Description=" << StringUtils::URLEncode(m_description.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ImportSnapshotTask.cpp b/aws-cpp-sdk-ec2/source/model/ImportSnapshotTask.cpp index 3057d3f7cce..3bd4017afe3 100644 --- a/aws-cpp-sdk-ec2/source/model/ImportSnapshotTask.cpp +++ b/aws-cpp-sdk-ec2/source/model/ImportSnapshotTask.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ImportSnapshotTask::ImportSnapshotTask() : m_importTaskIdHasBeenSet(false), m_snapshotTaskDetailHasBeenSet(false), @@ -102,3 +108,7 @@ void ImportSnapshotTask::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".Description=" << StringUtils::URLEncode(m_description.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ImportVolumeTaskDetails.cpp b/aws-cpp-sdk-ec2/source/model/ImportVolumeTaskDetails.cpp index aa189456214..7bf6ad8b9bf 100644 --- a/aws-cpp-sdk-ec2/source/model/ImportVolumeTaskDetails.cpp +++ b/aws-cpp-sdk-ec2/source/model/ImportVolumeTaskDetails.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ImportVolumeTaskDetails::ImportVolumeTaskDetails() : m_bytesConverted(0), m_bytesConvertedHasBeenSet(false), @@ -140,3 +146,7 @@ void ImportVolumeTaskDetails::OutputToStream(Aws::OStream& oStream, const char* m_volume.OutputToStream(oStream, volumeLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/Instance.cpp b/aws-cpp-sdk-ec2/source/model/Instance.cpp index 2ac06f6695a..159be71b494 100644 --- a/aws-cpp-sdk-ec2/source/model/Instance.cpp +++ b/aws-cpp-sdk-ec2/source/model/Instance.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Instance::Instance() : m_instanceIdHasBeenSet(false), m_imageIdHasBeenSet(false), @@ -758,3 +764,7 @@ void Instance::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".SriovNetSupport=" << StringUtils::URLEncode(m_sriovNetSupport.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/InstanceAttributeName.cpp b/aws-cpp-sdk-ec2/source/model/InstanceAttributeName.cpp index cc65e69cb3e..1c2a1a277bb 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceAttributeName.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceAttributeName.cpp @@ -19,19 +19,6 @@ using namespace Aws::Utils; -static const int instanceType_HASH = HashingUtils::HashString("instanceType"); -static const int kernel_HASH = HashingUtils::HashString("kernel"); -static const int ramdisk_HASH = HashingUtils::HashString("ramdisk"); -static const int userData_HASH = HashingUtils::HashString("userData"); -static const int disableApiTermination_HASH = HashingUtils::HashString("disableApiTermination"); -static const int instanceInitiatedShutdownBehavior_HASH = HashingUtils::HashString("instanceInitiatedShutdownBehavior"); -static const int rootDeviceName_HASH = HashingUtils::HashString("rootDeviceName"); -static const int blockDeviceMapping_HASH = HashingUtils::HashString("blockDeviceMapping"); -static const int productCodes_HASH = HashingUtils::HashString("productCodes"); -static const int sourceDestCheck_HASH = HashingUtils::HashString("sourceDestCheck"); -static const int groupSet_HASH = HashingUtils::HashString("groupSet"); -static const int ebsOptimized_HASH = HashingUtils::HashString("ebsOptimized"); -static const int sriovNetSupport_HASH = HashingUtils::HashString("sriovNetSupport"); namespace Aws { @@ -42,6 +29,20 @@ namespace Aws namespace InstanceAttributeNameMapper { + static const int instanceType_HASH = HashingUtils::HashString("instanceType"); + static const int kernel_HASH = HashingUtils::HashString("kernel"); + static const int ramdisk_HASH = HashingUtils::HashString("ramdisk"); + static const int userData_HASH = HashingUtils::HashString("userData"); + static const int disableApiTermination_HASH = HashingUtils::HashString("disableApiTermination"); + static const int instanceInitiatedShutdownBehavior_HASH = HashingUtils::HashString("instanceInitiatedShutdownBehavior"); + static const int rootDeviceName_HASH = HashingUtils::HashString("rootDeviceName"); + static const int blockDeviceMapping_HASH = HashingUtils::HashString("blockDeviceMapping"); + static const int productCodes_HASH = HashingUtils::HashString("productCodes"); + static const int sourceDestCheck_HASH = HashingUtils::HashString("sourceDestCheck"); + static const int groupSet_HASH = HashingUtils::HashString("groupSet"); + static const int ebsOptimized_HASH = HashingUtils::HashString("ebsOptimized"); + static const int sriovNetSupport_HASH = HashingUtils::HashString("sriovNetSupport"); + InstanceAttributeName GetInstanceAttributeNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/InstanceBlockDeviceMapping.cpp b/aws-cpp-sdk-ec2/source/model/InstanceBlockDeviceMapping.cpp index 50abc74e889..a38e1feab5c 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceBlockDeviceMapping.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceBlockDeviceMapping.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceBlockDeviceMapping::InstanceBlockDeviceMapping() : m_deviceNameHasBeenSet(false), m_ebsHasBeenSet(false) @@ -86,3 +92,7 @@ void InstanceBlockDeviceMapping::OutputToStream(Aws::OStream& oStream, const cha m_ebs.OutputToStream(oStream, ebsLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InstanceBlockDeviceMappingSpecification.cpp b/aws-cpp-sdk-ec2/source/model/InstanceBlockDeviceMappingSpecification.cpp index 8ce1f8f2e69..facf64e25bf 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceBlockDeviceMappingSpecification.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceBlockDeviceMappingSpecification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceBlockDeviceMappingSpecification::InstanceBlockDeviceMappingSpecification() : m_deviceNameHasBeenSet(false), m_ebsHasBeenSet(false), @@ -118,3 +124,7 @@ void InstanceBlockDeviceMappingSpecification::OutputToStream(Aws::OStream& oStre oStream << location << ".NoDevice=" << StringUtils::URLEncode(m_noDevice.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InstanceCapacity.cpp b/aws-cpp-sdk-ec2/source/model/InstanceCapacity.cpp index 870912866cf..86576d1b1b9 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceCapacity.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceCapacity.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceCapacity::InstanceCapacity() : m_instanceTypeHasBeenSet(false), m_availableCapacity(0), @@ -102,3 +108,7 @@ void InstanceCapacity::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".TotalCapacity=" << m_totalCapacity << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InstanceCount.cpp b/aws-cpp-sdk-ec2/source/model/InstanceCount.cpp index 47a49fabe95..a03f8d93d09 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceCount.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceCount.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceCount::InstanceCount() : m_stateHasBeenSet(false), m_instanceCount(0), @@ -84,3 +90,7 @@ void InstanceCount::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".InstanceCount=" << m_instanceCount << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InstanceExportDetails.cpp b/aws-cpp-sdk-ec2/source/model/InstanceExportDetails.cpp index 0cfda522840..97dfa12c311 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceExportDetails.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceExportDetails.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceExportDetails::InstanceExportDetails() : m_instanceIdHasBeenSet(false), m_targetEnvironmentHasBeenSet(false) @@ -82,3 +88,7 @@ void InstanceExportDetails::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".TargetEnvironment=" << ExportEnvironmentMapper::GetNameForExportEnvironment(m_targetEnvironment) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InstanceLifecycleType.cpp b/aws-cpp-sdk-ec2/source/model/InstanceLifecycleType.cpp index e2f5cd9d632..1206089b664 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceLifecycleType.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceLifecycleType.cpp @@ -15,12 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int spot_HASH = HashingUtils::HashString("spot"); -static const int scheduled_HASH = HashingUtils::HashString("scheduled"); namespace Aws { @@ -31,6 +28,8 @@ namespace Aws namespace InstanceLifecycleTypeMapper { + static const int spot_HASH = HashingUtils::HashString("spot"); + InstanceLifecycleType GetInstanceLifecycleTypeForName(const Aws::String& name) { @@ -39,11 +38,7 @@ namespace Aws { return InstanceLifecycleType::spot; } - else if (hashCode == scheduled_HASH) - { - return InstanceLifecycleType::scheduled; - } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -59,10 +54,8 @@ namespace Aws { case InstanceLifecycleType::spot: return "spot"; - case InstanceLifecycleType::scheduled: - return "scheduled"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-ec2/source/model/InstanceMonitoring.cpp b/aws-cpp-sdk-ec2/source/model/InstanceMonitoring.cpp index c2b20231350..75cf654882c 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceMonitoring.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceMonitoring.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceMonitoring::InstanceMonitoring() : m_instanceIdHasBeenSet(false), m_monitoringHasBeenSet(false) @@ -86,3 +92,7 @@ void InstanceMonitoring::OutputToStream(Aws::OStream& oStream, const char* locat m_monitoring.OutputToStream(oStream, monitoringLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterface.cpp b/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterface.cpp index 5fc4cc9025e..34e88e3ab29 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterface.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterface.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceNetworkInterface::InstanceNetworkInterface() : m_networkInterfaceIdHasBeenSet(false), m_subnetIdHasBeenSet(false), @@ -320,3 +326,7 @@ void InstanceNetworkInterface::OutputToStream(Aws::OStream& oStream, const char* } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceAssociation.cpp b/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceAssociation.cpp index 886dac16e50..ce81db75723 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceAssociation.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceAssociation.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceNetworkInterfaceAssociation::InstanceNetworkInterfaceAssociation() : m_publicIpHasBeenSet(false), m_publicDnsNameHasBeenSet(false), @@ -98,3 +104,7 @@ void InstanceNetworkInterfaceAssociation::OutputToStream(Aws::OStream& oStream, oStream << location << ".IpOwnerId=" << StringUtils::URLEncode(m_ipOwnerId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceAttachment.cpp b/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceAttachment.cpp index d93ae8b7c76..dff11019cf0 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceAttachment.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceAttachment.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceNetworkInterfaceAttachment::InstanceNetworkInterfaceAttachment() : m_attachmentIdHasBeenSet(false), m_deviceIndex(0), @@ -134,3 +140,7 @@ void InstanceNetworkInterfaceAttachment::OutputToStream(Aws::OStream& oStream, c oStream << location << ".DeleteOnTermination=" << m_deleteOnTermination << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceSpecification.cpp b/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceSpecification.cpp index 65e21c77233..d71440a8de0 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceSpecification.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceNetworkInterfaceSpecification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceNetworkInterfaceSpecification::InstanceNetworkInterfaceSpecification() : m_networkInterfaceIdHasBeenSet(false), m_deviceIndex(0), @@ -250,3 +256,7 @@ void InstanceNetworkInterfaceSpecification::OutputToStream(Aws::OStream& oStream oStream << location << ".AssociatePublicIpAddress=" << m_associatePublicIpAddress << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InstancePrivateIpAddress.cpp b/aws-cpp-sdk-ec2/source/model/InstancePrivateIpAddress.cpp index 5ab8d64be78..f35bc886a22 100644 --- a/aws-cpp-sdk-ec2/source/model/InstancePrivateIpAddress.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstancePrivateIpAddress.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstancePrivateIpAddress::InstancePrivateIpAddress() : m_privateIpAddressHasBeenSet(false), m_privateDnsNameHasBeenSet(false), @@ -120,3 +126,7 @@ void InstancePrivateIpAddress::OutputToStream(Aws::OStream& oStream, const char* m_association.OutputToStream(oStream, associationLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InstanceState.cpp b/aws-cpp-sdk-ec2/source/model/InstanceState.cpp index 5492a47ce95..da94beb99e7 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceState.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceState.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceState::InstanceState() : m_code(0), m_codeHasBeenSet(false), @@ -84,3 +90,7 @@ void InstanceState::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".Name=" << InstanceStateNameMapper::GetNameForInstanceStateName(m_name) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InstanceStateChange.cpp b/aws-cpp-sdk-ec2/source/model/InstanceStateChange.cpp index 852d5736063..f461e30792a 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceStateChange.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceStateChange.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceStateChange::InstanceStateChange() : m_instanceIdHasBeenSet(false), m_currentStateHasBeenSet(false), @@ -106,3 +112,7 @@ void InstanceStateChange::OutputToStream(Aws::OStream& oStream, const char* loca m_previousState.OutputToStream(oStream, previousStateLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InstanceStateName.cpp b/aws-cpp-sdk-ec2/source/model/InstanceStateName.cpp index 7bcef010faf..4bbc770d3e5 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceStateName.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceStateName.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int pending_HASH = HashingUtils::HashString("pending"); -static const int running_HASH = HashingUtils::HashString("running"); -static const int shutting_down_HASH = HashingUtils::HashString("shutting-down"); -static const int terminated_HASH = HashingUtils::HashString("terminated"); -static const int stopping_HASH = HashingUtils::HashString("stopping"); -static const int stopped_HASH = HashingUtils::HashString("stopped"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace InstanceStateNameMapper { + static const int pending_HASH = HashingUtils::HashString("pending"); + static const int running_HASH = HashingUtils::HashString("running"); + static const int shutting_down_HASH = HashingUtils::HashString("shutting-down"); + static const int terminated_HASH = HashingUtils::HashString("terminated"); + static const int stopping_HASH = HashingUtils::HashString("stopping"); + static const int stopped_HASH = HashingUtils::HashString("stopped"); + InstanceStateName GetInstanceStateNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/InstanceStatus.cpp b/aws-cpp-sdk-ec2/source/model/InstanceStatus.cpp index 6535b54c51a..cc592bc9b94 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceStatus.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceStatus::InstanceStatus() : m_instanceIdHasBeenSet(false), m_availabilityZoneHasBeenSet(false), @@ -176,3 +182,7 @@ void InstanceStatus::OutputToStream(Aws::OStream& oStream, const char* location) m_instanceStatus.OutputToStream(oStream, instanceStatusLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InstanceStatusDetails.cpp b/aws-cpp-sdk-ec2/source/model/InstanceStatusDetails.cpp index cffa333fbd1..2dd6b59f277 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceStatusDetails.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceStatusDetails.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceStatusDetails::InstanceStatusDetails() : m_nameHasBeenSet(false), m_statusHasBeenSet(false), @@ -98,3 +104,7 @@ void InstanceStatusDetails::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".ImpairedSince=" << StringUtils::URLEncode(m_impairedSince.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/InstanceStatusEvent.cpp b/aws-cpp-sdk-ec2/source/model/InstanceStatusEvent.cpp index 4039569a5ae..e056aa95361 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceStatusEvent.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceStatusEvent.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceStatusEvent::InstanceStatusEvent() : m_codeHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -114,3 +120,7 @@ void InstanceStatusEvent::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".NotAfter=" << StringUtils::URLEncode(m_notAfter.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/InstanceStatusSummary.cpp b/aws-cpp-sdk-ec2/source/model/InstanceStatusSummary.cpp index 47dd4963093..3635023efeb 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceStatusSummary.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceStatusSummary.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InstanceStatusSummary::InstanceStatusSummary() : m_statusHasBeenSet(false), m_detailsHasBeenSet(false) @@ -100,3 +106,7 @@ void InstanceStatusSummary::OutputToStream(Aws::OStream& oStream, const char* lo } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InstanceType.cpp b/aws-cpp-sdk-ec2/source/model/InstanceType.cpp index ff38dee29eb..c4fb0a038f5 100644 --- a/aws-cpp-sdk-ec2/source/model/InstanceType.cpp +++ b/aws-cpp-sdk-ec2/source/model/InstanceType.cpp @@ -15,65 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int t1_micro_HASH = HashingUtils::HashString("t1.micro"); -static const int m1_small_HASH = HashingUtils::HashString("m1.small"); -static const int m1_medium_HASH = HashingUtils::HashString("m1.medium"); -static const int m1_large_HASH = HashingUtils::HashString("m1.large"); -static const int m1_xlarge_HASH = HashingUtils::HashString("m1.xlarge"); -static const int m3_medium_HASH = HashingUtils::HashString("m3.medium"); -static const int m3_large_HASH = HashingUtils::HashString("m3.large"); -static const int m3_xlarge_HASH = HashingUtils::HashString("m3.xlarge"); -static const int m3_2xlarge_HASH = HashingUtils::HashString("m3.2xlarge"); -static const int m4_large_HASH = HashingUtils::HashString("m4.large"); -static const int m4_xlarge_HASH = HashingUtils::HashString("m4.xlarge"); -static const int m4_2xlarge_HASH = HashingUtils::HashString("m4.2xlarge"); -static const int m4_4xlarge_HASH = HashingUtils::HashString("m4.4xlarge"); -static const int m4_10xlarge_HASH = HashingUtils::HashString("m4.10xlarge"); -static const int t2_nano_HASH = HashingUtils::HashString("t2.nano"); -static const int t2_micro_HASH = HashingUtils::HashString("t2.micro"); -static const int t2_small_HASH = HashingUtils::HashString("t2.small"); -static const int t2_medium_HASH = HashingUtils::HashString("t2.medium"); -static const int t2_large_HASH = HashingUtils::HashString("t2.large"); -static const int m2_xlarge_HASH = HashingUtils::HashString("m2.xlarge"); -static const int m2_2xlarge_HASH = HashingUtils::HashString("m2.2xlarge"); -static const int m2_4xlarge_HASH = HashingUtils::HashString("m2.4xlarge"); -static const int cr1_8xlarge_HASH = HashingUtils::HashString("cr1.8xlarge"); -static const int i2_xlarge_HASH = HashingUtils::HashString("i2.xlarge"); -static const int i2_2xlarge_HASH = HashingUtils::HashString("i2.2xlarge"); -static const int i2_4xlarge_HASH = HashingUtils::HashString("i2.4xlarge"); -static const int i2_8xlarge_HASH = HashingUtils::HashString("i2.8xlarge"); -static const int hi1_4xlarge_HASH = HashingUtils::HashString("hi1.4xlarge"); -static const int hs1_8xlarge_HASH = HashingUtils::HashString("hs1.8xlarge"); -static const int c1_medium_HASH = HashingUtils::HashString("c1.medium"); -static const int c1_xlarge_HASH = HashingUtils::HashString("c1.xlarge"); -static const int c3_large_HASH = HashingUtils::HashString("c3.large"); -static const int c3_xlarge_HASH = HashingUtils::HashString("c3.xlarge"); -static const int c3_2xlarge_HASH = HashingUtils::HashString("c3.2xlarge"); -static const int c3_4xlarge_HASH = HashingUtils::HashString("c3.4xlarge"); -static const int c3_8xlarge_HASH = HashingUtils::HashString("c3.8xlarge"); -static const int c4_large_HASH = HashingUtils::HashString("c4.large"); -static const int c4_xlarge_HASH = HashingUtils::HashString("c4.xlarge"); -static const int c4_2xlarge_HASH = HashingUtils::HashString("c4.2xlarge"); -static const int c4_4xlarge_HASH = HashingUtils::HashString("c4.4xlarge"); -static const int c4_8xlarge_HASH = HashingUtils::HashString("c4.8xlarge"); -static const int cc1_4xlarge_HASH = HashingUtils::HashString("cc1.4xlarge"); -static const int cc2_8xlarge_HASH = HashingUtils::HashString("cc2.8xlarge"); -static const int g2_2xlarge_HASH = HashingUtils::HashString("g2.2xlarge"); -static const int g2_8xlarge_HASH = HashingUtils::HashString("g2.8xlarge"); -static const int cg1_4xlarge_HASH = HashingUtils::HashString("cg1.4xlarge"); -static const int r3_large_HASH = HashingUtils::HashString("r3.large"); -static const int r3_xlarge_HASH = HashingUtils::HashString("r3.xlarge"); -static const int r3_2xlarge_HASH = HashingUtils::HashString("r3.2xlarge"); -static const int r3_4xlarge_HASH = HashingUtils::HashString("r3.4xlarge"); -static const int r3_8xlarge_HASH = HashingUtils::HashString("r3.8xlarge"); -static const int d2_xlarge_HASH = HashingUtils::HashString("d2.xlarge"); -static const int d2_2xlarge_HASH = HashingUtils::HashString("d2.2xlarge"); -static const int d2_4xlarge_HASH = HashingUtils::HashString("d2.4xlarge"); -static const int d2_8xlarge_HASH = HashingUtils::HashString("d2.8xlarge"); namespace Aws { @@ -84,6 +28,61 @@ namespace Aws namespace InstanceTypeMapper { + static const int t1_micro_HASH = HashingUtils::HashString("t1.micro"); + static const int m1_small_HASH = HashingUtils::HashString("m1.small"); + static const int m1_medium_HASH = HashingUtils::HashString("m1.medium"); + static const int m1_large_HASH = HashingUtils::HashString("m1.large"); + static const int m1_xlarge_HASH = HashingUtils::HashString("m1.xlarge"); + static const int m3_medium_HASH = HashingUtils::HashString("m3.medium"); + static const int m3_large_HASH = HashingUtils::HashString("m3.large"); + static const int m3_xlarge_HASH = HashingUtils::HashString("m3.xlarge"); + static const int m3_2xlarge_HASH = HashingUtils::HashString("m3.2xlarge"); + static const int m4_large_HASH = HashingUtils::HashString("m4.large"); + static const int m4_xlarge_HASH = HashingUtils::HashString("m4.xlarge"); + static const int m4_2xlarge_HASH = HashingUtils::HashString("m4.2xlarge"); + static const int m4_4xlarge_HASH = HashingUtils::HashString("m4.4xlarge"); + static const int m4_10xlarge_HASH = HashingUtils::HashString("m4.10xlarge"); + static const int t2_nano_HASH = HashingUtils::HashString("t2.nano"); + static const int t2_micro_HASH = HashingUtils::HashString("t2.micro"); + static const int t2_small_HASH = HashingUtils::HashString("t2.small"); + static const int t2_medium_HASH = HashingUtils::HashString("t2.medium"); + static const int t2_large_HASH = HashingUtils::HashString("t2.large"); + static const int m2_xlarge_HASH = HashingUtils::HashString("m2.xlarge"); + static const int m2_2xlarge_HASH = HashingUtils::HashString("m2.2xlarge"); + static const int m2_4xlarge_HASH = HashingUtils::HashString("m2.4xlarge"); + static const int cr1_8xlarge_HASH = HashingUtils::HashString("cr1.8xlarge"); + static const int i2_xlarge_HASH = HashingUtils::HashString("i2.xlarge"); + static const int i2_2xlarge_HASH = HashingUtils::HashString("i2.2xlarge"); + static const int i2_4xlarge_HASH = HashingUtils::HashString("i2.4xlarge"); + static const int i2_8xlarge_HASH = HashingUtils::HashString("i2.8xlarge"); + static const int hi1_4xlarge_HASH = HashingUtils::HashString("hi1.4xlarge"); + static const int hs1_8xlarge_HASH = HashingUtils::HashString("hs1.8xlarge"); + static const int c1_medium_HASH = HashingUtils::HashString("c1.medium"); + static const int c1_xlarge_HASH = HashingUtils::HashString("c1.xlarge"); + static const int c3_large_HASH = HashingUtils::HashString("c3.large"); + static const int c3_xlarge_HASH = HashingUtils::HashString("c3.xlarge"); + static const int c3_2xlarge_HASH = HashingUtils::HashString("c3.2xlarge"); + static const int c3_4xlarge_HASH = HashingUtils::HashString("c3.4xlarge"); + static const int c3_8xlarge_HASH = HashingUtils::HashString("c3.8xlarge"); + static const int c4_large_HASH = HashingUtils::HashString("c4.large"); + static const int c4_xlarge_HASH = HashingUtils::HashString("c4.xlarge"); + static const int c4_2xlarge_HASH = HashingUtils::HashString("c4.2xlarge"); + static const int c4_4xlarge_HASH = HashingUtils::HashString("c4.4xlarge"); + static const int c4_8xlarge_HASH = HashingUtils::HashString("c4.8xlarge"); + static const int cc1_4xlarge_HASH = HashingUtils::HashString("cc1.4xlarge"); + static const int cc2_8xlarge_HASH = HashingUtils::HashString("cc2.8xlarge"); + static const int g2_2xlarge_HASH = HashingUtils::HashString("g2.2xlarge"); + static const int cg1_4xlarge_HASH = HashingUtils::HashString("cg1.4xlarge"); + static const int r3_large_HASH = HashingUtils::HashString("r3.large"); + static const int r3_xlarge_HASH = HashingUtils::HashString("r3.xlarge"); + static const int r3_2xlarge_HASH = HashingUtils::HashString("r3.2xlarge"); + static const int r3_4xlarge_HASH = HashingUtils::HashString("r3.4xlarge"); + static const int r3_8xlarge_HASH = HashingUtils::HashString("r3.8xlarge"); + static const int d2_xlarge_HASH = HashingUtils::HashString("d2.xlarge"); + static const int d2_2xlarge_HASH = HashingUtils::HashString("d2.2xlarge"); + static const int d2_4xlarge_HASH = HashingUtils::HashString("d2.4xlarge"); + static const int d2_8xlarge_HASH = HashingUtils::HashString("d2.8xlarge"); + InstanceType GetInstanceTypeForName(const Aws::String& name) { @@ -264,10 +263,6 @@ namespace Aws { return InstanceType::g2_2xlarge; } - else if (hashCode == g2_8xlarge_HASH) - { - return InstanceType::g2_8xlarge; - } else if (hashCode == cg1_4xlarge_HASH) { return InstanceType::cg1_4xlarge; @@ -308,7 +303,7 @@ namespace Aws { return InstanceType::d2_8xlarge; } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -410,8 +405,6 @@ namespace Aws return "cc2.8xlarge"; case InstanceType::g2_2xlarge: return "g2.2xlarge"; - case InstanceType::g2_8xlarge: - return "g2.8xlarge"; case InstanceType::cg1_4xlarge: return "cg1.4xlarge"; case InstanceType::r3_large: @@ -433,7 +426,7 @@ namespace Aws case InstanceType::d2_8xlarge: return "d2.8xlarge"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-ec2/source/model/InternetGateway.cpp b/aws-cpp-sdk-ec2/source/model/InternetGateway.cpp index 5e7da0f697c..145ebd7fdd1 100644 --- a/aws-cpp-sdk-ec2/source/model/InternetGateway.cpp +++ b/aws-cpp-sdk-ec2/source/model/InternetGateway.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InternetGateway::InternetGateway() : m_internetGatewayIdHasBeenSet(false), m_attachmentsHasBeenSet(false), @@ -134,3 +140,7 @@ void InternetGateway::OutputToStream(Aws::OStream& oStream, const char* location } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/InternetGatewayAttachment.cpp b/aws-cpp-sdk-ec2/source/model/InternetGatewayAttachment.cpp index c74d13c234d..ac55c6f141c 100644 --- a/aws-cpp-sdk-ec2/source/model/InternetGatewayAttachment.cpp +++ b/aws-cpp-sdk-ec2/source/model/InternetGatewayAttachment.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + InternetGatewayAttachment::InternetGatewayAttachment() : m_vpcIdHasBeenSet(false), m_stateHasBeenSet(false) @@ -82,3 +88,7 @@ void InternetGatewayAttachment::OutputToStream(Aws::OStream& oStream, const char oStream << location << ".State=" << AttachmentStatusMapper::GetNameForAttachmentStatus(m_state) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/IpPermission.cpp b/aws-cpp-sdk-ec2/source/model/IpPermission.cpp index 0cf9270f5cd..d65f5fff805 100644 --- a/aws-cpp-sdk-ec2/source/model/IpPermission.cpp +++ b/aws-cpp-sdk-ec2/source/model/IpPermission.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + IpPermission::IpPermission() : m_ipProtocolHasBeenSet(false), m_fromPort(0), @@ -204,3 +210,7 @@ void IpPermission::OutputToStream(Aws::OStream& oStream, const char* location) c } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/IpRange.cpp b/aws-cpp-sdk-ec2/source/model/IpRange.cpp index f934163fc4f..1e46e4646b5 100644 --- a/aws-cpp-sdk-ec2/source/model/IpRange.cpp +++ b/aws-cpp-sdk-ec2/source/model/IpRange.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + IpRange::IpRange() : m_cidrIpHasBeenSet(false) { @@ -66,3 +72,7 @@ void IpRange::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".CidrIp=" << StringUtils::URLEncode(m_cidrIp.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/KeyPairInfo.cpp b/aws-cpp-sdk-ec2/source/model/KeyPairInfo.cpp index 233d7f66352..4bb706bbd94 100644 --- a/aws-cpp-sdk-ec2/source/model/KeyPairInfo.cpp +++ b/aws-cpp-sdk-ec2/source/model/KeyPairInfo.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + KeyPairInfo::KeyPairInfo() : m_keyNameHasBeenSet(false), m_keyFingerprintHasBeenSet(false) @@ -82,3 +88,7 @@ void KeyPairInfo::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".KeyFingerprint=" << StringUtils::URLEncode(m_keyFingerprint.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/LaunchPermission.cpp b/aws-cpp-sdk-ec2/source/model/LaunchPermission.cpp index c97d337c3fc..318bb1a4b9f 100644 --- a/aws-cpp-sdk-ec2/source/model/LaunchPermission.cpp +++ b/aws-cpp-sdk-ec2/source/model/LaunchPermission.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + LaunchPermission::LaunchPermission() : m_userIdHasBeenSet(false), m_groupHasBeenSet(false) @@ -82,3 +88,7 @@ void LaunchPermission::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".Group=" << PermissionGroupMapper::GetNameForPermissionGroup(m_group) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/LaunchPermissionModifications.cpp b/aws-cpp-sdk-ec2/source/model/LaunchPermissionModifications.cpp index 980d2062cff..df4cddaab28 100644 --- a/aws-cpp-sdk-ec2/source/model/LaunchPermissionModifications.cpp +++ b/aws-cpp-sdk-ec2/source/model/LaunchPermissionModifications.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + LaunchPermissionModifications::LaunchPermissionModifications() : m_addHasBeenSet(false), m_removeHasBeenSet(false) @@ -118,3 +124,7 @@ void LaunchPermissionModifications::OutputToStream(Aws::OStream& oStream, const } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/LaunchSpecification.cpp b/aws-cpp-sdk-ec2/source/model/LaunchSpecification.cpp index bf2107b4d39..4e76c8fe57c 100644 --- a/aws-cpp-sdk-ec2/source/model/LaunchSpecification.cpp +++ b/aws-cpp-sdk-ec2/source/model/LaunchSpecification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + LaunchSpecification::LaunchSpecification() : m_imageIdHasBeenSet(false), m_keyNameHasBeenSet(false), @@ -358,3 +364,7 @@ void LaunchSpecification::OutputToStream(Aws::OStream& oStream, const char* loca m_monitoring.OutputToStream(oStream, monitoringLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ListingState.cpp b/aws-cpp-sdk-ec2/source/model/ListingState.cpp index 3ad457d8448..ce8145dad38 100644 --- a/aws-cpp-sdk-ec2/source/model/ListingState.cpp +++ b/aws-cpp-sdk-ec2/source/model/ListingState.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int available_HASH = HashingUtils::HashString("available"); -static const int sold_HASH = HashingUtils::HashString("sold"); -static const int cancelled_HASH = HashingUtils::HashString("cancelled"); -static const int pending_HASH = HashingUtils::HashString("pending"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace ListingStateMapper { + static const int available_HASH = HashingUtils::HashString("available"); + static const int sold_HASH = HashingUtils::HashString("sold"); + static const int cancelled_HASH = HashingUtils::HashString("cancelled"); + static const int pending_HASH = HashingUtils::HashString("pending"); + ListingState GetListingStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/ListingStatus.cpp b/aws-cpp-sdk-ec2/source/model/ListingStatus.cpp index a0d8e071d6a..d08b72f362d 100644 --- a/aws-cpp-sdk-ec2/source/model/ListingStatus.cpp +++ b/aws-cpp-sdk-ec2/source/model/ListingStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int active_HASH = HashingUtils::HashString("active"); -static const int pending_HASH = HashingUtils::HashString("pending"); -static const int cancelled_HASH = HashingUtils::HashString("cancelled"); -static const int closed_HASH = HashingUtils::HashString("closed"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace ListingStatusMapper { + static const int active_HASH = HashingUtils::HashString("active"); + static const int pending_HASH = HashingUtils::HashString("pending"); + static const int cancelled_HASH = HashingUtils::HashString("cancelled"); + static const int closed_HASH = HashingUtils::HashString("closed"); + ListingStatus GetListingStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/Monitoring.cpp b/aws-cpp-sdk-ec2/source/model/Monitoring.cpp index 2a47057197f..3206a03c6e6 100644 --- a/aws-cpp-sdk-ec2/source/model/Monitoring.cpp +++ b/aws-cpp-sdk-ec2/source/model/Monitoring.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Monitoring::Monitoring() : m_stateHasBeenSet(false) { @@ -66,3 +72,7 @@ void Monitoring::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".State=" << MonitoringStateMapper::GetNameForMonitoringState(m_state) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/MonitoringState.cpp b/aws-cpp-sdk-ec2/source/model/MonitoringState.cpp index 8335c5e4759..e257232ca17 100644 --- a/aws-cpp-sdk-ec2/source/model/MonitoringState.cpp +++ b/aws-cpp-sdk-ec2/source/model/MonitoringState.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int disabled_HASH = HashingUtils::HashString("disabled"); -static const int disabling_HASH = HashingUtils::HashString("disabling"); -static const int enabled_HASH = HashingUtils::HashString("enabled"); -static const int pending_HASH = HashingUtils::HashString("pending"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace MonitoringStateMapper { + static const int disabled_HASH = HashingUtils::HashString("disabled"); + static const int disabling_HASH = HashingUtils::HashString("disabling"); + static const int enabled_HASH = HashingUtils::HashString("enabled"); + static const int pending_HASH = HashingUtils::HashString("pending"); + MonitoringState GetMonitoringStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/MoveStatus.cpp b/aws-cpp-sdk-ec2/source/model/MoveStatus.cpp index cf6cc8603f3..3aaccf4d971 100644 --- a/aws-cpp-sdk-ec2/source/model/MoveStatus.cpp +++ b/aws-cpp-sdk-ec2/source/model/MoveStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int movingToVpc_HASH = HashingUtils::HashString("movingToVpc"); -static const int restoringToClassic_HASH = HashingUtils::HashString("restoringToClassic"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace MoveStatusMapper { + static const int movingToVpc_HASH = HashingUtils::HashString("movingToVpc"); + static const int restoringToClassic_HASH = HashingUtils::HashString("restoringToClassic"); + MoveStatus GetMoveStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/MovingAddressStatus.cpp b/aws-cpp-sdk-ec2/source/model/MovingAddressStatus.cpp index 0073e3b352a..5f73b3861c8 100644 --- a/aws-cpp-sdk-ec2/source/model/MovingAddressStatus.cpp +++ b/aws-cpp-sdk-ec2/source/model/MovingAddressStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + MovingAddressStatus::MovingAddressStatus() : m_publicIpHasBeenSet(false), m_moveStatusHasBeenSet(false) @@ -82,3 +88,7 @@ void MovingAddressStatus::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".MoveStatus=" << MoveStatusMapper::GetNameForMoveStatus(m_moveStatus) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/NatGateway.cpp b/aws-cpp-sdk-ec2/source/model/NatGateway.cpp index 94ff09adc7c..fde822265b5 100644 --- a/aws-cpp-sdk-ec2/source/model/NatGateway.cpp +++ b/aws-cpp-sdk-ec2/source/model/NatGateway.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + NatGateway::NatGateway() : m_vpcIdHasBeenSet(false), m_subnetIdHasBeenSet(false), @@ -212,3 +218,7 @@ void NatGateway::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".FailureMessage=" << StringUtils::URLEncode(m_failureMessage.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/NatGatewayAddress.cpp b/aws-cpp-sdk-ec2/source/model/NatGatewayAddress.cpp index 59d6cbc58d7..b0533226758 100644 --- a/aws-cpp-sdk-ec2/source/model/NatGatewayAddress.cpp +++ b/aws-cpp-sdk-ec2/source/model/NatGatewayAddress.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + NatGatewayAddress::NatGatewayAddress() : m_publicIpHasBeenSet(false), m_allocationIdHasBeenSet(false), @@ -114,3 +120,7 @@ void NatGatewayAddress::OutputToStream(Aws::OStream& oStream, const char* locati oStream << location << ".NetworkInterfaceId=" << StringUtils::URLEncode(m_networkInterfaceId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/NatGatewayState.cpp b/aws-cpp-sdk-ec2/source/model/NatGatewayState.cpp index 13b6e748c7d..9a758352bc2 100644 --- a/aws-cpp-sdk-ec2/source/model/NatGatewayState.cpp +++ b/aws-cpp-sdk-ec2/source/model/NatGatewayState.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int pending_HASH = HashingUtils::HashString("pending"); -static const int failed_HASH = HashingUtils::HashString("failed"); -static const int available_HASH = HashingUtils::HashString("available"); -static const int deleting_HASH = HashingUtils::HashString("deleting"); -static const int deleted_HASH = HashingUtils::HashString("deleted"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace NatGatewayStateMapper { + static const int pending_HASH = HashingUtils::HashString("pending"); + static const int failed_HASH = HashingUtils::HashString("failed"); + static const int available_HASH = HashingUtils::HashString("available"); + static const int deleting_HASH = HashingUtils::HashString("deleting"); + static const int deleted_HASH = HashingUtils::HashString("deleted"); + NatGatewayState GetNatGatewayStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/NetworkAcl.cpp b/aws-cpp-sdk-ec2/source/model/NetworkAcl.cpp index 3c6e68701a6..58e44edec94 100644 --- a/aws-cpp-sdk-ec2/source/model/NetworkAcl.cpp +++ b/aws-cpp-sdk-ec2/source/model/NetworkAcl.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + NetworkAcl::NetworkAcl() : m_networkAclIdHasBeenSet(false), m_vpcIdHasBeenSet(false), @@ -202,3 +208,7 @@ void NetworkAcl::OutputToStream(Aws::OStream& oStream, const char* location) con } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/NetworkAclAssociation.cpp b/aws-cpp-sdk-ec2/source/model/NetworkAclAssociation.cpp index e40064080df..21728a0e351 100644 --- a/aws-cpp-sdk-ec2/source/model/NetworkAclAssociation.cpp +++ b/aws-cpp-sdk-ec2/source/model/NetworkAclAssociation.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + NetworkAclAssociation::NetworkAclAssociation() : m_networkAclAssociationIdHasBeenSet(false), m_networkAclIdHasBeenSet(false), @@ -98,3 +104,7 @@ void NetworkAclAssociation::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".SubnetId=" << StringUtils::URLEncode(m_subnetId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/NetworkAclEntry.cpp b/aws-cpp-sdk-ec2/source/model/NetworkAclEntry.cpp index 6755664d011..796eea1865d 100644 --- a/aws-cpp-sdk-ec2/source/model/NetworkAclEntry.cpp +++ b/aws-cpp-sdk-ec2/source/model/NetworkAclEntry.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + NetworkAclEntry::NetworkAclEntry() : m_ruleNumber(0), m_ruleNumberHasBeenSet(false), @@ -174,3 +180,7 @@ void NetworkAclEntry::OutputToStream(Aws::OStream& oStream, const char* location m_portRange.OutputToStream(oStream, portRangeLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/NetworkInterface.cpp b/aws-cpp-sdk-ec2/source/model/NetworkInterface.cpp index 4e7224c81e7..de1b11a3f34 100644 --- a/aws-cpp-sdk-ec2/source/model/NetworkInterface.cpp +++ b/aws-cpp-sdk-ec2/source/model/NetworkInterface.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + NetworkInterface::NetworkInterface() : m_networkInterfaceIdHasBeenSet(false), m_subnetIdHasBeenSet(false), @@ -420,3 +426,7 @@ void NetworkInterface::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".InterfaceType=" << NetworkInterfaceTypeMapper::GetNameForNetworkInterfaceType(m_interfaceType) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAssociation.cpp b/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAssociation.cpp index ffc7543ae0b..806555b5235 100644 --- a/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAssociation.cpp +++ b/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAssociation.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + NetworkInterfaceAssociation::NetworkInterfaceAssociation() : m_publicIpHasBeenSet(false), m_publicDnsNameHasBeenSet(false), @@ -130,3 +136,7 @@ void NetworkInterfaceAssociation::OutputToStream(Aws::OStream& oStream, const ch oStream << location << ".AssociationId=" << StringUtils::URLEncode(m_associationId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAttachment.cpp b/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAttachment.cpp index 2c927957cdc..0bed57df90e 100644 --- a/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAttachment.cpp +++ b/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAttachment.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + NetworkInterfaceAttachment::NetworkInterfaceAttachment() : m_attachmentIdHasBeenSet(false), m_instanceIdHasBeenSet(false), @@ -166,3 +172,7 @@ void NetworkInterfaceAttachment::OutputToStream(Aws::OStream& oStream, const cha oStream << location << ".DeleteOnTermination=" << m_deleteOnTermination << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAttachmentChanges.cpp b/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAttachmentChanges.cpp index 2022a2fee50..719f9d16bc5 100644 --- a/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAttachmentChanges.cpp +++ b/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAttachmentChanges.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + NetworkInterfaceAttachmentChanges::NetworkInterfaceAttachmentChanges() : m_attachmentIdHasBeenSet(false), m_deleteOnTermination(false), @@ -84,3 +90,7 @@ void NetworkInterfaceAttachmentChanges::OutputToStream(Aws::OStream& oStream, co oStream << location << ".DeleteOnTermination=" << m_deleteOnTermination << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAttribute.cpp b/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAttribute.cpp index d39c17e012c..86ee1c25142 100644 --- a/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAttribute.cpp +++ b/aws-cpp-sdk-ec2/source/model/NetworkInterfaceAttribute.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int description_HASH = HashingUtils::HashString("description"); -static const int groupSet_HASH = HashingUtils::HashString("groupSet"); -static const int sourceDestCheck_HASH = HashingUtils::HashString("sourceDestCheck"); -static const int attachment_HASH = HashingUtils::HashString("attachment"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace NetworkInterfaceAttributeMapper { + static const int description_HASH = HashingUtils::HashString("description"); + static const int groupSet_HASH = HashingUtils::HashString("groupSet"); + static const int sourceDestCheck_HASH = HashingUtils::HashString("sourceDestCheck"); + static const int attachment_HASH = HashingUtils::HashString("attachment"); + NetworkInterfaceAttribute GetNetworkInterfaceAttributeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/NetworkInterfacePrivateIpAddress.cpp b/aws-cpp-sdk-ec2/source/model/NetworkInterfacePrivateIpAddress.cpp index 1da8dcb6a31..ecbd74db449 100644 --- a/aws-cpp-sdk-ec2/source/model/NetworkInterfacePrivateIpAddress.cpp +++ b/aws-cpp-sdk-ec2/source/model/NetworkInterfacePrivateIpAddress.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + NetworkInterfacePrivateIpAddress::NetworkInterfacePrivateIpAddress() : m_privateIpAddressHasBeenSet(false), m_privateDnsNameHasBeenSet(false), @@ -120,3 +126,7 @@ void NetworkInterfacePrivateIpAddress::OutputToStream(Aws::OStream& oStream, con m_association.OutputToStream(oStream, associationLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/NetworkInterfaceStatus.cpp b/aws-cpp-sdk-ec2/source/model/NetworkInterfaceStatus.cpp index 7a664796e7f..575d4e55ee2 100644 --- a/aws-cpp-sdk-ec2/source/model/NetworkInterfaceStatus.cpp +++ b/aws-cpp-sdk-ec2/source/model/NetworkInterfaceStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int available_HASH = HashingUtils::HashString("available"); -static const int attaching_HASH = HashingUtils::HashString("attaching"); -static const int in_use_HASH = HashingUtils::HashString("in-use"); -static const int detaching_HASH = HashingUtils::HashString("detaching"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace NetworkInterfaceStatusMapper { + static const int available_HASH = HashingUtils::HashString("available"); + static const int attaching_HASH = HashingUtils::HashString("attaching"); + static const int in_use_HASH = HashingUtils::HashString("in-use"); + static const int detaching_HASH = HashingUtils::HashString("detaching"); + NetworkInterfaceStatus GetNetworkInterfaceStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/NetworkInterfaceType.cpp b/aws-cpp-sdk-ec2/source/model/NetworkInterfaceType.cpp index 108a8051b82..1af4a0c5d90 100644 --- a/aws-cpp-sdk-ec2/source/model/NetworkInterfaceType.cpp +++ b/aws-cpp-sdk-ec2/source/model/NetworkInterfaceType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int interface_HASH = HashingUtils::HashString("interface"); -static const int natGateway_HASH = HashingUtils::HashString("natGateway"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace NetworkInterfaceTypeMapper { + static const int interface_HASH = HashingUtils::HashString("interface"); + static const int natGateway_HASH = HashingUtils::HashString("natGateway"); + NetworkInterfaceType GetNetworkInterfaceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/NewDhcpConfiguration.cpp b/aws-cpp-sdk-ec2/source/model/NewDhcpConfiguration.cpp index 87144c4ac82..db2ff3308b6 100644 --- a/aws-cpp-sdk-ec2/source/model/NewDhcpConfiguration.cpp +++ b/aws-cpp-sdk-ec2/source/model/NewDhcpConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + NewDhcpConfiguration::NewDhcpConfiguration() : m_keyHasBeenSet(false), m_valuesHasBeenSet(false) @@ -96,3 +102,7 @@ void NewDhcpConfiguration::OutputToStream(Aws::OStream& oStream, const char* loc } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/OfferingTypeValues.cpp b/aws-cpp-sdk-ec2/source/model/OfferingTypeValues.cpp index 019359e3431..260ccd1ecf0 100644 --- a/aws-cpp-sdk-ec2/source/model/OfferingTypeValues.cpp +++ b/aws-cpp-sdk-ec2/source/model/OfferingTypeValues.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int Heavy_Utilization_HASH = HashingUtils::HashString("Heavy Utilization"); -static const int Medium_Utilization_HASH = HashingUtils::HashString("Medium Utilization"); -static const int Light_Utilization_HASH = HashingUtils::HashString("Light Utilization"); -static const int No_Upfront_HASH = HashingUtils::HashString("No Upfront"); -static const int Partial_Upfront_HASH = HashingUtils::HashString("Partial Upfront"); -static const int All_Upfront_HASH = HashingUtils::HashString("All Upfront"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace OfferingTypeValuesMapper { + static const int Heavy_Utilization_HASH = HashingUtils::HashString("Heavy Utilization"); + static const int Medium_Utilization_HASH = HashingUtils::HashString("Medium Utilization"); + static const int Light_Utilization_HASH = HashingUtils::HashString("Light Utilization"); + static const int No_Upfront_HASH = HashingUtils::HashString("No Upfront"); + static const int Partial_Upfront_HASH = HashingUtils::HashString("Partial Upfront"); + static const int All_Upfront_HASH = HashingUtils::HashString("All Upfront"); + OfferingTypeValues GetOfferingTypeValuesForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/OperationType.cpp b/aws-cpp-sdk-ec2/source/model/OperationType.cpp index 7353da3a11a..51095b3d348 100644 --- a/aws-cpp-sdk-ec2/source/model/OperationType.cpp +++ b/aws-cpp-sdk-ec2/source/model/OperationType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int add_HASH = HashingUtils::HashString("add"); -static const int remove_HASH = HashingUtils::HashString("remove"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace OperationTypeMapper { + static const int add_HASH = HashingUtils::HashString("add"); + static const int remove_HASH = HashingUtils::HashString("remove"); + OperationType GetOperationTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/PermissionGroup.cpp b/aws-cpp-sdk-ec2/source/model/PermissionGroup.cpp index 6905c857222..0c73aaffa2c 100644 --- a/aws-cpp-sdk-ec2/source/model/PermissionGroup.cpp +++ b/aws-cpp-sdk-ec2/source/model/PermissionGroup.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int all_HASH = HashingUtils::HashString("all"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace PermissionGroupMapper { + static const int all_HASH = HashingUtils::HashString("all"); + PermissionGroup GetPermissionGroupForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/Placement.cpp b/aws-cpp-sdk-ec2/source/model/Placement.cpp index 9ce9fc541c5..4db98da8754 100644 --- a/aws-cpp-sdk-ec2/source/model/Placement.cpp +++ b/aws-cpp-sdk-ec2/source/model/Placement.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Placement::Placement() : m_availabilityZoneHasBeenSet(false), m_groupNameHasBeenSet(false), @@ -130,3 +136,7 @@ void Placement::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".Affinity=" << StringUtils::URLEncode(m_affinity.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/PlacementGroup.cpp b/aws-cpp-sdk-ec2/source/model/PlacementGroup.cpp index fe91cfa3fb9..a46360a675e 100644 --- a/aws-cpp-sdk-ec2/source/model/PlacementGroup.cpp +++ b/aws-cpp-sdk-ec2/source/model/PlacementGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + PlacementGroup::PlacementGroup() : m_groupNameHasBeenSet(false), m_strategyHasBeenSet(false), @@ -98,3 +104,7 @@ void PlacementGroup::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".State=" << PlacementGroupStateMapper::GetNameForPlacementGroupState(m_state) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/PlacementGroupState.cpp b/aws-cpp-sdk-ec2/source/model/PlacementGroupState.cpp index e4eca297ed3..66d31c7990d 100644 --- a/aws-cpp-sdk-ec2/source/model/PlacementGroupState.cpp +++ b/aws-cpp-sdk-ec2/source/model/PlacementGroupState.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int pending_HASH = HashingUtils::HashString("pending"); -static const int available_HASH = HashingUtils::HashString("available"); -static const int deleting_HASH = HashingUtils::HashString("deleting"); -static const int deleted_HASH = HashingUtils::HashString("deleted"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace PlacementGroupStateMapper { + static const int pending_HASH = HashingUtils::HashString("pending"); + static const int available_HASH = HashingUtils::HashString("available"); + static const int deleting_HASH = HashingUtils::HashString("deleting"); + static const int deleted_HASH = HashingUtils::HashString("deleted"); + PlacementGroupState GetPlacementGroupStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/PlacementStrategy.cpp b/aws-cpp-sdk-ec2/source/model/PlacementStrategy.cpp index ef0475cbe3f..9cabc713ba7 100644 --- a/aws-cpp-sdk-ec2/source/model/PlacementStrategy.cpp +++ b/aws-cpp-sdk-ec2/source/model/PlacementStrategy.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int cluster_HASH = HashingUtils::HashString("cluster"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace PlacementStrategyMapper { + static const int cluster_HASH = HashingUtils::HashString("cluster"); + PlacementStrategy GetPlacementStrategyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/PlatformValues.cpp b/aws-cpp-sdk-ec2/source/model/PlatformValues.cpp index def427d7e6f..b3dfa74f77f 100644 --- a/aws-cpp-sdk-ec2/source/model/PlatformValues.cpp +++ b/aws-cpp-sdk-ec2/source/model/PlatformValues.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int Windows_HASH = HashingUtils::HashString("Windows"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace PlatformValuesMapper { + static const int Windows_HASH = HashingUtils::HashString("Windows"); + PlatformValues GetPlatformValuesForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/PortRange.cpp b/aws-cpp-sdk-ec2/source/model/PortRange.cpp index 4fa966939fa..e5b1afb3357 100644 --- a/aws-cpp-sdk-ec2/source/model/PortRange.cpp +++ b/aws-cpp-sdk-ec2/source/model/PortRange.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + PortRange::PortRange() : m_from(0), m_fromHasBeenSet(false), @@ -86,3 +92,7 @@ void PortRange::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".To=" << m_to << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/PrefixList.cpp b/aws-cpp-sdk-ec2/source/model/PrefixList.cpp index 0665090867a..ea386b09115 100644 --- a/aws-cpp-sdk-ec2/source/model/PrefixList.cpp +++ b/aws-cpp-sdk-ec2/source/model/PrefixList.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + PrefixList::PrefixList() : m_prefixListIdHasBeenSet(false), m_prefixListNameHasBeenSet(false), @@ -112,3 +118,7 @@ void PrefixList::OutputToStream(Aws::OStream& oStream, const char* location) con } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/PrefixListId.cpp b/aws-cpp-sdk-ec2/source/model/PrefixListId.cpp index d3fe1f4c8a7..cd7a17f161b 100644 --- a/aws-cpp-sdk-ec2/source/model/PrefixListId.cpp +++ b/aws-cpp-sdk-ec2/source/model/PrefixListId.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + PrefixListId::PrefixListId() : m_prefixListIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void PrefixListId::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".PrefixListId=" << StringUtils::URLEncode(m_prefixListId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/PriceSchedule.cpp b/aws-cpp-sdk-ec2/source/model/PriceSchedule.cpp index 3692397fc6d..c34294487e8 100644 --- a/aws-cpp-sdk-ec2/source/model/PriceSchedule.cpp +++ b/aws-cpp-sdk-ec2/source/model/PriceSchedule.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + PriceSchedule::PriceSchedule() : m_term(0), m_termHasBeenSet(false), @@ -120,3 +126,7 @@ void PriceSchedule::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".Active=" << m_active << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/PriceScheduleSpecification.cpp b/aws-cpp-sdk-ec2/source/model/PriceScheduleSpecification.cpp index 9df20a91d55..e4e58e6e7d3 100644 --- a/aws-cpp-sdk-ec2/source/model/PriceScheduleSpecification.cpp +++ b/aws-cpp-sdk-ec2/source/model/PriceScheduleSpecification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + PriceScheduleSpecification::PriceScheduleSpecification() : m_term(0), m_termHasBeenSet(false), @@ -102,3 +108,7 @@ void PriceScheduleSpecification::OutputToStream(Aws::OStream& oStream, const cha oStream << location << ".CurrencyCode=" << CurrencyCodeValuesMapper::GetNameForCurrencyCodeValues(m_currencyCode) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/PricingDetail.cpp b/aws-cpp-sdk-ec2/source/model/PricingDetail.cpp index f525d5e0804..db17a6f0087 100644 --- a/aws-cpp-sdk-ec2/source/model/PricingDetail.cpp +++ b/aws-cpp-sdk-ec2/source/model/PricingDetail.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + PricingDetail::PricingDetail() : m_price(0.0), m_priceHasBeenSet(false), @@ -86,3 +92,7 @@ void PricingDetail::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".Count=" << m_count << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/PrivateIpAddressSpecification.cpp b/aws-cpp-sdk-ec2/source/model/PrivateIpAddressSpecification.cpp index f255a547f82..f7af80874c3 100644 --- a/aws-cpp-sdk-ec2/source/model/PrivateIpAddressSpecification.cpp +++ b/aws-cpp-sdk-ec2/source/model/PrivateIpAddressSpecification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + PrivateIpAddressSpecification::PrivateIpAddressSpecification() : m_privateIpAddressHasBeenSet(false), m_primary(false), @@ -84,3 +90,7 @@ void PrivateIpAddressSpecification::OutputToStream(Aws::OStream& oStream, const oStream << location << ".Primary=" << m_primary << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ProductCode.cpp b/aws-cpp-sdk-ec2/source/model/ProductCode.cpp index 07499dbb47b..fb168d93dbe 100644 --- a/aws-cpp-sdk-ec2/source/model/ProductCode.cpp +++ b/aws-cpp-sdk-ec2/source/model/ProductCode.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ProductCode::ProductCode() : m_productCodeIdHasBeenSet(false), m_productCodeTypeHasBeenSet(false) @@ -82,3 +88,7 @@ void ProductCode::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".ProductCodeType=" << ProductCodeValuesMapper::GetNameForProductCodeValues(m_productCodeType) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ProductCodeValues.cpp b/aws-cpp-sdk-ec2/source/model/ProductCodeValues.cpp index 8bd0733d212..67b85c48080 100644 --- a/aws-cpp-sdk-ec2/source/model/ProductCodeValues.cpp +++ b/aws-cpp-sdk-ec2/source/model/ProductCodeValues.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int devpay_HASH = HashingUtils::HashString("devpay"); -static const int marketplace_HASH = HashingUtils::HashString("marketplace"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ProductCodeValuesMapper { + static const int devpay_HASH = HashingUtils::HashString("devpay"); + static const int marketplace_HASH = HashingUtils::HashString("marketplace"); + ProductCodeValues GetProductCodeValuesForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/PropagatingVgw.cpp b/aws-cpp-sdk-ec2/source/model/PropagatingVgw.cpp index 64eb4d23b99..0eafe02f08b 100644 --- a/aws-cpp-sdk-ec2/source/model/PropagatingVgw.cpp +++ b/aws-cpp-sdk-ec2/source/model/PropagatingVgw.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + PropagatingVgw::PropagatingVgw() : m_gatewayIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void PropagatingVgw::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".GatewayId=" << StringUtils::URLEncode(m_gatewayId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/PurchaseRequest.cpp b/aws-cpp-sdk-ec2/source/model/PurchaseRequest.cpp index 4741ceaedc8..bfa23e8b9c0 100644 --- a/aws-cpp-sdk-ec2/source/model/PurchaseRequest.cpp +++ b/aws-cpp-sdk-ec2/source/model/PurchaseRequest.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + PurchaseRequest::PurchaseRequest() : m_purchaseTokenHasBeenSet(false), m_instanceCount(0), @@ -84,3 +90,7 @@ void PurchaseRequest::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".InstanceCount=" << m_instanceCount << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/RIProductDescription.cpp b/aws-cpp-sdk-ec2/source/model/RIProductDescription.cpp index 0358eba6878..7a065203214 100644 --- a/aws-cpp-sdk-ec2/source/model/RIProductDescription.cpp +++ b/aws-cpp-sdk-ec2/source/model/RIProductDescription.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int Linux_UNIX_HASH = HashingUtils::HashString("Linux/UNIX"); -static const int Linux_UNIX_Amazon_VPC_HASH = HashingUtils::HashString("Linux/UNIX (Amazon VPC)"); -static const int Windows_HASH = HashingUtils::HashString("Windows"); -static const int Windows_Amazon_VPC_HASH = HashingUtils::HashString("Windows (Amazon VPC)"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace RIProductDescriptionMapper { + static const int Linux_UNIX_HASH = HashingUtils::HashString("Linux/UNIX"); + static const int Linux_UNIX_Amazon_VPC_HASH = HashingUtils::HashString("Linux/UNIX (Amazon VPC)"); + static const int Windows_HASH = HashingUtils::HashString("Windows"); + static const int Windows_Amazon_VPC_HASH = HashingUtils::HashString("Windows (Amazon VPC)"); + RIProductDescription GetRIProductDescriptionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/RecurringCharge.cpp b/aws-cpp-sdk-ec2/source/model/RecurringCharge.cpp index 0147ad437d3..26ce6f9d5fb 100644 --- a/aws-cpp-sdk-ec2/source/model/RecurringCharge.cpp +++ b/aws-cpp-sdk-ec2/source/model/RecurringCharge.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + RecurringCharge::RecurringCharge() : m_frequencyHasBeenSet(false), m_amount(0.0), @@ -84,3 +90,7 @@ void RecurringCharge::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".Amount=" << StringUtils::URLEncode(m_amount) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/RecurringChargeFrequency.cpp b/aws-cpp-sdk-ec2/source/model/RecurringChargeFrequency.cpp index 81e9da0caac..ab1fcfeb955 100644 --- a/aws-cpp-sdk-ec2/source/model/RecurringChargeFrequency.cpp +++ b/aws-cpp-sdk-ec2/source/model/RecurringChargeFrequency.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int Hourly_HASH = HashingUtils::HashString("Hourly"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace RecurringChargeFrequencyMapper { + static const int Hourly_HASH = HashingUtils::HashString("Hourly"); + RecurringChargeFrequency GetRecurringChargeFrequencyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/Region.cpp b/aws-cpp-sdk-ec2/source/model/Region.cpp index e2ef0a68503..81bafefe0e6 100644 --- a/aws-cpp-sdk-ec2/source/model/Region.cpp +++ b/aws-cpp-sdk-ec2/source/model/Region.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Region::Region() : m_regionNameHasBeenSet(false), m_endpointHasBeenSet(false) @@ -82,3 +88,7 @@ void Region::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Endpoint=" << StringUtils::URLEncode(m_endpoint.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ReportInstanceReasonCodes.cpp b/aws-cpp-sdk-ec2/source/model/ReportInstanceReasonCodes.cpp index 4e9aadefa78..ee6c4126965 100644 --- a/aws-cpp-sdk-ec2/source/model/ReportInstanceReasonCodes.cpp +++ b/aws-cpp-sdk-ec2/source/model/ReportInstanceReasonCodes.cpp @@ -19,15 +19,6 @@ using namespace Aws::Utils; -static const int instance_stuck_in_state_HASH = HashingUtils::HashString("instance-stuck-in-state"); -static const int unresponsive_HASH = HashingUtils::HashString("unresponsive"); -static const int not_accepting_credentials_HASH = HashingUtils::HashString("not-accepting-credentials"); -static const int password_not_available_HASH = HashingUtils::HashString("password-not-available"); -static const int performance_network_HASH = HashingUtils::HashString("performance-network"); -static const int performance_instance_store_HASH = HashingUtils::HashString("performance-instance-store"); -static const int performance_ebs_volume_HASH = HashingUtils::HashString("performance-ebs-volume"); -static const int performance_other_HASH = HashingUtils::HashString("performance-other"); -static const int other_HASH = HashingUtils::HashString("other"); namespace Aws { @@ -38,6 +29,16 @@ namespace Aws namespace ReportInstanceReasonCodesMapper { + static const int instance_stuck_in_state_HASH = HashingUtils::HashString("instance-stuck-in-state"); + static const int unresponsive_HASH = HashingUtils::HashString("unresponsive"); + static const int not_accepting_credentials_HASH = HashingUtils::HashString("not-accepting-credentials"); + static const int password_not_available_HASH = HashingUtils::HashString("password-not-available"); + static const int performance_network_HASH = HashingUtils::HashString("performance-network"); + static const int performance_instance_store_HASH = HashingUtils::HashString("performance-instance-store"); + static const int performance_ebs_volume_HASH = HashingUtils::HashString("performance-ebs-volume"); + static const int performance_other_HASH = HashingUtils::HashString("performance-other"); + static const int other_HASH = HashingUtils::HashString("other"); + ReportInstanceReasonCodes GetReportInstanceReasonCodesForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/ReportStatusType.cpp b/aws-cpp-sdk-ec2/source/model/ReportStatusType.cpp index c1d194da203..73f974cf13d 100644 --- a/aws-cpp-sdk-ec2/source/model/ReportStatusType.cpp +++ b/aws-cpp-sdk-ec2/source/model/ReportStatusType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ok_HASH = HashingUtils::HashString("ok"); -static const int impaired_HASH = HashingUtils::HashString("impaired"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ReportStatusTypeMapper { + static const int ok_HASH = HashingUtils::HashString("ok"); + static const int impaired_HASH = HashingUtils::HashString("impaired"); + ReportStatusType GetReportStatusTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/RequestSpotLaunchSpecification.cpp b/aws-cpp-sdk-ec2/source/model/RequestSpotLaunchSpecification.cpp index 7da610ef1c5..2c03a517e15 100644 --- a/aws-cpp-sdk-ec2/source/model/RequestSpotLaunchSpecification.cpp +++ b/aws-cpp-sdk-ec2/source/model/RequestSpotLaunchSpecification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + RequestSpotLaunchSpecification::RequestSpotLaunchSpecification() : m_imageIdHasBeenSet(false), m_keyNameHasBeenSet(false), @@ -384,3 +390,7 @@ void RequestSpotLaunchSpecification::OutputToStream(Aws::OStream& oStream, const } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/Reservation.cpp b/aws-cpp-sdk-ec2/source/model/Reservation.cpp index 1a1adc13cc0..4e6ffb48262 100644 --- a/aws-cpp-sdk-ec2/source/model/Reservation.cpp +++ b/aws-cpp-sdk-ec2/source/model/Reservation.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Reservation::Reservation() : m_reservationIdHasBeenSet(false), m_ownerIdHasBeenSet(false), @@ -180,3 +186,7 @@ void Reservation::OutputToStream(Aws::OStream& oStream, const char* location) co m_responseMetadata.OutputToStream(oStream, responseMetadataLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ReservedInstanceLimitPrice.cpp b/aws-cpp-sdk-ec2/source/model/ReservedInstanceLimitPrice.cpp index 56a4da98958..c8066daa3c8 100644 --- a/aws-cpp-sdk-ec2/source/model/ReservedInstanceLimitPrice.cpp +++ b/aws-cpp-sdk-ec2/source/model/ReservedInstanceLimitPrice.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ReservedInstanceLimitPrice::ReservedInstanceLimitPrice() : m_amount(0.0), m_amountHasBeenSet(false), @@ -84,3 +90,7 @@ void ReservedInstanceLimitPrice::OutputToStream(Aws::OStream& oStream, const cha oStream << location << ".CurrencyCode=" << CurrencyCodeValuesMapper::GetNameForCurrencyCodeValues(m_currencyCode) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ReservedInstanceState.cpp b/aws-cpp-sdk-ec2/source/model/ReservedInstanceState.cpp index 170a466c1b5..4c338e1db99 100644 --- a/aws-cpp-sdk-ec2/source/model/ReservedInstanceState.cpp +++ b/aws-cpp-sdk-ec2/source/model/ReservedInstanceState.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int payment_pending_HASH = HashingUtils::HashString("payment-pending"); -static const int active_HASH = HashingUtils::HashString("active"); -static const int payment_failed_HASH = HashingUtils::HashString("payment-failed"); -static const int retired_HASH = HashingUtils::HashString("retired"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace ReservedInstanceStateMapper { + static const int payment_pending_HASH = HashingUtils::HashString("payment-pending"); + static const int active_HASH = HashingUtils::HashString("active"); + static const int payment_failed_HASH = HashingUtils::HashString("payment-failed"); + static const int retired_HASH = HashingUtils::HashString("retired"); + ReservedInstanceState GetReservedInstanceStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/ReservedInstances.cpp b/aws-cpp-sdk-ec2/source/model/ReservedInstances.cpp index 90707e3cb4a..4f3fb60cbba 100644 --- a/aws-cpp-sdk-ec2/source/model/ReservedInstances.cpp +++ b/aws-cpp-sdk-ec2/source/model/ReservedInstances.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ReservedInstances::ReservedInstances() : m_reservedInstancesIdHasBeenSet(false), m_instanceTypeHasBeenSet(false), @@ -350,3 +356,7 @@ void ReservedInstances::OutputToStream(Aws::OStream& oStream, const char* locati } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/ReservedInstancesConfiguration.cpp b/aws-cpp-sdk-ec2/source/model/ReservedInstancesConfiguration.cpp index 577c1801025..e9f08421e50 100644 --- a/aws-cpp-sdk-ec2/source/model/ReservedInstancesConfiguration.cpp +++ b/aws-cpp-sdk-ec2/source/model/ReservedInstancesConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ReservedInstancesConfiguration::ReservedInstancesConfiguration() : m_availabilityZoneHasBeenSet(false), m_platformHasBeenSet(false), @@ -116,3 +122,7 @@ void ReservedInstancesConfiguration::OutputToStream(Aws::OStream& oStream, const oStream << location << ".InstanceType=" << InstanceTypeMapper::GetNameForInstanceType(m_instanceType) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ReservedInstancesId.cpp b/aws-cpp-sdk-ec2/source/model/ReservedInstancesId.cpp index 1fffc9f254c..842d23edb82 100644 --- a/aws-cpp-sdk-ec2/source/model/ReservedInstancesId.cpp +++ b/aws-cpp-sdk-ec2/source/model/ReservedInstancesId.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ReservedInstancesId::ReservedInstancesId() : m_reservedInstancesIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ReservedInstancesId::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".ReservedInstancesId=" << StringUtils::URLEncode(m_reservedInstancesId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ReservedInstancesListing.cpp b/aws-cpp-sdk-ec2/source/model/ReservedInstancesListing.cpp index 8100dca3189..031f8ea05b7 100644 --- a/aws-cpp-sdk-ec2/source/model/ReservedInstancesListing.cpp +++ b/aws-cpp-sdk-ec2/source/model/ReservedInstancesListing.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ReservedInstancesListing::ReservedInstancesListing() : m_reservedInstancesListingIdHasBeenSet(false), m_reservedInstancesIdHasBeenSet(false), @@ -264,3 +270,7 @@ void ReservedInstancesListing::OutputToStream(Aws::OStream& oStream, const char* oStream << location << ".ClientToken=" << StringUtils::URLEncode(m_clientToken.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/ReservedInstancesModification.cpp b/aws-cpp-sdk-ec2/source/model/ReservedInstancesModification.cpp index f074a33f6fa..aff4c43a6f6 100644 --- a/aws-cpp-sdk-ec2/source/model/ReservedInstancesModification.cpp +++ b/aws-cpp-sdk-ec2/source/model/ReservedInstancesModification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ReservedInstancesModification::ReservedInstancesModification() : m_reservedInstancesModificationIdHasBeenSet(false), m_reservedInstancesIdsHasBeenSet(false), @@ -230,3 +236,7 @@ void ReservedInstancesModification::OutputToStream(Aws::OStream& oStream, const oStream << location << ".ClientToken=" << StringUtils::URLEncode(m_clientToken.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/ReservedInstancesModificationResponse.cpp b/aws-cpp-sdk-ec2/source/model/ReservedInstancesModificationResponse.cpp index 67225cc40bf..7b54aaf29a9 100644 --- a/aws-cpp-sdk-ec2/source/model/ReservedInstancesModificationResponse.cpp +++ b/aws-cpp-sdk-ec2/source/model/ReservedInstancesModificationResponse.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ReservedInstancesModificationResponse::ReservedInstancesModificationResponse() : m_reservedInstancesIdHasBeenSet(false), m_targetConfigurationHasBeenSet(false) @@ -86,3 +92,7 @@ void ReservedInstancesModificationResponse::OutputToStream(Aws::OStream& oStream m_targetConfiguration.OutputToStream(oStream, targetConfigurationLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ReservedInstancesOffering.cpp b/aws-cpp-sdk-ec2/source/model/ReservedInstancesOffering.cpp index 45f2984bd95..89ea6493057 100644 --- a/aws-cpp-sdk-ec2/source/model/ReservedInstancesOffering.cpp +++ b/aws-cpp-sdk-ec2/source/model/ReservedInstancesOffering.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ReservedInstancesOffering::ReservedInstancesOffering() : m_reservedInstancesOfferingIdHasBeenSet(false), m_instanceTypeHasBeenSet(false), @@ -302,3 +308,7 @@ void ReservedInstancesOffering::OutputToStream(Aws::OStream& oStream, const char } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ResetImageAttributeName.cpp b/aws-cpp-sdk-ec2/source/model/ResetImageAttributeName.cpp index 51d72a1d95f..9c38d61244a 100644 --- a/aws-cpp-sdk-ec2/source/model/ResetImageAttributeName.cpp +++ b/aws-cpp-sdk-ec2/source/model/ResetImageAttributeName.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int launchPermission_HASH = HashingUtils::HashString("launchPermission"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace ResetImageAttributeNameMapper { + static const int launchPermission_HASH = HashingUtils::HashString("launchPermission"); + ResetImageAttributeName GetResetImageAttributeNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/ResourceType.cpp b/aws-cpp-sdk-ec2/source/model/ResourceType.cpp index f6fd675aad6..a399d49af53 100644 --- a/aws-cpp-sdk-ec2/source/model/ResourceType.cpp +++ b/aws-cpp-sdk-ec2/source/model/ResourceType.cpp @@ -19,23 +19,6 @@ using namespace Aws::Utils; -static const int customer_gateway_HASH = HashingUtils::HashString("customer-gateway"); -static const int dhcp_options_HASH = HashingUtils::HashString("dhcp-options"); -static const int image_HASH = HashingUtils::HashString("image"); -static const int instance_HASH = HashingUtils::HashString("instance"); -static const int internet_gateway_HASH = HashingUtils::HashString("internet-gateway"); -static const int network_acl_HASH = HashingUtils::HashString("network-acl"); -static const int network_interface_HASH = HashingUtils::HashString("network-interface"); -static const int reserved_instances_HASH = HashingUtils::HashString("reserved-instances"); -static const int route_table_HASH = HashingUtils::HashString("route-table"); -static const int snapshot_HASH = HashingUtils::HashString("snapshot"); -static const int spot_instances_request_HASH = HashingUtils::HashString("spot-instances-request"); -static const int subnet_HASH = HashingUtils::HashString("subnet"); -static const int security_group_HASH = HashingUtils::HashString("security-group"); -static const int volume_HASH = HashingUtils::HashString("volume"); -static const int vpc_HASH = HashingUtils::HashString("vpc"); -static const int vpn_connection_HASH = HashingUtils::HashString("vpn-connection"); -static const int vpn_gateway_HASH = HashingUtils::HashString("vpn-gateway"); namespace Aws { @@ -46,6 +29,24 @@ namespace Aws namespace ResourceTypeMapper { + static const int customer_gateway_HASH = HashingUtils::HashString("customer-gateway"); + static const int dhcp_options_HASH = HashingUtils::HashString("dhcp-options"); + static const int image_HASH = HashingUtils::HashString("image"); + static const int instance_HASH = HashingUtils::HashString("instance"); + static const int internet_gateway_HASH = HashingUtils::HashString("internet-gateway"); + static const int network_acl_HASH = HashingUtils::HashString("network-acl"); + static const int network_interface_HASH = HashingUtils::HashString("network-interface"); + static const int reserved_instances_HASH = HashingUtils::HashString("reserved-instances"); + static const int route_table_HASH = HashingUtils::HashString("route-table"); + static const int snapshot_HASH = HashingUtils::HashString("snapshot"); + static const int spot_instances_request_HASH = HashingUtils::HashString("spot-instances-request"); + static const int subnet_HASH = HashingUtils::HashString("subnet"); + static const int security_group_HASH = HashingUtils::HashString("security-group"); + static const int volume_HASH = HashingUtils::HashString("volume"); + static const int vpc_HASH = HashingUtils::HashString("vpc"); + static const int vpn_connection_HASH = HashingUtils::HashString("vpn-connection"); + static const int vpn_gateway_HASH = HashingUtils::HashString("vpn-gateway"); + ResourceType GetResourceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-ec2/source/model/ResponseMetadata.cpp index 6516fbef2f1..1a776b81895 100644 --- a/aws-cpp-sdk-ec2/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-ec2/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/Route.cpp b/aws-cpp-sdk-ec2/source/model/Route.cpp index ddb1965eb97..f642a1f26c9 100644 --- a/aws-cpp-sdk-ec2/source/model/Route.cpp +++ b/aws-cpp-sdk-ec2/source/model/Route.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Route::Route() : m_destinationCidrBlockHasBeenSet(false), m_destinationPrefixListIdHasBeenSet(false), @@ -210,3 +216,7 @@ void Route::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Origin=" << RouteOriginMapper::GetNameForRouteOrigin(m_origin) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/RouteOrigin.cpp b/aws-cpp-sdk-ec2/source/model/RouteOrigin.cpp index b24349dcec6..da350912460 100644 --- a/aws-cpp-sdk-ec2/source/model/RouteOrigin.cpp +++ b/aws-cpp-sdk-ec2/source/model/RouteOrigin.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int CreateRouteTable_HASH = HashingUtils::HashString("CreateRouteTable"); -static const int CreateRoute_HASH = HashingUtils::HashString("CreateRoute"); -static const int EnableVgwRoutePropagation_HASH = HashingUtils::HashString("EnableVgwRoutePropagation"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace RouteOriginMapper { + static const int CreateRouteTable_HASH = HashingUtils::HashString("CreateRouteTable"); + static const int CreateRoute_HASH = HashingUtils::HashString("CreateRoute"); + static const int EnableVgwRoutePropagation_HASH = HashingUtils::HashString("EnableVgwRoutePropagation"); + RouteOrigin GetRouteOriginForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/RouteState.cpp b/aws-cpp-sdk-ec2/source/model/RouteState.cpp index 6141b2bad57..bde0c212a6f 100644 --- a/aws-cpp-sdk-ec2/source/model/RouteState.cpp +++ b/aws-cpp-sdk-ec2/source/model/RouteState.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int active_HASH = HashingUtils::HashString("active"); -static const int blackhole_HASH = HashingUtils::HashString("blackhole"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace RouteStateMapper { + static const int active_HASH = HashingUtils::HashString("active"); + static const int blackhole_HASH = HashingUtils::HashString("blackhole"); + RouteState GetRouteStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/RouteTable.cpp b/aws-cpp-sdk-ec2/source/model/RouteTable.cpp index c7f6736139f..c467b7a50c2 100644 --- a/aws-cpp-sdk-ec2/source/model/RouteTable.cpp +++ b/aws-cpp-sdk-ec2/source/model/RouteTable.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + RouteTable::RouteTable() : m_routeTableIdHasBeenSet(false), m_vpcIdHasBeenSet(false), @@ -218,3 +224,7 @@ void RouteTable::OutputToStream(Aws::OStream& oStream, const char* location) con } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/RouteTableAssociation.cpp b/aws-cpp-sdk-ec2/source/model/RouteTableAssociation.cpp index 95abfdc4866..787180340ff 100644 --- a/aws-cpp-sdk-ec2/source/model/RouteTableAssociation.cpp +++ b/aws-cpp-sdk-ec2/source/model/RouteTableAssociation.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + RouteTableAssociation::RouteTableAssociation() : m_routeTableAssociationIdHasBeenSet(false), m_routeTableIdHasBeenSet(false), @@ -116,3 +122,7 @@ void RouteTableAssociation::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".Main=" << m_main << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/RuleAction.cpp b/aws-cpp-sdk-ec2/source/model/RuleAction.cpp index 0dd7a59f9a2..e9a2e1c9bc7 100644 --- a/aws-cpp-sdk-ec2/source/model/RuleAction.cpp +++ b/aws-cpp-sdk-ec2/source/model/RuleAction.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int allow_HASH = HashingUtils::HashString("allow"); -static const int deny_HASH = HashingUtils::HashString("deny"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace RuleActionMapper { + static const int allow_HASH = HashingUtils::HashString("allow"); + static const int deny_HASH = HashingUtils::HashString("deny"); + RuleAction GetRuleActionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/RunInstancesMonitoringEnabled.cpp b/aws-cpp-sdk-ec2/source/model/RunInstancesMonitoringEnabled.cpp index b8e2c1b4d43..d0e040a4e2c 100644 --- a/aws-cpp-sdk-ec2/source/model/RunInstancesMonitoringEnabled.cpp +++ b/aws-cpp-sdk-ec2/source/model/RunInstancesMonitoringEnabled.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + RunInstancesMonitoringEnabled::RunInstancesMonitoringEnabled() : m_enabled(false), m_enabledHasBeenSet(false) @@ -68,3 +74,7 @@ void RunInstancesMonitoringEnabled::OutputToStream(Aws::OStream& oStream, const oStream << location << ".Enabled=" << m_enabled << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/S3Storage.cpp b/aws-cpp-sdk-ec2/source/model/S3Storage.cpp index 191fc79df2e..56cb9e53db6 100644 --- a/aws-cpp-sdk-ec2/source/model/S3Storage.cpp +++ b/aws-cpp-sdk-ec2/source/model/S3Storage.cpp @@ -20,10 +20,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + S3Storage::S3Storage() : m_bucketHasBeenSet(false), m_prefixHasBeenSet(false), @@ -131,3 +137,7 @@ void S3Storage::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".UploadPolicySignature=" << StringUtils::URLEncode(m_uploadPolicySignature.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ScheduledInstance.cpp b/aws-cpp-sdk-ec2/source/model/ScheduledInstance.cpp index 65db3f1aad0..1e671bc21dc 100644 --- a/aws-cpp-sdk-ec2/source/model/ScheduledInstance.cpp +++ b/aws-cpp-sdk-ec2/source/model/ScheduledInstance.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ScheduledInstance::ScheduledInstance() : m_scheduledInstanceIdHasBeenSet(false), m_instanceTypeHasBeenSet(false), @@ -300,3 +306,7 @@ void ScheduledInstance::OutputToStream(Aws::OStream& oStream, const char* locati oStream << location << ".CreateDate=" << StringUtils::URLEncode(m_createDate.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/ScheduledInstanceAvailability.cpp b/aws-cpp-sdk-ec2/source/model/ScheduledInstanceAvailability.cpp index f9278a36cb3..774dcf708a8 100644 --- a/aws-cpp-sdk-ec2/source/model/ScheduledInstanceAvailability.cpp +++ b/aws-cpp-sdk-ec2/source/model/ScheduledInstanceAvailability.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ScheduledInstanceAvailability::ScheduledInstanceAvailability() : m_instanceTypeHasBeenSet(false), m_platformHasBeenSet(false), @@ -272,3 +278,7 @@ void ScheduledInstanceAvailability::OutputToStream(Aws::OStream& oStream, const oStream << location << ".MaxTermDurationInDays=" << m_maxTermDurationInDays << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/ScheduledInstanceRecurrence.cpp b/aws-cpp-sdk-ec2/source/model/ScheduledInstanceRecurrence.cpp index f270b0b0566..a6ef3ae0c23 100644 --- a/aws-cpp-sdk-ec2/source/model/ScheduledInstanceRecurrence.cpp +++ b/aws-cpp-sdk-ec2/source/model/ScheduledInstanceRecurrence.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ScheduledInstanceRecurrence::ScheduledInstanceRecurrence() : m_frequencyHasBeenSet(false), m_interval(0), @@ -148,3 +154,7 @@ void ScheduledInstanceRecurrence::OutputToStream(Aws::OStream& oStream, const ch oStream << location << ".OccurrenceUnit=" << StringUtils::URLEncode(m_occurrenceUnit.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ScheduledInstanceRecurrenceRequest.cpp b/aws-cpp-sdk-ec2/source/model/ScheduledInstanceRecurrenceRequest.cpp index 44852c048ea..cdaf40d7a86 100644 --- a/aws-cpp-sdk-ec2/source/model/ScheduledInstanceRecurrenceRequest.cpp +++ b/aws-cpp-sdk-ec2/source/model/ScheduledInstanceRecurrenceRequest.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ScheduledInstanceRecurrenceRequest::ScheduledInstanceRecurrenceRequest() : m_frequencyHasBeenSet(false), m_interval(0), @@ -148,3 +154,7 @@ void ScheduledInstanceRecurrenceRequest::OutputToStream(Aws::OStream& oStream, c oStream << location << ".OccurrenceUnit=" << StringUtils::URLEncode(m_occurrenceUnit.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesBlockDeviceMapping.cpp b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesBlockDeviceMapping.cpp index 8164a86722f..5858f46ae38 100644 --- a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesBlockDeviceMapping.cpp +++ b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesBlockDeviceMapping.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ScheduledInstancesBlockDeviceMapping::ScheduledInstancesBlockDeviceMapping() : m_deviceNameHasBeenSet(false), m_noDeviceHasBeenSet(false), @@ -118,3 +124,7 @@ void ScheduledInstancesBlockDeviceMapping::OutputToStream(Aws::OStream& oStream, m_ebs.OutputToStream(oStream, ebsLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesEbs.cpp b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesEbs.cpp index a26dbf4a408..32aab95777d 100644 --- a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesEbs.cpp +++ b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesEbs.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ScheduledInstancesEbs::ScheduledInstancesEbs() : m_snapshotIdHasBeenSet(false), m_volumeSize(0), @@ -154,3 +160,7 @@ void ScheduledInstancesEbs::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".Encrypted=" << m_encrypted << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesIamInstanceProfile.cpp b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesIamInstanceProfile.cpp index df095bb17a9..c4e83d8f111 100644 --- a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesIamInstanceProfile.cpp +++ b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesIamInstanceProfile.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ScheduledInstancesIamInstanceProfile::ScheduledInstancesIamInstanceProfile() : m_arnHasBeenSet(false), m_nameHasBeenSet(false) @@ -82,3 +88,7 @@ void ScheduledInstancesIamInstanceProfile::OutputToStream(Aws::OStream& oStream, oStream << location << ".Name=" << StringUtils::URLEncode(m_name.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesLaunchSpecification.cpp b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesLaunchSpecification.cpp index 38c52476b1c..d02b2e5e8b6 100644 --- a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesLaunchSpecification.cpp +++ b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesLaunchSpecification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ScheduledInstancesLaunchSpecification::ScheduledInstancesLaunchSpecification() : m_imageIdHasBeenSet(false), m_keyNameHasBeenSet(false), @@ -338,3 +344,7 @@ void ScheduledInstancesLaunchSpecification::OutputToStream(Aws::OStream& oStream oStream << location << ".EbsOptimized=" << m_ebsOptimized << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesMonitoring.cpp b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesMonitoring.cpp index ea6df59202c..65e52689297 100644 --- a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesMonitoring.cpp +++ b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesMonitoring.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ScheduledInstancesMonitoring::ScheduledInstancesMonitoring() : m_enabled(false), m_enabledHasBeenSet(false) @@ -68,3 +74,7 @@ void ScheduledInstancesMonitoring::OutputToStream(Aws::OStream& oStream, const c oStream << location << ".Enabled=" << m_enabled << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesNetworkInterface.cpp b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesNetworkInterface.cpp index c102551ff52..92d007f022b 100644 --- a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesNetworkInterface.cpp +++ b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesNetworkInterface.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ScheduledInstancesNetworkInterface::ScheduledInstancesNetworkInterface() : m_networkInterfaceIdHasBeenSet(false), m_deviceIndex(0), @@ -250,3 +256,7 @@ void ScheduledInstancesNetworkInterface::OutputToStream(Aws::OStream& oStream, c oStream << location << ".DeleteOnTermination=" << m_deleteOnTermination << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesPlacement.cpp b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesPlacement.cpp index d6ecb118cda..77c815bd237 100644 --- a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesPlacement.cpp +++ b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesPlacement.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ScheduledInstancesPlacement::ScheduledInstancesPlacement() : m_availabilityZoneHasBeenSet(false), m_groupNameHasBeenSet(false) @@ -82,3 +88,7 @@ void ScheduledInstancesPlacement::OutputToStream(Aws::OStream& oStream, const ch oStream << location << ".GroupName=" << StringUtils::URLEncode(m_groupName.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesPrivateIpAddressConfig.cpp b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesPrivateIpAddressConfig.cpp index ce941020bef..758bf9ab7ac 100644 --- a/aws-cpp-sdk-ec2/source/model/ScheduledInstancesPrivateIpAddressConfig.cpp +++ b/aws-cpp-sdk-ec2/source/model/ScheduledInstancesPrivateIpAddressConfig.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + ScheduledInstancesPrivateIpAddressConfig::ScheduledInstancesPrivateIpAddressConfig() : m_privateIpAddressHasBeenSet(false), m_primary(false), @@ -84,3 +90,7 @@ void ScheduledInstancesPrivateIpAddressConfig::OutputToStream(Aws::OStream& oStr oStream << location << ".Primary=" << m_primary << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/SecurityGroup.cpp b/aws-cpp-sdk-ec2/source/model/SecurityGroup.cpp index c4555a7528c..ae9a40a87d1 100644 --- a/aws-cpp-sdk-ec2/source/model/SecurityGroup.cpp +++ b/aws-cpp-sdk-ec2/source/model/SecurityGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SecurityGroup::SecurityGroup() : m_ownerIdHasBeenSet(false), m_groupNameHasBeenSet(false), @@ -232,3 +238,7 @@ void SecurityGroup::OutputToStream(Aws::OStream& oStream, const char* location) } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/ShutdownBehavior.cpp b/aws-cpp-sdk-ec2/source/model/ShutdownBehavior.cpp index 35baaba573a..f2504c65938 100644 --- a/aws-cpp-sdk-ec2/source/model/ShutdownBehavior.cpp +++ b/aws-cpp-sdk-ec2/source/model/ShutdownBehavior.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int stop_HASH = HashingUtils::HashString("stop"); -static const int terminate_HASH = HashingUtils::HashString("terminate"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ShutdownBehaviorMapper { + static const int stop_HASH = HashingUtils::HashString("stop"); + static const int terminate_HASH = HashingUtils::HashString("terminate"); + ShutdownBehavior GetShutdownBehaviorForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/SlotDateTimeRangeRequest.cpp b/aws-cpp-sdk-ec2/source/model/SlotDateTimeRangeRequest.cpp index 7963a6e189f..8a151178b3b 100644 --- a/aws-cpp-sdk-ec2/source/model/SlotDateTimeRangeRequest.cpp +++ b/aws-cpp-sdk-ec2/source/model/SlotDateTimeRangeRequest.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SlotDateTimeRangeRequest::SlotDateTimeRangeRequest() : m_earliestTimeHasBeenSet(false), m_latestTimeHasBeenSet(false) @@ -82,3 +88,7 @@ void SlotDateTimeRangeRequest::OutputToStream(Aws::OStream& oStream, const char* oStream << location << ".LatestTime=" << StringUtils::URLEncode(m_latestTime.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/SlotStartTimeRangeRequest.cpp b/aws-cpp-sdk-ec2/source/model/SlotStartTimeRangeRequest.cpp index 0d8c995ebf9..70e4bda237d 100644 --- a/aws-cpp-sdk-ec2/source/model/SlotStartTimeRangeRequest.cpp +++ b/aws-cpp-sdk-ec2/source/model/SlotStartTimeRangeRequest.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SlotStartTimeRangeRequest::SlotStartTimeRangeRequest() : m_earliestTimeHasBeenSet(false), m_latestTimeHasBeenSet(false) @@ -82,3 +88,7 @@ void SlotStartTimeRangeRequest::OutputToStream(Aws::OStream& oStream, const char oStream << location << ".LatestTime=" << StringUtils::URLEncode(m_latestTime.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/Snapshot.cpp b/aws-cpp-sdk-ec2/source/model/Snapshot.cpp index 55e74a75119..d08d6b2f86b 100644 --- a/aws-cpp-sdk-ec2/source/model/Snapshot.cpp +++ b/aws-cpp-sdk-ec2/source/model/Snapshot.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Snapshot::Snapshot() : m_snapshotIdHasBeenSet(false), m_volumeIdHasBeenSet(false), @@ -310,3 +316,7 @@ void Snapshot::OutputToStream(Aws::OStream& oStream, const char* location) const m_responseMetadata.OutputToStream(oStream, responseMetadataLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/SnapshotAttributeName.cpp b/aws-cpp-sdk-ec2/source/model/SnapshotAttributeName.cpp index 784999aecef..2a646e7bfbc 100644 --- a/aws-cpp-sdk-ec2/source/model/SnapshotAttributeName.cpp +++ b/aws-cpp-sdk-ec2/source/model/SnapshotAttributeName.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int productCodes_HASH = HashingUtils::HashString("productCodes"); -static const int createVolumePermission_HASH = HashingUtils::HashString("createVolumePermission"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace SnapshotAttributeNameMapper { + static const int productCodes_HASH = HashingUtils::HashString("productCodes"); + static const int createVolumePermission_HASH = HashingUtils::HashString("createVolumePermission"); + SnapshotAttributeName GetSnapshotAttributeNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/SnapshotDetail.cpp b/aws-cpp-sdk-ec2/source/model/SnapshotDetail.cpp index 4cfeb5b5016..9ff20cad372 100644 --- a/aws-cpp-sdk-ec2/source/model/SnapshotDetail.cpp +++ b/aws-cpp-sdk-ec2/source/model/SnapshotDetail.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SnapshotDetail::SnapshotDetail() : m_diskImageSize(0.0), m_diskImageSizeHasBeenSet(false), @@ -216,3 +222,7 @@ void SnapshotDetail::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".Status=" << StringUtils::URLEncode(m_status.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/SnapshotDiskContainer.cpp b/aws-cpp-sdk-ec2/source/model/SnapshotDiskContainer.cpp index eeb23d6fb4f..51e8d29fc27 100644 --- a/aws-cpp-sdk-ec2/source/model/SnapshotDiskContainer.cpp +++ b/aws-cpp-sdk-ec2/source/model/SnapshotDiskContainer.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SnapshotDiskContainer::SnapshotDiskContainer() : m_descriptionHasBeenSet(false), m_formatHasBeenSet(false), @@ -118,3 +124,7 @@ void SnapshotDiskContainer::OutputToStream(Aws::OStream& oStream, const char* lo m_userBucket.OutputToStream(oStream, userBucketLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/SnapshotState.cpp b/aws-cpp-sdk-ec2/source/model/SnapshotState.cpp index 11ac4734cdd..6fd1ede2494 100644 --- a/aws-cpp-sdk-ec2/source/model/SnapshotState.cpp +++ b/aws-cpp-sdk-ec2/source/model/SnapshotState.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int pending_HASH = HashingUtils::HashString("pending"); -static const int completed_HASH = HashingUtils::HashString("completed"); -static const int error_HASH = HashingUtils::HashString("error"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace SnapshotStateMapper { + static const int pending_HASH = HashingUtils::HashString("pending"); + static const int completed_HASH = HashingUtils::HashString("completed"); + static const int error_HASH = HashingUtils::HashString("error"); + SnapshotState GetSnapshotStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/SnapshotTaskDetail.cpp b/aws-cpp-sdk-ec2/source/model/SnapshotTaskDetail.cpp index a47cd6778e1..61406d7b512 100644 --- a/aws-cpp-sdk-ec2/source/model/SnapshotTaskDetail.cpp +++ b/aws-cpp-sdk-ec2/source/model/SnapshotTaskDetail.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SnapshotTaskDetail::SnapshotTaskDetail() : m_diskImageSize(0.0), m_diskImageSizeHasBeenSet(false), @@ -200,3 +206,7 @@ void SnapshotTaskDetail::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".Status=" << StringUtils::URLEncode(m_status.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/SpotDatafeedSubscription.cpp b/aws-cpp-sdk-ec2/source/model/SpotDatafeedSubscription.cpp index 017d17d8507..b51ccd908c9 100644 --- a/aws-cpp-sdk-ec2/source/model/SpotDatafeedSubscription.cpp +++ b/aws-cpp-sdk-ec2/source/model/SpotDatafeedSubscription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SpotDatafeedSubscription::SpotDatafeedSubscription() : m_ownerIdHasBeenSet(false), m_bucketHasBeenSet(false), @@ -134,3 +140,7 @@ void SpotDatafeedSubscription::OutputToStream(Aws::OStream& oStream, const char* m_fault.OutputToStream(oStream, faultLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/SpotFleetLaunchSpecification.cpp b/aws-cpp-sdk-ec2/source/model/SpotFleetLaunchSpecification.cpp index b960fb4826c..8e7b4341582 100644 --- a/aws-cpp-sdk-ec2/source/model/SpotFleetLaunchSpecification.cpp +++ b/aws-cpp-sdk-ec2/source/model/SpotFleetLaunchSpecification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SpotFleetLaunchSpecification::SpotFleetLaunchSpecification() : m_imageIdHasBeenSet(false), m_keyNameHasBeenSet(false), @@ -392,3 +398,7 @@ void SpotFleetLaunchSpecification::OutputToStream(Aws::OStream& oStream, const c oStream << location << ".SpotPrice=" << StringUtils::URLEncode(m_spotPrice.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/SpotFleetMonitoring.cpp b/aws-cpp-sdk-ec2/source/model/SpotFleetMonitoring.cpp index e77c7051e6d..745cbc9ae04 100644 --- a/aws-cpp-sdk-ec2/source/model/SpotFleetMonitoring.cpp +++ b/aws-cpp-sdk-ec2/source/model/SpotFleetMonitoring.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SpotFleetMonitoring::SpotFleetMonitoring() : m_enabled(false), m_enabledHasBeenSet(false) @@ -68,3 +74,7 @@ void SpotFleetMonitoring::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".Enabled=" << m_enabled << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/SpotFleetRequestConfig.cpp b/aws-cpp-sdk-ec2/source/model/SpotFleetRequestConfig.cpp index a3fc19f438b..4db909d4fb3 100644 --- a/aws-cpp-sdk-ec2/source/model/SpotFleetRequestConfig.cpp +++ b/aws-cpp-sdk-ec2/source/model/SpotFleetRequestConfig.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SpotFleetRequestConfig::SpotFleetRequestConfig() : m_spotFleetRequestIdHasBeenSet(false), m_spotFleetRequestStateHasBeenSet(false), @@ -118,3 +124,7 @@ void SpotFleetRequestConfig::OutputToStream(Aws::OStream& oStream, const char* l oStream << location << ".CreateTime=" << StringUtils::URLEncode(m_createTime.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/SpotFleetRequestConfigData.cpp b/aws-cpp-sdk-ec2/source/model/SpotFleetRequestConfigData.cpp index beb8f375f54..b003a5a6383 100644 --- a/aws-cpp-sdk-ec2/source/model/SpotFleetRequestConfigData.cpp +++ b/aws-cpp-sdk-ec2/source/model/SpotFleetRequestConfigData.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SpotFleetRequestConfigData::SpotFleetRequestConfigData() : m_clientTokenHasBeenSet(false), m_spotPriceHasBeenSet(false), @@ -232,3 +238,7 @@ void SpotFleetRequestConfigData::OutputToStream(Aws::OStream& oStream, const cha oStream << location << ".AllocationStrategy=" << AllocationStrategyMapper::GetNameForAllocationStrategy(m_allocationStrategy) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/SpotInstanceRequest.cpp b/aws-cpp-sdk-ec2/source/model/SpotInstanceRequest.cpp index 759e65d238a..6b6c1f0fbd9 100644 --- a/aws-cpp-sdk-ec2/source/model/SpotInstanceRequest.cpp +++ b/aws-cpp-sdk-ec2/source/model/SpotInstanceRequest.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SpotInstanceRequest::SpotInstanceRequest() : m_spotInstanceRequestIdHasBeenSet(false), m_spotPriceHasBeenSet(false), @@ -370,3 +376,7 @@ void SpotInstanceRequest::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".LaunchedAvailabilityZone=" << StringUtils::URLEncode(m_launchedAvailabilityZone.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/SpotInstanceState.cpp b/aws-cpp-sdk-ec2/source/model/SpotInstanceState.cpp index 23aa58c926e..24acc670819 100644 --- a/aws-cpp-sdk-ec2/source/model/SpotInstanceState.cpp +++ b/aws-cpp-sdk-ec2/source/model/SpotInstanceState.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int open_HASH = HashingUtils::HashString("open"); -static const int active_HASH = HashingUtils::HashString("active"); -static const int closed_HASH = HashingUtils::HashString("closed"); -static const int cancelled_HASH = HashingUtils::HashString("cancelled"); -static const int failed_HASH = HashingUtils::HashString("failed"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace SpotInstanceStateMapper { + static const int open_HASH = HashingUtils::HashString("open"); + static const int active_HASH = HashingUtils::HashString("active"); + static const int closed_HASH = HashingUtils::HashString("closed"); + static const int cancelled_HASH = HashingUtils::HashString("cancelled"); + static const int failed_HASH = HashingUtils::HashString("failed"); + SpotInstanceState GetSpotInstanceStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/SpotInstanceStateFault.cpp b/aws-cpp-sdk-ec2/source/model/SpotInstanceStateFault.cpp index bb665d3f347..2669947bcd3 100644 --- a/aws-cpp-sdk-ec2/source/model/SpotInstanceStateFault.cpp +++ b/aws-cpp-sdk-ec2/source/model/SpotInstanceStateFault.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SpotInstanceStateFault::SpotInstanceStateFault() : m_codeHasBeenSet(false), m_messageHasBeenSet(false) @@ -82,3 +88,7 @@ void SpotInstanceStateFault::OutputToStream(Aws::OStream& oStream, const char* l oStream << location << ".Message=" << StringUtils::URLEncode(m_message.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/SpotInstanceStatus.cpp b/aws-cpp-sdk-ec2/source/model/SpotInstanceStatus.cpp index 28a8b283d2e..46ab3419aca 100644 --- a/aws-cpp-sdk-ec2/source/model/SpotInstanceStatus.cpp +++ b/aws-cpp-sdk-ec2/source/model/SpotInstanceStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SpotInstanceStatus::SpotInstanceStatus() : m_codeHasBeenSet(false), m_updateTimeHasBeenSet(false), @@ -98,3 +104,7 @@ void SpotInstanceStatus::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".Message=" << StringUtils::URLEncode(m_message.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/SpotInstanceType.cpp b/aws-cpp-sdk-ec2/source/model/SpotInstanceType.cpp index 753cd6c6b7b..345ac7d93d8 100644 --- a/aws-cpp-sdk-ec2/source/model/SpotInstanceType.cpp +++ b/aws-cpp-sdk-ec2/source/model/SpotInstanceType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int one_time_HASH = HashingUtils::HashString("one-time"); -static const int persistent_HASH = HashingUtils::HashString("persistent"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace SpotInstanceTypeMapper { + static const int one_time_HASH = HashingUtils::HashString("one-time"); + static const int persistent_HASH = HashingUtils::HashString("persistent"); + SpotInstanceType GetSpotInstanceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/SpotPlacement.cpp b/aws-cpp-sdk-ec2/source/model/SpotPlacement.cpp index 09e954cf10b..0d07e423f73 100644 --- a/aws-cpp-sdk-ec2/source/model/SpotPlacement.cpp +++ b/aws-cpp-sdk-ec2/source/model/SpotPlacement.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SpotPlacement::SpotPlacement() : m_availabilityZoneHasBeenSet(false), m_groupNameHasBeenSet(false) @@ -82,3 +88,7 @@ void SpotPlacement::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".GroupName=" << StringUtils::URLEncode(m_groupName.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/SpotPrice.cpp b/aws-cpp-sdk-ec2/source/model/SpotPrice.cpp index 43b97eeb315..d1fa43513f4 100644 --- a/aws-cpp-sdk-ec2/source/model/SpotPrice.cpp +++ b/aws-cpp-sdk-ec2/source/model/SpotPrice.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + SpotPrice::SpotPrice() : m_instanceTypeHasBeenSet(false), m_productDescriptionHasBeenSet(false), @@ -130,3 +136,7 @@ void SpotPrice::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".AvailabilityZone=" << StringUtils::URLEncode(m_availabilityZone.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/State.cpp b/aws-cpp-sdk-ec2/source/model/State.cpp index 25e8f85510d..c58db0eed37 100644 --- a/aws-cpp-sdk-ec2/source/model/State.cpp +++ b/aws-cpp-sdk-ec2/source/model/State.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int Pending_HASH = HashingUtils::HashString("Pending"); -static const int Available_HASH = HashingUtils::HashString("Available"); -static const int Deleting_HASH = HashingUtils::HashString("Deleting"); -static const int Deleted_HASH = HashingUtils::HashString("Deleted"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace StateMapper { + static const int Pending_HASH = HashingUtils::HashString("Pending"); + static const int Available_HASH = HashingUtils::HashString("Available"); + static const int Deleting_HASH = HashingUtils::HashString("Deleting"); + static const int Deleted_HASH = HashingUtils::HashString("Deleted"); + State GetStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/StateReason.cpp b/aws-cpp-sdk-ec2/source/model/StateReason.cpp index ded8628883f..8d1b82f1f45 100644 --- a/aws-cpp-sdk-ec2/source/model/StateReason.cpp +++ b/aws-cpp-sdk-ec2/source/model/StateReason.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + StateReason::StateReason() : m_codeHasBeenSet(false), m_messageHasBeenSet(false) @@ -82,3 +88,7 @@ void StateReason::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".Message=" << StringUtils::URLEncode(m_message.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/Status.cpp b/aws-cpp-sdk-ec2/source/model/Status.cpp index 69b3f576220..2590beb2c12 100644 --- a/aws-cpp-sdk-ec2/source/model/Status.cpp +++ b/aws-cpp-sdk-ec2/source/model/Status.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int MoveInProgress_HASH = HashingUtils::HashString("MoveInProgress"); -static const int InVpc_HASH = HashingUtils::HashString("InVpc"); -static const int InClassic_HASH = HashingUtils::HashString("InClassic"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace StatusMapper { + static const int MoveInProgress_HASH = HashingUtils::HashString("MoveInProgress"); + static const int InVpc_HASH = HashingUtils::HashString("InVpc"); + static const int InClassic_HASH = HashingUtils::HashString("InClassic"); + Status GetStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/StatusName.cpp b/aws-cpp-sdk-ec2/source/model/StatusName.cpp index 9f56df0faf6..fa2f2a81957 100644 --- a/aws-cpp-sdk-ec2/source/model/StatusName.cpp +++ b/aws-cpp-sdk-ec2/source/model/StatusName.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int reachability_HASH = HashingUtils::HashString("reachability"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace StatusNameMapper { + static const int reachability_HASH = HashingUtils::HashString("reachability"); + StatusName GetStatusNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/StatusType.cpp b/aws-cpp-sdk-ec2/source/model/StatusType.cpp index 22a2ed17428..3af3d34aabc 100644 --- a/aws-cpp-sdk-ec2/source/model/StatusType.cpp +++ b/aws-cpp-sdk-ec2/source/model/StatusType.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int passed_HASH = HashingUtils::HashString("passed"); -static const int failed_HASH = HashingUtils::HashString("failed"); -static const int insufficient_data_HASH = HashingUtils::HashString("insufficient-data"); -static const int initializing_HASH = HashingUtils::HashString("initializing"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace StatusTypeMapper { + static const int passed_HASH = HashingUtils::HashString("passed"); + static const int failed_HASH = HashingUtils::HashString("failed"); + static const int insufficient_data_HASH = HashingUtils::HashString("insufficient-data"); + static const int initializing_HASH = HashingUtils::HashString("initializing"); + StatusType GetStatusTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/Storage.cpp b/aws-cpp-sdk-ec2/source/model/Storage.cpp index 46d8bcaae3f..03f1f70b59a 100644 --- a/aws-cpp-sdk-ec2/source/model/Storage.cpp +++ b/aws-cpp-sdk-ec2/source/model/Storage.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Storage::Storage() : m_s3HasBeenSet(false) { @@ -70,3 +76,7 @@ void Storage::OutputToStream(Aws::OStream& oStream, const char* location) const m_s3.OutputToStream(oStream, s3LocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/Subnet.cpp b/aws-cpp-sdk-ec2/source/model/Subnet.cpp index d456185d690..135ac177588 100644 --- a/aws-cpp-sdk-ec2/source/model/Subnet.cpp +++ b/aws-cpp-sdk-ec2/source/model/Subnet.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Subnet::Subnet() : m_subnetIdHasBeenSet(false), m_stateHasBeenSet(false), @@ -218,3 +224,7 @@ void Subnet::OutputToStream(Aws::OStream& oStream, const char* location) const } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/SubnetState.cpp b/aws-cpp-sdk-ec2/source/model/SubnetState.cpp index dd38f85c15d..95f6b709fe6 100644 --- a/aws-cpp-sdk-ec2/source/model/SubnetState.cpp +++ b/aws-cpp-sdk-ec2/source/model/SubnetState.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int pending_HASH = HashingUtils::HashString("pending"); -static const int available_HASH = HashingUtils::HashString("available"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace SubnetStateMapper { + static const int pending_HASH = HashingUtils::HashString("pending"); + static const int available_HASH = HashingUtils::HashString("available"); + SubnetState GetSubnetStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/SummaryStatus.cpp b/aws-cpp-sdk-ec2/source/model/SummaryStatus.cpp index a6669e3fb57..61520ef04e1 100644 --- a/aws-cpp-sdk-ec2/source/model/SummaryStatus.cpp +++ b/aws-cpp-sdk-ec2/source/model/SummaryStatus.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int ok_HASH = HashingUtils::HashString("ok"); -static const int impaired_HASH = HashingUtils::HashString("impaired"); -static const int insufficient_data_HASH = HashingUtils::HashString("insufficient-data"); -static const int not_applicable_HASH = HashingUtils::HashString("not-applicable"); -static const int initializing_HASH = HashingUtils::HashString("initializing"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace SummaryStatusMapper { + static const int ok_HASH = HashingUtils::HashString("ok"); + static const int impaired_HASH = HashingUtils::HashString("impaired"); + static const int insufficient_data_HASH = HashingUtils::HashString("insufficient-data"); + static const int not_applicable_HASH = HashingUtils::HashString("not-applicable"); + static const int initializing_HASH = HashingUtils::HashString("initializing"); + SummaryStatus GetSummaryStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/Tag.cpp b/aws-cpp-sdk-ec2/source/model/Tag.cpp index 6457aeaf5f0..66488768842 100644 --- a/aws-cpp-sdk-ec2/source/model/Tag.cpp +++ b/aws-cpp-sdk-ec2/source/model/Tag.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -82,3 +88,7 @@ void Tag::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/TagDescription.cpp b/aws-cpp-sdk-ec2/source/model/TagDescription.cpp index 43ce099ee6d..998cd486ef8 100644 --- a/aws-cpp-sdk-ec2/source/model/TagDescription.cpp +++ b/aws-cpp-sdk-ec2/source/model/TagDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + TagDescription::TagDescription() : m_resourceIdHasBeenSet(false), m_resourceTypeHasBeenSet(false), @@ -114,3 +120,7 @@ void TagDescription::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/TelemetryStatus.cpp b/aws-cpp-sdk-ec2/source/model/TelemetryStatus.cpp index bfb3c2e8261..c4b442041d5 100644 --- a/aws-cpp-sdk-ec2/source/model/TelemetryStatus.cpp +++ b/aws-cpp-sdk-ec2/source/model/TelemetryStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int UP_HASH = HashingUtils::HashString("UP"); -static const int DOWN_HASH = HashingUtils::HashString("DOWN"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace TelemetryStatusMapper { + static const int UP_HASH = HashingUtils::HashString("UP"); + static const int DOWN_HASH = HashingUtils::HashString("DOWN"); + TelemetryStatus GetTelemetryStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/Tenancy.cpp b/aws-cpp-sdk-ec2/source/model/Tenancy.cpp index aa22cd0f395..041e6644cab 100644 --- a/aws-cpp-sdk-ec2/source/model/Tenancy.cpp +++ b/aws-cpp-sdk-ec2/source/model/Tenancy.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int default__HASH = HashingUtils::HashString("default"); -static const int dedicated_HASH = HashingUtils::HashString("dedicated"); -static const int host_HASH = HashingUtils::HashString("host"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace TenancyMapper { + static const int default__HASH = HashingUtils::HashString("default"); + static const int dedicated_HASH = HashingUtils::HashString("dedicated"); + static const int host_HASH = HashingUtils::HashString("host"); + Tenancy GetTenancyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/TrafficType.cpp b/aws-cpp-sdk-ec2/source/model/TrafficType.cpp index 4c0bb82ece9..873f1178f96 100644 --- a/aws-cpp-sdk-ec2/source/model/TrafficType.cpp +++ b/aws-cpp-sdk-ec2/source/model/TrafficType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int ACCEPT_HASH = HashingUtils::HashString("ACCEPT"); -static const int REJECT_HASH = HashingUtils::HashString("REJECT"); -static const int ALL_HASH = HashingUtils::HashString("ALL"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace TrafficTypeMapper { + static const int ACCEPT_HASH = HashingUtils::HashString("ACCEPT"); + static const int REJECT_HASH = HashingUtils::HashString("REJECT"); + static const int ALL_HASH = HashingUtils::HashString("ALL"); + TrafficType GetTrafficTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/UnsuccessfulItem.cpp b/aws-cpp-sdk-ec2/source/model/UnsuccessfulItem.cpp index b6febb44d50..6e74c4f696f 100644 --- a/aws-cpp-sdk-ec2/source/model/UnsuccessfulItem.cpp +++ b/aws-cpp-sdk-ec2/source/model/UnsuccessfulItem.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + UnsuccessfulItem::UnsuccessfulItem() : m_errorHasBeenSet(false), m_resourceIdHasBeenSet(false) @@ -86,3 +92,7 @@ void UnsuccessfulItem::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".ResourceId=" << StringUtils::URLEncode(m_resourceId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/UnsuccessfulItemError.cpp b/aws-cpp-sdk-ec2/source/model/UnsuccessfulItemError.cpp index 60d50e9ff14..dbbfcb9447a 100644 --- a/aws-cpp-sdk-ec2/source/model/UnsuccessfulItemError.cpp +++ b/aws-cpp-sdk-ec2/source/model/UnsuccessfulItemError.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + UnsuccessfulItemError::UnsuccessfulItemError() : m_codeHasBeenSet(false), m_messageHasBeenSet(false) @@ -82,3 +88,7 @@ void UnsuccessfulItemError::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".Message=" << StringUtils::URLEncode(m_message.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/UserBucket.cpp b/aws-cpp-sdk-ec2/source/model/UserBucket.cpp index 5f461fb7f2f..4a2ce2f1d9a 100644 --- a/aws-cpp-sdk-ec2/source/model/UserBucket.cpp +++ b/aws-cpp-sdk-ec2/source/model/UserBucket.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + UserBucket::UserBucket() : m_s3BucketHasBeenSet(false), m_s3KeyHasBeenSet(false) @@ -82,3 +88,7 @@ void UserBucket::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".S3Key=" << StringUtils::URLEncode(m_s3Key.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/UserBucketDetails.cpp b/aws-cpp-sdk-ec2/source/model/UserBucketDetails.cpp index 2d924fb3225..33b574ac830 100644 --- a/aws-cpp-sdk-ec2/source/model/UserBucketDetails.cpp +++ b/aws-cpp-sdk-ec2/source/model/UserBucketDetails.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + UserBucketDetails::UserBucketDetails() : m_s3BucketHasBeenSet(false), m_s3KeyHasBeenSet(false) @@ -82,3 +88,7 @@ void UserBucketDetails::OutputToStream(Aws::OStream& oStream, const char* locati oStream << location << ".S3Key=" << StringUtils::URLEncode(m_s3Key.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/UserData.cpp b/aws-cpp-sdk-ec2/source/model/UserData.cpp index 173a623dab4..f9191e9ff4c 100644 --- a/aws-cpp-sdk-ec2/source/model/UserData.cpp +++ b/aws-cpp-sdk-ec2/source/model/UserData.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + UserData::UserData() : m_dataHasBeenSet(false) { @@ -66,3 +72,7 @@ void UserData::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Data=" << StringUtils::URLEncode(m_data.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/UserIdGroupPair.cpp b/aws-cpp-sdk-ec2/source/model/UserIdGroupPair.cpp index 54540df236e..830de526541 100644 --- a/aws-cpp-sdk-ec2/source/model/UserIdGroupPair.cpp +++ b/aws-cpp-sdk-ec2/source/model/UserIdGroupPair.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + UserIdGroupPair::UserIdGroupPair() : m_userIdHasBeenSet(false), m_groupNameHasBeenSet(false), @@ -146,3 +152,7 @@ void UserIdGroupPair::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".PeeringStatus=" << StringUtils::URLEncode(m_peeringStatus.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/VgwTelemetry.cpp b/aws-cpp-sdk-ec2/source/model/VgwTelemetry.cpp index e1b4a20044b..35de05402c8 100644 --- a/aws-cpp-sdk-ec2/source/model/VgwTelemetry.cpp +++ b/aws-cpp-sdk-ec2/source/model/VgwTelemetry.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VgwTelemetry::VgwTelemetry() : m_outsideIpAddressHasBeenSet(false), m_statusHasBeenSet(false), @@ -132,3 +138,7 @@ void VgwTelemetry::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".AcceptedRouteCount=" << m_acceptedRouteCount << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/VirtualizationType.cpp b/aws-cpp-sdk-ec2/source/model/VirtualizationType.cpp index 78811a92020..f4568552f43 100644 --- a/aws-cpp-sdk-ec2/source/model/VirtualizationType.cpp +++ b/aws-cpp-sdk-ec2/source/model/VirtualizationType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int hvm_HASH = HashingUtils::HashString("hvm"); -static const int paravirtual_HASH = HashingUtils::HashString("paravirtual"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace VirtualizationTypeMapper { + static const int hvm_HASH = HashingUtils::HashString("hvm"); + static const int paravirtual_HASH = HashingUtils::HashString("paravirtual"); + VirtualizationType GetVirtualizationTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/Volume.cpp b/aws-cpp-sdk-ec2/source/model/Volume.cpp index 3a12a57e83e..936ede24724 100644 --- a/aws-cpp-sdk-ec2/source/model/Volume.cpp +++ b/aws-cpp-sdk-ec2/source/model/Volume.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Volume::Volume() : m_volumeIdHasBeenSet(false), m_size(0), @@ -298,3 +304,7 @@ void Volume::OutputToStream(Aws::OStream& oStream, const char* location) const m_responseMetadata.OutputToStream(oStream, responseMetadataLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/VolumeAttachment.cpp b/aws-cpp-sdk-ec2/source/model/VolumeAttachment.cpp index c393c0897c8..d0a34863102 100644 --- a/aws-cpp-sdk-ec2/source/model/VolumeAttachment.cpp +++ b/aws-cpp-sdk-ec2/source/model/VolumeAttachment.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VolumeAttachment::VolumeAttachment() : m_volumeIdHasBeenSet(false), m_instanceIdHasBeenSet(false), @@ -162,3 +168,7 @@ void VolumeAttachment::OutputToStream(Aws::OStream& oStream, const char* locatio m_responseMetadata.OutputToStream(oStream, responseMetadataLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/VolumeAttachmentState.cpp b/aws-cpp-sdk-ec2/source/model/VolumeAttachmentState.cpp index 67344b7e810..852a2fc207e 100644 --- a/aws-cpp-sdk-ec2/source/model/VolumeAttachmentState.cpp +++ b/aws-cpp-sdk-ec2/source/model/VolumeAttachmentState.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int attaching_HASH = HashingUtils::HashString("attaching"); -static const int attached_HASH = HashingUtils::HashString("attached"); -static const int detaching_HASH = HashingUtils::HashString("detaching"); -static const int detached_HASH = HashingUtils::HashString("detached"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace VolumeAttachmentStateMapper { + static const int attaching_HASH = HashingUtils::HashString("attaching"); + static const int attached_HASH = HashingUtils::HashString("attached"); + static const int detaching_HASH = HashingUtils::HashString("detaching"); + static const int detached_HASH = HashingUtils::HashString("detached"); + VolumeAttachmentState GetVolumeAttachmentStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/VolumeAttributeName.cpp b/aws-cpp-sdk-ec2/source/model/VolumeAttributeName.cpp index 10eff74b264..129b71540bd 100644 --- a/aws-cpp-sdk-ec2/source/model/VolumeAttributeName.cpp +++ b/aws-cpp-sdk-ec2/source/model/VolumeAttributeName.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int autoEnableIO_HASH = HashingUtils::HashString("autoEnableIO"); -static const int productCodes_HASH = HashingUtils::HashString("productCodes"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace VolumeAttributeNameMapper { + static const int autoEnableIO_HASH = HashingUtils::HashString("autoEnableIO"); + static const int productCodes_HASH = HashingUtils::HashString("productCodes"); + VolumeAttributeName GetVolumeAttributeNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/VolumeDetail.cpp b/aws-cpp-sdk-ec2/source/model/VolumeDetail.cpp index 02b5c0c93c9..e3f303a56f0 100644 --- a/aws-cpp-sdk-ec2/source/model/VolumeDetail.cpp +++ b/aws-cpp-sdk-ec2/source/model/VolumeDetail.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VolumeDetail::VolumeDetail() : m_size(0), m_sizeHasBeenSet(false) @@ -68,3 +74,7 @@ void VolumeDetail::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".Size=" << m_size << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/VolumeState.cpp b/aws-cpp-sdk-ec2/source/model/VolumeState.cpp index 3ea6379d5f6..9d3625bb4a2 100644 --- a/aws-cpp-sdk-ec2/source/model/VolumeState.cpp +++ b/aws-cpp-sdk-ec2/source/model/VolumeState.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int creating_HASH = HashingUtils::HashString("creating"); -static const int available_HASH = HashingUtils::HashString("available"); -static const int in_use_HASH = HashingUtils::HashString("in-use"); -static const int deleting_HASH = HashingUtils::HashString("deleting"); -static const int deleted_HASH = HashingUtils::HashString("deleted"); -static const int error_HASH = HashingUtils::HashString("error"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace VolumeStateMapper { + static const int creating_HASH = HashingUtils::HashString("creating"); + static const int available_HASH = HashingUtils::HashString("available"); + static const int in_use_HASH = HashingUtils::HashString("in-use"); + static const int deleting_HASH = HashingUtils::HashString("deleting"); + static const int deleted_HASH = HashingUtils::HashString("deleted"); + static const int error_HASH = HashingUtils::HashString("error"); + VolumeState GetVolumeStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/VolumeStatusAction.cpp b/aws-cpp-sdk-ec2/source/model/VolumeStatusAction.cpp index e4e481876c2..e541be8b3fb 100644 --- a/aws-cpp-sdk-ec2/source/model/VolumeStatusAction.cpp +++ b/aws-cpp-sdk-ec2/source/model/VolumeStatusAction.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VolumeStatusAction::VolumeStatusAction() : m_codeHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -114,3 +120,7 @@ void VolumeStatusAction::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".EventId=" << StringUtils::URLEncode(m_eventId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/VolumeStatusDetails.cpp b/aws-cpp-sdk-ec2/source/model/VolumeStatusDetails.cpp index 6c0bbb0ab05..402b6c1b835 100644 --- a/aws-cpp-sdk-ec2/source/model/VolumeStatusDetails.cpp +++ b/aws-cpp-sdk-ec2/source/model/VolumeStatusDetails.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VolumeStatusDetails::VolumeStatusDetails() : m_nameHasBeenSet(false), m_statusHasBeenSet(false) @@ -82,3 +88,7 @@ void VolumeStatusDetails::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".Status=" << StringUtils::URLEncode(m_status.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/VolumeStatusEvent.cpp b/aws-cpp-sdk-ec2/source/model/VolumeStatusEvent.cpp index cd798910f7f..d0fe6b1f4cf 100644 --- a/aws-cpp-sdk-ec2/source/model/VolumeStatusEvent.cpp +++ b/aws-cpp-sdk-ec2/source/model/VolumeStatusEvent.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VolumeStatusEvent::VolumeStatusEvent() : m_eventTypeHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -130,3 +136,7 @@ void VolumeStatusEvent::OutputToStream(Aws::OStream& oStream, const char* locati oStream << location << ".EventId=" << StringUtils::URLEncode(m_eventId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/VolumeStatusInfo.cpp b/aws-cpp-sdk-ec2/source/model/VolumeStatusInfo.cpp index 6085a759bc7..fe043ed948f 100644 --- a/aws-cpp-sdk-ec2/source/model/VolumeStatusInfo.cpp +++ b/aws-cpp-sdk-ec2/source/model/VolumeStatusInfo.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VolumeStatusInfo::VolumeStatusInfo() : m_statusHasBeenSet(false), m_detailsHasBeenSet(false) @@ -100,3 +106,7 @@ void VolumeStatusInfo::OutputToStream(Aws::OStream& oStream, const char* locatio } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/VolumeStatusInfoStatus.cpp b/aws-cpp-sdk-ec2/source/model/VolumeStatusInfoStatus.cpp index 8753b3802a7..884f5a93e01 100644 --- a/aws-cpp-sdk-ec2/source/model/VolumeStatusInfoStatus.cpp +++ b/aws-cpp-sdk-ec2/source/model/VolumeStatusInfoStatus.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int ok_HASH = HashingUtils::HashString("ok"); -static const int impaired_HASH = HashingUtils::HashString("impaired"); -static const int insufficient_data_HASH = HashingUtils::HashString("insufficient-data"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace VolumeStatusInfoStatusMapper { + static const int ok_HASH = HashingUtils::HashString("ok"); + static const int impaired_HASH = HashingUtils::HashString("impaired"); + static const int insufficient_data_HASH = HashingUtils::HashString("insufficient-data"); + VolumeStatusInfoStatus GetVolumeStatusInfoStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/VolumeStatusItem.cpp b/aws-cpp-sdk-ec2/source/model/VolumeStatusItem.cpp index 94f917c18b8..4784d525738 100644 --- a/aws-cpp-sdk-ec2/source/model/VolumeStatusItem.cpp +++ b/aws-cpp-sdk-ec2/source/model/VolumeStatusItem.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VolumeStatusItem::VolumeStatusItem() : m_volumeIdHasBeenSet(false), m_availabilityZoneHasBeenSet(false), @@ -170,3 +176,7 @@ void VolumeStatusItem::OutputToStream(Aws::OStream& oStream, const char* locatio } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/VolumeStatusName.cpp b/aws-cpp-sdk-ec2/source/model/VolumeStatusName.cpp index 019821ec08c..f14de73a1b3 100644 --- a/aws-cpp-sdk-ec2/source/model/VolumeStatusName.cpp +++ b/aws-cpp-sdk-ec2/source/model/VolumeStatusName.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int io_enabled_HASH = HashingUtils::HashString("io-enabled"); -static const int io_performance_HASH = HashingUtils::HashString("io-performance"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace VolumeStatusNameMapper { + static const int io_enabled_HASH = HashingUtils::HashString("io-enabled"); + static const int io_performance_HASH = HashingUtils::HashString("io-performance"); + VolumeStatusName GetVolumeStatusNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/VolumeType.cpp b/aws-cpp-sdk-ec2/source/model/VolumeType.cpp index 34afee1db78..97bd41f9f52 100644 --- a/aws-cpp-sdk-ec2/source/model/VolumeType.cpp +++ b/aws-cpp-sdk-ec2/source/model/VolumeType.cpp @@ -15,15 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int standard_HASH = HashingUtils::HashString("standard"); -static const int io1_HASH = HashingUtils::HashString("io1"); -static const int gp2_HASH = HashingUtils::HashString("gp2"); -static const int sc1_HASH = HashingUtils::HashString("sc1"); -static const int st1_HASH = HashingUtils::HashString("st1"); namespace Aws { @@ -34,6 +28,10 @@ namespace Aws namespace VolumeTypeMapper { + static const int standard_HASH = HashingUtils::HashString("standard"); + static const int io1_HASH = HashingUtils::HashString("io1"); + static const int gp2_HASH = HashingUtils::HashString("gp2"); + VolumeType GetVolumeTypeForName(const Aws::String& name) { @@ -50,15 +48,7 @@ namespace Aws { return VolumeType::gp2; } - else if (hashCode == sc1_HASH) - { - return VolumeType::sc1; - } - else if (hashCode == st1_HASH) - { - return VolumeType::st1; - } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -78,12 +68,8 @@ namespace Aws return "io1"; case VolumeType::gp2: return "gp2"; - case VolumeType::sc1: - return "sc1"; - case VolumeType::st1: - return "st1"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-ec2/source/model/Vpc.cpp b/aws-cpp-sdk-ec2/source/model/Vpc.cpp index 420ea3208f5..9ca212a362d 100644 --- a/aws-cpp-sdk-ec2/source/model/Vpc.cpp +++ b/aws-cpp-sdk-ec2/source/model/Vpc.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + Vpc::Vpc() : m_vpcIdHasBeenSet(false), m_stateHasBeenSet(false), @@ -182,3 +188,7 @@ void Vpc::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".IsDefault=" << m_isDefault << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/VpcAttachment.cpp b/aws-cpp-sdk-ec2/source/model/VpcAttachment.cpp index 6c8bf2e43e1..f2138ddad5a 100644 --- a/aws-cpp-sdk-ec2/source/model/VpcAttachment.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpcAttachment.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VpcAttachment::VpcAttachment() : m_vpcIdHasBeenSet(false), m_stateHasBeenSet(false) @@ -82,3 +88,7 @@ void VpcAttachment::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".State=" << AttachmentStatusMapper::GetNameForAttachmentStatus(m_state) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/VpcAttributeName.cpp b/aws-cpp-sdk-ec2/source/model/VpcAttributeName.cpp index caa86d63164..b3dc9961d37 100644 --- a/aws-cpp-sdk-ec2/source/model/VpcAttributeName.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpcAttributeName.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int enableDnsSupport_HASH = HashingUtils::HashString("enableDnsSupport"); -static const int enableDnsHostnames_HASH = HashingUtils::HashString("enableDnsHostnames"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace VpcAttributeNameMapper { + static const int enableDnsSupport_HASH = HashingUtils::HashString("enableDnsSupport"); + static const int enableDnsHostnames_HASH = HashingUtils::HashString("enableDnsHostnames"); + VpcAttributeName GetVpcAttributeNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/VpcClassicLink.cpp b/aws-cpp-sdk-ec2/source/model/VpcClassicLink.cpp index 6679c7572d0..8f27e94bd57 100644 --- a/aws-cpp-sdk-ec2/source/model/VpcClassicLink.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpcClassicLink.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VpcClassicLink::VpcClassicLink() : m_vpcIdHasBeenSet(false), m_classicLinkEnabled(false), @@ -118,3 +124,7 @@ void VpcClassicLink::OutputToStream(Aws::OStream& oStream, const char* location) } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/VpcEndpoint.cpp b/aws-cpp-sdk-ec2/source/model/VpcEndpoint.cpp index a3dabd61d1d..9c6b0739903 100644 --- a/aws-cpp-sdk-ec2/source/model/VpcEndpoint.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpcEndpoint.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VpcEndpoint::VpcEndpoint() : m_vpcEndpointIdHasBeenSet(false), m_vpcIdHasBeenSet(false), @@ -176,3 +182,7 @@ void VpcEndpoint::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".CreationTimestamp=" << StringUtils::URLEncode(m_creationTimestamp.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/VpcPeeringConnection.cpp b/aws-cpp-sdk-ec2/source/model/VpcPeeringConnection.cpp index ab643ea98c9..6012b38118b 100644 --- a/aws-cpp-sdk-ec2/source/model/VpcPeeringConnection.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpcPeeringConnection.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VpcPeeringConnection::VpcPeeringConnection() : m_accepterVpcInfoHasBeenSet(false), m_expirationTimeHasBeenSet(false), @@ -176,3 +182,7 @@ void VpcPeeringConnection::OutputToStream(Aws::OStream& oStream, const char* loc oStream << location << ".VpcPeeringConnectionId=" << StringUtils::URLEncode(m_vpcPeeringConnectionId.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/VpcPeeringConnectionStateReason.cpp b/aws-cpp-sdk-ec2/source/model/VpcPeeringConnectionStateReason.cpp index 4df3714fcbb..f02bd714274 100644 --- a/aws-cpp-sdk-ec2/source/model/VpcPeeringConnectionStateReason.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpcPeeringConnectionStateReason.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VpcPeeringConnectionStateReason::VpcPeeringConnectionStateReason() : m_codeHasBeenSet(false), m_messageHasBeenSet(false) @@ -82,3 +88,7 @@ void VpcPeeringConnectionStateReason::OutputToStream(Aws::OStream& oStream, cons oStream << location << ".Message=" << StringUtils::URLEncode(m_message.c_str()) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/VpcPeeringConnectionStateReasonCode.cpp b/aws-cpp-sdk-ec2/source/model/VpcPeeringConnectionStateReasonCode.cpp index d7af743a1cd..7b93cfafc15 100644 --- a/aws-cpp-sdk-ec2/source/model/VpcPeeringConnectionStateReasonCode.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpcPeeringConnectionStateReasonCode.cpp @@ -19,15 +19,6 @@ using namespace Aws::Utils; -static const int initiating_request_HASH = HashingUtils::HashString("initiating-request"); -static const int pending_acceptance_HASH = HashingUtils::HashString("pending-acceptance"); -static const int active_HASH = HashingUtils::HashString("active"); -static const int deleted_HASH = HashingUtils::HashString("deleted"); -static const int rejected_HASH = HashingUtils::HashString("rejected"); -static const int failed_HASH = HashingUtils::HashString("failed"); -static const int expired_HASH = HashingUtils::HashString("expired"); -static const int provisioning_HASH = HashingUtils::HashString("provisioning"); -static const int deleting_HASH = HashingUtils::HashString("deleting"); namespace Aws { @@ -38,6 +29,16 @@ namespace Aws namespace VpcPeeringConnectionStateReasonCodeMapper { + static const int initiating_request_HASH = HashingUtils::HashString("initiating-request"); + static const int pending_acceptance_HASH = HashingUtils::HashString("pending-acceptance"); + static const int active_HASH = HashingUtils::HashString("active"); + static const int deleted_HASH = HashingUtils::HashString("deleted"); + static const int rejected_HASH = HashingUtils::HashString("rejected"); + static const int failed_HASH = HashingUtils::HashString("failed"); + static const int expired_HASH = HashingUtils::HashString("expired"); + static const int provisioning_HASH = HashingUtils::HashString("provisioning"); + static const int deleting_HASH = HashingUtils::HashString("deleting"); + VpcPeeringConnectionStateReasonCode GetVpcPeeringConnectionStateReasonCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/VpcPeeringConnectionVpcInfo.cpp b/aws-cpp-sdk-ec2/source/model/VpcPeeringConnectionVpcInfo.cpp index f2b7605cba1..3b533e7fa68 100644 --- a/aws-cpp-sdk-ec2/source/model/VpcPeeringConnectionVpcInfo.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpcPeeringConnectionVpcInfo.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VpcPeeringConnectionVpcInfo::VpcPeeringConnectionVpcInfo() : m_cidrBlockHasBeenSet(false), m_ownerIdHasBeenSet(false), @@ -118,3 +124,7 @@ void VpcPeeringConnectionVpcInfo::OutputToStream(Aws::OStream& oStream, const ch m_peeringOptions.OutputToStream(oStream, peeringOptionsLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws diff --git a/aws-cpp-sdk-ec2/source/model/VpcState.cpp b/aws-cpp-sdk-ec2/source/model/VpcState.cpp index ba60684f875..2e8b0c60801 100644 --- a/aws-cpp-sdk-ec2/source/model/VpcState.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpcState.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int pending_HASH = HashingUtils::HashString("pending"); -static const int available_HASH = HashingUtils::HashString("available"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace VpcStateMapper { + static const int pending_HASH = HashingUtils::HashString("pending"); + static const int available_HASH = HashingUtils::HashString("available"); + VpcState GetVpcStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/VpnConnection.cpp b/aws-cpp-sdk-ec2/source/model/VpnConnection.cpp index 3970fd5479e..5989f38907d 100644 --- a/aws-cpp-sdk-ec2/source/model/VpnConnection.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpnConnection.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VpnConnection::VpnConnection() : m_vpnConnectionIdHasBeenSet(false), m_stateHasBeenSet(false), @@ -268,3 +274,7 @@ void VpnConnection::OutputToStream(Aws::OStream& oStream, const char* location) } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/VpnConnectionOptions.cpp b/aws-cpp-sdk-ec2/source/model/VpnConnectionOptions.cpp index 5516b18b32b..d8bcdc1dab9 100644 --- a/aws-cpp-sdk-ec2/source/model/VpnConnectionOptions.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpnConnectionOptions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VpnConnectionOptions::VpnConnectionOptions() : m_staticRoutesOnly(false), m_staticRoutesOnlyHasBeenSet(false) @@ -68,3 +74,7 @@ void VpnConnectionOptions::OutputToStream(Aws::OStream& oStream, const char* loc oStream << location << ".StaticRoutesOnly=" << m_staticRoutesOnly << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/VpnConnectionOptionsSpecification.cpp b/aws-cpp-sdk-ec2/source/model/VpnConnectionOptionsSpecification.cpp index 8c6d026a487..1d4675a41a3 100644 --- a/aws-cpp-sdk-ec2/source/model/VpnConnectionOptionsSpecification.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpnConnectionOptionsSpecification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VpnConnectionOptionsSpecification::VpnConnectionOptionsSpecification() : m_staticRoutesOnly(false), m_staticRoutesOnlyHasBeenSet(false) @@ -68,3 +74,7 @@ void VpnConnectionOptionsSpecification::OutputToStream(Aws::OStream& oStream, co oStream << location << ".StaticRoutesOnly=" << m_staticRoutesOnly << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/VpnGateway.cpp b/aws-cpp-sdk-ec2/source/model/VpnGateway.cpp index 55c392da1c5..56835ff06ce 100644 --- a/aws-cpp-sdk-ec2/source/model/VpnGateway.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpnGateway.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VpnGateway::VpnGateway() : m_vpnGatewayIdHasBeenSet(false), m_stateHasBeenSet(false), @@ -182,3 +188,7 @@ void VpnGateway::OutputToStream(Aws::OStream& oStream, const char* location) con } } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/VpnState.cpp b/aws-cpp-sdk-ec2/source/model/VpnState.cpp index f4445b2b2da..1e1f5c5fa77 100644 --- a/aws-cpp-sdk-ec2/source/model/VpnState.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpnState.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int pending_HASH = HashingUtils::HashString("pending"); -static const int available_HASH = HashingUtils::HashString("available"); -static const int deleting_HASH = HashingUtils::HashString("deleting"); -static const int deleted_HASH = HashingUtils::HashString("deleted"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace VpnStateMapper { + static const int pending_HASH = HashingUtils::HashString("pending"); + static const int available_HASH = HashingUtils::HashString("available"); + static const int deleting_HASH = HashingUtils::HashString("deleting"); + static const int deleted_HASH = HashingUtils::HashString("deleted"); + VpnState GetVpnStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ec2/source/model/VpnStaticRoute.cpp b/aws-cpp-sdk-ec2/source/model/VpnStaticRoute.cpp index 50e764c25d0..d5e69cc1303 100644 --- a/aws-cpp-sdk-ec2/source/model/VpnStaticRoute.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpnStaticRoute.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::EC2::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace EC2 +{ +namespace Model +{ + VpnStaticRoute::VpnStaticRoute() : m_destinationCidrBlockHasBeenSet(false), m_sourceHasBeenSet(false), @@ -98,3 +104,7 @@ void VpnStaticRoute::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".State=" << VpnStateMapper::GetNameForVpnState(m_state) << "&"; } } + +} // namespace Model +} // namespace EC2 +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ec2/source/model/VpnStaticRouteSource.cpp b/aws-cpp-sdk-ec2/source/model/VpnStaticRouteSource.cpp index 7b74b7402ca..d3e32703378 100644 --- a/aws-cpp-sdk-ec2/source/model/VpnStaticRouteSource.cpp +++ b/aws-cpp-sdk-ec2/source/model/VpnStaticRouteSource.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int Static_HASH = HashingUtils::HashString("Static"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace VpnStaticRouteSourceMapper { + static const int Static_HASH = HashingUtils::HashString("Static"); + VpnStaticRouteSource GetVpnStaticRouteSourceForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ecr/CMakeLists.txt b/aws-cpp-sdk-ecr/CMakeLists.txt index 702d61b8e75..f58710a4357 100644 --- a/aws-cpp-sdk-ecr/CMakeLists.txt +++ b/aws-cpp-sdk-ecr/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-ecr) "source/model/*.cpp" ) - file(GLOB ECR_SRC + file(GLOB ECR_UNIFIED_HEADERS ${AWS_ECR_HEADERS} ${AWS_ECR_MODEL_HEADERS} + ) + + file(GLOB ECR_UNITY_SRC ${AWS_ECR_SOURCE} ${AWS_ECR_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("ECR" ECR_UNITY_SRC) + endif() + + file(GLOB ECR_SRC + ${ECR_UNIFIED_HEADERS} + ${ECR_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-ecr/source/ECRErrors.cpp b/aws-cpp-sdk-ecr/source/ECRErrors.cpp index 541b7d380b7..514be56e173 100644 --- a/aws-cpp-sdk-ecr/source/ECRErrors.cpp +++ b/aws-cpp-sdk-ecr/source/ECRErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::ECR; using namespace Aws::Utils; +namespace Aws +{ +namespace ECR +{ +namespace ECRErrorMapper +{ + static const int LAYER_INACCESSIBLE_HASH = HashingUtils::HashString("LayerInaccessibleException"); static const int INVALID_LAYER_PART_HASH = HashingUtils::HashString("InvalidLayerPartException"); static const int SERVER_HASH = HashingUtils::HashString("ServerException"); @@ -37,12 +44,6 @@ static const int REPOSITORY_ALREADY_EXISTS_HASH = HashingUtils::HashString("Repo static const int LAYER_PART_TOO_SMALL_HASH = HashingUtils::HashString("LayerPartTooSmallException"); static const int INVALID_PARAMETER_HASH = HashingUtils::HashString("InvalidParameterException"); -namespace Aws -{ -namespace ECR -{ -namespace ECRErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-ecr/source/model/AuthorizationData.cpp b/aws-cpp-sdk-ecr/source/model/AuthorizationData.cpp index 6a785c9f9c3..dacda524ca3 100644 --- a/aws-cpp-sdk-ecr/source/model/AuthorizationData.cpp +++ b/aws-cpp-sdk-ecr/source/model/AuthorizationData.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECR +{ +namespace Model +{ + AuthorizationData::AuthorizationData() : m_authorizationTokenHasBeenSet(false), m_expiresAtHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue AuthorizationData::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECR +} // namespace Aws diff --git a/aws-cpp-sdk-ecr/source/model/Image.cpp b/aws-cpp-sdk-ecr/source/model/Image.cpp index cfc1aac777f..0dc64c7a528 100644 --- a/aws-cpp-sdk-ecr/source/model/Image.cpp +++ b/aws-cpp-sdk-ecr/source/model/Image.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECR +{ +namespace Model +{ + Image::Image() : m_registryIdHasBeenSet(false), m_repositoryNameHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue Image::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecr/source/model/ImageFailure.cpp b/aws-cpp-sdk-ecr/source/model/ImageFailure.cpp index c9932a78176..849f526e101 100644 --- a/aws-cpp-sdk-ecr/source/model/ImageFailure.cpp +++ b/aws-cpp-sdk-ecr/source/model/ImageFailure.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECR +{ +namespace Model +{ + ImageFailure::ImageFailure() : m_imageIdHasBeenSet(false), m_failureCodeHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue ImageFailure::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecr/source/model/ImageFailureCode.cpp b/aws-cpp-sdk-ecr/source/model/ImageFailureCode.cpp index a820f0961d0..08e70898f50 100644 --- a/aws-cpp-sdk-ecr/source/model/ImageFailureCode.cpp +++ b/aws-cpp-sdk-ecr/source/model/ImageFailureCode.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int InvalidImageDigest_HASH = HashingUtils::HashString("InvalidImageDigest"); -static const int InvalidImageTag_HASH = HashingUtils::HashString("InvalidImageTag"); -static const int ImageTagDoesNotMatchDigest_HASH = HashingUtils::HashString("ImageTagDoesNotMatchDigest"); -static const int ImageNotFound_HASH = HashingUtils::HashString("ImageNotFound"); -static const int MissingDigestAndTag_HASH = HashingUtils::HashString("MissingDigestAndTag"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace ImageFailureCodeMapper { + static const int InvalidImageDigest_HASH = HashingUtils::HashString("InvalidImageDigest"); + static const int InvalidImageTag_HASH = HashingUtils::HashString("InvalidImageTag"); + static const int ImageTagDoesNotMatchDigest_HASH = HashingUtils::HashString("ImageTagDoesNotMatchDigest"); + static const int ImageNotFound_HASH = HashingUtils::HashString("ImageNotFound"); + static const int MissingDigestAndTag_HASH = HashingUtils::HashString("MissingDigestAndTag"); + ImageFailureCode GetImageFailureCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ecr/source/model/ImageIdentifier.cpp b/aws-cpp-sdk-ecr/source/model/ImageIdentifier.cpp index 2104d0ec2e0..64293a80fa4 100644 --- a/aws-cpp-sdk-ecr/source/model/ImageIdentifier.cpp +++ b/aws-cpp-sdk-ecr/source/model/ImageIdentifier.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECR +{ +namespace Model +{ + ImageIdentifier::ImageIdentifier() : m_imageDigestHasBeenSet(false), m_imageTagHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue ImageIdentifier::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecr/source/model/Layer.cpp b/aws-cpp-sdk-ecr/source/model/Layer.cpp index 9a95ef990c6..037fe721250 100644 --- a/aws-cpp-sdk-ecr/source/model/Layer.cpp +++ b/aws-cpp-sdk-ecr/source/model/Layer.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECR +{ +namespace Model +{ + Layer::Layer() : m_layerDigestHasBeenSet(false), m_layerAvailabilityHasBeenSet(false), @@ -86,4 +92,8 @@ JsonValue Layer::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecr/source/model/LayerAvailability.cpp b/aws-cpp-sdk-ecr/source/model/LayerAvailability.cpp index 541faa7fc81..9fdff035c69 100644 --- a/aws-cpp-sdk-ecr/source/model/LayerAvailability.cpp +++ b/aws-cpp-sdk-ecr/source/model/LayerAvailability.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int AVAILABLE_HASH = HashingUtils::HashString("AVAILABLE"); -static const int UNAVAILABLE_HASH = HashingUtils::HashString("UNAVAILABLE"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace LayerAvailabilityMapper { + static const int AVAILABLE_HASH = HashingUtils::HashString("AVAILABLE"); + static const int UNAVAILABLE_HASH = HashingUtils::HashString("UNAVAILABLE"); + LayerAvailability GetLayerAvailabilityForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ecr/source/model/LayerFailure.cpp b/aws-cpp-sdk-ecr/source/model/LayerFailure.cpp index 9dd671e3d05..e79f5da6faa 100644 --- a/aws-cpp-sdk-ecr/source/model/LayerFailure.cpp +++ b/aws-cpp-sdk-ecr/source/model/LayerFailure.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECR +{ +namespace Model +{ + LayerFailure::LayerFailure() : m_layerDigestHasBeenSet(false), m_failureCodeHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue LayerFailure::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecr/source/model/LayerFailureCode.cpp b/aws-cpp-sdk-ecr/source/model/LayerFailureCode.cpp index 6599abb5ac0..92a753ca3d0 100644 --- a/aws-cpp-sdk-ecr/source/model/LayerFailureCode.cpp +++ b/aws-cpp-sdk-ecr/source/model/LayerFailureCode.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int InvalidLayerDigest_HASH = HashingUtils::HashString("InvalidLayerDigest"); -static const int MissingLayerDigest_HASH = HashingUtils::HashString("MissingLayerDigest"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace LayerFailureCodeMapper { + static const int InvalidLayerDigest_HASH = HashingUtils::HashString("InvalidLayerDigest"); + static const int MissingLayerDigest_HASH = HashingUtils::HashString("MissingLayerDigest"); + LayerFailureCode GetLayerFailureCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ecr/source/model/Repository.cpp b/aws-cpp-sdk-ecr/source/model/Repository.cpp index 74a4a13eb38..b7cd5b42369 100644 --- a/aws-cpp-sdk-ecr/source/model/Repository.cpp +++ b/aws-cpp-sdk-ecr/source/model/Repository.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECR +{ +namespace Model +{ + Repository::Repository() : m_repositoryArnHasBeenSet(false), m_registryIdHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue Repository::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECR +} // namespace Aws diff --git a/aws-cpp-sdk-ecs/CMakeLists.txt b/aws-cpp-sdk-ecs/CMakeLists.txt index 8588921958c..456c82e1572 100644 --- a/aws-cpp-sdk-ecs/CMakeLists.txt +++ b/aws-cpp-sdk-ecs/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-ecs) "source/model/*.cpp" ) - file(GLOB ECS_SRC + file(GLOB ECS_UNIFIED_HEADERS ${AWS_ECS_HEADERS} ${AWS_ECS_MODEL_HEADERS} + ) + + file(GLOB ECS_UNITY_SRC ${AWS_ECS_SOURCE} ${AWS_ECS_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("ECS" ECS_UNITY_SRC) + endif() + + file(GLOB ECS_SRC + ${ECS_UNIFIED_HEADERS} + ${ECS_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-ecs/source/ECSErrors.cpp b/aws-cpp-sdk-ecs/source/ECSErrors.cpp index 2aa747feac8..f5049153432 100644 --- a/aws-cpp-sdk-ecs/source/ECSErrors.cpp +++ b/aws-cpp-sdk-ecs/source/ECSErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::ECS; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace ECSErrorMapper +{ + static const int UPDATE_IN_PROGRESS_HASH = HashingUtils::HashString("UpdateInProgressException"); static const int CLIENT_HASH = HashingUtils::HashString("ClientException"); static const int CLUSTER_CONTAINS_CONTAINER_INSTANCES_HASH = HashingUtils::HashString("ClusterContainsContainerInstancesException"); @@ -32,12 +39,6 @@ static const int INVALID_PARAMETER_HASH = HashingUtils::HashString("InvalidParam static const int SERVICE_NOT_FOUND_HASH = HashingUtils::HashString("ServiceNotFoundException"); static const int MISSING_VERSION_HASH = HashingUtils::HashString("MissingVersionException"); -namespace Aws -{ -namespace ECS -{ -namespace ECSErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-ecs/source/model/AgentUpdateStatus.cpp b/aws-cpp-sdk-ecs/source/model/AgentUpdateStatus.cpp index d6fe34cccb8..92ecdc02c12 100644 --- a/aws-cpp-sdk-ecs/source/model/AgentUpdateStatus.cpp +++ b/aws-cpp-sdk-ecs/source/model/AgentUpdateStatus.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int PENDING_HASH = HashingUtils::HashString("PENDING"); -static const int STAGING_HASH = HashingUtils::HashString("STAGING"); -static const int STAGED_HASH = HashingUtils::HashString("STAGED"); -static const int UPDATING_HASH = HashingUtils::HashString("UPDATING"); -static const int UPDATED_HASH = HashingUtils::HashString("UPDATED"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace AgentUpdateStatusMapper { + static const int PENDING_HASH = HashingUtils::HashString("PENDING"); + static const int STAGING_HASH = HashingUtils::HashString("STAGING"); + static const int STAGED_HASH = HashingUtils::HashString("STAGED"); + static const int UPDATING_HASH = HashingUtils::HashString("UPDATING"); + static const int UPDATED_HASH = HashingUtils::HashString("UPDATED"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + AgentUpdateStatus GetAgentUpdateStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ecs/source/model/Attribute.cpp b/aws-cpp-sdk-ecs/source/model/Attribute.cpp index 95aaa1daf16..fa39d06d7c4 100644 --- a/aws-cpp-sdk-ecs/source/model/Attribute.cpp +++ b/aws-cpp-sdk-ecs/source/model/Attribute.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + Attribute::Attribute() : m_nameHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Attribute::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/Cluster.cpp b/aws-cpp-sdk-ecs/source/model/Cluster.cpp index 7b7bc807f6e..b9df1fa655c 100644 --- a/aws-cpp-sdk-ecs/source/model/Cluster.cpp +++ b/aws-cpp-sdk-ecs/source/model/Cluster.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + Cluster::Cluster() : m_clusterArnHasBeenSet(false), m_clusterNameHasBeenSet(false), @@ -153,4 +159,8 @@ JsonValue Cluster::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/Container.cpp b/aws-cpp-sdk-ecs/source/model/Container.cpp index afc86de7f0d..670f70aef86 100644 --- a/aws-cpp-sdk-ecs/source/model/Container.cpp +++ b/aws-cpp-sdk-ecs/source/model/Container.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + Container::Container() : m_containerArnHasBeenSet(false), m_taskArnHasBeenSet(false), @@ -155,4 +161,8 @@ JsonValue Container::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/ContainerDefinition.cpp b/aws-cpp-sdk-ecs/source/model/ContainerDefinition.cpp index b06598eeaa0..73796ad650b 100644 --- a/aws-cpp-sdk-ecs/source/model/ContainerDefinition.cpp +++ b/aws-cpp-sdk-ecs/source/model/ContainerDefinition.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + ContainerDefinition::ContainerDefinition() : m_nameHasBeenSet(false), m_imageHasBeenSet(false), @@ -531,4 +537,8 @@ JsonValue ContainerDefinition::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/ContainerInstance.cpp b/aws-cpp-sdk-ecs/source/model/ContainerInstance.cpp index 7ec04703512..2ff1b2a3421 100644 --- a/aws-cpp-sdk-ecs/source/model/ContainerInstance.cpp +++ b/aws-cpp-sdk-ecs/source/model/ContainerInstance.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + ContainerInstance::ContainerInstance() : m_containerInstanceArnHasBeenSet(false), m_ec2InstanceIdHasBeenSet(false), @@ -234,4 +240,8 @@ JsonValue ContainerInstance::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/ContainerOverride.cpp b/aws-cpp-sdk-ecs/source/model/ContainerOverride.cpp index 37cfb586b82..a669acd74af 100644 --- a/aws-cpp-sdk-ecs/source/model/ContainerOverride.cpp +++ b/aws-cpp-sdk-ecs/source/model/ContainerOverride.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + ContainerOverride::ContainerOverride() : m_nameHasBeenSet(false), m_commandHasBeenSet(false), @@ -101,4 +107,8 @@ JsonValue ContainerOverride::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/Deployment.cpp b/aws-cpp-sdk-ecs/source/model/Deployment.cpp index b28bb932119..cf093e1b9cc 100644 --- a/aws-cpp-sdk-ecs/source/model/Deployment.cpp +++ b/aws-cpp-sdk-ecs/source/model/Deployment.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + Deployment::Deployment() : m_idHasBeenSet(false), m_statusHasBeenSet(false), @@ -164,4 +170,8 @@ JsonValue Deployment::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws diff --git a/aws-cpp-sdk-ecs/source/model/DeploymentConfiguration.cpp b/aws-cpp-sdk-ecs/source/model/DeploymentConfiguration.cpp index d3a48150676..162f2cfa534 100644 --- a/aws-cpp-sdk-ecs/source/model/DeploymentConfiguration.cpp +++ b/aws-cpp-sdk-ecs/source/model/DeploymentConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + DeploymentConfiguration::DeploymentConfiguration() : m_maximumPercent(0), m_maximumPercentHasBeenSet(false), @@ -74,4 +80,8 @@ JsonValue DeploymentConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/DesiredStatus.cpp b/aws-cpp-sdk-ecs/source/model/DesiredStatus.cpp index 57d37a07619..fc7018e478c 100644 --- a/aws-cpp-sdk-ecs/source/model/DesiredStatus.cpp +++ b/aws-cpp-sdk-ecs/source/model/DesiredStatus.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); -static const int PENDING_HASH = HashingUtils::HashString("PENDING"); -static const int STOPPED_HASH = HashingUtils::HashString("STOPPED"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace DesiredStatusMapper { + static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); + static const int PENDING_HASH = HashingUtils::HashString("PENDING"); + static const int STOPPED_HASH = HashingUtils::HashString("STOPPED"); + DesiredStatus GetDesiredStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ecs/source/model/Failure.cpp b/aws-cpp-sdk-ecs/source/model/Failure.cpp index 9016fa7b9e0..96bcdfa6b36 100644 --- a/aws-cpp-sdk-ecs/source/model/Failure.cpp +++ b/aws-cpp-sdk-ecs/source/model/Failure.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + Failure::Failure() : m_arnHasBeenSet(false), m_reasonHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Failure::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/HostEntry.cpp b/aws-cpp-sdk-ecs/source/model/HostEntry.cpp index 50d9d0bf660..65052d194f5 100644 --- a/aws-cpp-sdk-ecs/source/model/HostEntry.cpp +++ b/aws-cpp-sdk-ecs/source/model/HostEntry.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + HostEntry::HostEntry() : m_hostnameHasBeenSet(false), m_ipAddressHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue HostEntry::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/HostVolumeProperties.cpp b/aws-cpp-sdk-ecs/source/model/HostVolumeProperties.cpp index b4eb178460c..fa382689c9f 100644 --- a/aws-cpp-sdk-ecs/source/model/HostVolumeProperties.cpp +++ b/aws-cpp-sdk-ecs/source/model/HostVolumeProperties.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + HostVolumeProperties::HostVolumeProperties() : m_sourcePathHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue HostVolumeProperties::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/KeyValuePair.cpp b/aws-cpp-sdk-ecs/source/model/KeyValuePair.cpp index 3eedad99d18..f9ada6fecd8 100644 --- a/aws-cpp-sdk-ecs/source/model/KeyValuePair.cpp +++ b/aws-cpp-sdk-ecs/source/model/KeyValuePair.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + KeyValuePair::KeyValuePair() : m_nameHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue KeyValuePair::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/LoadBalancer.cpp b/aws-cpp-sdk-ecs/source/model/LoadBalancer.cpp index d18d09fa6fe..465d09d57b2 100644 --- a/aws-cpp-sdk-ecs/source/model/LoadBalancer.cpp +++ b/aws-cpp-sdk-ecs/source/model/LoadBalancer.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + LoadBalancer::LoadBalancer() : m_loadBalancerNameHasBeenSet(false), m_containerNameHasBeenSet(false), @@ -87,4 +93,8 @@ JsonValue LoadBalancer::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/LogConfiguration.cpp b/aws-cpp-sdk-ecs/source/model/LogConfiguration.cpp index dad1ddf3397..b0d182bd1fd 100644 --- a/aws-cpp-sdk-ecs/source/model/LogConfiguration.cpp +++ b/aws-cpp-sdk-ecs/source/model/LogConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + LogConfiguration::LogConfiguration() : m_logDriverHasBeenSet(false), m_optionsHasBeenSet(false) @@ -77,4 +83,8 @@ JsonValue LogConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/LogDriver.cpp b/aws-cpp-sdk-ecs/source/model/LogDriver.cpp index 60fa955744e..02837e2e83c 100644 --- a/aws-cpp-sdk-ecs/source/model/LogDriver.cpp +++ b/aws-cpp-sdk-ecs/source/model/LogDriver.cpp @@ -15,16 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int json_file_HASH = HashingUtils::HashString("json-file"); -static const int syslog_HASH = HashingUtils::HashString("syslog"); -static const int journald_HASH = HashingUtils::HashString("journald"); -static const int gelf_HASH = HashingUtils::HashString("gelf"); -static const int fluentd_HASH = HashingUtils::HashString("fluentd"); -static const int awslogs_HASH = HashingUtils::HashString("awslogs"); namespace Aws { @@ -35,6 +28,12 @@ namespace Aws namespace LogDriverMapper { + static const int json_file_HASH = HashingUtils::HashString("json-file"); + static const int syslog_HASH = HashingUtils::HashString("syslog"); + static const int journald_HASH = HashingUtils::HashString("journald"); + static const int gelf_HASH = HashingUtils::HashString("gelf"); + static const int fluentd_HASH = HashingUtils::HashString("fluentd"); + LogDriver GetLogDriverForName(const Aws::String& name) { @@ -59,11 +58,7 @@ namespace Aws { return LogDriver::fluentd; } - else if (hashCode == awslogs_HASH) - { - return LogDriver::awslogs; - } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -87,10 +82,8 @@ namespace Aws return "gelf"; case LogDriver::fluentd: return "fluentd"; - case LogDriver::awslogs: - return "awslogs"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-ecs/source/model/MountPoint.cpp b/aws-cpp-sdk-ecs/source/model/MountPoint.cpp index 854251c1056..3e1ed481598 100644 --- a/aws-cpp-sdk-ecs/source/model/MountPoint.cpp +++ b/aws-cpp-sdk-ecs/source/model/MountPoint.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + MountPoint::MountPoint() : m_sourceVolumeHasBeenSet(false), m_containerPathHasBeenSet(false), @@ -87,4 +93,8 @@ JsonValue MountPoint::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/NetworkBinding.cpp b/aws-cpp-sdk-ecs/source/model/NetworkBinding.cpp index 7e2f327ca1c..01d9c22bed6 100644 --- a/aws-cpp-sdk-ecs/source/model/NetworkBinding.cpp +++ b/aws-cpp-sdk-ecs/source/model/NetworkBinding.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + NetworkBinding::NetworkBinding() : m_bindIPHasBeenSet(false), m_containerPort(0), @@ -103,4 +109,8 @@ JsonValue NetworkBinding::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/PortMapping.cpp b/aws-cpp-sdk-ecs/source/model/PortMapping.cpp index 93a9a434995..3cb4d33ccae 100644 --- a/aws-cpp-sdk-ecs/source/model/PortMapping.cpp +++ b/aws-cpp-sdk-ecs/source/model/PortMapping.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + PortMapping::PortMapping() : m_containerPort(0), m_containerPortHasBeenSet(false), @@ -88,4 +94,8 @@ JsonValue PortMapping::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/Resource.cpp b/aws-cpp-sdk-ecs/source/model/Resource.cpp index b2867d62890..485e41d188c 100644 --- a/aws-cpp-sdk-ecs/source/model/Resource.cpp +++ b/aws-cpp-sdk-ecs/source/model/Resource.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + Resource::Resource() : m_nameHasBeenSet(false), m_typeHasBeenSet(false), @@ -144,4 +150,8 @@ JsonValue Resource::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/Service.cpp b/aws-cpp-sdk-ecs/source/model/Service.cpp index 1bba09259ea..35aef4e5d38 100644 --- a/aws-cpp-sdk-ecs/source/model/Service.cpp +++ b/aws-cpp-sdk-ecs/source/model/Service.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + Service::Service() : m_serviceArnHasBeenSet(false), m_serviceNameHasBeenSet(false), @@ -279,4 +285,8 @@ JsonValue Service::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws diff --git a/aws-cpp-sdk-ecs/source/model/ServiceEvent.cpp b/aws-cpp-sdk-ecs/source/model/ServiceEvent.cpp index 3789bebcd43..447e0fcd12f 100644 --- a/aws-cpp-sdk-ecs/source/model/ServiceEvent.cpp +++ b/aws-cpp-sdk-ecs/source/model/ServiceEvent.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + ServiceEvent::ServiceEvent() : m_idHasBeenSet(false), m_createdAtHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue ServiceEvent::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws diff --git a/aws-cpp-sdk-ecs/source/model/SortOrder.cpp b/aws-cpp-sdk-ecs/source/model/SortOrder.cpp index a82cf0ff80d..97d0d16db3b 100644 --- a/aws-cpp-sdk-ecs/source/model/SortOrder.cpp +++ b/aws-cpp-sdk-ecs/source/model/SortOrder.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ASC_HASH = HashingUtils::HashString("ASC"); -static const int DESC_HASH = HashingUtils::HashString("DESC"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace SortOrderMapper { + static const int ASC_HASH = HashingUtils::HashString("ASC"); + static const int DESC_HASH = HashingUtils::HashString("DESC"); + SortOrder GetSortOrderForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ecs/source/model/Task.cpp b/aws-cpp-sdk-ecs/source/model/Task.cpp index ad03d86db19..1dddfcb40aa 100644 --- a/aws-cpp-sdk-ecs/source/model/Task.cpp +++ b/aws-cpp-sdk-ecs/source/model/Task.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + Task::Task() : m_taskArnHasBeenSet(false), m_clusterArnHasBeenSet(false), @@ -240,4 +246,8 @@ JsonValue Task::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws diff --git a/aws-cpp-sdk-ecs/source/model/TaskDefinition.cpp b/aws-cpp-sdk-ecs/source/model/TaskDefinition.cpp index 4831e1537d1..14b0ff6b93c 100644 --- a/aws-cpp-sdk-ecs/source/model/TaskDefinition.cpp +++ b/aws-cpp-sdk-ecs/source/model/TaskDefinition.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + TaskDefinition::TaskDefinition() : m_taskDefinitionArnHasBeenSet(false), m_containerDefinitionsHasBeenSet(false), @@ -170,4 +176,8 @@ JsonValue TaskDefinition::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/TaskDefinitionStatus.cpp b/aws-cpp-sdk-ecs/source/model/TaskDefinitionStatus.cpp index 035c31c6bf9..2ea1ba481ca 100644 --- a/aws-cpp-sdk-ecs/source/model/TaskDefinitionStatus.cpp +++ b/aws-cpp-sdk-ecs/source/model/TaskDefinitionStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); -static const int INACTIVE_HASH = HashingUtils::HashString("INACTIVE"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace TaskDefinitionStatusMapper { + static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); + static const int INACTIVE_HASH = HashingUtils::HashString("INACTIVE"); + TaskDefinitionStatus GetTaskDefinitionStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ecs/source/model/TaskOverride.cpp b/aws-cpp-sdk-ecs/source/model/TaskOverride.cpp index 265d1c0549f..83a7552de51 100644 --- a/aws-cpp-sdk-ecs/source/model/TaskOverride.cpp +++ b/aws-cpp-sdk-ecs/source/model/TaskOverride.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + TaskOverride::TaskOverride() : m_containerOverridesHasBeenSet(false) { @@ -63,4 +69,8 @@ JsonValue TaskOverride::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/TransportProtocol.cpp b/aws-cpp-sdk-ecs/source/model/TransportProtocol.cpp index a6dfaf72f7b..4c0777ca6f9 100644 --- a/aws-cpp-sdk-ecs/source/model/TransportProtocol.cpp +++ b/aws-cpp-sdk-ecs/source/model/TransportProtocol.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int tcp_HASH = HashingUtils::HashString("tcp"); -static const int udp_HASH = HashingUtils::HashString("udp"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace TransportProtocolMapper { + static const int tcp_HASH = HashingUtils::HashString("tcp"); + static const int udp_HASH = HashingUtils::HashString("udp"); + TransportProtocol GetTransportProtocolForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ecs/source/model/Ulimit.cpp b/aws-cpp-sdk-ecs/source/model/Ulimit.cpp index b246643d4b0..247d7677aca 100644 --- a/aws-cpp-sdk-ecs/source/model/Ulimit.cpp +++ b/aws-cpp-sdk-ecs/source/model/Ulimit.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + Ulimit::Ulimit() : m_nameHasBeenSet(false), m_softLimit(0), @@ -88,4 +94,8 @@ JsonValue Ulimit::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/UlimitName.cpp b/aws-cpp-sdk-ecs/source/model/UlimitName.cpp index aba83b26fd5..0d3db8ffd27 100644 --- a/aws-cpp-sdk-ecs/source/model/UlimitName.cpp +++ b/aws-cpp-sdk-ecs/source/model/UlimitName.cpp @@ -19,21 +19,6 @@ using namespace Aws::Utils; -static const int core_HASH = HashingUtils::HashString("core"); -static const int cpu_HASH = HashingUtils::HashString("cpu"); -static const int data_HASH = HashingUtils::HashString("data"); -static const int fsize_HASH = HashingUtils::HashString("fsize"); -static const int locks_HASH = HashingUtils::HashString("locks"); -static const int memlock_HASH = HashingUtils::HashString("memlock"); -static const int msgqueue_HASH = HashingUtils::HashString("msgqueue"); -static const int nice_HASH = HashingUtils::HashString("nice"); -static const int nofile_HASH = HashingUtils::HashString("nofile"); -static const int nproc_HASH = HashingUtils::HashString("nproc"); -static const int rss_HASH = HashingUtils::HashString("rss"); -static const int rtprio_HASH = HashingUtils::HashString("rtprio"); -static const int rttime_HASH = HashingUtils::HashString("rttime"); -static const int sigpending_HASH = HashingUtils::HashString("sigpending"); -static const int stack_HASH = HashingUtils::HashString("stack"); namespace Aws { @@ -44,6 +29,22 @@ namespace Aws namespace UlimitNameMapper { + static const int core_HASH = HashingUtils::HashString("core"); + static const int cpu_HASH = HashingUtils::HashString("cpu"); + static const int data_HASH = HashingUtils::HashString("data"); + static const int fsize_HASH = HashingUtils::HashString("fsize"); + static const int locks_HASH = HashingUtils::HashString("locks"); + static const int memlock_HASH = HashingUtils::HashString("memlock"); + static const int msgqueue_HASH = HashingUtils::HashString("msgqueue"); + static const int nice_HASH = HashingUtils::HashString("nice"); + static const int nofile_HASH = HashingUtils::HashString("nofile"); + static const int nproc_HASH = HashingUtils::HashString("nproc"); + static const int rss_HASH = HashingUtils::HashString("rss"); + static const int rtprio_HASH = HashingUtils::HashString("rtprio"); + static const int rttime_HASH = HashingUtils::HashString("rttime"); + static const int sigpending_HASH = HashingUtils::HashString("sigpending"); + static const int stack_HASH = HashingUtils::HashString("stack"); + UlimitName GetUlimitNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ecs/source/model/VersionInfo.cpp b/aws-cpp-sdk-ecs/source/model/VersionInfo.cpp index 99760216c6d..9b4f4e3343f 100644 --- a/aws-cpp-sdk-ecs/source/model/VersionInfo.cpp +++ b/aws-cpp-sdk-ecs/source/model/VersionInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + VersionInfo::VersionInfo() : m_agentVersionHasBeenSet(false), m_agentHashHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue VersionInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/Volume.cpp b/aws-cpp-sdk-ecs/source/model/Volume.cpp index ef104820297..4a0c834c2de 100644 --- a/aws-cpp-sdk-ecs/source/model/Volume.cpp +++ b/aws-cpp-sdk-ecs/source/model/Volume.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + Volume::Volume() : m_nameHasBeenSet(false), m_hostHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Volume::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ecs/source/model/VolumeFrom.cpp b/aws-cpp-sdk-ecs/source/model/VolumeFrom.cpp index 57ea119f0e7..d25ce927476 100644 --- a/aws-cpp-sdk-ecs/source/model/VolumeFrom.cpp +++ b/aws-cpp-sdk-ecs/source/model/VolumeFrom.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ECS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ECS +{ +namespace Model +{ + VolumeFrom::VolumeFrom() : m_sourceContainerHasBeenSet(false), m_readOnly(false), @@ -72,4 +78,8 @@ JsonValue VolumeFrom::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ECS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/CMakeLists.txt b/aws-cpp-sdk-elasticache/CMakeLists.txt index 55a5ccda6fd..0ae23ff50fc 100644 --- a/aws-cpp-sdk-elasticache/CMakeLists.txt +++ b/aws-cpp-sdk-elasticache/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-elasticache) "source/model/*.cpp" ) - file(GLOB ELASTICACHE_SRC + file(GLOB ELASTICACHE_UNIFIED_HEADERS ${AWS_ELASTICACHE_HEADERS} ${AWS_ELASTICACHE_MODEL_HEADERS} + ) + + file(GLOB ELASTICACHE_UNITY_SRC ${AWS_ELASTICACHE_SOURCE} ${AWS_ELASTICACHE_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("ELASTICACHE" ELASTICACHE_UNITY_SRC) + endif() + + file(GLOB ELASTICACHE_SRC + ${ELASTICACHE_UNIFIED_HEADERS} + ${ELASTICACHE_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-elasticache/source/ElastiCacheErrors.cpp b/aws-cpp-sdk-elasticache/source/ElastiCacheErrors.cpp index 4540a8441ef..3176d0c5671 100644 --- a/aws-cpp-sdk-elasticache/source/ElastiCacheErrors.cpp +++ b/aws-cpp-sdk-elasticache/source/ElastiCacheErrors.cpp @@ -20,81 +20,86 @@ using namespace Aws::Client; using namespace Aws::ElastiCache; using namespace Aws::Utils; -static const int INVALID_A_R_N_FAULT_HASH = HashingUtils::HashString("InvalidARN"); -static const int CACHE_CLUSTER_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("CacheClusterAlreadyExists"); -static const int REPLICATION_GROUP_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ReplicationGroupAlreadyExists"); -static const int CACHE_SECURITY_GROUP_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("CacheSecurityGroupAlreadyExists"); +namespace Aws +{ +namespace ElastiCache +{ +namespace ElastiCacheErrorMapper +{ + +static const int INVALID_REPLICATION_GROUP_STATE_FAULT_HASH = HashingUtils::HashString("InvalidReplicationGroupState"); static const int CACHE_SECURITY_GROUP_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("QuotaExceeded.CacheSecurityGroup"); -static const int REPLICATION_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ReplicationGroupNotFoundFault"); +static const int CACHE_SECURITY_GROUP_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("CacheSecurityGroupAlreadyExists"); +static const int CACHE_CLUSTER_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("CacheClusterNotFound"); +static const int CACHE_SUBNET_GROUP_IN_USE_HASH = HashingUtils::HashString("CacheSubnetGroupInUse"); +static const int INSUFFICIENT_CACHE_CLUSTER_CAPACITY_FAULT_HASH = HashingUtils::HashString("InsufficientCacheClusterCapacity"); +static const int INVALID_CACHE_PARAMETER_GROUP_STATE_FAULT_HASH = HashingUtils::HashString("InvalidCacheParameterGroupState"); static const int RESERVED_CACHE_NODES_OFFERING_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ReservedCacheNodesOfferingNotFound"); static const int TAG_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("TagNotFound"); -static const int CACHE_SUBNET_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("CacheSubnetGroupNotFoundFault"); -static const int NODE_QUOTA_FOR_CLUSTER_EXCEEDED_FAULT_HASH = HashingUtils::HashString("NodeQuotaForClusterExceeded"); static const int SUBNET_IN_USE_HASH = HashingUtils::HashString("SubnetInUse"); -static const int INSUFFICIENT_CACHE_CLUSTER_CAPACITY_FAULT_HASH = HashingUtils::HashString("InsufficientCacheClusterCapacity"); -static const int SNAPSHOT_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SnapshotNotFoundFault"); -static const int AUTHORIZATION_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("AuthorizationAlreadyExists"); -static const int RESERVED_CACHE_NODE_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ReservedCacheNodeAlreadyExists"); +static const int NODE_QUOTA_FOR_CLUSTER_EXCEEDED_FAULT_HASH = HashingUtils::HashString("NodeQuotaForClusterExceeded"); +static const int INVALID_A_R_N_FAULT_HASH = HashingUtils::HashString("InvalidARN"); +static const int INVALID_V_P_C_NETWORK_STATE_FAULT_HASH = HashingUtils::HashString("InvalidVPCNetworkStateFault"); static const int NODE_QUOTA_FOR_CUSTOMER_EXCEEDED_FAULT_HASH = HashingUtils::HashString("NodeQuotaForCustomerExceeded"); -static const int CACHE_SUBNET_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("CacheSubnetQuotaExceededFault"); -static const int INVALID_REPLICATION_GROUP_STATE_FAULT_HASH = HashingUtils::HashString("InvalidReplicationGroupState"); -static const int CACHE_SUBNET_GROUP_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("CacheSubnetGroupQuotaExceeded"); -static const int SNAPSHOT_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("SnapshotAlreadyExistsFault"); +static const int AUTHORIZATION_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("AuthorizationAlreadyExists"); +static const int CACHE_PARAMETER_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("CacheParameterGroupNotFound"); +static const int CACHE_CLUSTER_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("CacheClusterAlreadyExists"); +static const int INVALID_CACHE_CLUSTER_STATE_FAULT_HASH = HashingUtils::HashString("InvalidCacheClusterState"); +static const int RESERVED_CACHE_NODE_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("ReservedCacheNodeQuotaExceeded"); +static const int CACHE_SECURITY_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("CacheSecurityGroupNotFound"); static const int INVALID_CACHE_SECURITY_GROUP_STATE_FAULT_HASH = HashingUtils::HashString("InvalidCacheSecurityGroupState"); +static const int CACHE_SUBNET_GROUP_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("CacheSubnetGroupQuotaExceeded"); +static const int RESERVED_CACHE_NODE_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ReservedCacheNodeAlreadyExists"); static const int CACHE_PARAMETER_GROUP_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("CacheParameterGroupAlreadyExists"); -static const int AUTHORIZATION_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("AuthorizationNotFound"); -static const int RESERVED_CACHE_NODE_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("ReservedCacheNodeQuotaExceeded"); -static const int CACHE_SUBNET_GROUP_IN_USE_HASH = HashingUtils::HashString("CacheSubnetGroupInUse"); -static const int SNAPSHOT_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("SnapshotQuotaExceededFault"); -static const int CACHE_SUBNET_GROUP_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("CacheSubnetGroupAlreadyExists"); +static const int CACHE_SUBNET_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("CacheSubnetGroupNotFoundFault"); static const int SNAPSHOT_FEATURE_NOT_SUPPORTED_FAULT_HASH = HashingUtils::HashString("SnapshotFeatureNotSupportedFault"); -static const int INVALID_SNAPSHOT_STATE_FAULT_HASH = HashingUtils::HashString("InvalidSnapshotState"); -static const int INVALID_V_P_C_NETWORK_STATE_FAULT_HASH = HashingUtils::HashString("InvalidVPCNetworkStateFault"); +static const int CACHE_SUBNET_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("CacheSubnetQuotaExceededFault"); +static const int CLUSTER_QUOTA_FOR_CUSTOMER_EXCEEDED_FAULT_HASH = HashingUtils::HashString("ClusterQuotaForCustomerExceeded"); +static const int CACHE_PARAMETER_GROUP_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("CacheParameterGroupQuotaExceeded"); static const int TAG_QUOTA_PER_RESOURCE_EXCEEDED_HASH = HashingUtils::HashString("TagQuotaPerResourceExceeded"); -static const int CACHE_PARAMETER_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("CacheParameterGroupNotFound"); -static const int INVALID_CACHE_PARAMETER_GROUP_STATE_FAULT_HASH = HashingUtils::HashString("InvalidCacheParameterGroupState"); -static const int INVALID_CACHE_CLUSTER_STATE_FAULT_HASH = HashingUtils::HashString("InvalidCacheClusterState"); +static const int INVALID_SNAPSHOT_STATE_FAULT_HASH = HashingUtils::HashString("InvalidSnapshotState"); +static const int SNAPSHOT_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("SnapshotQuotaExceededFault"); +static const int REPLICATION_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ReplicationGroupNotFoundFault"); static const int RESERVED_CACHE_NODE_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ReservedCacheNodeNotFound"); -static const int CLUSTER_QUOTA_FOR_CUSTOMER_EXCEEDED_FAULT_HASH = HashingUtils::HashString("ClusterQuotaForCustomerExceeded"); +static const int CACHE_SUBNET_GROUP_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("CacheSubnetGroupAlreadyExists"); static const int INVALID_SUBNET_HASH = HashingUtils::HashString("InvalidSubnet"); -static const int CACHE_CLUSTER_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("CacheClusterNotFound"); -static const int CACHE_PARAMETER_GROUP_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("CacheParameterGroupQuotaExceeded"); -static const int CACHE_SECURITY_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("CacheSecurityGroupNotFound"); +static const int AUTHORIZATION_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("AuthorizationNotFound"); +static const int SNAPSHOT_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SnapshotNotFoundFault"); +static const int SNAPSHOT_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("SnapshotAlreadyExistsFault"); +static const int REPLICATION_GROUP_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ReplicationGroupAlreadyExists"); -namespace Aws -{ -namespace ElastiCache -{ -namespace ElastiCacheErrorMapper -{ AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); - if (hashCode == INVALID_A_R_N_FAULT_HASH) + if (hashCode == INVALID_REPLICATION_GROUP_STATE_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::INVALID_A_R_N_FAULT), false); - } - else if (hashCode == CACHE_CLUSTER_ALREADY_EXISTS_FAULT_HASH) - { - return AWSError(static_cast(ElastiCacheErrors::CACHE_CLUSTER_ALREADY_EXISTS_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::INVALID_REPLICATION_GROUP_STATE_FAULT), false); } - else if (hashCode == REPLICATION_GROUP_ALREADY_EXISTS_FAULT_HASH) + else if (hashCode == CACHE_SECURITY_GROUP_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::REPLICATION_GROUP_ALREADY_EXISTS_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::CACHE_SECURITY_GROUP_QUOTA_EXCEEDED_FAULT), false); } else if (hashCode == CACHE_SECURITY_GROUP_ALREADY_EXISTS_FAULT_HASH) { return AWSError(static_cast(ElastiCacheErrors::CACHE_SECURITY_GROUP_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == CACHE_SECURITY_GROUP_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == CACHE_CLUSTER_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::CACHE_SECURITY_GROUP_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::CACHE_CLUSTER_NOT_FOUND_FAULT), false); } - else if (hashCode == REPLICATION_GROUP_NOT_FOUND_FAULT_HASH) + else if (hashCode == CACHE_SUBNET_GROUP_IN_USE_HASH) { - return AWSError(static_cast(ElastiCacheErrors::REPLICATION_GROUP_NOT_FOUND_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::CACHE_SUBNET_GROUP_IN_USE), false); + } + else if (hashCode == INSUFFICIENT_CACHE_CLUSTER_CAPACITY_FAULT_HASH) + { + return AWSError(static_cast(ElastiCacheErrors::INSUFFICIENT_CACHE_CLUSTER_CAPACITY_FAULT), false); + } + else if (hashCode == INVALID_CACHE_PARAMETER_GROUP_STATE_FAULT_HASH) + { + return AWSError(static_cast(ElastiCacheErrors::INVALID_CACHE_PARAMETER_GROUP_STATE_FAULT), false); } else if (hashCode == RESERVED_CACHE_NODES_OFFERING_NOT_FOUND_FAULT_HASH) { @@ -104,133 +109,129 @@ AWSError GetErrorForName(const char* errorName) { return AWSError(static_cast(ElastiCacheErrors::TAG_NOT_FOUND_FAULT), false); } - else if (hashCode == CACHE_SUBNET_GROUP_NOT_FOUND_FAULT_HASH) + else if (hashCode == SUBNET_IN_USE_HASH) { - return AWSError(static_cast(ElastiCacheErrors::CACHE_SUBNET_GROUP_NOT_FOUND_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::SUBNET_IN_USE), false); } else if (hashCode == NODE_QUOTA_FOR_CLUSTER_EXCEEDED_FAULT_HASH) { return AWSError(static_cast(ElastiCacheErrors::NODE_QUOTA_FOR_CLUSTER_EXCEEDED_FAULT), false); } - else if (hashCode == SUBNET_IN_USE_HASH) + else if (hashCode == INVALID_A_R_N_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::SUBNET_IN_USE), false); + return AWSError(static_cast(ElastiCacheErrors::INVALID_A_R_N_FAULT), false); } - else if (hashCode == INSUFFICIENT_CACHE_CLUSTER_CAPACITY_FAULT_HASH) + else if (hashCode == INVALID_V_P_C_NETWORK_STATE_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::INSUFFICIENT_CACHE_CLUSTER_CAPACITY_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::INVALID_V_P_C_NETWORK_STATE_FAULT), false); } - else if (hashCode == SNAPSHOT_NOT_FOUND_FAULT_HASH) + else if (hashCode == NODE_QUOTA_FOR_CUSTOMER_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::SNAPSHOT_NOT_FOUND_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::NODE_QUOTA_FOR_CUSTOMER_EXCEEDED_FAULT), false); } else if (hashCode == AUTHORIZATION_ALREADY_EXISTS_FAULT_HASH) { return AWSError(static_cast(ElastiCacheErrors::AUTHORIZATION_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == RESERVED_CACHE_NODE_ALREADY_EXISTS_FAULT_HASH) - { - return AWSError(static_cast(ElastiCacheErrors::RESERVED_CACHE_NODE_ALREADY_EXISTS_FAULT), false); - } - else if (hashCode == NODE_QUOTA_FOR_CUSTOMER_EXCEEDED_FAULT_HASH) + else if (hashCode == CACHE_PARAMETER_GROUP_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::NODE_QUOTA_FOR_CUSTOMER_EXCEEDED_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::CACHE_PARAMETER_GROUP_NOT_FOUND_FAULT), false); } - else if (hashCode == CACHE_SUBNET_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == CACHE_CLUSTER_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::CACHE_SUBNET_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::CACHE_CLUSTER_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == INVALID_REPLICATION_GROUP_STATE_FAULT_HASH) + else if (hashCode == INVALID_CACHE_CLUSTER_STATE_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::INVALID_REPLICATION_GROUP_STATE_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::INVALID_CACHE_CLUSTER_STATE_FAULT), false); } - else if (hashCode == CACHE_SUBNET_GROUP_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == RESERVED_CACHE_NODE_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::CACHE_SUBNET_GROUP_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::RESERVED_CACHE_NODE_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == SNAPSHOT_ALREADY_EXISTS_FAULT_HASH) + else if (hashCode == CACHE_SECURITY_GROUP_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::SNAPSHOT_ALREADY_EXISTS_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::CACHE_SECURITY_GROUP_NOT_FOUND_FAULT), false); } else if (hashCode == INVALID_CACHE_SECURITY_GROUP_STATE_FAULT_HASH) { return AWSError(static_cast(ElastiCacheErrors::INVALID_CACHE_SECURITY_GROUP_STATE_FAULT), false); } - else if (hashCode == CACHE_PARAMETER_GROUP_ALREADY_EXISTS_FAULT_HASH) - { - return AWSError(static_cast(ElastiCacheErrors::CACHE_PARAMETER_GROUP_ALREADY_EXISTS_FAULT), false); - } - else if (hashCode == AUTHORIZATION_NOT_FOUND_FAULT_HASH) - { - return AWSError(static_cast(ElastiCacheErrors::AUTHORIZATION_NOT_FOUND_FAULT), false); - } - else if (hashCode == RESERVED_CACHE_NODE_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == CACHE_SUBNET_GROUP_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::RESERVED_CACHE_NODE_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::CACHE_SUBNET_GROUP_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == CACHE_SUBNET_GROUP_IN_USE_HASH) + else if (hashCode == RESERVED_CACHE_NODE_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::CACHE_SUBNET_GROUP_IN_USE), false); + return AWSError(static_cast(ElastiCacheErrors::RESERVED_CACHE_NODE_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == SNAPSHOT_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == CACHE_PARAMETER_GROUP_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::SNAPSHOT_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::CACHE_PARAMETER_GROUP_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == CACHE_SUBNET_GROUP_ALREADY_EXISTS_FAULT_HASH) + else if (hashCode == CACHE_SUBNET_GROUP_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::CACHE_SUBNET_GROUP_ALREADY_EXISTS_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::CACHE_SUBNET_GROUP_NOT_FOUND_FAULT), false); } else if (hashCode == SNAPSHOT_FEATURE_NOT_SUPPORTED_FAULT_HASH) { return AWSError(static_cast(ElastiCacheErrors::SNAPSHOT_FEATURE_NOT_SUPPORTED_FAULT), false); } - else if (hashCode == INVALID_SNAPSHOT_STATE_FAULT_HASH) + else if (hashCode == CACHE_SUBNET_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::INVALID_SNAPSHOT_STATE_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::CACHE_SUBNET_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == INVALID_V_P_C_NETWORK_STATE_FAULT_HASH) + else if (hashCode == CLUSTER_QUOTA_FOR_CUSTOMER_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::INVALID_V_P_C_NETWORK_STATE_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::CLUSTER_QUOTA_FOR_CUSTOMER_EXCEEDED_FAULT), false); + } + else if (hashCode == CACHE_PARAMETER_GROUP_QUOTA_EXCEEDED_FAULT_HASH) + { + return AWSError(static_cast(ElastiCacheErrors::CACHE_PARAMETER_GROUP_QUOTA_EXCEEDED_FAULT), false); } else if (hashCode == TAG_QUOTA_PER_RESOURCE_EXCEEDED_HASH) { return AWSError(static_cast(ElastiCacheErrors::TAG_QUOTA_PER_RESOURCE_EXCEEDED), false); } - else if (hashCode == CACHE_PARAMETER_GROUP_NOT_FOUND_FAULT_HASH) + else if (hashCode == INVALID_SNAPSHOT_STATE_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::CACHE_PARAMETER_GROUP_NOT_FOUND_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::INVALID_SNAPSHOT_STATE_FAULT), false); } - else if (hashCode == INVALID_CACHE_PARAMETER_GROUP_STATE_FAULT_HASH) + else if (hashCode == SNAPSHOT_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::INVALID_CACHE_PARAMETER_GROUP_STATE_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::SNAPSHOT_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == INVALID_CACHE_CLUSTER_STATE_FAULT_HASH) + else if (hashCode == REPLICATION_GROUP_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::INVALID_CACHE_CLUSTER_STATE_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::REPLICATION_GROUP_NOT_FOUND_FAULT), false); } else if (hashCode == RESERVED_CACHE_NODE_NOT_FOUND_FAULT_HASH) { return AWSError(static_cast(ElastiCacheErrors::RESERVED_CACHE_NODE_NOT_FOUND_FAULT), false); } - else if (hashCode == CLUSTER_QUOTA_FOR_CUSTOMER_EXCEEDED_FAULT_HASH) + else if (hashCode == CACHE_SUBNET_GROUP_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::CLUSTER_QUOTA_FOR_CUSTOMER_EXCEEDED_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::CACHE_SUBNET_GROUP_ALREADY_EXISTS_FAULT), false); } else if (hashCode == INVALID_SUBNET_HASH) { return AWSError(static_cast(ElastiCacheErrors::INVALID_SUBNET), false); } - else if (hashCode == CACHE_CLUSTER_NOT_FOUND_FAULT_HASH) + else if (hashCode == AUTHORIZATION_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::CACHE_CLUSTER_NOT_FOUND_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::AUTHORIZATION_NOT_FOUND_FAULT), false); } - else if (hashCode == CACHE_PARAMETER_GROUP_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == SNAPSHOT_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::CACHE_PARAMETER_GROUP_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::SNAPSHOT_NOT_FOUND_FAULT), false); } - else if (hashCode == CACHE_SECURITY_GROUP_NOT_FOUND_FAULT_HASH) + else if (hashCode == SNAPSHOT_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(ElastiCacheErrors::CACHE_SECURITY_GROUP_NOT_FOUND_FAULT), false); + return AWSError(static_cast(ElastiCacheErrors::SNAPSHOT_ALREADY_EXISTS_FAULT), false); + } + else if (hashCode == REPLICATION_GROUP_ALREADY_EXISTS_FAULT_HASH) + { + return AWSError(static_cast(ElastiCacheErrors::REPLICATION_GROUP_ALREADY_EXISTS_FAULT), false); } return AWSError(CoreErrors::UNKNOWN, false); } diff --git a/aws-cpp-sdk-elasticache/source/model/AZMode.cpp b/aws-cpp-sdk-elasticache/source/model/AZMode.cpp index feae139e65a..80163680702 100644 --- a/aws-cpp-sdk-elasticache/source/model/AZMode.cpp +++ b/aws-cpp-sdk-elasticache/source/model/AZMode.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int single_az_HASH = HashingUtils::HashString("single-az"); -static const int cross_az_HASH = HashingUtils::HashString("cross-az"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace AZModeMapper { + static const int single_az_HASH = HashingUtils::HashString("single-az"); + static const int cross_az_HASH = HashingUtils::HashString("cross-az"); + AZMode GetAZModeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticache/source/model/AutomaticFailoverStatus.cpp b/aws-cpp-sdk-elasticache/source/model/AutomaticFailoverStatus.cpp index 54a984c1dea..537f164e6a7 100644 --- a/aws-cpp-sdk-elasticache/source/model/AutomaticFailoverStatus.cpp +++ b/aws-cpp-sdk-elasticache/source/model/AutomaticFailoverStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int enabled_HASH = HashingUtils::HashString("enabled"); -static const int disabled_HASH = HashingUtils::HashString("disabled"); -static const int enabling_HASH = HashingUtils::HashString("enabling"); -static const int disabling_HASH = HashingUtils::HashString("disabling"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace AutomaticFailoverStatusMapper { + static const int enabled_HASH = HashingUtils::HashString("enabled"); + static const int disabled_HASH = HashingUtils::HashString("disabled"); + static const int enabling_HASH = HashingUtils::HashString("enabling"); + static const int disabling_HASH = HashingUtils::HashString("disabling"); + AutomaticFailoverStatus GetAutomaticFailoverStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticache/source/model/AvailabilityZone.cpp b/aws-cpp-sdk-elasticache/source/model/AvailabilityZone.cpp index f0a1f0b482d..a9c51352059 100644 --- a/aws-cpp-sdk-elasticache/source/model/AvailabilityZone.cpp +++ b/aws-cpp-sdk-elasticache/source/model/AvailabilityZone.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + AvailabilityZone::AvailabilityZone() : m_nameHasBeenSet(false) { @@ -66,3 +72,7 @@ void AvailabilityZone::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".Name=" << StringUtils::URLEncode(m_name.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/CacheCluster.cpp b/aws-cpp-sdk-elasticache/source/model/CacheCluster.cpp index 907d6130e0a..d9d0810ccf3 100644 --- a/aws-cpp-sdk-elasticache/source/model/CacheCluster.cpp +++ b/aws-cpp-sdk-elasticache/source/model/CacheCluster.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + CacheCluster::CacheCluster() : m_cacheClusterIdHasBeenSet(false), m_configurationEndpointHasBeenSet(false), @@ -478,3 +484,7 @@ void CacheCluster::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".SnapshotWindow=" << StringUtils::URLEncode(m_snapshotWindow.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws diff --git a/aws-cpp-sdk-elasticache/source/model/CacheEngineVersion.cpp b/aws-cpp-sdk-elasticache/source/model/CacheEngineVersion.cpp index daf5614e68e..aa247197bca 100644 --- a/aws-cpp-sdk-elasticache/source/model/CacheEngineVersion.cpp +++ b/aws-cpp-sdk-elasticache/source/model/CacheEngineVersion.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + CacheEngineVersion::CacheEngineVersion() : m_engineHasBeenSet(false), m_engineVersionHasBeenSet(false), @@ -130,3 +136,7 @@ void CacheEngineVersion::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".CacheEngineVersionDescription=" << StringUtils::URLEncode(m_cacheEngineVersionDescription.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/CacheNode.cpp b/aws-cpp-sdk-elasticache/source/model/CacheNode.cpp index 17c97d44903..77b5b29b718 100644 --- a/aws-cpp-sdk-elasticache/source/model/CacheNode.cpp +++ b/aws-cpp-sdk-elasticache/source/model/CacheNode.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + CacheNode::CacheNode() : m_cacheNodeIdHasBeenSet(false), m_cacheNodeStatusHasBeenSet(false), @@ -166,3 +172,7 @@ void CacheNode::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".CustomerAvailabilityZone=" << StringUtils::URLEncode(m_customerAvailabilityZone.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws diff --git a/aws-cpp-sdk-elasticache/source/model/CacheNodeTypeSpecificParameter.cpp b/aws-cpp-sdk-elasticache/source/model/CacheNodeTypeSpecificParameter.cpp index a598c4b9fb4..aa9a669c6cd 100644 --- a/aws-cpp-sdk-elasticache/source/model/CacheNodeTypeSpecificParameter.cpp +++ b/aws-cpp-sdk-elasticache/source/model/CacheNodeTypeSpecificParameter.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + CacheNodeTypeSpecificParameter::CacheNodeTypeSpecificParameter() : m_parameterNameHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -198,3 +204,7 @@ void CacheNodeTypeSpecificParameter::OutputToStream(Aws::OStream& oStream, const } } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/CacheNodeTypeSpecificValue.cpp b/aws-cpp-sdk-elasticache/source/model/CacheNodeTypeSpecificValue.cpp index daff9bf2183..87713a4fb81 100644 --- a/aws-cpp-sdk-elasticache/source/model/CacheNodeTypeSpecificValue.cpp +++ b/aws-cpp-sdk-elasticache/source/model/CacheNodeTypeSpecificValue.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + CacheNodeTypeSpecificValue::CacheNodeTypeSpecificValue() : m_cacheNodeTypeHasBeenSet(false), m_valueHasBeenSet(false) @@ -82,3 +88,7 @@ void CacheNodeTypeSpecificValue::OutputToStream(Aws::OStream& oStream, const cha oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/CacheParameterGroup.cpp b/aws-cpp-sdk-elasticache/source/model/CacheParameterGroup.cpp index d95bcf1ae42..9bad9fd321f 100644 --- a/aws-cpp-sdk-elasticache/source/model/CacheParameterGroup.cpp +++ b/aws-cpp-sdk-elasticache/source/model/CacheParameterGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + CacheParameterGroup::CacheParameterGroup() : m_cacheParameterGroupNameHasBeenSet(false), m_cacheParameterGroupFamilyHasBeenSet(false), @@ -98,3 +104,7 @@ void CacheParameterGroup::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".Description=" << StringUtils::URLEncode(m_description.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/CacheParameterGroupStatus.cpp b/aws-cpp-sdk-elasticache/source/model/CacheParameterGroupStatus.cpp index 63c12ea22cf..e2ee3b575f3 100644 --- a/aws-cpp-sdk-elasticache/source/model/CacheParameterGroupStatus.cpp +++ b/aws-cpp-sdk-elasticache/source/model/CacheParameterGroupStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + CacheParameterGroupStatus::CacheParameterGroupStatus() : m_cacheParameterGroupNameHasBeenSet(false), m_parameterApplyStatusHasBeenSet(false), @@ -112,3 +118,7 @@ void CacheParameterGroupStatus::OutputToStream(Aws::OStream& oStream, const char } } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/CacheSecurityGroup.cpp b/aws-cpp-sdk-elasticache/source/model/CacheSecurityGroup.cpp index 886d63b3d49..392a924bd7e 100644 --- a/aws-cpp-sdk-elasticache/source/model/CacheSecurityGroup.cpp +++ b/aws-cpp-sdk-elasticache/source/model/CacheSecurityGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + CacheSecurityGroup::CacheSecurityGroup() : m_ownerIdHasBeenSet(false), m_cacheSecurityGroupNameHasBeenSet(false), @@ -132,3 +138,7 @@ void CacheSecurityGroup::OutputToStream(Aws::OStream& oStream, const char* locat } } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/CacheSecurityGroupMembership.cpp b/aws-cpp-sdk-elasticache/source/model/CacheSecurityGroupMembership.cpp index 09710db2ab7..bf6aa07ed7f 100644 --- a/aws-cpp-sdk-elasticache/source/model/CacheSecurityGroupMembership.cpp +++ b/aws-cpp-sdk-elasticache/source/model/CacheSecurityGroupMembership.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + CacheSecurityGroupMembership::CacheSecurityGroupMembership() : m_cacheSecurityGroupNameHasBeenSet(false), m_statusHasBeenSet(false) @@ -82,3 +88,7 @@ void CacheSecurityGroupMembership::OutputToStream(Aws::OStream& oStream, const c oStream << location << ".Status=" << StringUtils::URLEncode(m_status.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/CacheSubnetGroup.cpp b/aws-cpp-sdk-elasticache/source/model/CacheSubnetGroup.cpp index 2bd2a145e15..fc63d0481e2 100644 --- a/aws-cpp-sdk-elasticache/source/model/CacheSubnetGroup.cpp +++ b/aws-cpp-sdk-elasticache/source/model/CacheSubnetGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + CacheSubnetGroup::CacheSubnetGroup() : m_cacheSubnetGroupNameHasBeenSet(false), m_cacheSubnetGroupDescriptionHasBeenSet(false), @@ -132,3 +138,7 @@ void CacheSubnetGroup::OutputToStream(Aws::OStream& oStream, const char* locatio } } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/EC2SecurityGroup.cpp b/aws-cpp-sdk-elasticache/source/model/EC2SecurityGroup.cpp index 9deb687c7c7..76f8ec8d0ab 100644 --- a/aws-cpp-sdk-elasticache/source/model/EC2SecurityGroup.cpp +++ b/aws-cpp-sdk-elasticache/source/model/EC2SecurityGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + EC2SecurityGroup::EC2SecurityGroup() : m_statusHasBeenSet(false), m_eC2SecurityGroupNameHasBeenSet(false), @@ -98,3 +104,7 @@ void EC2SecurityGroup::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".EC2SecurityGroupOwnerId=" << StringUtils::URLEncode(m_eC2SecurityGroupOwnerId.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/Endpoint.cpp b/aws-cpp-sdk-elasticache/source/model/Endpoint.cpp index c59696ec67a..9a4be0c46f2 100644 --- a/aws-cpp-sdk-elasticache/source/model/Endpoint.cpp +++ b/aws-cpp-sdk-elasticache/source/model/Endpoint.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + Endpoint::Endpoint() : m_addressHasBeenSet(false), m_port(0), @@ -84,3 +90,7 @@ void Endpoint::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Port=" << m_port << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/EngineDefaults.cpp b/aws-cpp-sdk-elasticache/source/model/EngineDefaults.cpp index 740435c74ba..4786c9ddc66 100644 --- a/aws-cpp-sdk-elasticache/source/model/EngineDefaults.cpp +++ b/aws-cpp-sdk-elasticache/source/model/EngineDefaults.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + EngineDefaults::EngineDefaults() : m_cacheParameterGroupFamilyHasBeenSet(false), m_markerHasBeenSet(false), @@ -150,3 +156,7 @@ void EngineDefaults::OutputToStream(Aws::OStream& oStream, const char* location) } } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/Event.cpp b/aws-cpp-sdk-elasticache/source/model/Event.cpp index 8ec67300e4f..1798d07cdb3 100644 --- a/aws-cpp-sdk-elasticache/source/model/Event.cpp +++ b/aws-cpp-sdk-elasticache/source/model/Event.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + Event::Event() : m_sourceIdentifierHasBeenSet(false), m_sourceTypeHasBeenSet(false), @@ -114,3 +120,7 @@ void Event::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Date=" << StringUtils::URLEncode(m_date.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws diff --git a/aws-cpp-sdk-elasticache/source/model/NodeGroup.cpp b/aws-cpp-sdk-elasticache/source/model/NodeGroup.cpp index fd341b67b28..a0edb7aaad4 100644 --- a/aws-cpp-sdk-elasticache/source/model/NodeGroup.cpp +++ b/aws-cpp-sdk-elasticache/source/model/NodeGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + NodeGroup::NodeGroup() : m_nodeGroupIdHasBeenSet(false), m_statusHasBeenSet(false), @@ -136,3 +142,7 @@ void NodeGroup::OutputToStream(Aws::OStream& oStream, const char* location) cons } } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/NodeGroupMember.cpp b/aws-cpp-sdk-elasticache/source/model/NodeGroupMember.cpp index 1b7b5d25ac3..75a035820a3 100644 --- a/aws-cpp-sdk-elasticache/source/model/NodeGroupMember.cpp +++ b/aws-cpp-sdk-elasticache/source/model/NodeGroupMember.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + NodeGroupMember::NodeGroupMember() : m_cacheClusterIdHasBeenSet(false), m_cacheNodeIdHasBeenSet(false), @@ -134,3 +140,7 @@ void NodeGroupMember::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".CurrentRole=" << StringUtils::URLEncode(m_currentRole.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/NodeSnapshot.cpp b/aws-cpp-sdk-elasticache/source/model/NodeSnapshot.cpp index 550dc5aa58f..3d904f59b19 100644 --- a/aws-cpp-sdk-elasticache/source/model/NodeSnapshot.cpp +++ b/aws-cpp-sdk-elasticache/source/model/NodeSnapshot.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + NodeSnapshot::NodeSnapshot() : m_cacheNodeIdHasBeenSet(false), m_cacheSizeHasBeenSet(false), @@ -114,3 +120,7 @@ void NodeSnapshot::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".SnapshotCreateTime=" << StringUtils::URLEncode(m_snapshotCreateTime.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws diff --git a/aws-cpp-sdk-elasticache/source/model/NotificationConfiguration.cpp b/aws-cpp-sdk-elasticache/source/model/NotificationConfiguration.cpp index 017740710d9..cbc467574ca 100644 --- a/aws-cpp-sdk-elasticache/source/model/NotificationConfiguration.cpp +++ b/aws-cpp-sdk-elasticache/source/model/NotificationConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + NotificationConfiguration::NotificationConfiguration() : m_topicArnHasBeenSet(false), m_topicStatusHasBeenSet(false) @@ -82,3 +88,7 @@ void NotificationConfiguration::OutputToStream(Aws::OStream& oStream, const char oStream << location << ".TopicStatus=" << StringUtils::URLEncode(m_topicStatus.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/Parameter.cpp b/aws-cpp-sdk-elasticache/source/model/Parameter.cpp index ae19453edd1..30c7532a94d 100644 --- a/aws-cpp-sdk-elasticache/source/model/Parameter.cpp +++ b/aws-cpp-sdk-elasticache/source/model/Parameter.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + Parameter::Parameter() : m_parameterNameHasBeenSet(false), m_parameterValueHasBeenSet(false), @@ -180,3 +186,7 @@ void Parameter::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".MinimumEngineVersion=" << StringUtils::URLEncode(m_minimumEngineVersion.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/ParameterNameValue.cpp b/aws-cpp-sdk-elasticache/source/model/ParameterNameValue.cpp index 784f3a8554b..7c23c90fdf8 100644 --- a/aws-cpp-sdk-elasticache/source/model/ParameterNameValue.cpp +++ b/aws-cpp-sdk-elasticache/source/model/ParameterNameValue.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + ParameterNameValue::ParameterNameValue() : m_parameterNameHasBeenSet(false), m_parameterValueHasBeenSet(false) @@ -82,3 +88,7 @@ void ParameterNameValue::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".ParameterValue=" << StringUtils::URLEncode(m_parameterValue.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/PendingAutomaticFailoverStatus.cpp b/aws-cpp-sdk-elasticache/source/model/PendingAutomaticFailoverStatus.cpp index 911438882e6..fc8767ee648 100644 --- a/aws-cpp-sdk-elasticache/source/model/PendingAutomaticFailoverStatus.cpp +++ b/aws-cpp-sdk-elasticache/source/model/PendingAutomaticFailoverStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int enabled_HASH = HashingUtils::HashString("enabled"); -static const int disabled_HASH = HashingUtils::HashString("disabled"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace PendingAutomaticFailoverStatusMapper { + static const int enabled_HASH = HashingUtils::HashString("enabled"); + static const int disabled_HASH = HashingUtils::HashString("disabled"); + PendingAutomaticFailoverStatus GetPendingAutomaticFailoverStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticache/source/model/PendingModifiedValues.cpp b/aws-cpp-sdk-elasticache/source/model/PendingModifiedValues.cpp index 74083252b19..efc25e036a3 100644 --- a/aws-cpp-sdk-elasticache/source/model/PendingModifiedValues.cpp +++ b/aws-cpp-sdk-elasticache/source/model/PendingModifiedValues.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + PendingModifiedValues::PendingModifiedValues() : m_numCacheNodes(0), m_numCacheNodesHasBeenSet(false), @@ -130,3 +136,7 @@ void PendingModifiedValues::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".CacheNodeType=" << StringUtils::URLEncode(m_cacheNodeType.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws diff --git a/aws-cpp-sdk-elasticache/source/model/RecurringCharge.cpp b/aws-cpp-sdk-elasticache/source/model/RecurringCharge.cpp index b63afe1c4ff..1b19e633771 100644 --- a/aws-cpp-sdk-elasticache/source/model/RecurringCharge.cpp +++ b/aws-cpp-sdk-elasticache/source/model/RecurringCharge.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + RecurringCharge::RecurringCharge() : m_recurringChargeAmount(0.0), m_recurringChargeAmountHasBeenSet(false), @@ -84,3 +90,7 @@ void RecurringCharge::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".RecurringChargeFrequency=" << StringUtils::URLEncode(m_recurringChargeFrequency.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/ReplicationGroup.cpp b/aws-cpp-sdk-elasticache/source/model/ReplicationGroup.cpp index 0d88317db59..48e1bf26e89 100644 --- a/aws-cpp-sdk-elasticache/source/model/ReplicationGroup.cpp +++ b/aws-cpp-sdk-elasticache/source/model/ReplicationGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + ReplicationGroup::ReplicationGroup() : m_replicationGroupIdHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -214,3 +220,7 @@ void ReplicationGroup::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".AutomaticFailover=" << AutomaticFailoverStatusMapper::GetNameForAutomaticFailoverStatus(m_automaticFailover) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/ReplicationGroupPendingModifiedValues.cpp b/aws-cpp-sdk-elasticache/source/model/ReplicationGroupPendingModifiedValues.cpp index 9e1b4e71be7..18e990b3e1c 100644 --- a/aws-cpp-sdk-elasticache/source/model/ReplicationGroupPendingModifiedValues.cpp +++ b/aws-cpp-sdk-elasticache/source/model/ReplicationGroupPendingModifiedValues.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + ReplicationGroupPendingModifiedValues::ReplicationGroupPendingModifiedValues() : m_primaryClusterIdHasBeenSet(false), m_automaticFailoverStatusHasBeenSet(false) @@ -82,3 +88,7 @@ void ReplicationGroupPendingModifiedValues::OutputToStream(Aws::OStream& oStream oStream << location << ".AutomaticFailoverStatus=" << PendingAutomaticFailoverStatusMapper::GetNameForPendingAutomaticFailoverStatus(m_automaticFailoverStatus) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/ReservedCacheNode.cpp b/aws-cpp-sdk-elasticache/source/model/ReservedCacheNode.cpp index 91ba3672a5a..655b339e1bc 100644 --- a/aws-cpp-sdk-elasticache/source/model/ReservedCacheNode.cpp +++ b/aws-cpp-sdk-elasticache/source/model/ReservedCacheNode.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + ReservedCacheNode::ReservedCacheNode() : m_reservedCacheNodeIdHasBeenSet(false), m_reservedCacheNodesOfferingIdHasBeenSet(false), @@ -268,3 +274,7 @@ void ReservedCacheNode::OutputToStream(Aws::OStream& oStream, const char* locati } } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws diff --git a/aws-cpp-sdk-elasticache/source/model/ReservedCacheNodesOffering.cpp b/aws-cpp-sdk-elasticache/source/model/ReservedCacheNodesOffering.cpp index 38d91cd78e0..de96c4001f1 100644 --- a/aws-cpp-sdk-elasticache/source/model/ReservedCacheNodesOffering.cpp +++ b/aws-cpp-sdk-elasticache/source/model/ReservedCacheNodesOffering.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + ReservedCacheNodesOffering::ReservedCacheNodesOffering() : m_reservedCacheNodesOfferingIdHasBeenSet(false), m_cacheNodeTypeHasBeenSet(false), @@ -202,3 +208,7 @@ void ReservedCacheNodesOffering::OutputToStream(Aws::OStream& oStream, const cha } } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-elasticache/source/model/ResponseMetadata.cpp index ebacafa747a..bccc17df847 100644 --- a/aws-cpp-sdk-elasticache/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-elasticache/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/SecurityGroupMembership.cpp b/aws-cpp-sdk-elasticache/source/model/SecurityGroupMembership.cpp index 03053cb49c2..eaa09651e02 100644 --- a/aws-cpp-sdk-elasticache/source/model/SecurityGroupMembership.cpp +++ b/aws-cpp-sdk-elasticache/source/model/SecurityGroupMembership.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + SecurityGroupMembership::SecurityGroupMembership() : m_securityGroupIdHasBeenSet(false), m_statusHasBeenSet(false) @@ -82,3 +88,7 @@ void SecurityGroupMembership::OutputToStream(Aws::OStream& oStream, const char* oStream << location << ".Status=" << StringUtils::URLEncode(m_status.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/Snapshot.cpp b/aws-cpp-sdk-elasticache/source/model/Snapshot.cpp index 4323e78d2b6..bbb4c479946 100644 --- a/aws-cpp-sdk-elasticache/source/model/Snapshot.cpp +++ b/aws-cpp-sdk-elasticache/source/model/Snapshot.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + Snapshot::Snapshot() : m_snapshotNameHasBeenSet(false), m_cacheClusterIdHasBeenSet(false), @@ -396,3 +402,7 @@ void Snapshot::OutputToStream(Aws::OStream& oStream, const char* location) const } } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws diff --git a/aws-cpp-sdk-elasticache/source/model/SourceType.cpp b/aws-cpp-sdk-elasticache/source/model/SourceType.cpp index aa842e53a73..cba8a4ce8f3 100644 --- a/aws-cpp-sdk-elasticache/source/model/SourceType.cpp +++ b/aws-cpp-sdk-elasticache/source/model/SourceType.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int cache_cluster_HASH = HashingUtils::HashString("cache-cluster"); -static const int cache_parameter_group_HASH = HashingUtils::HashString("cache-parameter-group"); -static const int cache_security_group_HASH = HashingUtils::HashString("cache-security-group"); -static const int cache_subnet_group_HASH = HashingUtils::HashString("cache-subnet-group"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace SourceTypeMapper { + static const int cache_cluster_HASH = HashingUtils::HashString("cache-cluster"); + static const int cache_parameter_group_HASH = HashingUtils::HashString("cache-parameter-group"); + static const int cache_security_group_HASH = HashingUtils::HashString("cache-security-group"); + static const int cache_subnet_group_HASH = HashingUtils::HashString("cache-subnet-group"); + SourceType GetSourceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticache/source/model/Subnet.cpp b/aws-cpp-sdk-elasticache/source/model/Subnet.cpp index 7b7463d528a..991119e2f71 100644 --- a/aws-cpp-sdk-elasticache/source/model/Subnet.cpp +++ b/aws-cpp-sdk-elasticache/source/model/Subnet.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + Subnet::Subnet() : m_subnetIdentifierHasBeenSet(false), m_subnetAvailabilityZoneHasBeenSet(false) @@ -86,3 +92,7 @@ void Subnet::OutputToStream(Aws::OStream& oStream, const char* location) const m_subnetAvailabilityZone.OutputToStream(oStream, subnetAvailabilityZoneLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticache/source/model/Tag.cpp b/aws-cpp-sdk-elasticache/source/model/Tag.cpp index 48604861b13..f80420a3b18 100644 --- a/aws-cpp-sdk-elasticache/source/model/Tag.cpp +++ b/aws-cpp-sdk-elasticache/source/model/Tag.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElastiCache::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElastiCache +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -82,3 +88,7 @@ void Tag::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElastiCache +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/CMakeLists.txt b/aws-cpp-sdk-elasticbeanstalk/CMakeLists.txt index 087be8bc57d..6ba03f38c69 100644 --- a/aws-cpp-sdk-elasticbeanstalk/CMakeLists.txt +++ b/aws-cpp-sdk-elasticbeanstalk/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-elasticbeanstalk) "source/model/*.cpp" ) - file(GLOB ELASTICBEANSTALK_SRC + file(GLOB ELASTICBEANSTALK_UNIFIED_HEADERS ${AWS_ELASTICBEANSTALK_HEADERS} ${AWS_ELASTICBEANSTALK_MODEL_HEADERS} + ) + + file(GLOB ELASTICBEANSTALK_UNITY_SRC ${AWS_ELASTICBEANSTALK_SOURCE} ${AWS_ELASTICBEANSTALK_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("ELASTICBEANSTALK" ELASTICBEANSTALK_UNITY_SRC) + endif() + + file(GLOB ELASTICBEANSTALK_SRC + ${ELASTICBEANSTALK_UNIFIED_HEADERS} + ${ELASTICBEANSTALK_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-elasticbeanstalk/include/aws/elasticbeanstalk/model/EventSeverity.h b/aws-cpp-sdk-elasticbeanstalk/include/aws/elasticbeanstalk/model/EventSeverity.h index b3e489b90ec..ab29c475570 100644 --- a/aws-cpp-sdk-elasticbeanstalk/include/aws/elasticbeanstalk/model/EventSeverity.h +++ b/aws-cpp-sdk-elasticbeanstalk/include/aws/elasticbeanstalk/model/EventSeverity.h @@ -26,7 +26,7 @@ namespace Model { NOT_SET, TRACE, - DEBUG, + DEBUG_, INFO, WARN, ERROR_, diff --git a/aws-cpp-sdk-elasticbeanstalk/source/ElasticBeanstalkErrors.cpp b/aws-cpp-sdk-elasticbeanstalk/source/ElasticBeanstalkErrors.cpp index 3f02488861c..f99eedf99b1 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/ElasticBeanstalkErrors.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/ElasticBeanstalkErrors.cpp @@ -20,32 +20,36 @@ using namespace Aws::Client; using namespace Aws::ElasticBeanstalk; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace ElasticBeanstalkErrorMapper +{ + +static const int SOURCE_BUNDLE_DELETION_HASH = HashingUtils::HashString("SourceBundleDeletionFailure"); static const int TOO_MANY_APPLICATION_VERSIONS_HASH = HashingUtils::HashString("TooManyApplicationVersionsException"); static const int TOO_MANY_APPLICATIONS_HASH = HashingUtils::HashString("TooManyApplicationsException"); static const int TOO_MANY_BUCKETS_HASH = HashingUtils::HashString("TooManyBucketsException"); -static const int ELASTIC_BEANSTALK_SERVICE_HASH = HashingUtils::HashString("ElasticBeanstalkServiceException"); -static const int TOO_MANY_ENVIRONMENTS_HASH = HashingUtils::HashString("TooManyEnvironmentsException"); -static const int MANAGED_ACTION_INVALID_STATE_HASH = HashingUtils::HashString("ManagedActionInvalidStateException"); -static const int SOURCE_BUNDLE_DELETION_HASH = HashingUtils::HashString("SourceBundleDeletionFailure"); static const int INSUFFICIENT_PRIVILEGES_HASH = HashingUtils::HashString("InsufficientPrivilegesException"); static const int S3_LOCATION_NOT_IN_SERVICE_REGION_HASH = HashingUtils::HashString("S3LocationNotInServiceRegionException"); static const int TOO_MANY_CONFIGURATION_TEMPLATES_HASH = HashingUtils::HashString("TooManyConfigurationTemplatesException"); +static const int ELASTIC_BEANSTALK_SERVICE_HASH = HashingUtils::HashString("ElasticBeanstalkServiceException"); +static const int TOO_MANY_ENVIRONMENTS_HASH = HashingUtils::HashString("TooManyEnvironmentsException"); static const int OPERATION_IN_PROGRESS_HASH = HashingUtils::HashString("OperationInProgressFailure"); static const int INVALID_REQUEST_HASH = HashingUtils::HashString("InvalidRequestException"); static const int S3_SUBSCRIPTION_REQUIRED_HASH = HashingUtils::HashString("S3SubscriptionRequiredException"); -namespace Aws -{ -namespace ElasticBeanstalk -{ -namespace ElasticBeanstalkErrorMapper -{ AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); - if (hashCode == TOO_MANY_APPLICATION_VERSIONS_HASH) + if (hashCode == SOURCE_BUNDLE_DELETION_HASH) + { + return AWSError(static_cast(ElasticBeanstalkErrors::SOURCE_BUNDLE_DELETION), false); + } + else if (hashCode == TOO_MANY_APPLICATION_VERSIONS_HASH) { return AWSError(static_cast(ElasticBeanstalkErrors::TOO_MANY_APPLICATION_VERSIONS), false); } @@ -57,22 +61,6 @@ AWSError GetErrorForName(const char* errorName) { return AWSError(static_cast(ElasticBeanstalkErrors::TOO_MANY_BUCKETS), false); } - else if (hashCode == ELASTIC_BEANSTALK_SERVICE_HASH) - { - return AWSError(static_cast(ElasticBeanstalkErrors::ELASTIC_BEANSTALK_SERVICE), false); - } - else if (hashCode == TOO_MANY_ENVIRONMENTS_HASH) - { - return AWSError(static_cast(ElasticBeanstalkErrors::TOO_MANY_ENVIRONMENTS), false); - } - else if (hashCode == MANAGED_ACTION_INVALID_STATE_HASH) - { - return AWSError(static_cast(ElasticBeanstalkErrors::MANAGED_ACTION_INVALID_STATE), false); - } - else if (hashCode == SOURCE_BUNDLE_DELETION_HASH) - { - return AWSError(static_cast(ElasticBeanstalkErrors::SOURCE_BUNDLE_DELETION), false); - } else if (hashCode == INSUFFICIENT_PRIVILEGES_HASH) { return AWSError(static_cast(ElasticBeanstalkErrors::INSUFFICIENT_PRIVILEGES), false); @@ -85,6 +73,14 @@ AWSError GetErrorForName(const char* errorName) { return AWSError(static_cast(ElasticBeanstalkErrors::TOO_MANY_CONFIGURATION_TEMPLATES), false); } + else if (hashCode == ELASTIC_BEANSTALK_SERVICE_HASH) + { + return AWSError(static_cast(ElasticBeanstalkErrors::ELASTIC_BEANSTALK_SERVICE), false); + } + else if (hashCode == TOO_MANY_ENVIRONMENTS_HASH) + { + return AWSError(static_cast(ElasticBeanstalkErrors::TOO_MANY_ENVIRONMENTS), false); + } else if (hashCode == OPERATION_IN_PROGRESS_HASH) { return AWSError(static_cast(ElasticBeanstalkErrors::OPERATION_IN_PROGRESS), false); diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationDescription.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationDescription.cpp index 62c0f7cd5b7..f9b24e7e9f0 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationDescription.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + ApplicationDescription::ApplicationDescription() : m_applicationNameHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -174,3 +180,7 @@ void ApplicationDescription::OutputToStream(Aws::OStream& oStream, const char* l } } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationMetrics.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationMetrics.cpp index 6b761b8f04e..7958e3256a7 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationMetrics.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationMetrics.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + ApplicationMetrics::ApplicationMetrics() : m_duration(0), m_durationHasBeenSet(false), @@ -126,3 +132,7 @@ void ApplicationMetrics::OutputToStream(Aws::OStream& oStream, const char* locat m_latency.OutputToStream(oStream, latencyLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationVersionDescription.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationVersionDescription.cpp index af2ac9ec954..5f9eb8ec79b 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationVersionDescription.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationVersionDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + ApplicationVersionDescription::ApplicationVersionDescription() : m_applicationNameHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -166,3 +172,7 @@ void ApplicationVersionDescription::OutputToStream(Aws::OStream& oStream, const oStream << location << ".Status=" << ApplicationVersionStatusMapper::GetNameForApplicationVersionStatus(m_status) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationVersionStatus.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationVersionStatus.cpp index 6ea86ea9369..df6efbda74e 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationVersionStatus.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/ApplicationVersionStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int Processed_HASH = HashingUtils::HashString("Processed"); -static const int Unprocessed_HASH = HashingUtils::HashString("Unprocessed"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); -static const int Processing_HASH = HashingUtils::HashString("Processing"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace ApplicationVersionStatusMapper { + static const int Processed_HASH = HashingUtils::HashString("Processed"); + static const int Unprocessed_HASH = HashingUtils::HashString("Unprocessed"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + static const int Processing_HASH = HashingUtils::HashString("Processing"); + ApplicationVersionStatus GetApplicationVersionStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/AutoScalingGroup.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/AutoScalingGroup.cpp index f6c434e9edf..49ae80cb602 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/AutoScalingGroup.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/AutoScalingGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + AutoScalingGroup::AutoScalingGroup() : m_nameHasBeenSet(false) { @@ -66,3 +72,7 @@ void AutoScalingGroup::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".Name=" << StringUtils::URLEncode(m_name.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/CPUUtilization.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/CPUUtilization.cpp index 9d8a576d2f6..6569a5d6c36 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/CPUUtilization.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/CPUUtilization.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + CPUUtilization::CPUUtilization() : m_user(0.0), m_userHasBeenSet(false), @@ -176,3 +182,7 @@ void CPUUtilization::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".SoftIRQ=" << StringUtils::URLEncode(m_softIRQ) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationDeploymentStatus.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationDeploymentStatus.cpp index 2756703209b..d1d113e1807 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationDeploymentStatus.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationDeploymentStatus.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int deployed_HASH = HashingUtils::HashString("deployed"); -static const int pending_HASH = HashingUtils::HashString("pending"); -static const int failed_HASH = HashingUtils::HashString("failed"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ConfigurationDeploymentStatusMapper { + static const int deployed_HASH = HashingUtils::HashString("deployed"); + static const int pending_HASH = HashingUtils::HashString("pending"); + static const int failed_HASH = HashingUtils::HashString("failed"); + ConfigurationDeploymentStatus GetConfigurationDeploymentStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationOptionDescription.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationOptionDescription.cpp index dc49799e0d2..ee2286c4717 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationOptionDescription.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationOptionDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + ConfigurationOptionDescription::ConfigurationOptionDescription() : m_namespaceHasBeenSet(false), m_nameHasBeenSet(false), @@ -252,3 +258,7 @@ void ConfigurationOptionDescription::OutputToStream(Aws::OStream& oStream, const m_regex.OutputToStream(oStream, regexLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationOptionSetting.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationOptionSetting.cpp index e8b95942b10..38146098657 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationOptionSetting.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationOptionSetting.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + ConfigurationOptionSetting::ConfigurationOptionSetting() : m_resourceNameHasBeenSet(false), m_namespaceHasBeenSet(false), @@ -114,3 +120,7 @@ void ConfigurationOptionSetting::OutputToStream(Aws::OStream& oStream, const cha oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationOptionValueType.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationOptionValueType.cpp index 1e3ccb3b572..273c9b4b717 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationOptionValueType.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationOptionValueType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Scalar_HASH = HashingUtils::HashString("Scalar"); -static const int List_HASH = HashingUtils::HashString("List"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ConfigurationOptionValueTypeMapper { + static const int Scalar_HASH = HashingUtils::HashString("Scalar"); + static const int List_HASH = HashingUtils::HashString("List"); + ConfigurationOptionValueType GetConfigurationOptionValueTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationSettingsDescription.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationSettingsDescription.cpp index ecf9fb43e91..c5da91f7120 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationSettingsDescription.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/ConfigurationSettingsDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + ConfigurationSettingsDescription::ConfigurationSettingsDescription() : m_solutionStackNameHasBeenSet(false), m_applicationNameHasBeenSet(false), @@ -226,3 +232,7 @@ void ConfigurationSettingsDescription::OutputToStream(Aws::OStream& oStream, con m_responseMetadata.OutputToStream(oStream, responseMetadataLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentDescription.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentDescription.cpp index 2edcaef0dbb..67d634d7bef 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentDescription.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + EnvironmentDescription::EnvironmentDescription() : m_environmentNameHasBeenSet(false), m_environmentIdHasBeenSet(false), @@ -380,3 +386,7 @@ void EnvironmentDescription::OutputToStream(Aws::OStream& oStream, const char* l m_responseMetadata.OutputToStream(oStream, responseMetadataLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentHealth.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentHealth.cpp index 42e9f07e9c6..10607302195 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentHealth.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentHealth.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int Green_HASH = HashingUtils::HashString("Green"); -static const int Yellow_HASH = HashingUtils::HashString("Yellow"); -static const int Red_HASH = HashingUtils::HashString("Red"); -static const int Grey_HASH = HashingUtils::HashString("Grey"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace EnvironmentHealthMapper { + static const int Green_HASH = HashingUtils::HashString("Green"); + static const int Yellow_HASH = HashingUtils::HashString("Yellow"); + static const int Red_HASH = HashingUtils::HashString("Red"); + static const int Grey_HASH = HashingUtils::HashString("Grey"); + EnvironmentHealth GetEnvironmentHealthForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentHealthAttribute.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentHealthAttribute.cpp index 1533f016ce7..675bfeb6658 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentHealthAttribute.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentHealthAttribute.cpp @@ -19,14 +19,6 @@ using namespace Aws::Utils; -static const int Status_HASH = HashingUtils::HashString("Status"); -static const int Color_HASH = HashingUtils::HashString("Color"); -static const int Causes_HASH = HashingUtils::HashString("Causes"); -static const int ApplicationMetrics_HASH = HashingUtils::HashString("ApplicationMetrics"); -static const int InstancesHealth_HASH = HashingUtils::HashString("InstancesHealth"); -static const int All_HASH = HashingUtils::HashString("All"); -static const int HealthStatus_HASH = HashingUtils::HashString("HealthStatus"); -static const int RefreshedAt_HASH = HashingUtils::HashString("RefreshedAt"); namespace Aws { @@ -37,6 +29,15 @@ namespace Aws namespace EnvironmentHealthAttributeMapper { + static const int Status_HASH = HashingUtils::HashString("Status"); + static const int Color_HASH = HashingUtils::HashString("Color"); + static const int Causes_HASH = HashingUtils::HashString("Causes"); + static const int ApplicationMetrics_HASH = HashingUtils::HashString("ApplicationMetrics"); + static const int InstancesHealth_HASH = HashingUtils::HashString("InstancesHealth"); + static const int All_HASH = HashingUtils::HashString("All"); + static const int HealthStatus_HASH = HashingUtils::HashString("HealthStatus"); + static const int RefreshedAt_HASH = HashingUtils::HashString("RefreshedAt"); + EnvironmentHealthAttribute GetEnvironmentHealthAttributeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentHealthStatus.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentHealthStatus.cpp index 72fb46b6740..55bf2f55213 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentHealthStatus.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentHealthStatus.cpp @@ -19,14 +19,6 @@ using namespace Aws::Utils; -static const int NoData_HASH = HashingUtils::HashString("NoData"); -static const int Unknown_HASH = HashingUtils::HashString("Unknown"); -static const int Pending_HASH = HashingUtils::HashString("Pending"); -static const int Ok_HASH = HashingUtils::HashString("Ok"); -static const int Info_HASH = HashingUtils::HashString("Info"); -static const int Warning_HASH = HashingUtils::HashString("Warning"); -static const int Degraded_HASH = HashingUtils::HashString("Degraded"); -static const int Severe_HASH = HashingUtils::HashString("Severe"); namespace Aws { @@ -37,6 +29,15 @@ namespace Aws namespace EnvironmentHealthStatusMapper { + static const int NoData_HASH = HashingUtils::HashString("NoData"); + static const int Unknown_HASH = HashingUtils::HashString("Unknown"); + static const int Pending_HASH = HashingUtils::HashString("Pending"); + static const int Ok_HASH = HashingUtils::HashString("Ok"); + static const int Info_HASH = HashingUtils::HashString("Info"); + static const int Warning_HASH = HashingUtils::HashString("Warning"); + static const int Degraded_HASH = HashingUtils::HashString("Degraded"); + static const int Severe_HASH = HashingUtils::HashString("Severe"); + EnvironmentHealthStatus GetEnvironmentHealthStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentInfoDescription.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentInfoDescription.cpp index 8bd8e9beeeb..c9354321a84 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentInfoDescription.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentInfoDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + EnvironmentInfoDescription::EnvironmentInfoDescription() : m_infoTypeHasBeenSet(false), m_ec2InstanceIdHasBeenSet(false), @@ -114,3 +120,7 @@ void EnvironmentInfoDescription::OutputToStream(Aws::OStream& oStream, const cha oStream << location << ".Message=" << StringUtils::URLEncode(m_message.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentInfoType.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentInfoType.cpp index 6223a4b2b53..38ed020f95b 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentInfoType.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentInfoType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int tail_HASH = HashingUtils::HashString("tail"); -static const int bundle_HASH = HashingUtils::HashString("bundle"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace EnvironmentInfoTypeMapper { + static const int tail_HASH = HashingUtils::HashString("tail"); + static const int bundle_HASH = HashingUtils::HashString("bundle"); + EnvironmentInfoType GetEnvironmentInfoTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentLink.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentLink.cpp index 9841e87138c..0bd161b0e36 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentLink.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentLink.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + EnvironmentLink::EnvironmentLink() : m_linkNameHasBeenSet(false), m_environmentNameHasBeenSet(false) @@ -82,3 +88,7 @@ void EnvironmentLink::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".EnvironmentName=" << StringUtils::URLEncode(m_environmentName.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentResourceDescription.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentResourceDescription.cpp index 17d5ceb2044..55d3d47609c 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentResourceDescription.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentResourceDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + EnvironmentResourceDescription::EnvironmentResourceDescription() : m_environmentNameHasBeenSet(false), m_autoScalingGroupsHasBeenSet(false), @@ -270,3 +276,7 @@ void EnvironmentResourceDescription::OutputToStream(Aws::OStream& oStream, const } } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentResourcesDescription.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentResourcesDescription.cpp index f8de9f5469d..fa83364f57c 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentResourcesDescription.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentResourcesDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + EnvironmentResourcesDescription::EnvironmentResourcesDescription() : m_loadBalancerHasBeenSet(false) { @@ -70,3 +76,7 @@ void EnvironmentResourcesDescription::OutputToStream(Aws::OStream& oStream, cons m_loadBalancer.OutputToStream(oStream, loadBalancerLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentStatus.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentStatus.cpp index 0ed5161b03a..0a5c216da97 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentStatus.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentStatus.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int Launching_HASH = HashingUtils::HashString("Launching"); -static const int Updating_HASH = HashingUtils::HashString("Updating"); -static const int Ready_HASH = HashingUtils::HashString("Ready"); -static const int Terminating_HASH = HashingUtils::HashString("Terminating"); -static const int Terminated_HASH = HashingUtils::HashString("Terminated"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace EnvironmentStatusMapper { + static const int Launching_HASH = HashingUtils::HashString("Launching"); + static const int Updating_HASH = HashingUtils::HashString("Updating"); + static const int Ready_HASH = HashingUtils::HashString("Ready"); + static const int Terminating_HASH = HashingUtils::HashString("Terminating"); + static const int Terminated_HASH = HashingUtils::HashString("Terminated"); + EnvironmentStatus GetEnvironmentStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentTier.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentTier.cpp index ca2d8e1942d..9e54e917a47 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentTier.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/EnvironmentTier.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + EnvironmentTier::EnvironmentTier() : m_nameHasBeenSet(false), m_typeHasBeenSet(false), @@ -98,3 +104,7 @@ void EnvironmentTier::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".Version=" << StringUtils::URLEncode(m_version.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/EventDescription.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/EventDescription.cpp index 38685a3c81c..221ef88d06b 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/EventDescription.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/EventDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + EventDescription::EventDescription() : m_eventDateHasBeenSet(false), m_messageHasBeenSet(false), @@ -178,3 +184,7 @@ void EventDescription::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".Severity=" << EventSeverityMapper::GetNameForEventSeverity(m_severity) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/EventSeverity.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/EventSeverity.cpp index 6c217e9bf97..2c43804fabb 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/EventSeverity.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/EventSeverity.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int TRACE_HASH = HashingUtils::HashString("TRACE"); -static const int DEBUG_HASH = HashingUtils::HashString("DEBUG"); -static const int INFO_HASH = HashingUtils::HashString("INFO"); -static const int WARN_HASH = HashingUtils::HashString("WARN"); -static const int ERROR__HASH = HashingUtils::HashString("ERROR"); -static const int FATAL_HASH = HashingUtils::HashString("FATAL"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace EventSeverityMapper { + static const int TRACE_HASH = HashingUtils::HashString("TRACE"); + static const int DEBUG_HASH = HashingUtils::HashString("DEBUG"); + static const int INFO_HASH = HashingUtils::HashString("INFO"); + static const int WARN_HASH = HashingUtils::HashString("WARN"); + static const int ERROR__HASH = HashingUtils::HashString("ERROR"); + static const int FATAL_HASH = HashingUtils::HashString("FATAL"); + EventSeverity GetEventSeverityForName(const Aws::String& name) { @@ -45,7 +46,7 @@ namespace Aws } else if (hashCode == DEBUG_HASH) { - return EventSeverity::DEBUG; + return EventSeverity::DEBUG_; } else if (hashCode == INFO_HASH) { @@ -79,7 +80,7 @@ namespace Aws { case EventSeverity::TRACE: return "TRACE"; - case EventSeverity::DEBUG: + case EventSeverity::DEBUG_: return "DEBUG"; case EventSeverity::INFO: return "INFO"; diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/Instance.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/Instance.cpp index 3e92f985060..a8bf9eaf80f 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/Instance.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/Instance.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + Instance::Instance() : m_idHasBeenSet(false) { @@ -66,3 +72,7 @@ void Instance::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Id=" << StringUtils::URLEncode(m_id.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/InstanceHealthSummary.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/InstanceHealthSummary.cpp index 6369db762a3..d25055de80e 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/InstanceHealthSummary.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/InstanceHealthSummary.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + InstanceHealthSummary::InstanceHealthSummary() : m_noData(0), m_noDataHasBeenSet(false), @@ -194,3 +200,7 @@ void InstanceHealthSummary::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".Severe=" << m_severe << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/InstancesHealthAttribute.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/InstancesHealthAttribute.cpp index cf6f90204d7..b7628bb8e6a 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/InstancesHealthAttribute.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/InstancesHealthAttribute.cpp @@ -15,21 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int HealthStatus_HASH = HashingUtils::HashString("HealthStatus"); -static const int Color_HASH = HashingUtils::HashString("Color"); -static const int Causes_HASH = HashingUtils::HashString("Causes"); -static const int ApplicationMetrics_HASH = HashingUtils::HashString("ApplicationMetrics"); -static const int RefreshedAt_HASH = HashingUtils::HashString("RefreshedAt"); -static const int LaunchedAt_HASH = HashingUtils::HashString("LaunchedAt"); -static const int System_HASH = HashingUtils::HashString("System"); -static const int Deployment_HASH = HashingUtils::HashString("Deployment"); -static const int AvailabilityZone_HASH = HashingUtils::HashString("AvailabilityZone"); -static const int InstanceType_HASH = HashingUtils::HashString("InstanceType"); -static const int All_HASH = HashingUtils::HashString("All"); namespace Aws { @@ -40,6 +28,15 @@ namespace Aws namespace InstancesHealthAttributeMapper { + static const int HealthStatus_HASH = HashingUtils::HashString("HealthStatus"); + static const int Color_HASH = HashingUtils::HashString("Color"); + static const int Causes_HASH = HashingUtils::HashString("Causes"); + static const int ApplicationMetrics_HASH = HashingUtils::HashString("ApplicationMetrics"); + static const int RefreshedAt_HASH = HashingUtils::HashString("RefreshedAt"); + static const int LaunchedAt_HASH = HashingUtils::HashString("LaunchedAt"); + static const int System_HASH = HashingUtils::HashString("System"); + static const int All_HASH = HashingUtils::HashString("All"); + InstancesHealthAttribute GetInstancesHealthAttributeForName(const Aws::String& name) { @@ -72,23 +69,11 @@ namespace Aws { return InstancesHealthAttribute::System; } - else if (hashCode == Deployment_HASH) - { - return InstancesHealthAttribute::Deployment; - } - else if (hashCode == AvailabilityZone_HASH) - { - return InstancesHealthAttribute::AvailabilityZone; - } - else if (hashCode == InstanceType_HASH) - { - return InstancesHealthAttribute::InstanceType; - } else if (hashCode == All_HASH) { return InstancesHealthAttribute::All; } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -116,16 +101,10 @@ namespace Aws return "LaunchedAt"; case InstancesHealthAttribute::System: return "System"; - case InstancesHealthAttribute::Deployment: - return "Deployment"; - case InstancesHealthAttribute::AvailabilityZone: - return "AvailabilityZone"; - case InstancesHealthAttribute::InstanceType: - return "InstanceType"; case InstancesHealthAttribute::All: return "All"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/Latency.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/Latency.cpp index ca7fff39d3b..3743d717e77 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/Latency.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/Latency.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + Latency::Latency() : m_p999(0.0), m_p999HasBeenSet(false), @@ -194,3 +200,7 @@ void Latency::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".P10=" << StringUtils::URLEncode(m_p10) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/LaunchConfiguration.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/LaunchConfiguration.cpp index d38ba96e019..7c3d6656720 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/LaunchConfiguration.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/LaunchConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + LaunchConfiguration::LaunchConfiguration() : m_nameHasBeenSet(false) { @@ -66,3 +72,7 @@ void LaunchConfiguration::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".Name=" << StringUtils::URLEncode(m_name.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/Listener.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/Listener.cpp index 49b626ffb6c..5c725d0c3e5 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/Listener.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/Listener.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + Listener::Listener() : m_protocolHasBeenSet(false), m_port(0), @@ -84,3 +90,7 @@ void Listener::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Port=" << m_port << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/LoadBalancer.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/LoadBalancer.cpp index ee6314a2799..ea9214af57f 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/LoadBalancer.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/LoadBalancer.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + LoadBalancer::LoadBalancer() : m_nameHasBeenSet(false) { @@ -66,3 +72,7 @@ void LoadBalancer::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".Name=" << StringUtils::URLEncode(m_name.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/LoadBalancerDescription.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/LoadBalancerDescription.cpp index 397e45fb38c..2a9afcedff1 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/LoadBalancerDescription.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/LoadBalancerDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + LoadBalancerDescription::LoadBalancerDescription() : m_loadBalancerNameHasBeenSet(false), m_domainHasBeenSet(false), @@ -116,3 +122,7 @@ void LoadBalancerDescription::OutputToStream(Aws::OStream& oStream, const char* } } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/OptionRestrictionRegex.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/OptionRestrictionRegex.cpp index 7691cdfaf6e..be7c58c1f1f 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/OptionRestrictionRegex.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/OptionRestrictionRegex.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + OptionRestrictionRegex::OptionRestrictionRegex() : m_patternHasBeenSet(false), m_labelHasBeenSet(false) @@ -82,3 +88,7 @@ void OptionRestrictionRegex::OutputToStream(Aws::OStream& oStream, const char* l oStream << location << ".Label=" << StringUtils::URLEncode(m_label.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/OptionSpecification.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/OptionSpecification.cpp index f9adbf41504..fffaeb80108 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/OptionSpecification.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/OptionSpecification.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + OptionSpecification::OptionSpecification() : m_resourceNameHasBeenSet(false), m_namespaceHasBeenSet(false), @@ -98,3 +104,7 @@ void OptionSpecification::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".OptionName=" << StringUtils::URLEncode(m_optionName.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/Queue.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/Queue.cpp index f3ffc166413..c0eb9d1ab3a 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/Queue.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/Queue.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + Queue::Queue() : m_nameHasBeenSet(false), m_uRLHasBeenSet(false) @@ -82,3 +88,7 @@ void Queue::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".URL=" << StringUtils::URLEncode(m_uRL.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/ResponseMetadata.cpp index fc12a45ba03..aa56d00b7d2 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/S3Location.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/S3Location.cpp index 6334c46c388..7a18ca39b05 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/S3Location.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/S3Location.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + S3Location::S3Location() : m_s3BucketHasBeenSet(false), m_s3KeyHasBeenSet(false) @@ -82,3 +88,7 @@ void S3Location::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".S3Key=" << StringUtils::URLEncode(m_s3Key.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/SingleInstanceHealth.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/SingleInstanceHealth.cpp index 6c76c6d8c57..c4e3892ebdc 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/SingleInstanceHealth.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/SingleInstanceHealth.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + SingleInstanceHealth::SingleInstanceHealth() : m_instanceIdHasBeenSet(false), m_healthStatusHasBeenSet(false), @@ -236,3 +242,7 @@ void SingleInstanceHealth::OutputToStream(Aws::OStream& oStream, const char* loc oStream << location << ".InstanceType=" << StringUtils::URLEncode(m_instanceType.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/SolutionStackDescription.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/SolutionStackDescription.cpp index c2939ffad0a..28bc3982a48 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/SolutionStackDescription.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/SolutionStackDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + SolutionStackDescription::SolutionStackDescription() : m_solutionStackNameHasBeenSet(false), m_permittedFileTypesHasBeenSet(false) @@ -96,3 +102,7 @@ void SolutionStackDescription::OutputToStream(Aws::OStream& oStream, const char* } } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/SourceConfiguration.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/SourceConfiguration.cpp index ceabe46137d..f9280d7ca3d 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/SourceConfiguration.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/SourceConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + SourceConfiguration::SourceConfiguration() : m_applicationNameHasBeenSet(false), m_templateNameHasBeenSet(false) @@ -82,3 +88,7 @@ void SourceConfiguration::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".TemplateName=" << StringUtils::URLEncode(m_templateName.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/StatusCodes.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/StatusCodes.cpp index 3f137289187..4de120b2ac8 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/StatusCodes.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/StatusCodes.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + StatusCodes::StatusCodes() : m_status2xx(0), m_status2xxHasBeenSet(false), @@ -122,3 +128,7 @@ void StatusCodes::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".Status5xx=" << m_status5xx << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/SystemStatus.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/SystemStatus.cpp index 192aa424a33..66fd04363d7 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/SystemStatus.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/SystemStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + SystemStatus::SystemStatus() : m_cPUUtilizationHasBeenSet(false), m_loadAverageHasBeenSet(false) @@ -100,3 +106,7 @@ void SystemStatus::OutputToStream(Aws::OStream& oStream, const char* location) c } } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/Tag.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/Tag.cpp index bc64a2fd0ce..6fececd5b83 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/Tag.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/Tag.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -82,3 +88,7 @@ void Tag::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/Trigger.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/Trigger.cpp index 28319c0e518..21f801145a2 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/Trigger.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/Trigger.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + Trigger::Trigger() : m_nameHasBeenSet(false) { @@ -66,3 +72,7 @@ void Trigger::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Name=" << StringUtils::URLEncode(m_name.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/ValidationMessage.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/ValidationMessage.cpp index 649bffd2354..671e5aa3220 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/ValidationMessage.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/ValidationMessage.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticBeanstalk::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticBeanstalk +{ +namespace Model +{ + ValidationMessage::ValidationMessage() : m_messageHasBeenSet(false), m_severityHasBeenSet(false), @@ -114,3 +120,7 @@ void ValidationMessage::OutputToStream(Aws::OStream& oStream, const char* locati oStream << location << ".OptionName=" << StringUtils::URLEncode(m_optionName.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticBeanstalk +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticbeanstalk/source/model/ValidationSeverity.cpp b/aws-cpp-sdk-elasticbeanstalk/source/model/ValidationSeverity.cpp index e1c7370784b..3b1d3efeaf5 100644 --- a/aws-cpp-sdk-elasticbeanstalk/source/model/ValidationSeverity.cpp +++ b/aws-cpp-sdk-elasticbeanstalk/source/model/ValidationSeverity.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int error_HASH = HashingUtils::HashString("error"); -static const int warning_HASH = HashingUtils::HashString("warning"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ValidationSeverityMapper { + static const int error_HASH = HashingUtils::HashString("error"); + static const int warning_HASH = HashingUtils::HashString("warning"); + ValidationSeverity GetValidationSeverityForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticfilesystem/CMakeLists.txt b/aws-cpp-sdk-elasticfilesystem/CMakeLists.txt index 1601a055665..2c3b9b3c673 100644 --- a/aws-cpp-sdk-elasticfilesystem/CMakeLists.txt +++ b/aws-cpp-sdk-elasticfilesystem/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-elasticfilesystem) "source/model/*.cpp" ) - file(GLOB ELASTICFILESYSTEM_SRC + file(GLOB ELASTICFILESYSTEM_UNIFIED_HEADERS ${AWS_ELASTICFILESYSTEM_HEADERS} ${AWS_ELASTICFILESYSTEM_MODEL_HEADERS} + ) + + file(GLOB ELASTICFILESYSTEM_UNITY_SRC ${AWS_ELASTICFILESYSTEM_SOURCE} ${AWS_ELASTICFILESYSTEM_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("ELASTICFILESYSTEM" ELASTICFILESYSTEM_UNITY_SRC) + endif() + + file(GLOB ELASTICFILESYSTEM_SRC + ${ELASTICFILESYSTEM_UNIFIED_HEADERS} + ${ELASTICFILESYSTEM_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-elasticfilesystem/source/EFSErrors.cpp b/aws-cpp-sdk-elasticfilesystem/source/EFSErrors.cpp index 12943d094a5..f6a63d46d25 100644 --- a/aws-cpp-sdk-elasticfilesystem/source/EFSErrors.cpp +++ b/aws-cpp-sdk-elasticfilesystem/source/EFSErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::EFS; using namespace Aws::Utils; +namespace Aws +{ +namespace EFS +{ +namespace EFSErrorMapper +{ + static const int IP_ADDRESS_IN_USE_HASH = HashingUtils::HashString("IpAddressInUse"); static const int FILE_SYSTEM_IN_USE_HASH = HashingUtils::HashString("FileSystemInUse"); static const int NO_FREE_ADDRESSES_IN_SUBNET_HASH = HashingUtils::HashString("NoFreeAddressesInSubnet"); @@ -38,12 +45,6 @@ static const int SUBNET_NOT_FOUND_HASH = HashingUtils::HashString("SubnetNotFoun static const int DEPENDENCY_TIMEOUT_HASH = HashingUtils::HashString("DependencyTimeout"); static const int NETWORK_INTERFACE_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("NetworkInterfaceLimitExceeded"); -namespace Aws -{ -namespace EFS -{ -namespace EFSErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-elasticfilesystem/source/model/FileSystemDescription.cpp b/aws-cpp-sdk-elasticfilesystem/source/model/FileSystemDescription.cpp index 1aef0accb9f..a7f56a316e2 100644 --- a/aws-cpp-sdk-elasticfilesystem/source/model/FileSystemDescription.cpp +++ b/aws-cpp-sdk-elasticfilesystem/source/model/FileSystemDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EFS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EFS +{ +namespace Model +{ + FileSystemDescription::FileSystemDescription() : m_ownerIdHasBeenSet(false), m_creationTokenHasBeenSet(false), @@ -160,4 +166,8 @@ JsonValue FileSystemDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EFS +} // namespace Aws diff --git a/aws-cpp-sdk-elasticfilesystem/source/model/FileSystemSize.cpp b/aws-cpp-sdk-elasticfilesystem/source/model/FileSystemSize.cpp index 468d508e894..d9a20a1940b 100644 --- a/aws-cpp-sdk-elasticfilesystem/source/model/FileSystemSize.cpp +++ b/aws-cpp-sdk-elasticfilesystem/source/model/FileSystemSize.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EFS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EFS +{ +namespace Model +{ + FileSystemSize::FileSystemSize() : m_value(0), m_valueHasBeenSet(false), @@ -71,4 +77,8 @@ JsonValue FileSystemSize::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EFS +} // namespace Aws diff --git a/aws-cpp-sdk-elasticfilesystem/source/model/LifeCycleState.cpp b/aws-cpp-sdk-elasticfilesystem/source/model/LifeCycleState.cpp index bba86083e3a..413cc9e5808 100644 --- a/aws-cpp-sdk-elasticfilesystem/source/model/LifeCycleState.cpp +++ b/aws-cpp-sdk-elasticfilesystem/source/model/LifeCycleState.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int creating_HASH = HashingUtils::HashString("creating"); -static const int available_HASH = HashingUtils::HashString("available"); -static const int deleting_HASH = HashingUtils::HashString("deleting"); -static const int deleted_HASH = HashingUtils::HashString("deleted"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace LifeCycleStateMapper { + static const int creating_HASH = HashingUtils::HashString("creating"); + static const int available_HASH = HashingUtils::HashString("available"); + static const int deleting_HASH = HashingUtils::HashString("deleting"); + static const int deleted_HASH = HashingUtils::HashString("deleted"); + LifeCycleState GetLifeCycleStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticfilesystem/source/model/MountTargetDescription.cpp b/aws-cpp-sdk-elasticfilesystem/source/model/MountTargetDescription.cpp index 59e545f1d9b..e3c996c705d 100644 --- a/aws-cpp-sdk-elasticfilesystem/source/model/MountTargetDescription.cpp +++ b/aws-cpp-sdk-elasticfilesystem/source/model/MountTargetDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EFS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EFS +{ +namespace Model +{ + MountTargetDescription::MountTargetDescription() : m_ownerIdHasBeenSet(false), m_mountTargetIdHasBeenSet(false), @@ -144,4 +150,8 @@ JsonValue MountTargetDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EFS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticfilesystem/source/model/Tag.cpp b/aws-cpp-sdk-elasticfilesystem/source/model/Tag.cpp index 372dd60252f..d626c1bb8a7 100644 --- a/aws-cpp-sdk-elasticfilesystem/source/model/Tag.cpp +++ b/aws-cpp-sdk-elasticfilesystem/source/model/Tag.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EFS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EFS +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Tag::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EFS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/CMakeLists.txt b/aws-cpp-sdk-elasticloadbalancing/CMakeLists.txt index 7541f161608..b3a9d80ec8b 100644 --- a/aws-cpp-sdk-elasticloadbalancing/CMakeLists.txt +++ b/aws-cpp-sdk-elasticloadbalancing/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-elasticloadbalancing) "source/model/*.cpp" ) - file(GLOB ELASTICLOADBALANCING_SRC + file(GLOB ELASTICLOADBALANCING_UNIFIED_HEADERS ${AWS_ELASTICLOADBALANCING_HEADERS} ${AWS_ELASTICLOADBALANCING_MODEL_HEADERS} + ) + + file(GLOB ELASTICLOADBALANCING_UNITY_SRC ${AWS_ELASTICLOADBALANCING_SOURCE} ${AWS_ELASTICLOADBALANCING_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("ELASTICLOADBALANCING" ELASTICLOADBALANCING_UNITY_SRC) + endif() + + file(GLOB ELASTICLOADBALANCING_SRC + ${ELASTICLOADBALANCING_UNIFIED_HEADERS} + ${ELASTICLOADBALANCING_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-elasticloadbalancing/source/ElasticLoadBalancingErrors.cpp b/aws-cpp-sdk-elasticloadbalancing/source/ElasticLoadBalancingErrors.cpp index 8fdf31144fd..4b872d08eeb 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/ElasticLoadBalancingErrors.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/ElasticLoadBalancingErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::ElasticLoadBalancing; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace ElasticLoadBalancingErrorMapper +{ + static const int INVALID_SECURITY_GROUP_HASH = HashingUtils::HashString("InvalidSecurityGroup"); static const int DUPLICATE_ACCESS_POINT_NAME_HASH = HashingUtils::HashString("DuplicateLoadBalancerName"); static const int DUPLICATE_TAG_KEYS_HASH = HashingUtils::HashString("DuplicateTagKeys"); @@ -40,12 +47,6 @@ static const int SUBNET_NOT_FOUND_HASH = HashingUtils::HashString("SubnetNotFoun static const int DUPLICATE_LISTENER_HASH = HashingUtils::HashString("DuplicateListener"); static const int POLICY_NOT_FOUND_HASH = HashingUtils::HashString("PolicyNotFound"); -namespace Aws -{ -namespace ElasticLoadBalancing -{ -namespace ElasticLoadBalancingErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/AccessLog.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/AccessLog.cpp index f3d827820c7..57eb67ab76a 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/AccessLog.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/AccessLog.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + AccessLog::AccessLog() : m_enabled(false), m_enabledHasBeenSet(false), @@ -118,3 +124,7 @@ void AccessLog::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".S3BucketPrefix=" << StringUtils::URLEncode(m_s3BucketPrefix.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/AdditionalAttribute.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/AdditionalAttribute.cpp index ecacd422747..ee24dd8bbc2 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/AdditionalAttribute.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/AdditionalAttribute.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + AdditionalAttribute::AdditionalAttribute() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -82,3 +88,7 @@ void AdditionalAttribute::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/AppCookieStickinessPolicy.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/AppCookieStickinessPolicy.cpp index 15d50d71bbc..da365b9fd89 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/AppCookieStickinessPolicy.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/AppCookieStickinessPolicy.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + AppCookieStickinessPolicy::AppCookieStickinessPolicy() : m_policyNameHasBeenSet(false), m_cookieNameHasBeenSet(false) @@ -82,3 +88,7 @@ void AppCookieStickinessPolicy::OutputToStream(Aws::OStream& oStream, const char oStream << location << ".CookieName=" << StringUtils::URLEncode(m_cookieName.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/BackendServerDescription.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/BackendServerDescription.cpp index 58128392699..a770d6b81d5 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/BackendServerDescription.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/BackendServerDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + BackendServerDescription::BackendServerDescription() : m_instancePort(0), m_instancePortHasBeenSet(false), @@ -98,3 +104,7 @@ void BackendServerDescription::OutputToStream(Aws::OStream& oStream, const char* } } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/ConnectionDraining.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/ConnectionDraining.cpp index 1f1d23360ac..46922b8a67a 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/ConnectionDraining.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/ConnectionDraining.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + ConnectionDraining::ConnectionDraining() : m_enabled(false), m_enabledHasBeenSet(false), @@ -86,3 +92,7 @@ void ConnectionDraining::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".Timeout=" << m_timeout << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/ConnectionSettings.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/ConnectionSettings.cpp index a21df687722..715c4b00ce1 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/ConnectionSettings.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/ConnectionSettings.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + ConnectionSettings::ConnectionSettings() : m_idleTimeout(0), m_idleTimeoutHasBeenSet(false) @@ -68,3 +74,7 @@ void ConnectionSettings::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".IdleTimeout=" << m_idleTimeout << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/CrossZoneLoadBalancing.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/CrossZoneLoadBalancing.cpp index 48e9a85cc31..9847a357ebc 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/CrossZoneLoadBalancing.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/CrossZoneLoadBalancing.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + CrossZoneLoadBalancing::CrossZoneLoadBalancing() : m_enabled(false), m_enabledHasBeenSet(false) @@ -68,3 +74,7 @@ void CrossZoneLoadBalancing::OutputToStream(Aws::OStream& oStream, const char* l oStream << location << ".Enabled=" << m_enabled << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/HealthCheck.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/HealthCheck.cpp index 95aac766f7a..cbf351fc0a6 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/HealthCheck.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/HealthCheck.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + HealthCheck::HealthCheck() : m_targetHasBeenSet(false), m_interval(0), @@ -138,3 +144,7 @@ void HealthCheck::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".HealthyThreshold=" << m_healthyThreshold << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/Instance.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/Instance.cpp index 8e96acfda53..749e21bb742 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/Instance.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/Instance.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + Instance::Instance() : m_instanceIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void Instance::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".InstanceId=" << StringUtils::URLEncode(m_instanceId.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/InstanceState.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/InstanceState.cpp index 945ec03bd62..d36b79541c5 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/InstanceState.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/InstanceState.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + InstanceState::InstanceState() : m_instanceIdHasBeenSet(false), m_stateHasBeenSet(false), @@ -114,3 +120,7 @@ void InstanceState::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".Description=" << StringUtils::URLEncode(m_description.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/LBCookieStickinessPolicy.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/LBCookieStickinessPolicy.cpp index a2a590a9698..56853793e62 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/LBCookieStickinessPolicy.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/LBCookieStickinessPolicy.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + LBCookieStickinessPolicy::LBCookieStickinessPolicy() : m_policyNameHasBeenSet(false), m_cookieExpirationPeriod(0), @@ -84,3 +90,7 @@ void LBCookieStickinessPolicy::OutputToStream(Aws::OStream& oStream, const char* oStream << location << ".CookieExpirationPeriod=" << m_cookieExpirationPeriod << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/Listener.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/Listener.cpp index 1716b265d40..613ea251945 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/Listener.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/Listener.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + Listener::Listener() : m_protocolHasBeenSet(false), m_loadBalancerPort(0), @@ -134,3 +140,7 @@ void Listener::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".SSLCertificateId=" << StringUtils::URLEncode(m_sSLCertificateId.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/ListenerDescription.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/ListenerDescription.cpp index 575deb418c3..39aadfb7b1b 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/ListenerDescription.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/ListenerDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + ListenerDescription::ListenerDescription() : m_listenerHasBeenSet(false), m_policyNamesHasBeenSet(false) @@ -100,3 +106,7 @@ void ListenerDescription::OutputToStream(Aws::OStream& oStream, const char* loca } } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/LoadBalancerAttributes.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/LoadBalancerAttributes.cpp index 4118aab0416..2ef320ed411 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/LoadBalancerAttributes.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/LoadBalancerAttributes.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + LoadBalancerAttributes::LoadBalancerAttributes() : m_crossZoneLoadBalancingHasBeenSet(false), m_accessLogHasBeenSet(false), @@ -164,3 +170,7 @@ void LoadBalancerAttributes::OutputToStream(Aws::OStream& oStream, const char* l } } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/LoadBalancerDescription.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/LoadBalancerDescription.cpp index 26f54adfef1..0b4210f953e 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/LoadBalancerDescription.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/LoadBalancerDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + LoadBalancerDescription::LoadBalancerDescription() : m_loadBalancerNameHasBeenSet(false), m_dNSNameHasBeenSet(false), @@ -414,3 +420,7 @@ void LoadBalancerDescription::OutputToStream(Aws::OStream& oStream, const char* oStream << location << ".Scheme=" << StringUtils::URLEncode(m_scheme.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/Policies.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/Policies.cpp index f278b0caa39..1d41437a058 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/Policies.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/Policies.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + Policies::Policies() : m_appCookieStickinessPoliciesHasBeenSet(false), m_lBCookieStickinessPoliciesHasBeenSet(false), @@ -148,3 +154,7 @@ void Policies::OutputToStream(Aws::OStream& oStream, const char* location) const } } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyAttribute.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyAttribute.cpp index d578188cb49..c343d31a5e1 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyAttribute.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyAttribute.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + PolicyAttribute::PolicyAttribute() : m_attributeNameHasBeenSet(false), m_attributeValueHasBeenSet(false) @@ -82,3 +88,7 @@ void PolicyAttribute::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".AttributeValue=" << StringUtils::URLEncode(m_attributeValue.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyAttributeDescription.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyAttributeDescription.cpp index 24ab85c2716..56bf4997a4a 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyAttributeDescription.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyAttributeDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + PolicyAttributeDescription::PolicyAttributeDescription() : m_attributeNameHasBeenSet(false), m_attributeValueHasBeenSet(false) @@ -82,3 +88,7 @@ void PolicyAttributeDescription::OutputToStream(Aws::OStream& oStream, const cha oStream << location << ".AttributeValue=" << StringUtils::URLEncode(m_attributeValue.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyAttributeTypeDescription.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyAttributeTypeDescription.cpp index c2f663337d4..bb6d1c462ab 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyAttributeTypeDescription.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyAttributeTypeDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + PolicyAttributeTypeDescription::PolicyAttributeTypeDescription() : m_attributeNameHasBeenSet(false), m_attributeTypeHasBeenSet(false), @@ -130,3 +136,7 @@ void PolicyAttributeTypeDescription::OutputToStream(Aws::OStream& oStream, const oStream << location << ".Cardinality=" << StringUtils::URLEncode(m_cardinality.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyDescription.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyDescription.cpp index 49e00431bb3..fdc12a86ab9 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyDescription.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + PolicyDescription::PolicyDescription() : m_policyNameHasBeenSet(false), m_policyTypeNameHasBeenSet(false), @@ -116,3 +122,7 @@ void PolicyDescription::OutputToStream(Aws::OStream& oStream, const char* locati } } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyTypeDescription.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyTypeDescription.cpp index de5f34a0c8a..86c7fcf150e 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyTypeDescription.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/PolicyTypeDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + PolicyTypeDescription::PolicyTypeDescription() : m_policyTypeNameHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -116,3 +122,7 @@ void PolicyTypeDescription::OutputToStream(Aws::OStream& oStream, const char* lo } } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/ResponseMetadata.cpp index f58c9654b6e..06ce3efe935 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/SourceSecurityGroup.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/SourceSecurityGroup.cpp index f1783cdd8d4..aee63a7537a 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/SourceSecurityGroup.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/SourceSecurityGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + SourceSecurityGroup::SourceSecurityGroup() : m_ownerAliasHasBeenSet(false), m_groupNameHasBeenSet(false) @@ -82,3 +88,7 @@ void SourceSecurityGroup::OutputToStream(Aws::OStream& oStream, const char* loca oStream << location << ".GroupName=" << StringUtils::URLEncode(m_groupName.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/Tag.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/Tag.cpp index d336ce4677c..6a23e5db22e 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/Tag.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/Tag.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -82,3 +88,7 @@ void Tag::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/TagDescription.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/TagDescription.cpp index d5fdbfcdfba..67b654619d4 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/TagDescription.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/TagDescription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + TagDescription::TagDescription() : m_loadBalancerNameHasBeenSet(false), m_tagsHasBeenSet(false) @@ -100,3 +106,7 @@ void TagDescription::OutputToStream(Aws::OStream& oStream, const char* location) } } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticloadbalancing/source/model/TagKeyOnly.cpp b/aws-cpp-sdk-elasticloadbalancing/source/model/TagKeyOnly.cpp index 4df025efad0..82de0576f36 100644 --- a/aws-cpp-sdk-elasticloadbalancing/source/model/TagKeyOnly.cpp +++ b/aws-cpp-sdk-elasticloadbalancing/source/model/TagKeyOnly.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ElasticLoadBalancing::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticLoadBalancing +{ +namespace Model +{ + TagKeyOnly::TagKeyOnly() : m_keyHasBeenSet(false) { @@ -66,3 +72,7 @@ void TagKeyOnly::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".Key=" << StringUtils::URLEncode(m_key.c_str()) << "&"; } } + +} // namespace Model +} // namespace ElasticLoadBalancing +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/CMakeLists.txt b/aws-cpp-sdk-elasticmapreduce/CMakeLists.txt index 7f289745835..5ac220db67f 100644 --- a/aws-cpp-sdk-elasticmapreduce/CMakeLists.txt +++ b/aws-cpp-sdk-elasticmapreduce/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-elasticmapreduce) "source/model/*.cpp" ) - file(GLOB ELASTICMAPREDUCE_SRC + file(GLOB ELASTICMAPREDUCE_UNIFIED_HEADERS ${AWS_ELASTICMAPREDUCE_HEADERS} ${AWS_ELASTICMAPREDUCE_MODEL_HEADERS} + ) + + file(GLOB ELASTICMAPREDUCE_UNITY_SRC ${AWS_ELASTICMAPREDUCE_SOURCE} ${AWS_ELASTICMAPREDUCE_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("ELASTICMAPREDUCE" ELASTICMAPREDUCE_UNITY_SRC) + endif() + + file(GLOB ELASTICMAPREDUCE_SRC + ${ELASTICMAPREDUCE_UNIFIED_HEADERS} + ${ELASTICMAPREDUCE_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-elasticmapreduce/include/aws/elasticmapreduce/model/InstanceGroup.h b/aws-cpp-sdk-elasticmapreduce/include/aws/elasticmapreduce/model/InstanceGroup.h index 75ee93d2bd1..48590a94716 100644 --- a/aws-cpp-sdk-elasticmapreduce/include/aws/elasticmapreduce/model/InstanceGroup.h +++ b/aws-cpp-sdk-elasticmapreduce/include/aws/elasticmapreduce/model/InstanceGroup.h @@ -391,21 +391,21 @@ namespace Model inline InstanceGroup& AddEbsBlockDevices(EbsBlockDevice&& value) { m_ebsBlockDevicesHasBeenSet = true; m_ebsBlockDevices.push_back(value); return *this; } /** - *

If the instance group is EBS-optimized. An Amazon EBS–optimized instance uses + *

If the instance group is EBS-optimized. An Amazon EBS?optimized instance uses * an optimized configuration stack and provides additional, dedicated capacity for * Amazon EBS I/O.

*/ inline bool GetEbsOptimized() const{ return m_ebsOptimized; } /** - *

If the instance group is EBS-optimized. An Amazon EBS–optimized instance uses + *

If the instance group is EBS-optimized. An Amazon EBS?optimized instance uses * an optimized configuration stack and provides additional, dedicated capacity for * Amazon EBS I/O.

*/ inline void SetEbsOptimized(bool value) { m_ebsOptimizedHasBeenSet = true; m_ebsOptimized = value; } /** - *

If the instance group is EBS-optimized. An Amazon EBS–optimized instance uses + *

If the instance group is EBS-optimized. An Amazon EBS?optimized instance uses * an optimized configuration stack and provides additional, dedicated capacity for * Amazon EBS I/O.

*/ diff --git a/aws-cpp-sdk-elasticmapreduce/include/aws/elasticmapreduce/model/VolumeSpecification.h b/aws-cpp-sdk-elasticmapreduce/include/aws/elasticmapreduce/model/VolumeSpecification.h index d55a269d366..ffa03a14e84 100644 --- a/aws-cpp-sdk-elasticmapreduce/include/aws/elasticmapreduce/model/VolumeSpecification.h +++ b/aws-cpp-sdk-elasticmapreduce/include/aws/elasticmapreduce/model/VolumeSpecification.h @@ -93,19 +93,19 @@ namespace Model inline VolumeSpecification& WithIops(long value) { SetIops(value); return *this;} /** - *

The volume size, in gibibytes (GiB). This can be a number from 1 – 1024. If + *

The volume size, in gibibytes (GiB). This can be a number from 1 ? 1024. If * the volume type is EBS-optimized, the minimum value is 10.

*/ inline long GetSizeInGB() const{ return m_sizeInGB; } /** - *

The volume size, in gibibytes (GiB). This can be a number from 1 – 1024. If + *

The volume size, in gibibytes (GiB). This can be a number from 1 ? 1024. If * the volume type is EBS-optimized, the minimum value is 10.

*/ inline void SetSizeInGB(long value) { m_sizeInGBHasBeenSet = true; m_sizeInGB = value; } /** - *

The volume size, in gibibytes (GiB). This can be a number from 1 – 1024. If + *

The volume size, in gibibytes (GiB). This can be a number from 1 ? 1024. If * the volume type is EBS-optimized, the minimum value is 10.

*/ inline VolumeSpecification& WithSizeInGB(long value) { SetSizeInGB(value); return *this;} diff --git a/aws-cpp-sdk-elasticmapreduce/source/EMRErrors.cpp b/aws-cpp-sdk-elasticmapreduce/source/EMRErrors.cpp index fadf2db1eac..19fe446dc44 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/EMRErrors.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/EMRErrors.cpp @@ -20,9 +20,6 @@ using namespace Aws::Client; using namespace Aws::EMR; using namespace Aws::Utils; -static const int INVALID_REQUEST_HASH = HashingUtils::HashString("InvalidRequestException"); -static const int INTERNAL_SERVER_HASH = HashingUtils::HashString("InternalServerException"); - namespace Aws { namespace EMR @@ -30,6 +27,10 @@ namespace EMR namespace EMRErrorMapper { +static const int INVALID_REQUEST_HASH = HashingUtils::HashString("InvalidRequestException"); +static const int INTERNAL_SERVER_HASH = HashingUtils::HashString("InternalServerException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/ActionOnFailure.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/ActionOnFailure.cpp index 4fecb841f79..4f403dd6081 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/ActionOnFailure.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/ActionOnFailure.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int TERMINATE_JOB_FLOW_HASH = HashingUtils::HashString("TERMINATE_JOB_FLOW"); -static const int TERMINATE_CLUSTER_HASH = HashingUtils::HashString("TERMINATE_CLUSTER"); -static const int CANCEL_AND_WAIT_HASH = HashingUtils::HashString("CANCEL_AND_WAIT"); -static const int CONTINUE_HASH = HashingUtils::HashString("CONTINUE"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace ActionOnFailureMapper { + static const int TERMINATE_JOB_FLOW_HASH = HashingUtils::HashString("TERMINATE_JOB_FLOW"); + static const int TERMINATE_CLUSTER_HASH = HashingUtils::HashString("TERMINATE_CLUSTER"); + static const int CANCEL_AND_WAIT_HASH = HashingUtils::HashString("CANCEL_AND_WAIT"); + static const int CONTINUE_HASH = HashingUtils::HashString("CONTINUE"); + ActionOnFailure GetActionOnFailureForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/Application.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/Application.cpp index 817771b4da2..0def0008126 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/Application.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/Application.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + Application::Application() : m_nameHasBeenSet(false), m_versionHasBeenSet(false), @@ -116,4 +122,8 @@ JsonValue Application::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/BootstrapActionConfig.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/BootstrapActionConfig.cpp index 666b6b1d539..ced5d5825de 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/BootstrapActionConfig.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/BootstrapActionConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + BootstrapActionConfig::BootstrapActionConfig() : m_nameHasBeenSet(false), m_scriptBootstrapActionHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue BootstrapActionConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/BootstrapActionDetail.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/BootstrapActionDetail.cpp index 69c10ee889c..8d3b4903a1a 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/BootstrapActionDetail.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/BootstrapActionDetail.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + BootstrapActionDetail::BootstrapActionDetail() : m_bootstrapActionConfigHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue BootstrapActionDetail::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/Cluster.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/Cluster.cpp index 2dc9da50340..6ec64aa3903 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/Cluster.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/Cluster.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + Cluster::Cluster() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -327,4 +333,8 @@ JsonValue Cluster::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/ClusterState.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/ClusterState.cpp index c384337f790..cc838cb812b 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/ClusterState.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/ClusterState.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int STARTING_HASH = HashingUtils::HashString("STARTING"); -static const int BOOTSTRAPPING_HASH = HashingUtils::HashString("BOOTSTRAPPING"); -static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); -static const int WAITING_HASH = HashingUtils::HashString("WAITING"); -static const int TERMINATING_HASH = HashingUtils::HashString("TERMINATING"); -static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); -static const int TERMINATED_WITH_ERRORS_HASH = HashingUtils::HashString("TERMINATED_WITH_ERRORS"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace ClusterStateMapper { + static const int STARTING_HASH = HashingUtils::HashString("STARTING"); + static const int BOOTSTRAPPING_HASH = HashingUtils::HashString("BOOTSTRAPPING"); + static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); + static const int WAITING_HASH = HashingUtils::HashString("WAITING"); + static const int TERMINATING_HASH = HashingUtils::HashString("TERMINATING"); + static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); + static const int TERMINATED_WITH_ERRORS_HASH = HashingUtils::HashString("TERMINATED_WITH_ERRORS"); + ClusterState GetClusterStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/ClusterStateChangeReason.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/ClusterStateChangeReason.cpp index db0de01ddd0..d3abbc8daa8 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/ClusterStateChangeReason.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/ClusterStateChangeReason.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + ClusterStateChangeReason::ClusterStateChangeReason() : m_codeHasBeenSet(false), m_messageHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue ClusterStateChangeReason::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/ClusterStateChangeReasonCode.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/ClusterStateChangeReasonCode.cpp index f9dd781ca78..809b144b3d5 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/ClusterStateChangeReasonCode.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/ClusterStateChangeReasonCode.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int INTERNAL_ERROR_HASH = HashingUtils::HashString("INTERNAL_ERROR"); -static const int VALIDATION_ERROR_HASH = HashingUtils::HashString("VALIDATION_ERROR"); -static const int INSTANCE_FAILURE_HASH = HashingUtils::HashString("INSTANCE_FAILURE"); -static const int BOOTSTRAP_FAILURE_HASH = HashingUtils::HashString("BOOTSTRAP_FAILURE"); -static const int USER_REQUEST_HASH = HashingUtils::HashString("USER_REQUEST"); -static const int STEP_FAILURE_HASH = HashingUtils::HashString("STEP_FAILURE"); -static const int ALL_STEPS_COMPLETED_HASH = HashingUtils::HashString("ALL_STEPS_COMPLETED"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace ClusterStateChangeReasonCodeMapper { + static const int INTERNAL_ERROR_HASH = HashingUtils::HashString("INTERNAL_ERROR"); + static const int VALIDATION_ERROR_HASH = HashingUtils::HashString("VALIDATION_ERROR"); + static const int INSTANCE_FAILURE_HASH = HashingUtils::HashString("INSTANCE_FAILURE"); + static const int BOOTSTRAP_FAILURE_HASH = HashingUtils::HashString("BOOTSTRAP_FAILURE"); + static const int USER_REQUEST_HASH = HashingUtils::HashString("USER_REQUEST"); + static const int STEP_FAILURE_HASH = HashingUtils::HashString("STEP_FAILURE"); + static const int ALL_STEPS_COMPLETED_HASH = HashingUtils::HashString("ALL_STEPS_COMPLETED"); + ClusterStateChangeReasonCode GetClusterStateChangeReasonCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/ClusterStatus.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/ClusterStatus.cpp index c92c86b6462..3f915d4e76d 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/ClusterStatus.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/ClusterStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + ClusterStatus::ClusterStatus() : m_stateHasBeenSet(false), m_stateChangeReasonHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue ClusterStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/ClusterSummary.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/ClusterSummary.cpp index 40aacb2b8b8..e76351a6b43 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/ClusterSummary.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/ClusterSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + ClusterSummary::ClusterSummary() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -102,4 +108,8 @@ JsonValue ClusterSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/ClusterTimeline.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/ClusterTimeline.cpp index 14dcf3e632a..8a247797259 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/ClusterTimeline.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/ClusterTimeline.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + ClusterTimeline::ClusterTimeline() : m_creationDateTimeHasBeenSet(false), m_readyDateTimeHasBeenSet(false), @@ -82,4 +88,8 @@ JsonValue ClusterTimeline::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/Command.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/Command.cpp index c157ac77daf..65ace0f53d3 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/Command.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/Command.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + Command::Command() : m_nameHasBeenSet(false), m_scriptPathHasBeenSet(false), @@ -93,4 +99,8 @@ JsonValue Command::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/Configuration.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/Configuration.cpp index 21e0c31b8a0..09eaf126904 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/Configuration.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/Configuration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + Configuration::Configuration() : m_classificationHasBeenSet(false), m_configurationsHasBeenSet(false), @@ -101,4 +107,8 @@ JsonValue Configuration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/EbsBlockDevice.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/EbsBlockDevice.cpp index ad38f856b3c..b3caa4ff5a2 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/EbsBlockDevice.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/EbsBlockDevice.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + EbsBlockDevice::EbsBlockDevice() : m_volumeSpecificationHasBeenSet(false), m_deviceHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue EbsBlockDevice::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/EbsBlockDeviceConfig.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/EbsBlockDeviceConfig.cpp index f2af0d38584..0a9c7ec91da 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/EbsBlockDeviceConfig.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/EbsBlockDeviceConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + EbsBlockDeviceConfig::EbsBlockDeviceConfig() : m_volumeSpecificationHasBeenSet(false), m_volumesPerInstance(0), @@ -72,4 +78,8 @@ JsonValue EbsBlockDeviceConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/EbsConfiguration.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/EbsConfiguration.cpp index b0f46c6f375..e5e05cdf666 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/EbsConfiguration.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/EbsConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + EbsConfiguration::EbsConfiguration() : m_ebsBlockDeviceConfigsHasBeenSet(false), m_ebsOptimized(false), @@ -80,4 +86,8 @@ JsonValue EbsConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/EbsVolume.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/EbsVolume.cpp index 9a4940d2adf..51ff14a2ad9 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/EbsVolume.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/EbsVolume.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + EbsVolume::EbsVolume() : m_deviceHasBeenSet(false), m_volumeIdHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue EbsVolume::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/Ec2InstanceAttributes.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/Ec2InstanceAttributes.cpp index a8d409ebcc4..85f63cd8df0 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/Ec2InstanceAttributes.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/Ec2InstanceAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + Ec2InstanceAttributes::Ec2InstanceAttributes() : m_ec2KeyNameHasBeenSet(false), m_ec2SubnetIdHasBeenSet(false), @@ -191,4 +197,8 @@ JsonValue Ec2InstanceAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/HadoopJarStepConfig.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/HadoopJarStepConfig.cpp index 39a2c3650a4..8b1f5065d8d 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/HadoopJarStepConfig.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/HadoopJarStepConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + HadoopJarStepConfig::HadoopJarStepConfig() : m_propertiesHasBeenSet(false), m_jarHasBeenSet(false), @@ -116,4 +122,8 @@ JsonValue HadoopJarStepConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/HadoopStepConfig.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/HadoopStepConfig.cpp index e2baf5cf5a9..ea0f57bdfbe 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/HadoopStepConfig.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/HadoopStepConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + HadoopStepConfig::HadoopStepConfig() : m_jarHasBeenSet(false), m_propertiesHasBeenSet(false), @@ -116,4 +122,8 @@ JsonValue HadoopStepConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/Instance.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/Instance.cpp index 529464a34df..73e7ec0f833 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/Instance.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/Instance.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + Instance::Instance() : m_idHasBeenSet(false), m_ec2InstanceIdHasBeenSet(false), @@ -183,4 +189,8 @@ JsonValue Instance::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroup.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroup.cpp index 793667e9c1d..ec4ec645e8c 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroup.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroup.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + InstanceGroup::InstanceGroup() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -255,4 +261,8 @@ JsonValue InstanceGroup::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupConfig.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupConfig.cpp index 4f953359621..ba66f274285 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupConfig.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + InstanceGroupConfig::InstanceGroupConfig() : m_nameHasBeenSet(false), m_marketHasBeenSet(false), @@ -168,4 +174,8 @@ JsonValue InstanceGroupConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupDetail.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupDetail.cpp index bfb938331e0..6a8c3748099 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupDetail.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupDetail.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + InstanceGroupDetail::InstanceGroupDetail() : m_instanceGroupIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -247,4 +253,8 @@ JsonValue InstanceGroupDetail::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupModifyConfig.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupModifyConfig.cpp index 598a39db701..d05f1c5ab0c 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupModifyConfig.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupModifyConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + InstanceGroupModifyConfig::InstanceGroupModifyConfig() : m_instanceGroupIdHasBeenSet(false), m_instanceCount(0), @@ -110,4 +116,8 @@ JsonValue InstanceGroupModifyConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupState.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupState.cpp index c42dd45e430..24127fa0427 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupState.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupState.cpp @@ -19,16 +19,6 @@ using namespace Aws::Utils; -static const int PROVISIONING_HASH = HashingUtils::HashString("PROVISIONING"); -static const int BOOTSTRAPPING_HASH = HashingUtils::HashString("BOOTSTRAPPING"); -static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); -static const int RESIZING_HASH = HashingUtils::HashString("RESIZING"); -static const int SUSPENDED_HASH = HashingUtils::HashString("SUSPENDED"); -static const int TERMINATING_HASH = HashingUtils::HashString("TERMINATING"); -static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); -static const int ARRESTED_HASH = HashingUtils::HashString("ARRESTED"); -static const int SHUTTING_DOWN_HASH = HashingUtils::HashString("SHUTTING_DOWN"); -static const int ENDED_HASH = HashingUtils::HashString("ENDED"); namespace Aws { @@ -39,6 +29,17 @@ namespace Aws namespace InstanceGroupStateMapper { + static const int PROVISIONING_HASH = HashingUtils::HashString("PROVISIONING"); + static const int BOOTSTRAPPING_HASH = HashingUtils::HashString("BOOTSTRAPPING"); + static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); + static const int RESIZING_HASH = HashingUtils::HashString("RESIZING"); + static const int SUSPENDED_HASH = HashingUtils::HashString("SUSPENDED"); + static const int TERMINATING_HASH = HashingUtils::HashString("TERMINATING"); + static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); + static const int ARRESTED_HASH = HashingUtils::HashString("ARRESTED"); + static const int SHUTTING_DOWN_HASH = HashingUtils::HashString("SHUTTING_DOWN"); + static const int ENDED_HASH = HashingUtils::HashString("ENDED"); + InstanceGroupState GetInstanceGroupStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupStateChangeReason.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupStateChangeReason.cpp index c65cf20392e..ec0fcb6ac8b 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupStateChangeReason.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupStateChangeReason.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + InstanceGroupStateChangeReason::InstanceGroupStateChangeReason() : m_codeHasBeenSet(false), m_messageHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue InstanceGroupStateChangeReason::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupStateChangeReasonCode.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupStateChangeReasonCode.cpp index bef39a7af12..e86f268fd9a 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupStateChangeReasonCode.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupStateChangeReasonCode.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int INTERNAL_ERROR_HASH = HashingUtils::HashString("INTERNAL_ERROR"); -static const int VALIDATION_ERROR_HASH = HashingUtils::HashString("VALIDATION_ERROR"); -static const int INSTANCE_FAILURE_HASH = HashingUtils::HashString("INSTANCE_FAILURE"); -static const int CLUSTER_TERMINATED_HASH = HashingUtils::HashString("CLUSTER_TERMINATED"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace InstanceGroupStateChangeReasonCodeMapper { + static const int INTERNAL_ERROR_HASH = HashingUtils::HashString("INTERNAL_ERROR"); + static const int VALIDATION_ERROR_HASH = HashingUtils::HashString("VALIDATION_ERROR"); + static const int INSTANCE_FAILURE_HASH = HashingUtils::HashString("INSTANCE_FAILURE"); + static const int CLUSTER_TERMINATED_HASH = HashingUtils::HashString("CLUSTER_TERMINATED"); + InstanceGroupStateChangeReasonCode GetInstanceGroupStateChangeReasonCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupStatus.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupStatus.cpp index e858b7b6bea..cda3c631cfb 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupStatus.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + InstanceGroupStatus::InstanceGroupStatus() : m_stateHasBeenSet(false), m_stateChangeReasonHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue InstanceGroupStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupTimeline.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupTimeline.cpp index 13b36d94a24..206574214d4 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupTimeline.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupTimeline.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + InstanceGroupTimeline::InstanceGroupTimeline() : m_creationDateTimeHasBeenSet(false), m_readyDateTimeHasBeenSet(false), @@ -82,4 +88,8 @@ JsonValue InstanceGroupTimeline::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupType.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupType.cpp index f2f0b4957ef..cd96c84738e 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupType.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceGroupType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int MASTER_HASH = HashingUtils::HashString("MASTER"); -static const int CORE_HASH = HashingUtils::HashString("CORE"); -static const int TASK_HASH = HashingUtils::HashString("TASK"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace InstanceGroupTypeMapper { + static const int MASTER_HASH = HashingUtils::HashString("MASTER"); + static const int CORE_HASH = HashingUtils::HashString("CORE"); + static const int TASK_HASH = HashingUtils::HashString("TASK"); + InstanceGroupType GetInstanceGroupTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceRoleType.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceRoleType.cpp index ede0b2de016..7f4745f5ab9 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceRoleType.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceRoleType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int MASTER_HASH = HashingUtils::HashString("MASTER"); -static const int CORE_HASH = HashingUtils::HashString("CORE"); -static const int TASK_HASH = HashingUtils::HashString("TASK"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace InstanceRoleTypeMapper { + static const int MASTER_HASH = HashingUtils::HashString("MASTER"); + static const int CORE_HASH = HashingUtils::HashString("CORE"); + static const int TASK_HASH = HashingUtils::HashString("TASK"); + InstanceRoleType GetInstanceRoleTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceState.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceState.cpp index a80e4ffdb33..0b93b877390 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceState.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceState.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int AWAITING_FULFILLMENT_HASH = HashingUtils::HashString("AWAITING_FULFILLMENT"); -static const int PROVISIONING_HASH = HashingUtils::HashString("PROVISIONING"); -static const int BOOTSTRAPPING_HASH = HashingUtils::HashString("BOOTSTRAPPING"); -static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); -static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace InstanceStateMapper { + static const int AWAITING_FULFILLMENT_HASH = HashingUtils::HashString("AWAITING_FULFILLMENT"); + static const int PROVISIONING_HASH = HashingUtils::HashString("PROVISIONING"); + static const int BOOTSTRAPPING_HASH = HashingUtils::HashString("BOOTSTRAPPING"); + static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); + static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); + InstanceState GetInstanceStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceStateChangeReason.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceStateChangeReason.cpp index 4f2efe24d85..67f18bee30a 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceStateChangeReason.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceStateChangeReason.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + InstanceStateChangeReason::InstanceStateChangeReason() : m_codeHasBeenSet(false), m_messageHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue InstanceStateChangeReason::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceStateChangeReasonCode.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceStateChangeReasonCode.cpp index 75349f06a42..20b9e1a4f8d 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceStateChangeReasonCode.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceStateChangeReasonCode.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int INTERNAL_ERROR_HASH = HashingUtils::HashString("INTERNAL_ERROR"); -static const int VALIDATION_ERROR_HASH = HashingUtils::HashString("VALIDATION_ERROR"); -static const int INSTANCE_FAILURE_HASH = HashingUtils::HashString("INSTANCE_FAILURE"); -static const int BOOTSTRAP_FAILURE_HASH = HashingUtils::HashString("BOOTSTRAP_FAILURE"); -static const int CLUSTER_TERMINATED_HASH = HashingUtils::HashString("CLUSTER_TERMINATED"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace InstanceStateChangeReasonCodeMapper { + static const int INTERNAL_ERROR_HASH = HashingUtils::HashString("INTERNAL_ERROR"); + static const int VALIDATION_ERROR_HASH = HashingUtils::HashString("VALIDATION_ERROR"); + static const int INSTANCE_FAILURE_HASH = HashingUtils::HashString("INSTANCE_FAILURE"); + static const int BOOTSTRAP_FAILURE_HASH = HashingUtils::HashString("BOOTSTRAP_FAILURE"); + static const int CLUSTER_TERMINATED_HASH = HashingUtils::HashString("CLUSTER_TERMINATED"); + InstanceStateChangeReasonCode GetInstanceStateChangeReasonCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceStatus.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceStatus.cpp index 69f64ea93ca..08e10e2b197 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceStatus.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + InstanceStatus::InstanceStatus() : m_stateHasBeenSet(false), m_stateChangeReasonHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue InstanceStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceTimeline.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceTimeline.cpp index 56ea68c8dd8..e88e9172370 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/InstanceTimeline.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/InstanceTimeline.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + InstanceTimeline::InstanceTimeline() : m_creationDateTimeHasBeenSet(false), m_readyDateTimeHasBeenSet(false), @@ -82,4 +88,8 @@ JsonValue InstanceTimeline::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowDetail.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowDetail.cpp index 9015b1671e8..a0451494b62 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowDetail.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowDetail.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + JobFlowDetail::JobFlowDetail() : m_jobFlowIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -246,4 +252,8 @@ JsonValue JobFlowDetail::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowExecutionState.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowExecutionState.cpp index 17cae46cad1..c4d5b991fda 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowExecutionState.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowExecutionState.cpp @@ -19,14 +19,6 @@ using namespace Aws::Utils; -static const int STARTING_HASH = HashingUtils::HashString("STARTING"); -static const int BOOTSTRAPPING_HASH = HashingUtils::HashString("BOOTSTRAPPING"); -static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); -static const int WAITING_HASH = HashingUtils::HashString("WAITING"); -static const int SHUTTING_DOWN_HASH = HashingUtils::HashString("SHUTTING_DOWN"); -static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); -static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); namespace Aws { @@ -37,6 +29,15 @@ namespace Aws namespace JobFlowExecutionStateMapper { + static const int STARTING_HASH = HashingUtils::HashString("STARTING"); + static const int BOOTSTRAPPING_HASH = HashingUtils::HashString("BOOTSTRAPPING"); + static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); + static const int WAITING_HASH = HashingUtils::HashString("WAITING"); + static const int SHUTTING_DOWN_HASH = HashingUtils::HashString("SHUTTING_DOWN"); + static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); + static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + JobFlowExecutionState GetJobFlowExecutionStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowExecutionStatusDetail.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowExecutionStatusDetail.cpp index 6b10723dbee..8e054f704fe 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowExecutionStatusDetail.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowExecutionStatusDetail.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + JobFlowExecutionStatusDetail::JobFlowExecutionStatusDetail() : m_stateHasBeenSet(false), m_creationDateTimeHasBeenSet(false), @@ -125,4 +131,8 @@ JsonValue JobFlowExecutionStatusDetail::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowInstancesConfig.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowInstancesConfig.cpp index 0a7c92b450d..74fce087255 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowInstancesConfig.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowInstancesConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + JobFlowInstancesConfig::JobFlowInstancesConfig() : m_masterInstanceTypeHasBeenSet(false), m_slaveInstanceTypeHasBeenSet(false), @@ -295,4 +301,8 @@ JsonValue JobFlowInstancesConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowInstancesDetail.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowInstancesDetail.cpp index f0eb1429586..3c74dad8152 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowInstancesDetail.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/JobFlowInstancesDetail.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + JobFlowInstancesDetail::JobFlowInstancesDetail() : m_masterInstanceTypeHasBeenSet(false), m_masterPublicDnsNameHasBeenSet(false), @@ -251,4 +257,8 @@ JsonValue JobFlowInstancesDetail::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/KeyValue.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/KeyValue.cpp index 6955e87d835..e7c1eed6ca8 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/KeyValue.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/KeyValue.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + KeyValue::KeyValue() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue KeyValue::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/MarketType.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/MarketType.cpp index 017afa3916a..aea51306935 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/MarketType.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/MarketType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ON_DEMAND_HASH = HashingUtils::HashString("ON_DEMAND"); -static const int SPOT_HASH = HashingUtils::HashString("SPOT"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace MarketTypeMapper { + static const int ON_DEMAND_HASH = HashingUtils::HashString("ON_DEMAND"); + static const int SPOT_HASH = HashingUtils::HashString("SPOT"); + MarketType GetMarketTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/PlacementType.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/PlacementType.cpp index 510b679b4da..651c33a5bb1 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/PlacementType.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/PlacementType.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + PlacementType::PlacementType() : m_availabilityZoneHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue PlacementType::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/ScriptBootstrapActionConfig.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/ScriptBootstrapActionConfig.cpp index d4bdc8d225c..bbc44006ce0 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/ScriptBootstrapActionConfig.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/ScriptBootstrapActionConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + ScriptBootstrapActionConfig::ScriptBootstrapActionConfig() : m_pathHasBeenSet(false), m_argsHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue ScriptBootstrapActionConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/Step.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/Step.cpp index 87f44a85dff..a2fe2680c71 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/Step.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/Step.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + Step::Step() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -114,4 +120,8 @@ JsonValue Step::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/StepConfig.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/StepConfig.cpp index 542bd3ce90d..480d18c353c 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/StepConfig.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/StepConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + StepConfig::StepConfig() : m_nameHasBeenSet(false), m_actionOnFailureHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue StepConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/StepDetail.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/StepDetail.cpp index 9f2c437aac6..19d518ac8c2 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/StepDetail.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/StepDetail.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + StepDetail::StepDetail() : m_stepConfigHasBeenSet(false), m_executionStatusDetailHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue StepDetail::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/StepExecutionState.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/StepExecutionState.cpp index 522812c9f02..5b47e74d63a 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/StepExecutionState.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/StepExecutionState.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int PENDING_HASH = HashingUtils::HashString("PENDING"); -static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); -static const int CONTINUE_HASH = HashingUtils::HashString("CONTINUE"); -static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); -static const int CANCELLED_HASH = HashingUtils::HashString("CANCELLED"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); -static const int INTERRUPTED_HASH = HashingUtils::HashString("INTERRUPTED"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace StepExecutionStateMapper { + static const int PENDING_HASH = HashingUtils::HashString("PENDING"); + static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); + static const int CONTINUE_HASH = HashingUtils::HashString("CONTINUE"); + static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); + static const int CANCELLED_HASH = HashingUtils::HashString("CANCELLED"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + static const int INTERRUPTED_HASH = HashingUtils::HashString("INTERRUPTED"); + StepExecutionState GetStepExecutionStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/StepExecutionStatusDetail.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/StepExecutionStatusDetail.cpp index 208a16e3148..fe55cc3acb5 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/StepExecutionStatusDetail.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/StepExecutionStatusDetail.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + StepExecutionStatusDetail::StepExecutionStatusDetail() : m_stateHasBeenSet(false), m_creationDateTimeHasBeenSet(false), @@ -111,4 +117,8 @@ JsonValue StepExecutionStatusDetail::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/StepState.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/StepState.cpp index 1f63c457cdf..e47579bb9f7 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/StepState.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/StepState.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int PENDING_HASH = HashingUtils::HashString("PENDING"); -static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); -static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); -static const int CANCELLED_HASH = HashingUtils::HashString("CANCELLED"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); -static const int INTERRUPTED_HASH = HashingUtils::HashString("INTERRUPTED"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace StepStateMapper { + static const int PENDING_HASH = HashingUtils::HashString("PENDING"); + static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); + static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); + static const int CANCELLED_HASH = HashingUtils::HashString("CANCELLED"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + static const int INTERRUPTED_HASH = HashingUtils::HashString("INTERRUPTED"); + StepState GetStepStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/StepStateChangeReason.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/StepStateChangeReason.cpp index fe0cf70f608..5ee3bde4e15 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/StepStateChangeReason.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/StepStateChangeReason.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + StepStateChangeReason::StepStateChangeReason() : m_codeHasBeenSet(false), m_messageHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue StepStateChangeReason::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/StepStateChangeReasonCode.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/StepStateChangeReasonCode.cpp index 315b71633ec..cd7f111cea0 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/StepStateChangeReasonCode.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/StepStateChangeReasonCode.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int NONE_HASH = HashingUtils::HashString("NONE"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace StepStateChangeReasonCodeMapper { + static const int NONE_HASH = HashingUtils::HashString("NONE"); + StepStateChangeReasonCode GetStepStateChangeReasonCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/StepStatus.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/StepStatus.cpp index 74533a4e41a..58a9841ad85 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/StepStatus.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/StepStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + StepStatus::StepStatus() : m_stateHasBeenSet(false), m_stateChangeReasonHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue StepStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/StepSummary.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/StepSummary.cpp index 4f663908121..52907fde975 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/StepSummary.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/StepSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + StepSummary::StepSummary() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -114,4 +120,8 @@ JsonValue StepSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/StepTimeline.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/StepTimeline.cpp index c56c884c658..b6f77e16568 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/StepTimeline.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/StepTimeline.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + StepTimeline::StepTimeline() : m_creationDateTimeHasBeenSet(false), m_startDateTimeHasBeenSet(false), @@ -82,4 +88,8 @@ JsonValue StepTimeline::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/SupportedProductConfig.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/SupportedProductConfig.cpp index 671e128c821..1510b09330d 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/SupportedProductConfig.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/SupportedProductConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + SupportedProductConfig::SupportedProductConfig() : m_nameHasBeenSet(false), m_argsHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue SupportedProductConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/Tag.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/Tag.cpp index 203361b77f9..7061b66ee00 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/Tag.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/Tag.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Tag::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elasticmapreduce/source/model/VolumeSpecification.cpp b/aws-cpp-sdk-elasticmapreduce/source/model/VolumeSpecification.cpp index 2dc8e2ea05c..faa21e516f2 100644 --- a/aws-cpp-sdk-elasticmapreduce/source/model/VolumeSpecification.cpp +++ b/aws-cpp-sdk-elasticmapreduce/source/model/VolumeSpecification.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::EMR::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace EMR +{ +namespace Model +{ + VolumeSpecification::VolumeSpecification() : m_volumeTypeHasBeenSet(false), m_iops(0), @@ -89,4 +95,8 @@ JsonValue VolumeSpecification::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace EMR +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/CMakeLists.txt b/aws-cpp-sdk-elastictranscoder/CMakeLists.txt index d75e3017806..749cbd3fe53 100644 --- a/aws-cpp-sdk-elastictranscoder/CMakeLists.txt +++ b/aws-cpp-sdk-elastictranscoder/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-elastictranscoder) "source/model/*.cpp" ) - file(GLOB ELASTICTRANSCODER_SRC + file(GLOB ELASTICTRANSCODER_UNIFIED_HEADERS ${AWS_ELASTICTRANSCODER_HEADERS} ${AWS_ELASTICTRANSCODER_MODEL_HEADERS} + ) + + file(GLOB ELASTICTRANSCODER_UNITY_SRC ${AWS_ELASTICTRANSCODER_SOURCE} ${AWS_ELASTICTRANSCODER_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("ELASTICTRANSCODER" ELASTICTRANSCODER_UNITY_SRC) + endif() + + file(GLOB ELASTICTRANSCODER_SRC + ${ELASTICTRANSCODER_UNIFIED_HEADERS} + ${ELASTICTRANSCODER_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-elastictranscoder/source/ElasticTranscoderErrors.cpp b/aws-cpp-sdk-elastictranscoder/source/ElasticTranscoderErrors.cpp index 964765dc231..5d07520d2fc 100644 --- a/aws-cpp-sdk-elastictranscoder/source/ElasticTranscoderErrors.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/ElasticTranscoderErrors.cpp @@ -20,11 +20,6 @@ using namespace Aws::Client; using namespace Aws::ElasticTranscoder; using namespace Aws::Utils; -static const int INCOMPATIBLE_VERSION_HASH = HashingUtils::HashString("IncompatibleVersionException"); -static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); -static const int RESOURCE_IN_USE_HASH = HashingUtils::HashString("ResourceInUseException"); -static const int INTERNAL_SERVICE_HASH = HashingUtils::HashString("InternalServiceException"); - namespace Aws { namespace ElasticTranscoder @@ -32,6 +27,12 @@ namespace ElasticTranscoder namespace ElasticTranscoderErrorMapper { +static const int INCOMPATIBLE_VERSION_HASH = HashingUtils::HashString("IncompatibleVersionException"); +static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); +static const int RESOURCE_IN_USE_HASH = HashingUtils::HashString("ResourceInUseException"); +static const int INTERNAL_SERVICE_HASH = HashingUtils::HashString("InternalServiceException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-elastictranscoder/source/model/Artwork.cpp b/aws-cpp-sdk-elastictranscoder/source/model/Artwork.cpp index efee2d3e441..c4ada4dd8c0 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/Artwork.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/Artwork.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + Artwork::Artwork() : m_inputKeyHasBeenSet(false), m_maxWidthHasBeenSet(false), @@ -145,4 +151,8 @@ JsonValue Artwork::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/AudioCodecOptions.cpp b/aws-cpp-sdk-elastictranscoder/source/model/AudioCodecOptions.cpp index e59b590ce29..717cb36bf68 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/AudioCodecOptions.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/AudioCodecOptions.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + AudioCodecOptions::AudioCodecOptions() : m_profileHasBeenSet(false), m_bitDepthHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue AudioCodecOptions::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/AudioParameters.cpp b/aws-cpp-sdk-elastictranscoder/source/model/AudioParameters.cpp index 8a09565df08..57040ae6e76 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/AudioParameters.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/AudioParameters.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + AudioParameters::AudioParameters() : m_codecHasBeenSet(false), m_sampleRateHasBeenSet(false), @@ -130,4 +136,8 @@ JsonValue AudioParameters::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/CaptionFormat.cpp b/aws-cpp-sdk-elastictranscoder/source/model/CaptionFormat.cpp index da34fbab1d5..9c8ad89d91d 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/CaptionFormat.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/CaptionFormat.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + CaptionFormat::CaptionFormat() : m_formatHasBeenSet(false), m_patternHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue CaptionFormat::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/CaptionSource.cpp b/aws-cpp-sdk-elastictranscoder/source/model/CaptionSource.cpp index 0a638339fda..9b13fcbe911 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/CaptionSource.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/CaptionSource.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + CaptionSource::CaptionSource() : m_keyHasBeenSet(false), m_languageHasBeenSet(false), @@ -115,4 +121,8 @@ JsonValue CaptionSource::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/Captions.cpp b/aws-cpp-sdk-elastictranscoder/source/model/Captions.cpp index 4591e695ba6..781fc766713 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/Captions.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/Captions.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + Captions::Captions() : m_mergePolicyHasBeenSet(false), m_captionSourcesHasBeenSet(false), @@ -101,4 +107,8 @@ JsonValue Captions::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/Clip.cpp b/aws-cpp-sdk-elastictranscoder/source/model/Clip.cpp index 2b1cf210315..c056c5cbdde 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/Clip.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/Clip.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + Clip::Clip() : m_timeSpanHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue Clip::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/CreateJobOutput.cpp b/aws-cpp-sdk-elastictranscoder/source/model/CreateJobOutput.cpp index 3f8be45cc8f..75b3e0a69dc 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/CreateJobOutput.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/CreateJobOutput.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + CreateJobOutput::CreateJobOutput() : m_keyHasBeenSet(false), m_thumbnailPatternHasBeenSet(false), @@ -221,4 +227,8 @@ JsonValue CreateJobOutput::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/CreateJobPlaylist.cpp b/aws-cpp-sdk-elastictranscoder/source/model/CreateJobPlaylist.cpp index 6e6f75b6f43..09562fd1bdf 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/CreateJobPlaylist.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/CreateJobPlaylist.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + CreateJobPlaylist::CreateJobPlaylist() : m_nameHasBeenSet(false), m_formatHasBeenSet(false), @@ -123,4 +129,8 @@ JsonValue CreateJobPlaylist::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/DetectedProperties.cpp b/aws-cpp-sdk-elastictranscoder/source/model/DetectedProperties.cpp index f7932a9c83e..6984b28e2fa 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/DetectedProperties.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/DetectedProperties.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + DetectedProperties::DetectedProperties() : m_width(0), m_widthHasBeenSet(false), @@ -123,4 +129,8 @@ JsonValue DetectedProperties::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/Encryption.cpp b/aws-cpp-sdk-elastictranscoder/source/model/Encryption.cpp index 9af6b0a9275..686c51651d2 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/Encryption.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/Encryption.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + Encryption::Encryption() : m_modeHasBeenSet(false), m_keyHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue Encryption::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/HlsContentProtection.cpp b/aws-cpp-sdk-elastictranscoder/source/model/HlsContentProtection.cpp index ee4b9d40b31..70678bd56db 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/HlsContentProtection.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/HlsContentProtection.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + HlsContentProtection::HlsContentProtection() : m_methodHasBeenSet(false), m_keyHasBeenSet(false), @@ -130,4 +136,8 @@ JsonValue HlsContentProtection::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/Job.cpp b/aws-cpp-sdk-elastictranscoder/source/model/Job.cpp index 6f8f9a981d0..fead24513c5 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/Job.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/Job.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + Job::Job() : m_idHasBeenSet(false), m_arnHasBeenSet(false), @@ -229,4 +235,8 @@ JsonValue Job::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/JobAlbumArt.cpp b/aws-cpp-sdk-elastictranscoder/source/model/JobAlbumArt.cpp index 4c931b7e40d..16e07613fb8 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/JobAlbumArt.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/JobAlbumArt.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + JobAlbumArt::JobAlbumArt() : m_mergePolicyHasBeenSet(false), m_artworkHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue JobAlbumArt::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/JobInput.cpp b/aws-cpp-sdk-elastictranscoder/source/model/JobInput.cpp index 65192d6ae87..b0041e87c76 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/JobInput.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/JobInput.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + JobInput::JobInput() : m_keyHasBeenSet(false), m_frameRateHasBeenSet(false), @@ -160,4 +166,8 @@ JsonValue JobInput::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/JobOutput.cpp b/aws-cpp-sdk-elastictranscoder/source/model/JobOutput.cpp index 4eb21ac421f..411faf15c41 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/JobOutput.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/JobOutput.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + JobOutput::JobOutput() : m_idHasBeenSet(false), m_keyHasBeenSet(false), @@ -381,4 +387,8 @@ JsonValue JobOutput::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/JobWatermark.cpp b/aws-cpp-sdk-elastictranscoder/source/model/JobWatermark.cpp index 81178d7487a..5179258b9ef 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/JobWatermark.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/JobWatermark.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + JobWatermark::JobWatermark() : m_presetWatermarkIdHasBeenSet(false), m_inputKeyHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue JobWatermark::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/Notifications.cpp b/aws-cpp-sdk-elastictranscoder/source/model/Notifications.cpp index de5e0b48fb2..fd0fd413cbb 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/Notifications.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/Notifications.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + Notifications::Notifications() : m_progressingHasBeenSet(false), m_completedHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue Notifications::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/Permission.cpp b/aws-cpp-sdk-elastictranscoder/source/model/Permission.cpp index 82a9401b1db..c45ba860d13 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/Permission.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/Permission.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + Permission::Permission() : m_granteeTypeHasBeenSet(false), m_granteeHasBeenSet(false), @@ -93,4 +99,8 @@ JsonValue Permission::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/Pipeline.cpp b/aws-cpp-sdk-elastictranscoder/source/model/Pipeline.cpp index 3dce0b45a46..18264dc0bc6 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/Pipeline.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/Pipeline.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + Pipeline::Pipeline() : m_idHasBeenSet(false), m_arnHasBeenSet(false), @@ -205,4 +211,8 @@ JsonValue Pipeline::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/PipelineOutputConfig.cpp b/aws-cpp-sdk-elastictranscoder/source/model/PipelineOutputConfig.cpp index 6277c64432a..bc881c53166 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/PipelineOutputConfig.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/PipelineOutputConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + PipelineOutputConfig::PipelineOutputConfig() : m_bucketHasBeenSet(false), m_storageClassHasBeenSet(false), @@ -93,4 +99,8 @@ JsonValue PipelineOutputConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/PlayReadyDrm.cpp b/aws-cpp-sdk-elastictranscoder/source/model/PlayReadyDrm.cpp index 4859e9f1706..650f8d4c098 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/PlayReadyDrm.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/PlayReadyDrm.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + PlayReadyDrm::PlayReadyDrm() : m_formatHasBeenSet(false), m_keyHasBeenSet(false), @@ -130,4 +136,8 @@ JsonValue PlayReadyDrm::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/Playlist.cpp b/aws-cpp-sdk-elastictranscoder/source/model/Playlist.cpp index 7bfff11709f..94fe2827458 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/Playlist.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/Playlist.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + Playlist::Playlist() : m_nameHasBeenSet(false), m_formatHasBeenSet(false), @@ -153,4 +159,8 @@ JsonValue Playlist::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/Preset.cpp b/aws-cpp-sdk-elastictranscoder/source/model/Preset.cpp index 191dacd124a..2120089c63b 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/Preset.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/Preset.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + Preset::Preset() : m_idHasBeenSet(false), m_arnHasBeenSet(false), @@ -175,4 +181,8 @@ JsonValue Preset::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/PresetWatermark.cpp b/aws-cpp-sdk-elastictranscoder/source/model/PresetWatermark.cpp index 4311269f6a9..5183470b0e4 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/PresetWatermark.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/PresetWatermark.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + PresetWatermark::PresetWatermark() : m_idHasBeenSet(false), m_maxWidthHasBeenSet(false), @@ -190,4 +196,8 @@ JsonValue PresetWatermark::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/Thumbnails.cpp b/aws-cpp-sdk-elastictranscoder/source/model/Thumbnails.cpp index 8821566a240..56b00627d0d 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/Thumbnails.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/Thumbnails.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + Thumbnails::Thumbnails() : m_formatHasBeenSet(false), m_intervalHasBeenSet(false), @@ -160,4 +166,8 @@ JsonValue Thumbnails::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/TimeSpan.cpp b/aws-cpp-sdk-elastictranscoder/source/model/TimeSpan.cpp index 8cde69f91c1..a6b5da0b2e5 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/TimeSpan.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/TimeSpan.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + TimeSpan::TimeSpan() : m_startTimeHasBeenSet(false), m_durationHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue TimeSpan::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/Timing.cpp b/aws-cpp-sdk-elastictranscoder/source/model/Timing.cpp index d32f0fdd19d..9233ae6d83e 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/Timing.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/Timing.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + Timing::Timing() : m_submitTimeMillis(0), m_submitTimeMillisHasBeenSet(false), @@ -91,4 +97,8 @@ JsonValue Timing::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/VideoParameters.cpp b/aws-cpp-sdk-elastictranscoder/source/model/VideoParameters.cpp index f7b5a4a0148..19a4e079948 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/VideoParameters.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/VideoParameters.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + VideoParameters::VideoParameters() : m_codecHasBeenSet(false), m_codecOptionsHasBeenSet(false), @@ -281,4 +287,8 @@ JsonValue VideoParameters::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-elastictranscoder/source/model/Warning.cpp b/aws-cpp-sdk-elastictranscoder/source/model/Warning.cpp index 954c3fd9207..d121e0bae55 100644 --- a/aws-cpp-sdk-elastictranscoder/source/model/Warning.cpp +++ b/aws-cpp-sdk-elastictranscoder/source/model/Warning.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticTranscoder::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticTranscoder +{ +namespace Model +{ + Warning::Warning() : m_codeHasBeenSet(false), m_messageHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Warning::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticTranscoder +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/CMakeLists.txt b/aws-cpp-sdk-email/CMakeLists.txt index 947d98db176..a23b6e6ef9d 100644 --- a/aws-cpp-sdk-email/CMakeLists.txt +++ b/aws-cpp-sdk-email/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-email) "source/model/*.cpp" ) - file(GLOB EMAIL_SRC + file(GLOB EMAIL_UNIFIED_HEADERS ${AWS_EMAIL_HEADERS} ${AWS_EMAIL_MODEL_HEADERS} + ) + + file(GLOB EMAIL_UNITY_SRC ${AWS_EMAIL_SOURCE} ${AWS_EMAIL_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("EMAIL" EMAIL_UNITY_SRC) + endif() + + file(GLOB EMAIL_SRC + ${EMAIL_UNIFIED_HEADERS} + ${EMAIL_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-email/include/aws/email/SESClient.h b/aws-cpp-sdk-email/include/aws/email/SESClient.h index 70c6888b9b3..13abf15fd32 100644 --- a/aws-cpp-sdk-email/include/aws/email/SESClient.h +++ b/aws-cpp-sdk-email/include/aws/email/SESClient.h @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -52,7 +51,6 @@ #include #include #include -#include #include #include #include @@ -119,7 +117,6 @@ namespace Model class DescribeReceiptRuleRequest; class DescribeReceiptRuleSetRequest; class GetIdentityDkimAttributesRequest; - class GetIdentityMailFromDomainAttributesRequest; class GetIdentityNotificationAttributesRequest; class GetIdentityPoliciesRequest; class GetIdentityVerificationAttributesRequest; @@ -138,7 +135,6 @@ namespace Model class SetActiveReceiptRuleSetRequest; class SetIdentityDkimEnabledRequest; class SetIdentityFeedbackForwardingEnabledRequest; - class SetIdentityMailFromDomainRequest; class SetIdentityNotificationTopicRequest; class SetReceiptRulePositionRequest; class UpdateReceiptRuleRequest; @@ -161,7 +157,6 @@ namespace Model typedef Aws::Utils::Outcome> DescribeReceiptRuleOutcome; typedef Aws::Utils::Outcome> DescribeReceiptRuleSetOutcome; typedef Aws::Utils::Outcome> GetIdentityDkimAttributesOutcome; - typedef Aws::Utils::Outcome> GetIdentityMailFromDomainAttributesOutcome; typedef Aws::Utils::Outcome> GetIdentityNotificationAttributesOutcome; typedef Aws::Utils::Outcome> GetIdentityPoliciesOutcome; typedef Aws::Utils::Outcome> GetIdentityVerificationAttributesOutcome; @@ -180,7 +175,6 @@ namespace Model typedef Aws::Utils::Outcome> SetActiveReceiptRuleSetOutcome; typedef Aws::Utils::Outcome> SetIdentityDkimEnabledOutcome; typedef Aws::Utils::Outcome> SetIdentityFeedbackForwardingEnabledOutcome; - typedef Aws::Utils::Outcome> SetIdentityMailFromDomainOutcome; typedef Aws::Utils::Outcome> SetIdentityNotificationTopicOutcome; typedef Aws::Utils::Outcome> SetReceiptRulePositionOutcome; typedef Aws::Utils::Outcome> UpdateReceiptRuleOutcome; @@ -203,7 +197,6 @@ namespace Model typedef std::future DescribeReceiptRuleOutcomeCallable; typedef std::future DescribeReceiptRuleSetOutcomeCallable; typedef std::future GetIdentityDkimAttributesOutcomeCallable; - typedef std::future GetIdentityMailFromDomainAttributesOutcomeCallable; typedef std::future GetIdentityNotificationAttributesOutcomeCallable; typedef std::future GetIdentityPoliciesOutcomeCallable; typedef std::future GetIdentityVerificationAttributesOutcomeCallable; @@ -222,7 +215,6 @@ namespace Model typedef std::future SetActiveReceiptRuleSetOutcomeCallable; typedef std::future SetIdentityDkimEnabledOutcomeCallable; typedef std::future SetIdentityFeedbackForwardingEnabledOutcomeCallable; - typedef std::future SetIdentityMailFromDomainOutcomeCallable; typedef std::future SetIdentityNotificationTopicOutcomeCallable; typedef std::future SetReceiptRulePositionOutcomeCallable; typedef std::future UpdateReceiptRuleOutcomeCallable; @@ -248,7 +240,6 @@ namespace Model typedef std::function&) > DescribeReceiptRuleResponseReceivedHandler; typedef std::function&) > DescribeReceiptRuleSetResponseReceivedHandler; typedef std::function&) > GetIdentityDkimAttributesResponseReceivedHandler; - typedef std::function&) > GetIdentityMailFromDomainAttributesResponseReceivedHandler; typedef std::function&) > GetIdentityNotificationAttributesResponseReceivedHandler; typedef std::function&) > GetIdentityPoliciesResponseReceivedHandler; typedef std::function&) > GetIdentityVerificationAttributesResponseReceivedHandler; @@ -267,7 +258,6 @@ namespace Model typedef std::function&) > SetActiveReceiptRuleSetResponseReceivedHandler; typedef std::function&) > SetIdentityDkimEnabledResponseReceivedHandler; typedef std::function&) > SetIdentityFeedbackForwardingEnabledResponseReceivedHandler; - typedef std::function&) > SetIdentityMailFromDomainResponseReceivedHandler; typedef std::function&) > SetIdentityNotificationTopicResponseReceivedHandler; typedef std::function&) > SetReceiptRulePositionResponseReceivedHandler; typedef std::function&) > UpdateReceiptRuleResponseReceivedHandler; @@ -798,34 +788,6 @@ namespace Model */ virtual void GetIdentityDkimAttributesAsync(const Model::GetIdentityDkimAttributesRequest& request, const GetIdentityDkimAttributesResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; - /** - *

Returns the custom MAIL FROM attributes for a list of identities (email - * addresses and/or domains).

This action is throttled at one request per - * second and can only get custom MAIL FROM attributes for up to 100 identities at - * a time.

- */ - virtual Model::GetIdentityMailFromDomainAttributesOutcome GetIdentityMailFromDomainAttributes(const Model::GetIdentityMailFromDomainAttributesRequest& request) const; - - /** - *

Returns the custom MAIL FROM attributes for a list of identities (email - * addresses and/or domains).

This action is throttled at one request per - * second and can only get custom MAIL FROM attributes for up to 100 identities at - * a time.

- * - * returns a future to the operation so that it can be executed in parallel to other requests. - */ - virtual Model::GetIdentityMailFromDomainAttributesOutcomeCallable GetIdentityMailFromDomainAttributesCallable(const Model::GetIdentityMailFromDomainAttributesRequest& request) const; - - /** - *

Returns the custom MAIL FROM attributes for a list of identities (email - * addresses and/or domains).

This action is throttled at one request per - * second and can only get custom MAIL FROM attributes for up to 100 identities at - * a time.

- * - * Queues the request into a thread executor and triggers associated callback when operation has finished. - */ - virtual void GetIdentityMailFromDomainAttributesAsync(const Model::GetIdentityMailFromDomainAttributesRequest& request, const GetIdentityMailFromDomainAttributesResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; - /** *

Given a list of verified identities (email addresses and/or domains), returns * a structure describing identity notification attributes.

This action is @@ -1209,7 +1171,7 @@ namespace Model /** *

Reorders the receipt rules within a receipt rule set.

All of the * rules in the rule set must be represented in this request. That is, this API - * will return an error if the reorder request doesn't explicitly position all of + * will return an error if the reorder request doesn?t explicitly position all of * the rules.

For information about managing receipt rule sets, see the * Amazon @@ -1221,7 +1183,7 @@ namespace Model /** *

Reorders the receipt rules within a receipt rule set.

All of the * rules in the rule set must be represented in this request. That is, this API - * will return an error if the reorder request doesn't explicitly position all of + * will return an error if the reorder request doesn?t explicitly position all of * the rules.

For information about managing receipt rule sets, see the * Amazon @@ -1235,7 +1197,7 @@ namespace Model /** *

Reorders the receipt rules within a receipt rule set.

All of the * rules in the rule set must be represented in this request. That is, this API - * will return an error if the reorder request doesn't explicitly position all of + * will return an error if the reorder request doesn?t explicitly position all of * the rules.

For information about managing receipt rule sets, see the * Amazon @@ -1648,46 +1610,6 @@ namespace Model */ virtual void SetIdentityFeedbackForwardingEnabledAsync(const Model::SetIdentityFeedbackForwardingEnabledRequest& request, const SetIdentityFeedbackForwardingEnabledResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; - /** - *

Enables or disables the custom MAIL FROM domain setup for a verified identity - * (email address or domain).

To send emails using the specified - * MAIL FROM domain, you must add an MX record to your MAIL FROM domain's DNS - * settings. If you want your emails to pass Sender Policy Framework (SPF) checks, - * you must also add or update an SPF record. For more information, see the Amazon - * SES Developer Guide.

This action is throttled at one request - * per second.

- */ - virtual Model::SetIdentityMailFromDomainOutcome SetIdentityMailFromDomain(const Model::SetIdentityMailFromDomainRequest& request) const; - - /** - *

Enables or disables the custom MAIL FROM domain setup for a verified identity - * (email address or domain).

To send emails using the specified - * MAIL FROM domain, you must add an MX record to your MAIL FROM domain's DNS - * settings. If you want your emails to pass Sender Policy Framework (SPF) checks, - * you must also add or update an SPF record. For more information, see the Amazon - * SES Developer Guide.

This action is throttled at one request - * per second.

- * - * returns a future to the operation so that it can be executed in parallel to other requests. - */ - virtual Model::SetIdentityMailFromDomainOutcomeCallable SetIdentityMailFromDomainCallable(const Model::SetIdentityMailFromDomainRequest& request) const; - - /** - *

Enables or disables the custom MAIL FROM domain setup for a verified identity - * (email address or domain).

To send emails using the specified - * MAIL FROM domain, you must add an MX record to your MAIL FROM domain's DNS - * settings. If you want your emails to pass Sender Policy Framework (SPF) checks, - * you must also add or update an SPF record. For more information, see the Amazon - * SES Developer Guide.

This action is throttled at one request - * per second.

- * - * Queues the request into a thread executor and triggers associated callback when operation has finished. - */ - virtual void SetIdentityMailFromDomainAsync(const Model::SetIdentityMailFromDomainRequest& request, const SetIdentityMailFromDomainResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; - /** *

Given an identity (email address or domain), sets the Amazon Simple * Notification Service (Amazon SNS) topic to which Amazon SES will publish bounce, @@ -1945,7 +1867,6 @@ namespace Model void DescribeReceiptRuleAsyncHelper(const Model::DescribeReceiptRuleRequest& request, const DescribeReceiptRuleResponseReceivedHandler& handler, const std::shared_ptr& context) const; void DescribeReceiptRuleSetAsyncHelper(const Model::DescribeReceiptRuleSetRequest& request, const DescribeReceiptRuleSetResponseReceivedHandler& handler, const std::shared_ptr& context) const; void GetIdentityDkimAttributesAsyncHelper(const Model::GetIdentityDkimAttributesRequest& request, const GetIdentityDkimAttributesResponseReceivedHandler& handler, const std::shared_ptr& context) const; - void GetIdentityMailFromDomainAttributesAsyncHelper(const Model::GetIdentityMailFromDomainAttributesRequest& request, const GetIdentityMailFromDomainAttributesResponseReceivedHandler& handler, const std::shared_ptr& context) const; void GetIdentityNotificationAttributesAsyncHelper(const Model::GetIdentityNotificationAttributesRequest& request, const GetIdentityNotificationAttributesResponseReceivedHandler& handler, const std::shared_ptr& context) const; void GetIdentityPoliciesAsyncHelper(const Model::GetIdentityPoliciesRequest& request, const GetIdentityPoliciesResponseReceivedHandler& handler, const std::shared_ptr& context) const; void GetIdentityVerificationAttributesAsyncHelper(const Model::GetIdentityVerificationAttributesRequest& request, const GetIdentityVerificationAttributesResponseReceivedHandler& handler, const std::shared_ptr& context) const; @@ -1964,7 +1885,6 @@ namespace Model void SetActiveReceiptRuleSetAsyncHelper(const Model::SetActiveReceiptRuleSetRequest& request, const SetActiveReceiptRuleSetResponseReceivedHandler& handler, const std::shared_ptr& context) const; void SetIdentityDkimEnabledAsyncHelper(const Model::SetIdentityDkimEnabledRequest& request, const SetIdentityDkimEnabledResponseReceivedHandler& handler, const std::shared_ptr& context) const; void SetIdentityFeedbackForwardingEnabledAsyncHelper(const Model::SetIdentityFeedbackForwardingEnabledRequest& request, const SetIdentityFeedbackForwardingEnabledResponseReceivedHandler& handler, const std::shared_ptr& context) const; - void SetIdentityMailFromDomainAsyncHelper(const Model::SetIdentityMailFromDomainRequest& request, const SetIdentityMailFromDomainResponseReceivedHandler& handler, const std::shared_ptr& context) const; void SetIdentityNotificationTopicAsyncHelper(const Model::SetIdentityNotificationTopicRequest& request, const SetIdentityNotificationTopicResponseReceivedHandler& handler, const std::shared_ptr& context) const; void SetReceiptRulePositionAsyncHelper(const Model::SetReceiptRulePositionRequest& request, const SetReceiptRulePositionResponseReceivedHandler& handler, const std::shared_ptr& context) const; void UpdateReceiptRuleAsyncHelper(const Model::UpdateReceiptRuleRequest& request, const UpdateReceiptRuleResponseReceivedHandler& handler, const std::shared_ptr& context) const; diff --git a/aws-cpp-sdk-email/source/SESErrors.cpp b/aws-cpp-sdk-email/source/SESErrors.cpp index c49b8ab517b..ea2623962fb 100644 --- a/aws-cpp-sdk-email/source/SESErrors.cpp +++ b/aws-cpp-sdk-email/source/SESErrors.cpp @@ -20,18 +20,6 @@ using namespace Aws::Client; using namespace Aws::SES; using namespace Aws::Utils; -static const int INVALID_LAMBDA_FUNCTION_HASH = HashingUtils::HashString("InvalidLambdaFunction"); -static const int CANNOT_DELETE_HASH = HashingUtils::HashString("CannotDelete"); -static const int INVALID_POLICY_HASH = HashingUtils::HashString("InvalidPolicy"); -static const int INVALID_SNS_TOPIC_HASH = HashingUtils::HashString("InvalidSnsTopic"); -static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceeded"); -static const int MESSAGE_REJECTED_HASH = HashingUtils::HashString("MessageRejected"); -static const int RULE_DOES_NOT_EXIST_HASH = HashingUtils::HashString("RuleDoesNotExist"); -static const int RULE_SET_DOES_NOT_EXIST_HASH = HashingUtils::HashString("RuleSetDoesNotExist"); -static const int ALREADY_EXISTS_HASH = HashingUtils::HashString("AlreadyExists"); -static const int MAIL_FROM_DOMAIN_NOT_VERIFIED_HASH = HashingUtils::HashString("MailFromDomainNotVerifiedException"); -static const int INVALID_S3_CONFIGURATION_HASH = HashingUtils::HashString("InvalidS3Configuration"); - namespace Aws { namespace SES @@ -39,53 +27,61 @@ namespace SES namespace SESErrorMapper { +static const int RULE_SET_DOES_NOT_EXIST_HASH = HashingUtils::HashString("RuleSetDoesNotExist"); +static const int RULE_DOES_NOT_EXIST_HASH = HashingUtils::HashString("RuleDoesNotExist"); +static const int CANNOT_DELETE_HASH = HashingUtils::HashString("CannotDelete"); +static const int INVALID_S3_CONFIGURATION_HASH = HashingUtils::HashString("InvalidS3Configuration"); +static const int INVALID_LAMBDA_FUNCTION_HASH = HashingUtils::HashString("InvalidLambdaFunction"); +static const int ALREADY_EXISTS_HASH = HashingUtils::HashString("AlreadyExists"); +static const int INVALID_SNS_TOPIC_HASH = HashingUtils::HashString("InvalidSnsTopic"); +static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceeded"); +static const int INVALID_POLICY_HASH = HashingUtils::HashString("InvalidPolicy"); +static const int MESSAGE_REJECTED_HASH = HashingUtils::HashString("MessageRejected"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); - if (hashCode == INVALID_LAMBDA_FUNCTION_HASH) + if (hashCode == RULE_SET_DOES_NOT_EXIST_HASH) { - return AWSError(static_cast(SESErrors::INVALID_LAMBDA_FUNCTION), false); - } - else if (hashCode == CANNOT_DELETE_HASH) - { - return AWSError(static_cast(SESErrors::CANNOT_DELETE), false); + return AWSError(static_cast(SESErrors::RULE_SET_DOES_NOT_EXIST), false); } - else if (hashCode == INVALID_POLICY_HASH) + else if (hashCode == RULE_DOES_NOT_EXIST_HASH) { - return AWSError(static_cast(SESErrors::INVALID_POLICY), false); + return AWSError(static_cast(SESErrors::RULE_DOES_NOT_EXIST), false); } - else if (hashCode == INVALID_SNS_TOPIC_HASH) + else if (hashCode == CANNOT_DELETE_HASH) { - return AWSError(static_cast(SESErrors::INVALID_SNS_TOPIC), false); + return AWSError(static_cast(SESErrors::CANNOT_DELETE), false); } - else if (hashCode == LIMIT_EXCEEDED_HASH) + else if (hashCode == INVALID_S3_CONFIGURATION_HASH) { - return AWSError(static_cast(SESErrors::LIMIT_EXCEEDED), false); + return AWSError(static_cast(SESErrors::INVALID_S3_CONFIGURATION), false); } - else if (hashCode == MESSAGE_REJECTED_HASH) + else if (hashCode == INVALID_LAMBDA_FUNCTION_HASH) { - return AWSError(static_cast(SESErrors::MESSAGE_REJECTED), false); + return AWSError(static_cast(SESErrors::INVALID_LAMBDA_FUNCTION), false); } - else if (hashCode == RULE_DOES_NOT_EXIST_HASH) + else if (hashCode == ALREADY_EXISTS_HASH) { - return AWSError(static_cast(SESErrors::RULE_DOES_NOT_EXIST), false); + return AWSError(static_cast(SESErrors::ALREADY_EXISTS), false); } - else if (hashCode == RULE_SET_DOES_NOT_EXIST_HASH) + else if (hashCode == INVALID_SNS_TOPIC_HASH) { - return AWSError(static_cast(SESErrors::RULE_SET_DOES_NOT_EXIST), false); + return AWSError(static_cast(SESErrors::INVALID_SNS_TOPIC), false); } - else if (hashCode == ALREADY_EXISTS_HASH) + else if (hashCode == LIMIT_EXCEEDED_HASH) { - return AWSError(static_cast(SESErrors::ALREADY_EXISTS), false); + return AWSError(static_cast(SESErrors::LIMIT_EXCEEDED), false); } - else if (hashCode == MAIL_FROM_DOMAIN_NOT_VERIFIED_HASH) + else if (hashCode == INVALID_POLICY_HASH) { - return AWSError(static_cast(SESErrors::MAIL_FROM_DOMAIN_NOT_VERIFIED), false); + return AWSError(static_cast(SESErrors::INVALID_POLICY), false); } - else if (hashCode == INVALID_S3_CONFIGURATION_HASH) + else if (hashCode == MESSAGE_REJECTED_HASH) { - return AWSError(static_cast(SESErrors::INVALID_S3_CONFIGURATION), false); + return AWSError(static_cast(SESErrors::MESSAGE_REJECTED), false); } return AWSError(CoreErrors::UNKNOWN, false); } diff --git a/aws-cpp-sdk-email/source/model/AddHeaderAction.cpp b/aws-cpp-sdk-email/source/model/AddHeaderAction.cpp index fabd303ce2f..3f09464be46 100644 --- a/aws-cpp-sdk-email/source/model/AddHeaderAction.cpp +++ b/aws-cpp-sdk-email/source/model/AddHeaderAction.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + AddHeaderAction::AddHeaderAction() : m_headerNameHasBeenSet(false), m_headerValueHasBeenSet(false) @@ -82,3 +88,7 @@ void AddHeaderAction::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".HeaderValue=" << StringUtils::URLEncode(m_headerValue.c_str()) << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/Body.cpp b/aws-cpp-sdk-email/source/model/Body.cpp index b58d7bd5fee..7efa8dbf9c1 100644 --- a/aws-cpp-sdk-email/source/model/Body.cpp +++ b/aws-cpp-sdk-email/source/model/Body.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + Body::Body() : m_textHasBeenSet(false), m_htmlHasBeenSet(false) @@ -90,3 +96,7 @@ void Body::OutputToStream(Aws::OStream& oStream, const char* location) const m_html.OutputToStream(oStream, htmlLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/BounceAction.cpp b/aws-cpp-sdk-email/source/model/BounceAction.cpp index b6bc23d9c10..5896e37f603 100644 --- a/aws-cpp-sdk-email/source/model/BounceAction.cpp +++ b/aws-cpp-sdk-email/source/model/BounceAction.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + BounceAction::BounceAction() : m_topicArnHasBeenSet(false), m_smtpReplyCodeHasBeenSet(false), @@ -130,3 +136,7 @@ void BounceAction::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".Sender=" << StringUtils::URLEncode(m_sender.c_str()) << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/BounceType.cpp b/aws-cpp-sdk-email/source/model/BounceType.cpp index 3acf1cd46b9..0d1f2f6413d 100644 --- a/aws-cpp-sdk-email/source/model/BounceType.cpp +++ b/aws-cpp-sdk-email/source/model/BounceType.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int DoesNotExist_HASH = HashingUtils::HashString("DoesNotExist"); -static const int MessageTooLarge_HASH = HashingUtils::HashString("MessageTooLarge"); -static const int ExceededQuota_HASH = HashingUtils::HashString("ExceededQuota"); -static const int ContentRejected_HASH = HashingUtils::HashString("ContentRejected"); -static const int Undefined_HASH = HashingUtils::HashString("Undefined"); -static const int TemporaryFailure_HASH = HashingUtils::HashString("TemporaryFailure"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace BounceTypeMapper { + static const int DoesNotExist_HASH = HashingUtils::HashString("DoesNotExist"); + static const int MessageTooLarge_HASH = HashingUtils::HashString("MessageTooLarge"); + static const int ExceededQuota_HASH = HashingUtils::HashString("ExceededQuota"); + static const int ContentRejected_HASH = HashingUtils::HashString("ContentRejected"); + static const int Undefined_HASH = HashingUtils::HashString("Undefined"); + static const int TemporaryFailure_HASH = HashingUtils::HashString("TemporaryFailure"); + BounceType GetBounceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-email/source/model/BouncedRecipientInfo.cpp b/aws-cpp-sdk-email/source/model/BouncedRecipientInfo.cpp index dcdadb6fcdb..61264dbd8aa 100644 --- a/aws-cpp-sdk-email/source/model/BouncedRecipientInfo.cpp +++ b/aws-cpp-sdk-email/source/model/BouncedRecipientInfo.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + BouncedRecipientInfo::BouncedRecipientInfo() : m_recipientHasBeenSet(false), m_recipientArnHasBeenSet(false), @@ -118,3 +124,7 @@ void BouncedRecipientInfo::OutputToStream(Aws::OStream& oStream, const char* loc m_recipientDsnFields.OutputToStream(oStream, recipientDsnFieldsLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/Content.cpp b/aws-cpp-sdk-email/source/model/Content.cpp index 517cc0de532..67dcae3c180 100644 --- a/aws-cpp-sdk-email/source/model/Content.cpp +++ b/aws-cpp-sdk-email/source/model/Content.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + Content::Content() : m_dataHasBeenSet(false), m_charsetHasBeenSet(false) @@ -82,3 +88,7 @@ void Content::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Charset=" << StringUtils::URLEncode(m_charset.c_str()) << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/Destination.cpp b/aws-cpp-sdk-email/source/model/Destination.cpp index 1ba4dbd4def..e92d417ad59 100644 --- a/aws-cpp-sdk-email/source/model/Destination.cpp +++ b/aws-cpp-sdk-email/source/model/Destination.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + Destination::Destination() : m_toAddressesHasBeenSet(false), m_ccAddressesHasBeenSet(false), @@ -140,3 +146,7 @@ void Destination::OutputToStream(Aws::OStream& oStream, const char* location) co } } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/DsnAction.cpp b/aws-cpp-sdk-email/source/model/DsnAction.cpp index 7d3a1159c35..54414d56fb3 100644 --- a/aws-cpp-sdk-email/source/model/DsnAction.cpp +++ b/aws-cpp-sdk-email/source/model/DsnAction.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int failed_HASH = HashingUtils::HashString("failed"); -static const int delayed_HASH = HashingUtils::HashString("delayed"); -static const int delivered_HASH = HashingUtils::HashString("delivered"); -static const int relayed_HASH = HashingUtils::HashString("relayed"); -static const int expanded_HASH = HashingUtils::HashString("expanded"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace DsnActionMapper { + static const int failed_HASH = HashingUtils::HashString("failed"); + static const int delayed_HASH = HashingUtils::HashString("delayed"); + static const int delivered_HASH = HashingUtils::HashString("delivered"); + static const int relayed_HASH = HashingUtils::HashString("relayed"); + static const int expanded_HASH = HashingUtils::HashString("expanded"); + DsnAction GetDsnActionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-email/source/model/ExtensionField.cpp b/aws-cpp-sdk-email/source/model/ExtensionField.cpp index 855b14eba3a..ce15ebb67e7 100644 --- a/aws-cpp-sdk-email/source/model/ExtensionField.cpp +++ b/aws-cpp-sdk-email/source/model/ExtensionField.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + ExtensionField::ExtensionField() : m_nameHasBeenSet(false), m_valueHasBeenSet(false) @@ -82,3 +88,7 @@ void ExtensionField::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/IdentityDkimAttributes.cpp b/aws-cpp-sdk-email/source/model/IdentityDkimAttributes.cpp index c921e63b581..a777b0048d1 100644 --- a/aws-cpp-sdk-email/source/model/IdentityDkimAttributes.cpp +++ b/aws-cpp-sdk-email/source/model/IdentityDkimAttributes.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + IdentityDkimAttributes::IdentityDkimAttributes() : m_dkimEnabled(false), m_dkimEnabledHasBeenSet(false), @@ -114,3 +120,7 @@ void IdentityDkimAttributes::OutputToStream(Aws::OStream& oStream, const char* l } } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/IdentityNotificationAttributes.cpp b/aws-cpp-sdk-email/source/model/IdentityNotificationAttributes.cpp index 77158a95f7a..f2cb2d8ec48 100644 --- a/aws-cpp-sdk-email/source/model/IdentityNotificationAttributes.cpp +++ b/aws-cpp-sdk-email/source/model/IdentityNotificationAttributes.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + IdentityNotificationAttributes::IdentityNotificationAttributes() : m_bounceTopicHasBeenSet(false), m_complaintTopicHasBeenSet(false), @@ -116,3 +122,7 @@ void IdentityNotificationAttributes::OutputToStream(Aws::OStream& oStream, const oStream << location << ".ForwardingEnabled=" << m_forwardingEnabled << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/IdentityType.cpp b/aws-cpp-sdk-email/source/model/IdentityType.cpp index aac61dd7c15..6ebab90998d 100644 --- a/aws-cpp-sdk-email/source/model/IdentityType.cpp +++ b/aws-cpp-sdk-email/source/model/IdentityType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int EmailAddress_HASH = HashingUtils::HashString("EmailAddress"); -static const int Domain_HASH = HashingUtils::HashString("Domain"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace IdentityTypeMapper { + static const int EmailAddress_HASH = HashingUtils::HashString("EmailAddress"); + static const int Domain_HASH = HashingUtils::HashString("Domain"); + IdentityType GetIdentityTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-email/source/model/IdentityVerificationAttributes.cpp b/aws-cpp-sdk-email/source/model/IdentityVerificationAttributes.cpp index 91175efeec6..b8beecf0306 100644 --- a/aws-cpp-sdk-email/source/model/IdentityVerificationAttributes.cpp +++ b/aws-cpp-sdk-email/source/model/IdentityVerificationAttributes.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + IdentityVerificationAttributes::IdentityVerificationAttributes() : m_verificationStatusHasBeenSet(false), m_verificationTokenHasBeenSet(false) @@ -82,3 +88,7 @@ void IdentityVerificationAttributes::OutputToStream(Aws::OStream& oStream, const oStream << location << ".VerificationToken=" << StringUtils::URLEncode(m_verificationToken.c_str()) << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/InvocationType.cpp b/aws-cpp-sdk-email/source/model/InvocationType.cpp index 14d77562922..58726d271c2 100644 --- a/aws-cpp-sdk-email/source/model/InvocationType.cpp +++ b/aws-cpp-sdk-email/source/model/InvocationType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Event_HASH = HashingUtils::HashString("Event"); -static const int RequestResponse_HASH = HashingUtils::HashString("RequestResponse"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace InvocationTypeMapper { + static const int Event_HASH = HashingUtils::HashString("Event"); + static const int RequestResponse_HASH = HashingUtils::HashString("RequestResponse"); + InvocationType GetInvocationTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-email/source/model/LambdaAction.cpp b/aws-cpp-sdk-email/source/model/LambdaAction.cpp index d008406bc1c..d95a1a590b4 100644 --- a/aws-cpp-sdk-email/source/model/LambdaAction.cpp +++ b/aws-cpp-sdk-email/source/model/LambdaAction.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + LambdaAction::LambdaAction() : m_topicArnHasBeenSet(false), m_functionArnHasBeenSet(false), @@ -98,3 +104,7 @@ void LambdaAction::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".InvocationType=" << InvocationTypeMapper::GetNameForInvocationType(m_invocationType) << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/Message.cpp b/aws-cpp-sdk-email/source/model/Message.cpp index 17611df8001..bd46236d20a 100644 --- a/aws-cpp-sdk-email/source/model/Message.cpp +++ b/aws-cpp-sdk-email/source/model/Message.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + Message::Message() : m_subjectHasBeenSet(false), m_bodyHasBeenSet(false) @@ -90,3 +96,7 @@ void Message::OutputToStream(Aws::OStream& oStream, const char* location) const m_body.OutputToStream(oStream, bodyLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/MessageDsn.cpp b/aws-cpp-sdk-email/source/model/MessageDsn.cpp index 33079695886..257d6181f68 100644 --- a/aws-cpp-sdk-email/source/model/MessageDsn.cpp +++ b/aws-cpp-sdk-email/source/model/MessageDsn.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + MessageDsn::MessageDsn() : m_reportingMtaHasBeenSet(false), m_arrivalDateHasBeenSet(false), @@ -116,3 +122,7 @@ void MessageDsn::OutputToStream(Aws::OStream& oStream, const char* location) con } } } + +} // namespace Model +} // namespace SES +} // namespace Aws diff --git a/aws-cpp-sdk-email/source/model/NotificationType.cpp b/aws-cpp-sdk-email/source/model/NotificationType.cpp index c123d17cfea..b2087f4aa2e 100644 --- a/aws-cpp-sdk-email/source/model/NotificationType.cpp +++ b/aws-cpp-sdk-email/source/model/NotificationType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int Bounce_HASH = HashingUtils::HashString("Bounce"); -static const int Complaint_HASH = HashingUtils::HashString("Complaint"); -static const int Delivery_HASH = HashingUtils::HashString("Delivery"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace NotificationTypeMapper { + static const int Bounce_HASH = HashingUtils::HashString("Bounce"); + static const int Complaint_HASH = HashingUtils::HashString("Complaint"); + static const int Delivery_HASH = HashingUtils::HashString("Delivery"); + NotificationType GetNotificationTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-email/source/model/RawMessage.cpp b/aws-cpp-sdk-email/source/model/RawMessage.cpp index 29764785080..22ae664406c 100644 --- a/aws-cpp-sdk-email/source/model/RawMessage.cpp +++ b/aws-cpp-sdk-email/source/model/RawMessage.cpp @@ -20,10 +20,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + RawMessage::RawMessage() : m_dataHasBeenSet(false) { @@ -67,3 +73,7 @@ void RawMessage::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".Data=" << StringUtils::URLEncode(HashingUtils::Base64Encode(m_data).c_str()) << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/ReceiptAction.cpp b/aws-cpp-sdk-email/source/model/ReceiptAction.cpp index d161f494de7..9e64f9351a1 100644 --- a/aws-cpp-sdk-email/source/model/ReceiptAction.cpp +++ b/aws-cpp-sdk-email/source/model/ReceiptAction.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + ReceiptAction::ReceiptAction() : m_s3ActionHasBeenSet(false), m_bounceActionHasBeenSet(false), @@ -190,3 +196,7 @@ void ReceiptAction::OutputToStream(Aws::OStream& oStream, const char* location) m_sNSAction.OutputToStream(oStream, sNSActionLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/ReceiptFilter.cpp b/aws-cpp-sdk-email/source/model/ReceiptFilter.cpp index 95cb45f1e04..135e17ab95d 100644 --- a/aws-cpp-sdk-email/source/model/ReceiptFilter.cpp +++ b/aws-cpp-sdk-email/source/model/ReceiptFilter.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + ReceiptFilter::ReceiptFilter() : m_nameHasBeenSet(false), m_ipFilterHasBeenSet(false) @@ -86,3 +92,7 @@ void ReceiptFilter::OutputToStream(Aws::OStream& oStream, const char* location) m_ipFilter.OutputToStream(oStream, ipFilterLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/ReceiptFilterPolicy.cpp b/aws-cpp-sdk-email/source/model/ReceiptFilterPolicy.cpp index 29db3b45ddc..c5f12b70b7a 100644 --- a/aws-cpp-sdk-email/source/model/ReceiptFilterPolicy.cpp +++ b/aws-cpp-sdk-email/source/model/ReceiptFilterPolicy.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Block_HASH = HashingUtils::HashString("Block"); -static const int Allow_HASH = HashingUtils::HashString("Allow"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ReceiptFilterPolicyMapper { + static const int Block_HASH = HashingUtils::HashString("Block"); + static const int Allow_HASH = HashingUtils::HashString("Allow"); + ReceiptFilterPolicy GetReceiptFilterPolicyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-email/source/model/ReceiptIpFilter.cpp b/aws-cpp-sdk-email/source/model/ReceiptIpFilter.cpp index cfff95517d0..5e9c7808f4d 100644 --- a/aws-cpp-sdk-email/source/model/ReceiptIpFilter.cpp +++ b/aws-cpp-sdk-email/source/model/ReceiptIpFilter.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + ReceiptIpFilter::ReceiptIpFilter() : m_policyHasBeenSet(false), m_cidrHasBeenSet(false) @@ -82,3 +88,7 @@ void ReceiptIpFilter::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".Cidr=" << StringUtils::URLEncode(m_cidr.c_str()) << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/ReceiptRule.cpp b/aws-cpp-sdk-email/source/model/ReceiptRule.cpp index 09894c3614b..2ed48ea5b0b 100644 --- a/aws-cpp-sdk-email/source/model/ReceiptRule.cpp +++ b/aws-cpp-sdk-email/source/model/ReceiptRule.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + ReceiptRule::ReceiptRule() : m_nameHasBeenSet(false), m_enabled(false), @@ -182,3 +188,7 @@ void ReceiptRule::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".ScanEnabled=" << m_scanEnabled << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/ReceiptRuleSetMetadata.cpp b/aws-cpp-sdk-email/source/model/ReceiptRuleSetMetadata.cpp index 306df9ccec3..b1699b84137 100644 --- a/aws-cpp-sdk-email/source/model/ReceiptRuleSetMetadata.cpp +++ b/aws-cpp-sdk-email/source/model/ReceiptRuleSetMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + ReceiptRuleSetMetadata::ReceiptRuleSetMetadata() : m_nameHasBeenSet(false), m_createdTimestampHasBeenSet(false) @@ -82,3 +88,7 @@ void ReceiptRuleSetMetadata::OutputToStream(Aws::OStream& oStream, const char* l oStream << location << ".CreatedTimestamp=" << StringUtils::URLEncode(m_createdTimestamp.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws diff --git a/aws-cpp-sdk-email/source/model/RecipientDsnFields.cpp b/aws-cpp-sdk-email/source/model/RecipientDsnFields.cpp index d8f4f2f685a..02bc532eff7 100644 --- a/aws-cpp-sdk-email/source/model/RecipientDsnFields.cpp +++ b/aws-cpp-sdk-email/source/model/RecipientDsnFields.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + RecipientDsnFields::RecipientDsnFields() : m_finalRecipientHasBeenSet(false), m_actionHasBeenSet(false), @@ -180,3 +186,7 @@ void RecipientDsnFields::OutputToStream(Aws::OStream& oStream, const char* locat } } } + +} // namespace Model +} // namespace SES +} // namespace Aws diff --git a/aws-cpp-sdk-email/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-email/source/model/ResponseMetadata.cpp index 8c4f9904b90..adcce93b3f1 100644 --- a/aws-cpp-sdk-email/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-email/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/S3Action.cpp b/aws-cpp-sdk-email/source/model/S3Action.cpp index bf90b2a0130..502d67cd2d3 100644 --- a/aws-cpp-sdk-email/source/model/S3Action.cpp +++ b/aws-cpp-sdk-email/source/model/S3Action.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + S3Action::S3Action() : m_topicArnHasBeenSet(false), m_bucketNameHasBeenSet(false), @@ -114,3 +120,7 @@ void S3Action::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".KmsKeyArn=" << StringUtils::URLEncode(m_kmsKeyArn.c_str()) << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/SNSAction.cpp b/aws-cpp-sdk-email/source/model/SNSAction.cpp index 33bd3fa0f08..711bb07bd61 100644 --- a/aws-cpp-sdk-email/source/model/SNSAction.cpp +++ b/aws-cpp-sdk-email/source/model/SNSAction.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + SNSAction::SNSAction() : m_topicArnHasBeenSet(false), m_encodingHasBeenSet(false) @@ -82,3 +88,7 @@ void SNSAction::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".Encoding=" << SNSActionEncodingMapper::GetNameForSNSActionEncoding(m_encoding) << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws diff --git a/aws-cpp-sdk-email/source/model/SendDataPoint.cpp b/aws-cpp-sdk-email/source/model/SendDataPoint.cpp index e850e1e4477..cc4c436430a 100644 --- a/aws-cpp-sdk-email/source/model/SendDataPoint.cpp +++ b/aws-cpp-sdk-email/source/model/SendDataPoint.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + SendDataPoint::SendDataPoint() : m_timestampHasBeenSet(false), m_deliveryAttempts(0), @@ -138,3 +144,7 @@ void SendDataPoint::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".Rejects=" << m_rejects << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws diff --git a/aws-cpp-sdk-email/source/model/StopAction.cpp b/aws-cpp-sdk-email/source/model/StopAction.cpp index 09a37fd76bc..05a2e778c85 100644 --- a/aws-cpp-sdk-email/source/model/StopAction.cpp +++ b/aws-cpp-sdk-email/source/model/StopAction.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + StopAction::StopAction() : m_scopeHasBeenSet(false), m_topicArnHasBeenSet(false) @@ -82,3 +88,7 @@ void StopAction::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".TopicArn=" << StringUtils::URLEncode(m_topicArn.c_str()) << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-email/source/model/StopScope.cpp b/aws-cpp-sdk-email/source/model/StopScope.cpp index f89b79d7033..7f51093b87c 100644 --- a/aws-cpp-sdk-email/source/model/StopScope.cpp +++ b/aws-cpp-sdk-email/source/model/StopScope.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int RuleSet_HASH = HashingUtils::HashString("RuleSet"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace StopScopeMapper { + static const int RuleSet_HASH = HashingUtils::HashString("RuleSet"); + StopScope GetStopScopeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-email/source/model/TlsPolicy.cpp b/aws-cpp-sdk-email/source/model/TlsPolicy.cpp index 6687bc8a57a..2b3de8ea9e4 100644 --- a/aws-cpp-sdk-email/source/model/TlsPolicy.cpp +++ b/aws-cpp-sdk-email/source/model/TlsPolicy.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Require_HASH = HashingUtils::HashString("Require"); -static const int Optional_HASH = HashingUtils::HashString("Optional"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace TlsPolicyMapper { + static const int Require_HASH = HashingUtils::HashString("Require"); + static const int Optional_HASH = HashingUtils::HashString("Optional"); + TlsPolicy GetTlsPolicyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-email/source/model/VerificationStatus.cpp b/aws-cpp-sdk-email/source/model/VerificationStatus.cpp index 96aa3334aaa..cb5c76ca697 100644 --- a/aws-cpp-sdk-email/source/model/VerificationStatus.cpp +++ b/aws-cpp-sdk-email/source/model/VerificationStatus.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int Pending_HASH = HashingUtils::HashString("Pending"); -static const int Success_HASH = HashingUtils::HashString("Success"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); -static const int TemporaryFailure_HASH = HashingUtils::HashString("TemporaryFailure"); -static const int NotStarted_HASH = HashingUtils::HashString("NotStarted"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace VerificationStatusMapper { + static const int Pending_HASH = HashingUtils::HashString("Pending"); + static const int Success_HASH = HashingUtils::HashString("Success"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + static const int TemporaryFailure_HASH = HashingUtils::HashString("TemporaryFailure"); + static const int NotStarted_HASH = HashingUtils::HashString("NotStarted"); + VerificationStatus GetVerificationStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-email/source/model/WorkmailAction.cpp b/aws-cpp-sdk-email/source/model/WorkmailAction.cpp index b7b6ea77bfd..aa2a9fb4b04 100644 --- a/aws-cpp-sdk-email/source/model/WorkmailAction.cpp +++ b/aws-cpp-sdk-email/source/model/WorkmailAction.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SES::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SES +{ +namespace Model +{ + WorkmailAction::WorkmailAction() : m_topicArnHasBeenSet(false), m_organizationArnHasBeenSet(false) @@ -82,3 +88,7 @@ void WorkmailAction::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".OrganizationArn=" << StringUtils::URLEncode(m_organizationArn.c_str()) << "&"; } } + +} // namespace Model +} // namespace SES +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-es/CMakeLists.txt b/aws-cpp-sdk-es/CMakeLists.txt index a7a76876473..e1cda2f0080 100644 --- a/aws-cpp-sdk-es/CMakeLists.txt +++ b/aws-cpp-sdk-es/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-es) "source/model/*.cpp" ) - file(GLOB ES_SRC + file(GLOB ES_UNIFIED_HEADERS ${AWS_ES_HEADERS} ${AWS_ES_MODEL_HEADERS} + ) + + file(GLOB ES_UNITY_SRC ${AWS_ES_SOURCE} ${AWS_ES_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("ES" ES_UNITY_SRC) + endif() + + file(GLOB ES_SRC + ${ES_UNIFIED_HEADERS} + ${ES_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-es/source/ElasticsearchServiceErrors.cpp b/aws-cpp-sdk-es/source/ElasticsearchServiceErrors.cpp index 1bb25a0a619..5934554eb30 100644 --- a/aws-cpp-sdk-es/source/ElasticsearchServiceErrors.cpp +++ b/aws-cpp-sdk-es/source/ElasticsearchServiceErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::ElasticsearchService; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticsearchService +{ +namespace ElasticsearchServiceErrorMapper +{ + static const int DISABLED_OPERATION_HASH = HashingUtils::HashString("DisabledOperationException"); static const int INVALID_TYPE_HASH = HashingUtils::HashString("InvalidTypeException"); static const int BASE_HASH = HashingUtils::HashString("BaseException"); @@ -27,12 +34,6 @@ static const int RESOURCE_ALREADY_EXISTS_HASH = HashingUtils::HashString("Resour static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); static const int INTERNAL_HASH = HashingUtils::HashString("InternalException"); -namespace Aws -{ -namespace ElasticsearchService -{ -namespace ElasticsearchServiceErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-es/source/model/AccessPoliciesStatus.cpp b/aws-cpp-sdk-es/source/model/AccessPoliciesStatus.cpp index 7a83eb7cf40..a030eefce12 100644 --- a/aws-cpp-sdk-es/source/model/AccessPoliciesStatus.cpp +++ b/aws-cpp-sdk-es/source/model/AccessPoliciesStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticsearchService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticsearchService +{ +namespace Model +{ + AccessPoliciesStatus::AccessPoliciesStatus() : m_optionsHasBeenSet(false), m_statusHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue AccessPoliciesStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticsearchService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-es/source/model/AdvancedOptionsStatus.cpp b/aws-cpp-sdk-es/source/model/AdvancedOptionsStatus.cpp index 886fd664063..b6f9929f890 100644 --- a/aws-cpp-sdk-es/source/model/AdvancedOptionsStatus.cpp +++ b/aws-cpp-sdk-es/source/model/AdvancedOptionsStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticsearchService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticsearchService +{ +namespace Model +{ + AdvancedOptionsStatus::AdvancedOptionsStatus() : m_optionsHasBeenSet(false), m_statusHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue AdvancedOptionsStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticsearchService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-es/source/model/DomainInfo.cpp b/aws-cpp-sdk-es/source/model/DomainInfo.cpp index d557b6b82e8..fda8ef8683d 100644 --- a/aws-cpp-sdk-es/source/model/DomainInfo.cpp +++ b/aws-cpp-sdk-es/source/model/DomainInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticsearchService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticsearchService +{ +namespace Model +{ + DomainInfo::DomainInfo() : m_domainNameHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue DomainInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticsearchService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-es/source/model/EBSOptions.cpp b/aws-cpp-sdk-es/source/model/EBSOptions.cpp index c4c4fd0d9b2..284bfabeccf 100644 --- a/aws-cpp-sdk-es/source/model/EBSOptions.cpp +++ b/aws-cpp-sdk-es/source/model/EBSOptions.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticsearchService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticsearchService +{ +namespace Model +{ + EBSOptions::EBSOptions() : m_eBSEnabled(false), m_eBSEnabledHasBeenSet(false), @@ -105,4 +111,8 @@ JsonValue EBSOptions::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticsearchService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-es/source/model/EBSOptionsStatus.cpp b/aws-cpp-sdk-es/source/model/EBSOptionsStatus.cpp index de4270ee98b..7d906bd9322 100644 --- a/aws-cpp-sdk-es/source/model/EBSOptionsStatus.cpp +++ b/aws-cpp-sdk-es/source/model/EBSOptionsStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticsearchService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticsearchService +{ +namespace Model +{ + EBSOptionsStatus::EBSOptionsStatus() : m_optionsHasBeenSet(false), m_statusHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue EBSOptionsStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticsearchService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-es/source/model/ESPartitionInstanceType.cpp b/aws-cpp-sdk-es/source/model/ESPartitionInstanceType.cpp index a6368049ece..6768f35305f 100644 --- a/aws-cpp-sdk-es/source/model/ESPartitionInstanceType.cpp +++ b/aws-cpp-sdk-es/source/model/ESPartitionInstanceType.cpp @@ -19,20 +19,6 @@ using namespace Aws::Utils; -static const int m3_medium_elasticsearch_HASH = HashingUtils::HashString("m3.medium.elasticsearch"); -static const int m3_large_elasticsearch_HASH = HashingUtils::HashString("m3.large.elasticsearch"); -static const int m3_xlarge_elasticsearch_HASH = HashingUtils::HashString("m3.xlarge.elasticsearch"); -static const int m3_2xlarge_elasticsearch_HASH = HashingUtils::HashString("m3.2xlarge.elasticsearch"); -static const int t2_micro_elasticsearch_HASH = HashingUtils::HashString("t2.micro.elasticsearch"); -static const int t2_small_elasticsearch_HASH = HashingUtils::HashString("t2.small.elasticsearch"); -static const int t2_medium_elasticsearch_HASH = HashingUtils::HashString("t2.medium.elasticsearch"); -static const int r3_large_elasticsearch_HASH = HashingUtils::HashString("r3.large.elasticsearch"); -static const int r3_xlarge_elasticsearch_HASH = HashingUtils::HashString("r3.xlarge.elasticsearch"); -static const int r3_2xlarge_elasticsearch_HASH = HashingUtils::HashString("r3.2xlarge.elasticsearch"); -static const int r3_4xlarge_elasticsearch_HASH = HashingUtils::HashString("r3.4xlarge.elasticsearch"); -static const int r3_8xlarge_elasticsearch_HASH = HashingUtils::HashString("r3.8xlarge.elasticsearch"); -static const int i2_xlarge_elasticsearch_HASH = HashingUtils::HashString("i2.xlarge.elasticsearch"); -static const int i2_2xlarge_elasticsearch_HASH = HashingUtils::HashString("i2.2xlarge.elasticsearch"); namespace Aws { @@ -43,6 +29,21 @@ namespace Aws namespace ESPartitionInstanceTypeMapper { + static const int m3_medium_elasticsearch_HASH = HashingUtils::HashString("m3.medium.elasticsearch"); + static const int m3_large_elasticsearch_HASH = HashingUtils::HashString("m3.large.elasticsearch"); + static const int m3_xlarge_elasticsearch_HASH = HashingUtils::HashString("m3.xlarge.elasticsearch"); + static const int m3_2xlarge_elasticsearch_HASH = HashingUtils::HashString("m3.2xlarge.elasticsearch"); + static const int t2_micro_elasticsearch_HASH = HashingUtils::HashString("t2.micro.elasticsearch"); + static const int t2_small_elasticsearch_HASH = HashingUtils::HashString("t2.small.elasticsearch"); + static const int t2_medium_elasticsearch_HASH = HashingUtils::HashString("t2.medium.elasticsearch"); + static const int r3_large_elasticsearch_HASH = HashingUtils::HashString("r3.large.elasticsearch"); + static const int r3_xlarge_elasticsearch_HASH = HashingUtils::HashString("r3.xlarge.elasticsearch"); + static const int r3_2xlarge_elasticsearch_HASH = HashingUtils::HashString("r3.2xlarge.elasticsearch"); + static const int r3_4xlarge_elasticsearch_HASH = HashingUtils::HashString("r3.4xlarge.elasticsearch"); + static const int r3_8xlarge_elasticsearch_HASH = HashingUtils::HashString("r3.8xlarge.elasticsearch"); + static const int i2_xlarge_elasticsearch_HASH = HashingUtils::HashString("i2.xlarge.elasticsearch"); + static const int i2_2xlarge_elasticsearch_HASH = HashingUtils::HashString("i2.2xlarge.elasticsearch"); + ESPartitionInstanceType GetESPartitionInstanceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-es/source/model/ElasticsearchClusterConfig.cpp b/aws-cpp-sdk-es/source/model/ElasticsearchClusterConfig.cpp index 402d7695985..78322858301 100644 --- a/aws-cpp-sdk-es/source/model/ElasticsearchClusterConfig.cpp +++ b/aws-cpp-sdk-es/source/model/ElasticsearchClusterConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticsearchService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticsearchService +{ +namespace Model +{ + ElasticsearchClusterConfig::ElasticsearchClusterConfig() : m_instanceTypeHasBeenSet(false), m_instanceCount(0), @@ -136,4 +142,8 @@ JsonValue ElasticsearchClusterConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticsearchService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-es/source/model/ElasticsearchClusterConfigStatus.cpp b/aws-cpp-sdk-es/source/model/ElasticsearchClusterConfigStatus.cpp index 133ac7c803e..192c48e0f9c 100644 --- a/aws-cpp-sdk-es/source/model/ElasticsearchClusterConfigStatus.cpp +++ b/aws-cpp-sdk-es/source/model/ElasticsearchClusterConfigStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticsearchService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticsearchService +{ +namespace Model +{ + ElasticsearchClusterConfigStatus::ElasticsearchClusterConfigStatus() : m_optionsHasBeenSet(false), m_statusHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue ElasticsearchClusterConfigStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticsearchService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-es/source/model/ElasticsearchDomainConfig.cpp b/aws-cpp-sdk-es/source/model/ElasticsearchDomainConfig.cpp index d992433d7a4..594ed5b2fd1 100644 --- a/aws-cpp-sdk-es/source/model/ElasticsearchDomainConfig.cpp +++ b/aws-cpp-sdk-es/source/model/ElasticsearchDomainConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticsearchService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticsearchService +{ +namespace Model +{ + ElasticsearchDomainConfig::ElasticsearchDomainConfig() : m_elasticsearchClusterConfigHasBeenSet(false), m_eBSOptionsHasBeenSet(false), @@ -115,4 +121,8 @@ JsonValue ElasticsearchDomainConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticsearchService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-es/source/model/ElasticsearchDomainStatus.cpp b/aws-cpp-sdk-es/source/model/ElasticsearchDomainStatus.cpp index d06f68d3166..d4507856e31 100644 --- a/aws-cpp-sdk-es/source/model/ElasticsearchDomainStatus.cpp +++ b/aws-cpp-sdk-es/source/model/ElasticsearchDomainStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticsearchService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticsearchService +{ +namespace Model +{ + ElasticsearchDomainStatus::ElasticsearchDomainStatus() : m_domainIdHasBeenSet(false), m_domainNameHasBeenSet(false), @@ -234,4 +240,8 @@ JsonValue ElasticsearchDomainStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticsearchService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-es/source/model/OptionState.cpp b/aws-cpp-sdk-es/source/model/OptionState.cpp index 19e78c383f6..2eb4e37e47a 100644 --- a/aws-cpp-sdk-es/source/model/OptionState.cpp +++ b/aws-cpp-sdk-es/source/model/OptionState.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int RequiresIndexDocuments_HASH = HashingUtils::HashString("RequiresIndexDocuments"); -static const int Processing_HASH = HashingUtils::HashString("Processing"); -static const int Active_HASH = HashingUtils::HashString("Active"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace OptionStateMapper { + static const int RequiresIndexDocuments_HASH = HashingUtils::HashString("RequiresIndexDocuments"); + static const int Processing_HASH = HashingUtils::HashString("Processing"); + static const int Active_HASH = HashingUtils::HashString("Active"); + OptionState GetOptionStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-es/source/model/OptionStatus.cpp b/aws-cpp-sdk-es/source/model/OptionStatus.cpp index 96942a998dc..850cbd7d8e1 100644 --- a/aws-cpp-sdk-es/source/model/OptionStatus.cpp +++ b/aws-cpp-sdk-es/source/model/OptionStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticsearchService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticsearchService +{ +namespace Model +{ + OptionStatus::OptionStatus() : m_creationDateHasBeenSet(false), m_updateDateHasBeenSet(false), @@ -116,4 +122,8 @@ JsonValue OptionStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticsearchService +} // namespace Aws diff --git a/aws-cpp-sdk-es/source/model/SnapshotOptions.cpp b/aws-cpp-sdk-es/source/model/SnapshotOptions.cpp index d4d50de79eb..e2a0e994835 100644 --- a/aws-cpp-sdk-es/source/model/SnapshotOptions.cpp +++ b/aws-cpp-sdk-es/source/model/SnapshotOptions.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticsearchService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticsearchService +{ +namespace Model +{ + SnapshotOptions::SnapshotOptions() : m_automatedSnapshotStartHour(0), m_automatedSnapshotStartHourHasBeenSet(false) @@ -57,4 +63,8 @@ JsonValue SnapshotOptions::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticsearchService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-es/source/model/SnapshotOptionsStatus.cpp b/aws-cpp-sdk-es/source/model/SnapshotOptionsStatus.cpp index 99e9b416213..3c62fa9517e 100644 --- a/aws-cpp-sdk-es/source/model/SnapshotOptionsStatus.cpp +++ b/aws-cpp-sdk-es/source/model/SnapshotOptionsStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticsearchService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticsearchService +{ +namespace Model +{ + SnapshotOptionsStatus::SnapshotOptionsStatus() : m_optionsHasBeenSet(false), m_statusHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue SnapshotOptionsStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticsearchService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-es/source/model/Tag.cpp b/aws-cpp-sdk-es/source/model/Tag.cpp index 7a8612bea4b..ec9262ada22 100644 --- a/aws-cpp-sdk-es/source/model/Tag.cpp +++ b/aws-cpp-sdk-es/source/model/Tag.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::ElasticsearchService::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ElasticsearchService +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Tag::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ElasticsearchService +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-es/source/model/VolumeType.cpp b/aws-cpp-sdk-es/source/model/VolumeType.cpp index dbd6741b60b..b8177bce0b6 100644 --- a/aws-cpp-sdk-es/source/model/VolumeType.cpp +++ b/aws-cpp-sdk-es/source/model/VolumeType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int standard_HASH = HashingUtils::HashString("standard"); -static const int gp2_HASH = HashingUtils::HashString("gp2"); -static const int io1_HASH = HashingUtils::HashString("io1"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace VolumeTypeMapper { + static const int standard_HASH = HashingUtils::HashString("standard"); + static const int gp2_HASH = HashingUtils::HashString("gp2"); + static const int io1_HASH = HashingUtils::HashString("io1"); + VolumeType GetVolumeTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-events/CMakeLists.txt b/aws-cpp-sdk-events/CMakeLists.txt index 55442e4d9fd..b42621c986d 100644 --- a/aws-cpp-sdk-events/CMakeLists.txt +++ b/aws-cpp-sdk-events/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-events) "source/model/*.cpp" ) - file(GLOB EVENTS_SRC + file(GLOB EVENTS_UNIFIED_HEADERS ${AWS_EVENTS_HEADERS} ${AWS_EVENTS_MODEL_HEADERS} + ) + + file(GLOB EVENTS_UNITY_SRC ${AWS_EVENTS_SOURCE} ${AWS_EVENTS_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("EVENTS" EVENTS_UNITY_SRC) + endif() + + file(GLOB EVENTS_SRC + ${EVENTS_UNIFIED_HEADERS} + ${EVENTS_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-events/source/CloudWatchEventsErrors.cpp b/aws-cpp-sdk-events/source/CloudWatchEventsErrors.cpp index 26976212111..ad900260a46 100644 --- a/aws-cpp-sdk-events/source/CloudWatchEventsErrors.cpp +++ b/aws-cpp-sdk-events/source/CloudWatchEventsErrors.cpp @@ -20,11 +20,6 @@ using namespace Aws::Client; using namespace Aws::CloudWatchEvents; using namespace Aws::Utils; -static const int CONCURRENT_MODIFICATION_HASH = HashingUtils::HashString("ConcurrentModificationException"); -static const int INVALID_EVENT_PATTERN_HASH = HashingUtils::HashString("InvalidEventPatternException"); -static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); -static const int INTERNAL_HASH = HashingUtils::HashString("InternalException"); - namespace Aws { namespace CloudWatchEvents @@ -32,6 +27,12 @@ namespace CloudWatchEvents namespace CloudWatchEventsErrorMapper { +static const int CONCURRENT_MODIFICATION_HASH = HashingUtils::HashString("ConcurrentModificationException"); +static const int INVALID_EVENT_PATTERN_HASH = HashingUtils::HashString("InvalidEventPatternException"); +static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); +static const int INTERNAL_HASH = HashingUtils::HashString("InternalException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-events/source/model/PutEventsRequestEntry.cpp b/aws-cpp-sdk-events/source/model/PutEventsRequestEntry.cpp index dc0335b7d2d..24646c7e36c 100644 --- a/aws-cpp-sdk-events/source/model/PutEventsRequestEntry.cpp +++ b/aws-cpp-sdk-events/source/model/PutEventsRequestEntry.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchEvents::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchEvents +{ +namespace Model +{ + PutEventsRequestEntry::PutEventsRequestEntry() : m_timeHasBeenSet(false), m_sourceHasBeenSet(false), @@ -122,4 +128,8 @@ JsonValue PutEventsRequestEntry::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchEvents +} // namespace Aws diff --git a/aws-cpp-sdk-events/source/model/PutEventsResultEntry.cpp b/aws-cpp-sdk-events/source/model/PutEventsResultEntry.cpp index ecbc5370d44..f9863704fab 100644 --- a/aws-cpp-sdk-events/source/model/PutEventsResultEntry.cpp +++ b/aws-cpp-sdk-events/source/model/PutEventsResultEntry.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchEvents::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchEvents +{ +namespace Model +{ + PutEventsResultEntry::PutEventsResultEntry() : m_eventIdHasBeenSet(false), m_errorCodeHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue PutEventsResultEntry::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchEvents +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-events/source/model/PutTargetsResultEntry.cpp b/aws-cpp-sdk-events/source/model/PutTargetsResultEntry.cpp index 5ab4367fb87..a9ed00f42d8 100644 --- a/aws-cpp-sdk-events/source/model/PutTargetsResultEntry.cpp +++ b/aws-cpp-sdk-events/source/model/PutTargetsResultEntry.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchEvents::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchEvents +{ +namespace Model +{ + PutTargetsResultEntry::PutTargetsResultEntry() : m_targetIdHasBeenSet(false), m_errorCodeHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue PutTargetsResultEntry::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchEvents +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-events/source/model/RemoveTargetsResultEntry.cpp b/aws-cpp-sdk-events/source/model/RemoveTargetsResultEntry.cpp index 570eaad088c..f5be0aa7cd8 100644 --- a/aws-cpp-sdk-events/source/model/RemoveTargetsResultEntry.cpp +++ b/aws-cpp-sdk-events/source/model/RemoveTargetsResultEntry.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchEvents::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchEvents +{ +namespace Model +{ + RemoveTargetsResultEntry::RemoveTargetsResultEntry() : m_targetIdHasBeenSet(false), m_errorCodeHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue RemoveTargetsResultEntry::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchEvents +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-events/source/model/Rule.cpp b/aws-cpp-sdk-events/source/model/Rule.cpp index 9111b3b4af7..fc91007fc3e 100644 --- a/aws-cpp-sdk-events/source/model/Rule.cpp +++ b/aws-cpp-sdk-events/source/model/Rule.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchEvents::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchEvents +{ +namespace Model +{ + Rule::Rule() : m_nameHasBeenSet(false), m_arnHasBeenSet(false), @@ -144,4 +150,8 @@ JsonValue Rule::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchEvents +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-events/source/model/RuleState.cpp b/aws-cpp-sdk-events/source/model/RuleState.cpp index 70628ed65b8..33cc0dfd0b2 100644 --- a/aws-cpp-sdk-events/source/model/RuleState.cpp +++ b/aws-cpp-sdk-events/source/model/RuleState.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ENABLED_HASH = HashingUtils::HashString("ENABLED"); -static const int DISABLED_HASH = HashingUtils::HashString("DISABLED"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace RuleStateMapper { + static const int ENABLED_HASH = HashingUtils::HashString("ENABLED"); + static const int DISABLED_HASH = HashingUtils::HashString("DISABLED"); + RuleState GetRuleStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-events/source/model/Target.cpp b/aws-cpp-sdk-events/source/model/Target.cpp index b1df0569beb..80d71878766 100644 --- a/aws-cpp-sdk-events/source/model/Target.cpp +++ b/aws-cpp-sdk-events/source/model/Target.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchEvents::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchEvents +{ +namespace Model +{ + Target::Target() : m_idHasBeenSet(false), m_arnHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue Target::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchEvents +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-firehose/CMakeLists.txt b/aws-cpp-sdk-firehose/CMakeLists.txt index 4732ec2b891..6c85f72a0f9 100644 --- a/aws-cpp-sdk-firehose/CMakeLists.txt +++ b/aws-cpp-sdk-firehose/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-firehose) "source/model/*.cpp" ) - file(GLOB FIREHOSE_SRC + file(GLOB FIREHOSE_UNIFIED_HEADERS ${AWS_FIREHOSE_HEADERS} ${AWS_FIREHOSE_MODEL_HEADERS} + ) + + file(GLOB FIREHOSE_UNITY_SRC ${AWS_FIREHOSE_SOURCE} ${AWS_FIREHOSE_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("FIREHOSE" FIREHOSE_UNITY_SRC) + endif() + + file(GLOB FIREHOSE_SRC + ${FIREHOSE_UNIFIED_HEADERS} + ${FIREHOSE_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-firehose/source/FirehoseErrors.cpp b/aws-cpp-sdk-firehose/source/FirehoseErrors.cpp index d7c27532923..696c15915d5 100644 --- a/aws-cpp-sdk-firehose/source/FirehoseErrors.cpp +++ b/aws-cpp-sdk-firehose/source/FirehoseErrors.cpp @@ -20,11 +20,6 @@ using namespace Aws::Client; using namespace Aws::Firehose; using namespace Aws::Utils; -static const int RESOURCE_IN_USE_HASH = HashingUtils::HashString("ResourceInUseException"); -static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); -static const int CONCURRENT_MODIFICATION_HASH = HashingUtils::HashString("ConcurrentModificationException"); -static const int INVALID_ARGUMENT_HASH = HashingUtils::HashString("InvalidArgumentException"); - namespace Aws { namespace Firehose @@ -32,11 +27,21 @@ namespace Firehose namespace FirehoseErrorMapper { +static const int INVALID_ARGUMENT_HASH = HashingUtils::HashString("InvalidArgumentException"); +static const int RESOURCE_IN_USE_HASH = HashingUtils::HashString("ResourceInUseException"); +static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); +static const int CONCURRENT_MODIFICATION_HASH = HashingUtils::HashString("ConcurrentModificationException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); - if (hashCode == RESOURCE_IN_USE_HASH) + if (hashCode == INVALID_ARGUMENT_HASH) + { + return AWSError(static_cast(FirehoseErrors::INVALID_ARGUMENT), false); + } + else if (hashCode == RESOURCE_IN_USE_HASH) { return AWSError(static_cast(FirehoseErrors::RESOURCE_IN_USE), false); } @@ -48,10 +53,6 @@ AWSError GetErrorForName(const char* errorName) { return AWSError(static_cast(FirehoseErrors::CONCURRENT_MODIFICATION), false); } - else if (hashCode == INVALID_ARGUMENT_HASH) - { - return AWSError(static_cast(FirehoseErrors::INVALID_ARGUMENT), false); - } return AWSError(CoreErrors::UNKNOWN, false); } diff --git a/aws-cpp-sdk-firehose/source/model/BufferingHints.cpp b/aws-cpp-sdk-firehose/source/model/BufferingHints.cpp index 7aed0c60002..338d2e890ae 100644 --- a/aws-cpp-sdk-firehose/source/model/BufferingHints.cpp +++ b/aws-cpp-sdk-firehose/source/model/BufferingHints.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Firehose::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Firehose +{ +namespace Model +{ + BufferingHints::BufferingHints() : m_sizeInMBs(0), m_sizeInMBsHasBeenSet(false), @@ -74,4 +80,8 @@ JsonValue BufferingHints::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Firehose +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-firehose/source/model/CompressionFormat.cpp b/aws-cpp-sdk-firehose/source/model/CompressionFormat.cpp index 219e9b32446..902dd9ab6c4 100644 --- a/aws-cpp-sdk-firehose/source/model/CompressionFormat.cpp +++ b/aws-cpp-sdk-firehose/source/model/CompressionFormat.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int UNCOMPRESSED_HASH = HashingUtils::HashString("UNCOMPRESSED"); -static const int GZIP_HASH = HashingUtils::HashString("GZIP"); -static const int ZIP_HASH = HashingUtils::HashString("ZIP"); -static const int Snappy_HASH = HashingUtils::HashString("Snappy"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace CompressionFormatMapper { + static const int UNCOMPRESSED_HASH = HashingUtils::HashString("UNCOMPRESSED"); + static const int GZIP_HASH = HashingUtils::HashString("GZIP"); + static const int ZIP_HASH = HashingUtils::HashString("ZIP"); + static const int Snappy_HASH = HashingUtils::HashString("Snappy"); + CompressionFormat GetCompressionFormatForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-firehose/source/model/CopyCommand.cpp b/aws-cpp-sdk-firehose/source/model/CopyCommand.cpp index 75f07dda939..f9d90038c63 100644 --- a/aws-cpp-sdk-firehose/source/model/CopyCommand.cpp +++ b/aws-cpp-sdk-firehose/source/model/CopyCommand.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Firehose::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Firehose +{ +namespace Model +{ + CopyCommand::CopyCommand() : m_dataTableNameHasBeenSet(false), m_dataTableColumnsHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue CopyCommand::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Firehose +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-firehose/source/model/DeliveryStreamDescription.cpp b/aws-cpp-sdk-firehose/source/model/DeliveryStreamDescription.cpp index b2516a51f74..c905d1854b8 100644 --- a/aws-cpp-sdk-firehose/source/model/DeliveryStreamDescription.cpp +++ b/aws-cpp-sdk-firehose/source/model/DeliveryStreamDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Firehose::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Firehose +{ +namespace Model +{ + DeliveryStreamDescription::DeliveryStreamDescription() : m_deliveryStreamNameHasBeenSet(false), m_deliveryStreamARNHasBeenSet(false), @@ -167,4 +173,8 @@ JsonValue DeliveryStreamDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Firehose +} // namespace Aws diff --git a/aws-cpp-sdk-firehose/source/model/DeliveryStreamStatus.cpp b/aws-cpp-sdk-firehose/source/model/DeliveryStreamStatus.cpp index 838e10f5eb0..103ff8c9bb9 100644 --- a/aws-cpp-sdk-firehose/source/model/DeliveryStreamStatus.cpp +++ b/aws-cpp-sdk-firehose/source/model/DeliveryStreamStatus.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int CREATING_HASH = HashingUtils::HashString("CREATING"); -static const int DELETING_HASH = HashingUtils::HashString("DELETING"); -static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace DeliveryStreamStatusMapper { + static const int CREATING_HASH = HashingUtils::HashString("CREATING"); + static const int DELETING_HASH = HashingUtils::HashString("DELETING"); + static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); + DeliveryStreamStatus GetDeliveryStreamStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-firehose/source/model/DestinationDescription.cpp b/aws-cpp-sdk-firehose/source/model/DestinationDescription.cpp index 4b8d2ca81de..5d5408764ac 100644 --- a/aws-cpp-sdk-firehose/source/model/DestinationDescription.cpp +++ b/aws-cpp-sdk-firehose/source/model/DestinationDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Firehose::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Firehose +{ +namespace Model +{ + DestinationDescription::DestinationDescription() : m_destinationIdHasBeenSet(false), m_s3DestinationDescriptionHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue DestinationDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Firehose +} // namespace Aws diff --git a/aws-cpp-sdk-firehose/source/model/EncryptionConfiguration.cpp b/aws-cpp-sdk-firehose/source/model/EncryptionConfiguration.cpp index 8c4f391ef27..1f1e48ff1d9 100644 --- a/aws-cpp-sdk-firehose/source/model/EncryptionConfiguration.cpp +++ b/aws-cpp-sdk-firehose/source/model/EncryptionConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Firehose::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Firehose +{ +namespace Model +{ + EncryptionConfiguration::EncryptionConfiguration() : m_noEncryptionConfigHasBeenSet(false), m_kMSEncryptionConfigHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue EncryptionConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Firehose +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-firehose/source/model/KMSEncryptionConfig.cpp b/aws-cpp-sdk-firehose/source/model/KMSEncryptionConfig.cpp index 8beb2efe6a3..9f85a60ff22 100644 --- a/aws-cpp-sdk-firehose/source/model/KMSEncryptionConfig.cpp +++ b/aws-cpp-sdk-firehose/source/model/KMSEncryptionConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Firehose::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Firehose +{ +namespace Model +{ + KMSEncryptionConfig::KMSEncryptionConfig() : m_aWSKMSKeyARNHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue KMSEncryptionConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Firehose +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-firehose/source/model/NoEncryptionConfig.cpp b/aws-cpp-sdk-firehose/source/model/NoEncryptionConfig.cpp index 80f6efc7808..81d78cf2316 100644 --- a/aws-cpp-sdk-firehose/source/model/NoEncryptionConfig.cpp +++ b/aws-cpp-sdk-firehose/source/model/NoEncryptionConfig.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int NoEncryption_HASH = HashingUtils::HashString("NoEncryption"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace NoEncryptionConfigMapper { + static const int NoEncryption_HASH = HashingUtils::HashString("NoEncryption"); + NoEncryptionConfig GetNoEncryptionConfigForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-firehose/source/model/PutRecordBatchResponseEntry.cpp b/aws-cpp-sdk-firehose/source/model/PutRecordBatchResponseEntry.cpp index acc58168dd0..c9b5e168aed 100644 --- a/aws-cpp-sdk-firehose/source/model/PutRecordBatchResponseEntry.cpp +++ b/aws-cpp-sdk-firehose/source/model/PutRecordBatchResponseEntry.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Firehose::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Firehose +{ +namespace Model +{ + PutRecordBatchResponseEntry::PutRecordBatchResponseEntry() : m_recordIdHasBeenSet(false), m_errorCodeHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue PutRecordBatchResponseEntry::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Firehose +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-firehose/source/model/Record.cpp b/aws-cpp-sdk-firehose/source/model/Record.cpp index 4b5cfa98d70..5bd30d5f989 100644 --- a/aws-cpp-sdk-firehose/source/model/Record.cpp +++ b/aws-cpp-sdk-firehose/source/model/Record.cpp @@ -18,10 +18,16 @@ #include -using namespace Aws::Firehose::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Firehose +{ +namespace Model +{ + Record::Record() : m_dataHasBeenSet(false) { @@ -54,4 +60,8 @@ JsonValue Record::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Firehose +} // namespace Aws diff --git a/aws-cpp-sdk-firehose/source/model/RedshiftDestinationConfiguration.cpp b/aws-cpp-sdk-firehose/source/model/RedshiftDestinationConfiguration.cpp index 42cc8002e9e..9eda302709f 100644 --- a/aws-cpp-sdk-firehose/source/model/RedshiftDestinationConfiguration.cpp +++ b/aws-cpp-sdk-firehose/source/model/RedshiftDestinationConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Firehose::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Firehose +{ +namespace Model +{ + RedshiftDestinationConfiguration::RedshiftDestinationConfiguration() : m_roleARNHasBeenSet(false), m_clusterJDBCURLHasBeenSet(false), @@ -145,4 +151,8 @@ JsonValue RedshiftDestinationConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Firehose +} // namespace Aws diff --git a/aws-cpp-sdk-firehose/source/model/RedshiftDestinationDescription.cpp b/aws-cpp-sdk-firehose/source/model/RedshiftDestinationDescription.cpp index 777fd98c95d..c62cb15e6a0 100644 --- a/aws-cpp-sdk-firehose/source/model/RedshiftDestinationDescription.cpp +++ b/aws-cpp-sdk-firehose/source/model/RedshiftDestinationDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Firehose::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Firehose +{ +namespace Model +{ + RedshiftDestinationDescription::RedshiftDestinationDescription() : m_roleARNHasBeenSet(false), m_clusterJDBCURLHasBeenSet(false), @@ -130,4 +136,8 @@ JsonValue RedshiftDestinationDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Firehose +} // namespace Aws diff --git a/aws-cpp-sdk-firehose/source/model/RedshiftDestinationUpdate.cpp b/aws-cpp-sdk-firehose/source/model/RedshiftDestinationUpdate.cpp index 346cbe7bc2f..27ec16a86ae 100644 --- a/aws-cpp-sdk-firehose/source/model/RedshiftDestinationUpdate.cpp +++ b/aws-cpp-sdk-firehose/source/model/RedshiftDestinationUpdate.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Firehose::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Firehose +{ +namespace Model +{ + RedshiftDestinationUpdate::RedshiftDestinationUpdate() : m_roleARNHasBeenSet(false), m_clusterJDBCURLHasBeenSet(false), @@ -145,4 +151,8 @@ JsonValue RedshiftDestinationUpdate::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Firehose +} // namespace Aws diff --git a/aws-cpp-sdk-firehose/source/model/S3DestinationConfiguration.cpp b/aws-cpp-sdk-firehose/source/model/S3DestinationConfiguration.cpp index 52154490078..79f756df9b5 100644 --- a/aws-cpp-sdk-firehose/source/model/S3DestinationConfiguration.cpp +++ b/aws-cpp-sdk-firehose/source/model/S3DestinationConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Firehose::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Firehose +{ +namespace Model +{ + S3DestinationConfiguration::S3DestinationConfiguration() : m_roleARNHasBeenSet(false), m_bucketARNHasBeenSet(false), @@ -144,4 +150,8 @@ JsonValue S3DestinationConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Firehose +} // namespace Aws diff --git a/aws-cpp-sdk-firehose/source/model/S3DestinationDescription.cpp b/aws-cpp-sdk-firehose/source/model/S3DestinationDescription.cpp index 7cf7629ef5d..8475acc103e 100644 --- a/aws-cpp-sdk-firehose/source/model/S3DestinationDescription.cpp +++ b/aws-cpp-sdk-firehose/source/model/S3DestinationDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Firehose::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Firehose +{ +namespace Model +{ + S3DestinationDescription::S3DestinationDescription() : m_roleARNHasBeenSet(false), m_bucketARNHasBeenSet(false), @@ -144,4 +150,8 @@ JsonValue S3DestinationDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Firehose +} // namespace Aws diff --git a/aws-cpp-sdk-firehose/source/model/S3DestinationUpdate.cpp b/aws-cpp-sdk-firehose/source/model/S3DestinationUpdate.cpp index 07e5b753a04..f0adff09a7d 100644 --- a/aws-cpp-sdk-firehose/source/model/S3DestinationUpdate.cpp +++ b/aws-cpp-sdk-firehose/source/model/S3DestinationUpdate.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Firehose::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Firehose +{ +namespace Model +{ + S3DestinationUpdate::S3DestinationUpdate() : m_roleARNHasBeenSet(false), m_bucketARNHasBeenSet(false), @@ -144,4 +150,8 @@ JsonValue S3DestinationUpdate::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Firehose +} // namespace Aws diff --git a/aws-cpp-sdk-gamelift/CMakeLists.txt b/aws-cpp-sdk-gamelift/CMakeLists.txt index 8a9289580cc..072b270b78e 100644 --- a/aws-cpp-sdk-gamelift/CMakeLists.txt +++ b/aws-cpp-sdk-gamelift/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-gamelift) "source/model/*.cpp" ) - file(GLOB GAMELIFT_SRC + file(GLOB GAMELIFT_UNIFIED_HEADERS ${AWS_GAMELIFT_HEADERS} ${AWS_GAMELIFT_MODEL_HEADERS} + ) + + file(GLOB GAMELIFT_UNITY_SRC ${AWS_GAMELIFT_SOURCE} ${AWS_GAMELIFT_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("GAMELIFT" GAMELIFT_UNITY_SRC) + endif() + + file(GLOB GAMELIFT_SRC + ${GAMELIFT_UNIFIED_HEADERS} + ${GAMELIFT_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-gamelift/source/GameLiftErrors.cpp b/aws-cpp-sdk-gamelift/source/GameLiftErrors.cpp index 07359fae2a0..a0de6b86ed5 100644 --- a/aws-cpp-sdk-gamelift/source/GameLiftErrors.cpp +++ b/aws-cpp-sdk-gamelift/source/GameLiftErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::GameLift; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace GameLiftErrorMapper +{ + static const int INVALID_FLEET_STATUS_HASH = HashingUtils::HashString("InvalidFleetStatusException"); static const int UNAUTHORIZED_HASH = HashingUtils::HashString("UnauthorizedException"); static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); @@ -32,12 +39,6 @@ static const int GAME_SESSION_FULL_HASH = HashingUtils::HashString("GameSessionF static const int INVALID_REQUEST_HASH = HashingUtils::HashString("InvalidRequestException"); static const int FLEET_CAPACITY_EXCEEDED_HASH = HashingUtils::HashString("FleetCapacityExceededException"); -namespace Aws -{ -namespace GameLift -{ -namespace GameLiftErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-gamelift/source/model/Alias.cpp b/aws-cpp-sdk-gamelift/source/model/Alias.cpp index 1e668f9d3f5..30eb7b8ba79 100644 --- a/aws-cpp-sdk-gamelift/source/model/Alias.cpp +++ b/aws-cpp-sdk-gamelift/source/model/Alias.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + Alias::Alias() : m_aliasIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -128,4 +134,8 @@ JsonValue Alias::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws diff --git a/aws-cpp-sdk-gamelift/source/model/AwsCredentials.cpp b/aws-cpp-sdk-gamelift/source/model/AwsCredentials.cpp index 08216f7ae79..baff257eac4 100644 --- a/aws-cpp-sdk-gamelift/source/model/AwsCredentials.cpp +++ b/aws-cpp-sdk-gamelift/source/model/AwsCredentials.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + AwsCredentials::AwsCredentials() : m_accessKeyIdHasBeenSet(false), m_secretAccessKeyHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue AwsCredentials::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-gamelift/source/model/Build.cpp b/aws-cpp-sdk-gamelift/source/model/Build.cpp index 2017b22577e..9b26ecd7856 100644 --- a/aws-cpp-sdk-gamelift/source/model/Build.cpp +++ b/aws-cpp-sdk-gamelift/source/model/Build.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + Build::Build() : m_buildIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -130,4 +136,8 @@ JsonValue Build::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws diff --git a/aws-cpp-sdk-gamelift/source/model/BuildStatus.cpp b/aws-cpp-sdk-gamelift/source/model/BuildStatus.cpp index 559dd8fd404..9cfdd4ecace 100644 --- a/aws-cpp-sdk-gamelift/source/model/BuildStatus.cpp +++ b/aws-cpp-sdk-gamelift/source/model/BuildStatus.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int INITIALIZED_HASH = HashingUtils::HashString("INITIALIZED"); -static const int READY_HASH = HashingUtils::HashString("READY"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace BuildStatusMapper { + static const int INITIALIZED_HASH = HashingUtils::HashString("INITIALIZED"); + static const int READY_HASH = HashingUtils::HashString("READY"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + BuildStatus GetBuildStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-gamelift/source/model/EC2InstanceCounts.cpp b/aws-cpp-sdk-gamelift/source/model/EC2InstanceCounts.cpp index 3faf31f756f..68c15493a6b 100644 --- a/aws-cpp-sdk-gamelift/source/model/EC2InstanceCounts.cpp +++ b/aws-cpp-sdk-gamelift/source/model/EC2InstanceCounts.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + EC2InstanceCounts::EC2InstanceCounts() : m_dESIRED(0), m_dESIREDHasBeenSet(false), @@ -108,4 +114,8 @@ JsonValue EC2InstanceCounts::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-gamelift/source/model/EC2InstanceLimit.cpp b/aws-cpp-sdk-gamelift/source/model/EC2InstanceLimit.cpp index d24c307497a..be7e1ba95b4 100644 --- a/aws-cpp-sdk-gamelift/source/model/EC2InstanceLimit.cpp +++ b/aws-cpp-sdk-gamelift/source/model/EC2InstanceLimit.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + EC2InstanceLimit::EC2InstanceLimit() : m_eC2InstanceTypeHasBeenSet(false), m_currentInstances(0), @@ -88,4 +94,8 @@ JsonValue EC2InstanceLimit::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-gamelift/source/model/EC2InstanceType.cpp b/aws-cpp-sdk-gamelift/source/model/EC2InstanceType.cpp index 077f449b9c3..45b2fb2f739 100644 --- a/aws-cpp-sdk-gamelift/source/model/EC2InstanceType.cpp +++ b/aws-cpp-sdk-gamelift/source/model/EC2InstanceType.cpp @@ -19,34 +19,6 @@ using namespace Aws::Utils; -static const int t2_micro_HASH = HashingUtils::HashString("t2.micro"); -static const int t2_small_HASH = HashingUtils::HashString("t2.small"); -static const int t2_medium_HASH = HashingUtils::HashString("t2.medium"); -static const int t2_large_HASH = HashingUtils::HashString("t2.large"); -static const int c3_large_HASH = HashingUtils::HashString("c3.large"); -static const int c3_xlarge_HASH = HashingUtils::HashString("c3.xlarge"); -static const int c3_2xlarge_HASH = HashingUtils::HashString("c3.2xlarge"); -static const int c3_4xlarge_HASH = HashingUtils::HashString("c3.4xlarge"); -static const int c3_8xlarge_HASH = HashingUtils::HashString("c3.8xlarge"); -static const int c4_large_HASH = HashingUtils::HashString("c4.large"); -static const int c4_xlarge_HASH = HashingUtils::HashString("c4.xlarge"); -static const int c4_2xlarge_HASH = HashingUtils::HashString("c4.2xlarge"); -static const int c4_4xlarge_HASH = HashingUtils::HashString("c4.4xlarge"); -static const int c4_8xlarge_HASH = HashingUtils::HashString("c4.8xlarge"); -static const int r3_large_HASH = HashingUtils::HashString("r3.large"); -static const int r3_xlarge_HASH = HashingUtils::HashString("r3.xlarge"); -static const int r3_2xlarge_HASH = HashingUtils::HashString("r3.2xlarge"); -static const int r3_4xlarge_HASH = HashingUtils::HashString("r3.4xlarge"); -static const int r3_8xlarge_HASH = HashingUtils::HashString("r3.8xlarge"); -static const int m3_medium_HASH = HashingUtils::HashString("m3.medium"); -static const int m3_large_HASH = HashingUtils::HashString("m3.large"); -static const int m3_xlarge_HASH = HashingUtils::HashString("m3.xlarge"); -static const int m3_2xlarge_HASH = HashingUtils::HashString("m3.2xlarge"); -static const int m4_large_HASH = HashingUtils::HashString("m4.large"); -static const int m4_xlarge_HASH = HashingUtils::HashString("m4.xlarge"); -static const int m4_2xlarge_HASH = HashingUtils::HashString("m4.2xlarge"); -static const int m4_4xlarge_HASH = HashingUtils::HashString("m4.4xlarge"); -static const int m4_10xlarge_HASH = HashingUtils::HashString("m4.10xlarge"); namespace Aws { @@ -57,6 +29,35 @@ namespace Aws namespace EC2InstanceTypeMapper { + static const int t2_micro_HASH = HashingUtils::HashString("t2.micro"); + static const int t2_small_HASH = HashingUtils::HashString("t2.small"); + static const int t2_medium_HASH = HashingUtils::HashString("t2.medium"); + static const int t2_large_HASH = HashingUtils::HashString("t2.large"); + static const int c3_large_HASH = HashingUtils::HashString("c3.large"); + static const int c3_xlarge_HASH = HashingUtils::HashString("c3.xlarge"); + static const int c3_2xlarge_HASH = HashingUtils::HashString("c3.2xlarge"); + static const int c3_4xlarge_HASH = HashingUtils::HashString("c3.4xlarge"); + static const int c3_8xlarge_HASH = HashingUtils::HashString("c3.8xlarge"); + static const int c4_large_HASH = HashingUtils::HashString("c4.large"); + static const int c4_xlarge_HASH = HashingUtils::HashString("c4.xlarge"); + static const int c4_2xlarge_HASH = HashingUtils::HashString("c4.2xlarge"); + static const int c4_4xlarge_HASH = HashingUtils::HashString("c4.4xlarge"); + static const int c4_8xlarge_HASH = HashingUtils::HashString("c4.8xlarge"); + static const int r3_large_HASH = HashingUtils::HashString("r3.large"); + static const int r3_xlarge_HASH = HashingUtils::HashString("r3.xlarge"); + static const int r3_2xlarge_HASH = HashingUtils::HashString("r3.2xlarge"); + static const int r3_4xlarge_HASH = HashingUtils::HashString("r3.4xlarge"); + static const int r3_8xlarge_HASH = HashingUtils::HashString("r3.8xlarge"); + static const int m3_medium_HASH = HashingUtils::HashString("m3.medium"); + static const int m3_large_HASH = HashingUtils::HashString("m3.large"); + static const int m3_xlarge_HASH = HashingUtils::HashString("m3.xlarge"); + static const int m3_2xlarge_HASH = HashingUtils::HashString("m3.2xlarge"); + static const int m4_large_HASH = HashingUtils::HashString("m4.large"); + static const int m4_xlarge_HASH = HashingUtils::HashString("m4.xlarge"); + static const int m4_2xlarge_HASH = HashingUtils::HashString("m4.2xlarge"); + static const int m4_4xlarge_HASH = HashingUtils::HashString("m4.4xlarge"); + static const int m4_10xlarge_HASH = HashingUtils::HashString("m4.10xlarge"); + EC2InstanceType GetEC2InstanceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-gamelift/source/model/Event.cpp b/aws-cpp-sdk-gamelift/source/model/Event.cpp index c8c16cd6b05..57dddbf4a00 100644 --- a/aws-cpp-sdk-gamelift/source/model/Event.cpp +++ b/aws-cpp-sdk-gamelift/source/model/Event.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + Event::Event() : m_eventIdHasBeenSet(false), m_resourceIdHasBeenSet(false), @@ -113,4 +119,8 @@ JsonValue Event::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws diff --git a/aws-cpp-sdk-gamelift/source/model/EventCode.cpp b/aws-cpp-sdk-gamelift/source/model/EventCode.cpp index a140d662076..0d98aff6082 100644 --- a/aws-cpp-sdk-gamelift/source/model/EventCode.cpp +++ b/aws-cpp-sdk-gamelift/source/model/EventCode.cpp @@ -19,23 +19,6 @@ using namespace Aws::Utils; -static const int GENERIC_EVENT_HASH = HashingUtils::HashString("GENERIC_EVENT"); -static const int FLEET_CREATED_HASH = HashingUtils::HashString("FLEET_CREATED"); -static const int FLEET_DELETED_HASH = HashingUtils::HashString("FLEET_DELETED"); -static const int FLEET_SCALING_EVENT_HASH = HashingUtils::HashString("FLEET_SCALING_EVENT"); -static const int FLEET_STATE_DOWNLOADING_HASH = HashingUtils::HashString("FLEET_STATE_DOWNLOADING"); -static const int FLEET_STATE_VALIDATING_HASH = HashingUtils::HashString("FLEET_STATE_VALIDATING"); -static const int FLEET_STATE_BUILDING_HASH = HashingUtils::HashString("FLEET_STATE_BUILDING"); -static const int FLEET_STATE_ACTIVATING_HASH = HashingUtils::HashString("FLEET_STATE_ACTIVATING"); -static const int FLEET_STATE_ACTIVE_HASH = HashingUtils::HashString("FLEET_STATE_ACTIVE"); -static const int FLEET_STATE_ERROR_HASH = HashingUtils::HashString("FLEET_STATE_ERROR"); -static const int FLEET_INITIALIZATION_FAILED_HASH = HashingUtils::HashString("FLEET_INITIALIZATION_FAILED"); -static const int FLEET_BINARY_DOWNLOAD_FAILED_HASH = HashingUtils::HashString("FLEET_BINARY_DOWNLOAD_FAILED"); -static const int FLEET_VALIDATION_LAUNCH_PATH_NOT_FOUND_HASH = HashingUtils::HashString("FLEET_VALIDATION_LAUNCH_PATH_NOT_FOUND"); -static const int FLEET_VALIDATION_EXECUTABLE_RUNTIME_FAILURE_HASH = HashingUtils::HashString("FLEET_VALIDATION_EXECUTABLE_RUNTIME_FAILURE"); -static const int FLEET_VALIDATION_TIMED_OUT_HASH = HashingUtils::HashString("FLEET_VALIDATION_TIMED_OUT"); -static const int FLEET_ACTIVATION_FAILED_HASH = HashingUtils::HashString("FLEET_ACTIVATION_FAILED"); -static const int FLEET_ACTIVATION_FAILED_NO_INSTANCES_HASH = HashingUtils::HashString("FLEET_ACTIVATION_FAILED_NO_INSTANCES"); namespace Aws { @@ -46,6 +29,24 @@ namespace Aws namespace EventCodeMapper { + static const int GENERIC_EVENT_HASH = HashingUtils::HashString("GENERIC_EVENT"); + static const int FLEET_CREATED_HASH = HashingUtils::HashString("FLEET_CREATED"); + static const int FLEET_DELETED_HASH = HashingUtils::HashString("FLEET_DELETED"); + static const int FLEET_SCALING_EVENT_HASH = HashingUtils::HashString("FLEET_SCALING_EVENT"); + static const int FLEET_STATE_DOWNLOADING_HASH = HashingUtils::HashString("FLEET_STATE_DOWNLOADING"); + static const int FLEET_STATE_VALIDATING_HASH = HashingUtils::HashString("FLEET_STATE_VALIDATING"); + static const int FLEET_STATE_BUILDING_HASH = HashingUtils::HashString("FLEET_STATE_BUILDING"); + static const int FLEET_STATE_ACTIVATING_HASH = HashingUtils::HashString("FLEET_STATE_ACTIVATING"); + static const int FLEET_STATE_ACTIVE_HASH = HashingUtils::HashString("FLEET_STATE_ACTIVE"); + static const int FLEET_STATE_ERROR_HASH = HashingUtils::HashString("FLEET_STATE_ERROR"); + static const int FLEET_INITIALIZATION_FAILED_HASH = HashingUtils::HashString("FLEET_INITIALIZATION_FAILED"); + static const int FLEET_BINARY_DOWNLOAD_FAILED_HASH = HashingUtils::HashString("FLEET_BINARY_DOWNLOAD_FAILED"); + static const int FLEET_VALIDATION_LAUNCH_PATH_NOT_FOUND_HASH = HashingUtils::HashString("FLEET_VALIDATION_LAUNCH_PATH_NOT_FOUND"); + static const int FLEET_VALIDATION_EXECUTABLE_RUNTIME_FAILURE_HASH = HashingUtils::HashString("FLEET_VALIDATION_EXECUTABLE_RUNTIME_FAILURE"); + static const int FLEET_VALIDATION_TIMED_OUT_HASH = HashingUtils::HashString("FLEET_VALIDATION_TIMED_OUT"); + static const int FLEET_ACTIVATION_FAILED_HASH = HashingUtils::HashString("FLEET_ACTIVATION_FAILED"); + static const int FLEET_ACTIVATION_FAILED_NO_INSTANCES_HASH = HashingUtils::HashString("FLEET_ACTIVATION_FAILED_NO_INSTANCES"); + EventCode GetEventCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-gamelift/source/model/FleetAttributes.cpp b/aws-cpp-sdk-gamelift/source/model/FleetAttributes.cpp index 1bf270787d7..620e0461836 100644 --- a/aws-cpp-sdk-gamelift/source/model/FleetAttributes.cpp +++ b/aws-cpp-sdk-gamelift/source/model/FleetAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + FleetAttributes::FleetAttributes() : m_fleetIdHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -195,4 +201,8 @@ JsonValue FleetAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws diff --git a/aws-cpp-sdk-gamelift/source/model/FleetCapacity.cpp b/aws-cpp-sdk-gamelift/source/model/FleetCapacity.cpp index 333df57eedb..e066ebb230e 100644 --- a/aws-cpp-sdk-gamelift/source/model/FleetCapacity.cpp +++ b/aws-cpp-sdk-gamelift/source/model/FleetCapacity.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + FleetCapacity::FleetCapacity() : m_fleetIdHasBeenSet(false), m_instanceTypeHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue FleetCapacity::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-gamelift/source/model/FleetStatus.cpp b/aws-cpp-sdk-gamelift/source/model/FleetStatus.cpp index fed7acd8ecd..0e5c0c8cd5a 100644 --- a/aws-cpp-sdk-gamelift/source/model/FleetStatus.cpp +++ b/aws-cpp-sdk-gamelift/source/model/FleetStatus.cpp @@ -19,15 +19,6 @@ using namespace Aws::Utils; -static const int NEW__HASH = HashingUtils::HashString("NEW"); -static const int DOWNLOADING_HASH = HashingUtils::HashString("DOWNLOADING"); -static const int VALIDATING_HASH = HashingUtils::HashString("VALIDATING"); -static const int BUILDING_HASH = HashingUtils::HashString("BUILDING"); -static const int ACTIVATING_HASH = HashingUtils::HashString("ACTIVATING"); -static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); -static const int DELETING_HASH = HashingUtils::HashString("DELETING"); -static const int ERROR__HASH = HashingUtils::HashString("ERROR"); -static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); namespace Aws { @@ -38,6 +29,16 @@ namespace Aws namespace FleetStatusMapper { + static const int NEW__HASH = HashingUtils::HashString("NEW"); + static const int DOWNLOADING_HASH = HashingUtils::HashString("DOWNLOADING"); + static const int VALIDATING_HASH = HashingUtils::HashString("VALIDATING"); + static const int BUILDING_HASH = HashingUtils::HashString("BUILDING"); + static const int ACTIVATING_HASH = HashingUtils::HashString("ACTIVATING"); + static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); + static const int DELETING_HASH = HashingUtils::HashString("DELETING"); + static const int ERROR__HASH = HashingUtils::HashString("ERROR"); + static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); + FleetStatus GetFleetStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-gamelift/source/model/FleetUtilization.cpp b/aws-cpp-sdk-gamelift/source/model/FleetUtilization.cpp index aad3fcaa86f..c300758abb5 100644 --- a/aws-cpp-sdk-gamelift/source/model/FleetUtilization.cpp +++ b/aws-cpp-sdk-gamelift/source/model/FleetUtilization.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + FleetUtilization::FleetUtilization() : m_fleetIdHasBeenSet(false), m_activeGameSessionCount(0), @@ -106,4 +112,8 @@ JsonValue FleetUtilization::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-gamelift/source/model/GameProperty.cpp b/aws-cpp-sdk-gamelift/source/model/GameProperty.cpp index feb912fc1ef..a85ee613055 100644 --- a/aws-cpp-sdk-gamelift/source/model/GameProperty.cpp +++ b/aws-cpp-sdk-gamelift/source/model/GameProperty.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + GameProperty::GameProperty() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue GameProperty::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-gamelift/source/model/GameSession.cpp b/aws-cpp-sdk-gamelift/source/model/GameSession.cpp index 3a0973c9c87..45f0ea7b47c 100644 --- a/aws-cpp-sdk-gamelift/source/model/GameSession.cpp +++ b/aws-cpp-sdk-gamelift/source/model/GameSession.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + GameSession::GameSession() : m_gameSessionIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -213,4 +219,8 @@ JsonValue GameSession::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws diff --git a/aws-cpp-sdk-gamelift/source/model/GameSessionStatus.cpp b/aws-cpp-sdk-gamelift/source/model/GameSessionStatus.cpp index 198fc32a028..517ea2bff46 100644 --- a/aws-cpp-sdk-gamelift/source/model/GameSessionStatus.cpp +++ b/aws-cpp-sdk-gamelift/source/model/GameSessionStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); -static const int ACTIVATING_HASH = HashingUtils::HashString("ACTIVATING"); -static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); -static const int TERMINATING_HASH = HashingUtils::HashString("TERMINATING"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace GameSessionStatusMapper { + static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); + static const int ACTIVATING_HASH = HashingUtils::HashString("ACTIVATING"); + static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); + static const int TERMINATING_HASH = HashingUtils::HashString("TERMINATING"); + GameSessionStatus GetGameSessionStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-gamelift/source/model/IpPermission.cpp b/aws-cpp-sdk-gamelift/source/model/IpPermission.cpp index 3cb9f5092f7..321f232a2fe 100644 --- a/aws-cpp-sdk-gamelift/source/model/IpPermission.cpp +++ b/aws-cpp-sdk-gamelift/source/model/IpPermission.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + IpPermission::IpPermission() : m_fromPort(0), m_fromPortHasBeenSet(false), @@ -103,4 +109,8 @@ JsonValue IpPermission::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-gamelift/source/model/IpProtocol.cpp b/aws-cpp-sdk-gamelift/source/model/IpProtocol.cpp index a565adb83e2..8e7ff5ee61e 100644 --- a/aws-cpp-sdk-gamelift/source/model/IpProtocol.cpp +++ b/aws-cpp-sdk-gamelift/source/model/IpProtocol.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int TCP_HASH = HashingUtils::HashString("TCP"); -static const int UDP_HASH = HashingUtils::HashString("UDP"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace IpProtocolMapper { + static const int TCP_HASH = HashingUtils::HashString("TCP"); + static const int UDP_HASH = HashingUtils::HashString("UDP"); + IpProtocol GetIpProtocolForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-gamelift/source/model/PlayerSession.cpp b/aws-cpp-sdk-gamelift/source/model/PlayerSession.cpp index 02aee1b981e..72a54cf6791 100644 --- a/aws-cpp-sdk-gamelift/source/model/PlayerSession.cpp +++ b/aws-cpp-sdk-gamelift/source/model/PlayerSession.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + PlayerSession::PlayerSession() : m_playerSessionIdHasBeenSet(false), m_playerIdHasBeenSet(false), @@ -157,4 +163,8 @@ JsonValue PlayerSession::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws diff --git a/aws-cpp-sdk-gamelift/source/model/PlayerSessionCreationPolicy.cpp b/aws-cpp-sdk-gamelift/source/model/PlayerSessionCreationPolicy.cpp index 201bf0baded..92cadbae6aa 100644 --- a/aws-cpp-sdk-gamelift/source/model/PlayerSessionCreationPolicy.cpp +++ b/aws-cpp-sdk-gamelift/source/model/PlayerSessionCreationPolicy.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ACCEPT_ALL_HASH = HashingUtils::HashString("ACCEPT_ALL"); -static const int DENY_ALL_HASH = HashingUtils::HashString("DENY_ALL"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace PlayerSessionCreationPolicyMapper { + static const int ACCEPT_ALL_HASH = HashingUtils::HashString("ACCEPT_ALL"); + static const int DENY_ALL_HASH = HashingUtils::HashString("DENY_ALL"); + PlayerSessionCreationPolicy GetPlayerSessionCreationPolicyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-gamelift/source/model/PlayerSessionStatus.cpp b/aws-cpp-sdk-gamelift/source/model/PlayerSessionStatus.cpp index b0b2a1b72f0..cabdb45aafc 100644 --- a/aws-cpp-sdk-gamelift/source/model/PlayerSessionStatus.cpp +++ b/aws-cpp-sdk-gamelift/source/model/PlayerSessionStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int RESERVED_HASH = HashingUtils::HashString("RESERVED"); -static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); -static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); -static const int TIMEDOUT_HASH = HashingUtils::HashString("TIMEDOUT"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace PlayerSessionStatusMapper { + static const int RESERVED_HASH = HashingUtils::HashString("RESERVED"); + static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); + static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); + static const int TIMEDOUT_HASH = HashingUtils::HashString("TIMEDOUT"); + PlayerSessionStatus GetPlayerSessionStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-gamelift/source/model/RoutingStrategy.cpp b/aws-cpp-sdk-gamelift/source/model/RoutingStrategy.cpp index 6ceb57a2a69..bfb351cb73d 100644 --- a/aws-cpp-sdk-gamelift/source/model/RoutingStrategy.cpp +++ b/aws-cpp-sdk-gamelift/source/model/RoutingStrategy.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + RoutingStrategy::RoutingStrategy() : m_typeHasBeenSet(false), m_fleetIdHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue RoutingStrategy::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-gamelift/source/model/RoutingStrategyType.cpp b/aws-cpp-sdk-gamelift/source/model/RoutingStrategyType.cpp index 81c9cbd6482..2c683b1ffc4 100644 --- a/aws-cpp-sdk-gamelift/source/model/RoutingStrategyType.cpp +++ b/aws-cpp-sdk-gamelift/source/model/RoutingStrategyType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int SIMPLE_HASH = HashingUtils::HashString("SIMPLE"); -static const int TERMINAL_HASH = HashingUtils::HashString("TERMINAL"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace RoutingStrategyTypeMapper { + static const int SIMPLE_HASH = HashingUtils::HashString("SIMPLE"); + static const int TERMINAL_HASH = HashingUtils::HashString("TERMINAL"); + RoutingStrategyType GetRoutingStrategyTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-gamelift/source/model/S3Location.cpp b/aws-cpp-sdk-gamelift/source/model/S3Location.cpp index 88906476639..38d60d675d8 100644 --- a/aws-cpp-sdk-gamelift/source/model/S3Location.cpp +++ b/aws-cpp-sdk-gamelift/source/model/S3Location.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::GameLift::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace GameLift +{ +namespace Model +{ + S3Location::S3Location() : m_bucketHasBeenSet(false), m_keyHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue S3Location::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace GameLift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-glacier/CMakeLists.txt b/aws-cpp-sdk-glacier/CMakeLists.txt index 7e2e4a58d4a..4ecfb8efaf3 100644 --- a/aws-cpp-sdk-glacier/CMakeLists.txt +++ b/aws-cpp-sdk-glacier/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-glacier) "source/model/*.cpp" ) - file(GLOB GLACIER_SRC + file(GLOB GLACIER_UNIFIED_HEADERS ${AWS_GLACIER_HEADERS} ${AWS_GLACIER_MODEL_HEADERS} + ) + + file(GLOB GLACIER_UNITY_SRC ${AWS_GLACIER_SOURCE} ${AWS_GLACIER_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("GLACIER" GLACIER_UNITY_SRC) + endif() + + file(GLOB GLACIER_SRC + ${GLACIER_UNIFIED_HEADERS} + ${GLACIER_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-glacier/source/GlacierErrors.cpp b/aws-cpp-sdk-glacier/source/GlacierErrors.cpp index a92e22a4ce2..7199ef574f0 100644 --- a/aws-cpp-sdk-glacier/source/GlacierErrors.cpp +++ b/aws-cpp-sdk-glacier/source/GlacierErrors.cpp @@ -20,11 +20,6 @@ using namespace Aws::Client; using namespace Aws::Glacier; using namespace Aws::Utils; -static const int MISSING_PARAMETER_VALUE_HASH = HashingUtils::HashString("MissingParameterValueException"); -static const int REQUEST_TIMEOUT_HASH = HashingUtils::HashString("RequestTimeoutException"); -static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); -static const int POLICY_ENFORCED_HASH = HashingUtils::HashString("PolicyEnforcedException"); - namespace Aws { namespace Glacier @@ -32,6 +27,12 @@ namespace Glacier namespace GlacierErrorMapper { +static const int MISSING_PARAMETER_VALUE_HASH = HashingUtils::HashString("MissingParameterValueException"); +static const int REQUEST_TIMEOUT_HASH = HashingUtils::HashString("RequestTimeoutException"); +static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); +static const int POLICY_ENFORCED_HASH = HashingUtils::HashString("PolicyEnforcedException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-glacier/source/model/ActionCode.cpp b/aws-cpp-sdk-glacier/source/model/ActionCode.cpp index 04dff3ac51d..960efd37119 100644 --- a/aws-cpp-sdk-glacier/source/model/ActionCode.cpp +++ b/aws-cpp-sdk-glacier/source/model/ActionCode.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ArchiveRetrieval_HASH = HashingUtils::HashString("ArchiveRetrieval"); -static const int InventoryRetrieval_HASH = HashingUtils::HashString("InventoryRetrieval"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ActionCodeMapper { + static const int ArchiveRetrieval_HASH = HashingUtils::HashString("ArchiveRetrieval"); + static const int InventoryRetrieval_HASH = HashingUtils::HashString("InventoryRetrieval"); + ActionCode GetActionCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-glacier/source/model/DataRetrievalPolicy.cpp b/aws-cpp-sdk-glacier/source/model/DataRetrievalPolicy.cpp index f80e71e15bb..73c6fdf22c9 100644 --- a/aws-cpp-sdk-glacier/source/model/DataRetrievalPolicy.cpp +++ b/aws-cpp-sdk-glacier/source/model/DataRetrievalPolicy.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Glacier::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Glacier +{ +namespace Model +{ + DataRetrievalPolicy::DataRetrievalPolicy() : m_rulesHasBeenSet(false) { @@ -63,4 +69,8 @@ JsonValue DataRetrievalPolicy::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Glacier +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-glacier/source/model/DataRetrievalRule.cpp b/aws-cpp-sdk-glacier/source/model/DataRetrievalRule.cpp index 91073249346..a35395720e8 100644 --- a/aws-cpp-sdk-glacier/source/model/DataRetrievalRule.cpp +++ b/aws-cpp-sdk-glacier/source/model/DataRetrievalRule.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Glacier::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Glacier +{ +namespace Model +{ + DataRetrievalRule::DataRetrievalRule() : m_strategyHasBeenSet(false), m_bytesPerHour(0), @@ -72,4 +78,8 @@ JsonValue DataRetrievalRule::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Glacier +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-glacier/source/model/DescribeVaultOutput.cpp b/aws-cpp-sdk-glacier/source/model/DescribeVaultOutput.cpp index 4774f6c4305..f0f35c502bf 100644 --- a/aws-cpp-sdk-glacier/source/model/DescribeVaultOutput.cpp +++ b/aws-cpp-sdk-glacier/source/model/DescribeVaultOutput.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Glacier::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Glacier +{ +namespace Model +{ + DescribeVaultOutput::DescribeVaultOutput() : m_vaultARNHasBeenSet(false), m_vaultNameHasBeenSet(false), @@ -134,4 +140,8 @@ JsonValue DescribeVaultOutput::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Glacier +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-glacier/source/model/GlacierJobDescription.cpp b/aws-cpp-sdk-glacier/source/model/GlacierJobDescription.cpp index 3c1a8ddb9ec..7890ed56cff 100644 --- a/aws-cpp-sdk-glacier/source/model/GlacierJobDescription.cpp +++ b/aws-cpp-sdk-glacier/source/model/GlacierJobDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Glacier::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Glacier +{ +namespace Model +{ + GlacierJobDescription::GlacierJobDescription() : m_jobIdHasBeenSet(false), m_jobDescriptionHasBeenSet(false), @@ -299,4 +305,8 @@ JsonValue GlacierJobDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Glacier +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-glacier/source/model/InventoryRetrievalJobDescription.cpp b/aws-cpp-sdk-glacier/source/model/InventoryRetrievalJobDescription.cpp index d76545593ef..f708623208d 100644 --- a/aws-cpp-sdk-glacier/source/model/InventoryRetrievalJobDescription.cpp +++ b/aws-cpp-sdk-glacier/source/model/InventoryRetrievalJobDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Glacier::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Glacier +{ +namespace Model +{ + InventoryRetrievalJobDescription::InventoryRetrievalJobDescription() : m_formatHasBeenSet(false), m_startDateHasBeenSet(false), @@ -115,4 +121,8 @@ JsonValue InventoryRetrievalJobDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Glacier +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-glacier/source/model/InventoryRetrievalJobInput.cpp b/aws-cpp-sdk-glacier/source/model/InventoryRetrievalJobInput.cpp index 35a2b047242..66485a8edd5 100644 --- a/aws-cpp-sdk-glacier/source/model/InventoryRetrievalJobInput.cpp +++ b/aws-cpp-sdk-glacier/source/model/InventoryRetrievalJobInput.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Glacier::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Glacier +{ +namespace Model +{ + InventoryRetrievalJobInput::InventoryRetrievalJobInput() : m_startDateHasBeenSet(false), m_endDateHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue InventoryRetrievalJobInput::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Glacier +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-glacier/source/model/JobParameters.cpp b/aws-cpp-sdk-glacier/source/model/JobParameters.cpp index 27a5337cfda..7fa6f8c379f 100644 --- a/aws-cpp-sdk-glacier/source/model/JobParameters.cpp +++ b/aws-cpp-sdk-glacier/source/model/JobParameters.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Glacier::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Glacier +{ +namespace Model +{ + JobParameters::JobParameters() : m_formatHasBeenSet(false), m_typeHasBeenSet(false), @@ -145,4 +151,8 @@ JsonValue JobParameters::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Glacier +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-glacier/source/model/PartListElement.cpp b/aws-cpp-sdk-glacier/source/model/PartListElement.cpp index 90fa0dc9478..4c706784670 100644 --- a/aws-cpp-sdk-glacier/source/model/PartListElement.cpp +++ b/aws-cpp-sdk-glacier/source/model/PartListElement.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Glacier::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Glacier +{ +namespace Model +{ + PartListElement::PartListElement() : m_rangeInBytesHasBeenSet(false), m_sHA256TreeHashHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue PartListElement::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Glacier +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-glacier/source/model/StatusCode.cpp b/aws-cpp-sdk-glacier/source/model/StatusCode.cpp index b312508544c..fcb03a39938 100644 --- a/aws-cpp-sdk-glacier/source/model/StatusCode.cpp +++ b/aws-cpp-sdk-glacier/source/model/StatusCode.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int InProgress_HASH = HashingUtils::HashString("InProgress"); -static const int Succeeded_HASH = HashingUtils::HashString("Succeeded"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace StatusCodeMapper { + static const int InProgress_HASH = HashingUtils::HashString("InProgress"); + static const int Succeeded_HASH = HashingUtils::HashString("Succeeded"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + StatusCode GetStatusCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-glacier/source/model/UploadListElement.cpp b/aws-cpp-sdk-glacier/source/model/UploadListElement.cpp index b83c9649fea..45f8ce1f5a9 100644 --- a/aws-cpp-sdk-glacier/source/model/UploadListElement.cpp +++ b/aws-cpp-sdk-glacier/source/model/UploadListElement.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Glacier::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Glacier +{ +namespace Model +{ + UploadListElement::UploadListElement() : m_multipartUploadIdHasBeenSet(false), m_vaultARNHasBeenSet(false), @@ -117,4 +123,8 @@ JsonValue UploadListElement::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Glacier +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-glacier/source/model/VaultAccessPolicy.cpp b/aws-cpp-sdk-glacier/source/model/VaultAccessPolicy.cpp index bc3744982c2..464c4554312 100644 --- a/aws-cpp-sdk-glacier/source/model/VaultAccessPolicy.cpp +++ b/aws-cpp-sdk-glacier/source/model/VaultAccessPolicy.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Glacier::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Glacier +{ +namespace Model +{ + VaultAccessPolicy::VaultAccessPolicy() : m_policyHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue VaultAccessPolicy::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Glacier +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-glacier/source/model/VaultLockPolicy.cpp b/aws-cpp-sdk-glacier/source/model/VaultLockPolicy.cpp index 70478aee576..03489d9e23d 100644 --- a/aws-cpp-sdk-glacier/source/model/VaultLockPolicy.cpp +++ b/aws-cpp-sdk-glacier/source/model/VaultLockPolicy.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Glacier::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Glacier +{ +namespace Model +{ + VaultLockPolicy::VaultLockPolicy() : m_policyHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue VaultLockPolicy::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Glacier +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-glacier/source/model/VaultNotificationConfig.cpp b/aws-cpp-sdk-glacier/source/model/VaultNotificationConfig.cpp index 22ed59d775e..8ad2307b0a5 100644 --- a/aws-cpp-sdk-glacier/source/model/VaultNotificationConfig.cpp +++ b/aws-cpp-sdk-glacier/source/model/VaultNotificationConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Glacier::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Glacier +{ +namespace Model +{ + VaultNotificationConfig::VaultNotificationConfig() : m_sNSTopicHasBeenSet(false), m_eventsHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue VaultNotificationConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Glacier +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iam/CMakeLists.txt b/aws-cpp-sdk-iam/CMakeLists.txt index df7a345dcfa..ab51c12c16a 100644 --- a/aws-cpp-sdk-iam/CMakeLists.txt +++ b/aws-cpp-sdk-iam/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-iam) "source/model/*.cpp" ) - file(GLOB IAM_SRC + file(GLOB IAM_UNIFIED_HEADERS ${AWS_IAM_HEADERS} ${AWS_IAM_MODEL_HEADERS} + ) + + file(GLOB IAM_UNITY_SRC ${AWS_IAM_SOURCE} ${AWS_IAM_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("IAM" IAM_UNITY_SRC) + endif() + + file(GLOB IAM_SRC + ${IAM_UNIFIED_HEADERS} + ${IAM_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-iam/source/IAMErrors.cpp b/aws-cpp-sdk-iam/source/IAMErrors.cpp index 18e726fab50..beac7f6281a 100644 --- a/aws-cpp-sdk-iam/source/IAMErrors.cpp +++ b/aws-cpp-sdk-iam/source/IAMErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::IAM; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace IAMErrorMapper +{ + static const int CREDENTIAL_REPORT_NOT_PRESENT_HASH = HashingUtils::HashString("ReportNotPresent"); static const int CREDENTIAL_REPORT_NOT_READY_HASH = HashingUtils::HashString("ReportInProgress"); static const int INVALID_CERTIFICATE_HASH = HashingUtils::HashString("InvalidCertificate"); @@ -43,12 +50,6 @@ static const int DUPLICATE_CERTIFICATE_HASH = HashingUtils::HashString("Duplicat static const int SERVICE_FAILURE_HASH = HashingUtils::HashString("ServiceFailure"); static const int PASSWORD_POLICY_VIOLATION_HASH = HashingUtils::HashString("PasswordPolicyViolation"); -namespace Aws -{ -namespace IAM -{ -namespace IAMErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-iam/source/model/AccessKey.cpp b/aws-cpp-sdk-iam/source/model/AccessKey.cpp index b27fbded84b..70f679992b0 100644 --- a/aws-cpp-sdk-iam/source/model/AccessKey.cpp +++ b/aws-cpp-sdk-iam/source/model/AccessKey.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + AccessKey::AccessKey() : m_userNameHasBeenSet(false), m_accessKeyIdHasBeenSet(false), @@ -130,3 +136,7 @@ void AccessKey::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".CreateDate=" << StringUtils::URLEncode(m_createDate.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/AccessKeyLastUsed.cpp b/aws-cpp-sdk-iam/source/model/AccessKeyLastUsed.cpp index 58ebee1ef6f..378868667cd 100644 --- a/aws-cpp-sdk-iam/source/model/AccessKeyLastUsed.cpp +++ b/aws-cpp-sdk-iam/source/model/AccessKeyLastUsed.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + AccessKeyLastUsed::AccessKeyLastUsed() : m_lastUsedDateHasBeenSet(false), m_serviceNameHasBeenSet(false), @@ -98,3 +104,7 @@ void AccessKeyLastUsed::OutputToStream(Aws::OStream& oStream, const char* locati oStream << location << ".Region=" << StringUtils::URLEncode(m_region.c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/AccessKeyMetadata.cpp b/aws-cpp-sdk-iam/source/model/AccessKeyMetadata.cpp index 2e6c31921ee..39ec02cfbaf 100644 --- a/aws-cpp-sdk-iam/source/model/AccessKeyMetadata.cpp +++ b/aws-cpp-sdk-iam/source/model/AccessKeyMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + AccessKeyMetadata::AccessKeyMetadata() : m_userNameHasBeenSet(false), m_accessKeyIdHasBeenSet(false), @@ -114,3 +120,7 @@ void AccessKeyMetadata::OutputToStream(Aws::OStream& oStream, const char* locati oStream << location << ".CreateDate=" << StringUtils::URLEncode(m_createDate.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/AssignmentStatusType.cpp b/aws-cpp-sdk-iam/source/model/AssignmentStatusType.cpp index 8ce519ec7a5..39a43206d41 100644 --- a/aws-cpp-sdk-iam/source/model/AssignmentStatusType.cpp +++ b/aws-cpp-sdk-iam/source/model/AssignmentStatusType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int Assigned_HASH = HashingUtils::HashString("Assigned"); -static const int Unassigned_HASH = HashingUtils::HashString("Unassigned"); -static const int Any_HASH = HashingUtils::HashString("Any"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace AssignmentStatusTypeMapper { + static const int Assigned_HASH = HashingUtils::HashString("Assigned"); + static const int Unassigned_HASH = HashingUtils::HashString("Unassigned"); + static const int Any_HASH = HashingUtils::HashString("Any"); + AssignmentStatusType GetAssignmentStatusTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-iam/source/model/AttachedPolicy.cpp b/aws-cpp-sdk-iam/source/model/AttachedPolicy.cpp index f296f09778c..456ab990897 100644 --- a/aws-cpp-sdk-iam/source/model/AttachedPolicy.cpp +++ b/aws-cpp-sdk-iam/source/model/AttachedPolicy.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + AttachedPolicy::AttachedPolicy() : m_policyNameHasBeenSet(false), m_policyArnHasBeenSet(false) @@ -82,3 +88,7 @@ void AttachedPolicy::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".PolicyArn=" << StringUtils::URLEncode(m_policyArn.c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iam/source/model/ContextEntry.cpp b/aws-cpp-sdk-iam/source/model/ContextEntry.cpp index 7d4b523b482..fdf0504d48c 100644 --- a/aws-cpp-sdk-iam/source/model/ContextEntry.cpp +++ b/aws-cpp-sdk-iam/source/model/ContextEntry.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + ContextEntry::ContextEntry() : m_contextKeyNameHasBeenSet(false), m_contextKeyValuesHasBeenSet(false), @@ -112,3 +118,7 @@ void ContextEntry::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".ContextKeyType=" << ContextKeyTypeEnumMapper::GetNameForContextKeyTypeEnum(m_contextKeyType) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iam/source/model/ContextKeyTypeEnum.cpp b/aws-cpp-sdk-iam/source/model/ContextKeyTypeEnum.cpp index 45cd038ba57..a894d358500 100644 --- a/aws-cpp-sdk-iam/source/model/ContextKeyTypeEnum.cpp +++ b/aws-cpp-sdk-iam/source/model/ContextKeyTypeEnum.cpp @@ -19,18 +19,6 @@ using namespace Aws::Utils; -static const int string_HASH = HashingUtils::HashString("string"); -static const int stringList_HASH = HashingUtils::HashString("stringList"); -static const int numeric_HASH = HashingUtils::HashString("numeric"); -static const int numericList_HASH = HashingUtils::HashString("numericList"); -static const int boolean_HASH = HashingUtils::HashString("boolean"); -static const int booleanList_HASH = HashingUtils::HashString("booleanList"); -static const int ip_HASH = HashingUtils::HashString("ip"); -static const int ipList_HASH = HashingUtils::HashString("ipList"); -static const int binary_HASH = HashingUtils::HashString("binary"); -static const int binaryList_HASH = HashingUtils::HashString("binaryList"); -static const int date_HASH = HashingUtils::HashString("date"); -static const int dateList_HASH = HashingUtils::HashString("dateList"); namespace Aws { @@ -41,6 +29,19 @@ namespace Aws namespace ContextKeyTypeEnumMapper { + static const int string_HASH = HashingUtils::HashString("string"); + static const int stringList_HASH = HashingUtils::HashString("stringList"); + static const int numeric_HASH = HashingUtils::HashString("numeric"); + static const int numericList_HASH = HashingUtils::HashString("numericList"); + static const int boolean_HASH = HashingUtils::HashString("boolean"); + static const int booleanList_HASH = HashingUtils::HashString("booleanList"); + static const int ip_HASH = HashingUtils::HashString("ip"); + static const int ipList_HASH = HashingUtils::HashString("ipList"); + static const int binary_HASH = HashingUtils::HashString("binary"); + static const int binaryList_HASH = HashingUtils::HashString("binaryList"); + static const int date_HASH = HashingUtils::HashString("date"); + static const int dateList_HASH = HashingUtils::HashString("dateList"); + ContextKeyTypeEnum GetContextKeyTypeEnumForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-iam/source/model/EncodingType.cpp b/aws-cpp-sdk-iam/source/model/EncodingType.cpp index 053f7c2abd7..e0ced2ead7c 100644 --- a/aws-cpp-sdk-iam/source/model/EncodingType.cpp +++ b/aws-cpp-sdk-iam/source/model/EncodingType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int SSH_HASH = HashingUtils::HashString("SSH"); -static const int PEM_HASH = HashingUtils::HashString("PEM"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace EncodingTypeMapper { + static const int SSH_HASH = HashingUtils::HashString("SSH"); + static const int PEM_HASH = HashingUtils::HashString("PEM"); + EncodingType GetEncodingTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-iam/source/model/EntityType.cpp b/aws-cpp-sdk-iam/source/model/EntityType.cpp index cc46fa7ae5f..42a1a6e44e7 100644 --- a/aws-cpp-sdk-iam/source/model/EntityType.cpp +++ b/aws-cpp-sdk-iam/source/model/EntityType.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int User_HASH = HashingUtils::HashString("User"); -static const int Role_HASH = HashingUtils::HashString("Role"); -static const int Group_HASH = HashingUtils::HashString("Group"); -static const int LocalManagedPolicy_HASH = HashingUtils::HashString("LocalManagedPolicy"); -static const int AWSManagedPolicy_HASH = HashingUtils::HashString("AWSManagedPolicy"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace EntityTypeMapper { + static const int User_HASH = HashingUtils::HashString("User"); + static const int Role_HASH = HashingUtils::HashString("Role"); + static const int Group_HASH = HashingUtils::HashString("Group"); + static const int LocalManagedPolicy_HASH = HashingUtils::HashString("LocalManagedPolicy"); + static const int AWSManagedPolicy_HASH = HashingUtils::HashString("AWSManagedPolicy"); + EntityType GetEntityTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-iam/source/model/EvaluationResult.cpp b/aws-cpp-sdk-iam/source/model/EvaluationResult.cpp index 5d34c200500..1bc3ea179c0 100644 --- a/aws-cpp-sdk-iam/source/model/EvaluationResult.cpp +++ b/aws-cpp-sdk-iam/source/model/EvaluationResult.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + EvaluationResult::EvaluationResult() : m_evalActionNameHasBeenSet(false), m_evalResourceNameHasBeenSet(false), @@ -220,3 +226,7 @@ void EvaluationResult::OutputToStream(Aws::OStream& oStream, const char* locatio } } } + +} // namespace Model +} // namespace IAM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iam/source/model/Group.cpp b/aws-cpp-sdk-iam/source/model/Group.cpp index 70624258d70..98cda12067d 100644 --- a/aws-cpp-sdk-iam/source/model/Group.cpp +++ b/aws-cpp-sdk-iam/source/model/Group.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + Group::Group() : m_pathHasBeenSet(false), m_groupNameHasBeenSet(false), @@ -130,3 +136,7 @@ void Group::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".CreateDate=" << StringUtils::URLEncode(m_createDate.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/GroupDetail.cpp b/aws-cpp-sdk-iam/source/model/GroupDetail.cpp index 846c674459b..0c19495636c 100644 --- a/aws-cpp-sdk-iam/source/model/GroupDetail.cpp +++ b/aws-cpp-sdk-iam/source/model/GroupDetail.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + GroupDetail::GroupDetail() : m_pathHasBeenSet(false), m_groupNameHasBeenSet(false), @@ -198,3 +204,7 @@ void GroupDetail::OutputToStream(Aws::OStream& oStream, const char* location) co } } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/InstanceProfile.cpp b/aws-cpp-sdk-iam/source/model/InstanceProfile.cpp index 6b2e9d51242..b7b208b2901 100644 --- a/aws-cpp-sdk-iam/source/model/InstanceProfile.cpp +++ b/aws-cpp-sdk-iam/source/model/InstanceProfile.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + InstanceProfile::InstanceProfile() : m_pathHasBeenSet(false), m_instanceProfileNameHasBeenSet(false), @@ -164,3 +170,7 @@ void InstanceProfile::OutputToStream(Aws::OStream& oStream, const char* location } } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/LoginProfile.cpp b/aws-cpp-sdk-iam/source/model/LoginProfile.cpp index 43648161750..4eb033c09f9 100644 --- a/aws-cpp-sdk-iam/source/model/LoginProfile.cpp +++ b/aws-cpp-sdk-iam/source/model/LoginProfile.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + LoginProfile::LoginProfile() : m_userNameHasBeenSet(false), m_createDateHasBeenSet(false), @@ -100,3 +106,7 @@ void LoginProfile::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".PasswordResetRequired=" << m_passwordResetRequired << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/MFADevice.cpp b/aws-cpp-sdk-iam/source/model/MFADevice.cpp index 7453a073ab3..879ed68631a 100644 --- a/aws-cpp-sdk-iam/source/model/MFADevice.cpp +++ b/aws-cpp-sdk-iam/source/model/MFADevice.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + MFADevice::MFADevice() : m_userNameHasBeenSet(false), m_serialNumberHasBeenSet(false), @@ -98,3 +104,7 @@ void MFADevice::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".EnableDate=" << StringUtils::URLEncode(m_enableDate.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/ManagedPolicyDetail.cpp b/aws-cpp-sdk-iam/source/model/ManagedPolicyDetail.cpp index fe528c428f6..62e976af56c 100644 --- a/aws-cpp-sdk-iam/source/model/ManagedPolicyDetail.cpp +++ b/aws-cpp-sdk-iam/source/model/ManagedPolicyDetail.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + ManagedPolicyDetail::ManagedPolicyDetail() : m_policyNameHasBeenSet(false), m_policyIdHasBeenSet(false), @@ -248,3 +254,7 @@ void ManagedPolicyDetail::OutputToStream(Aws::OStream& oStream, const char* loca } } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/OpenIDConnectProviderListEntry.cpp b/aws-cpp-sdk-iam/source/model/OpenIDConnectProviderListEntry.cpp index b437239418d..c22df502451 100644 --- a/aws-cpp-sdk-iam/source/model/OpenIDConnectProviderListEntry.cpp +++ b/aws-cpp-sdk-iam/source/model/OpenIDConnectProviderListEntry.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + OpenIDConnectProviderListEntry::OpenIDConnectProviderListEntry() : m_arnHasBeenSet(false) { @@ -66,3 +72,7 @@ void OpenIDConnectProviderListEntry::OutputToStream(Aws::OStream& oStream, const oStream << location << ".Arn=" << StringUtils::URLEncode(m_arn.c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iam/source/model/PasswordPolicy.cpp b/aws-cpp-sdk-iam/source/model/PasswordPolicy.cpp index 48ddd8545e5..a048ed7924a 100644 --- a/aws-cpp-sdk-iam/source/model/PasswordPolicy.cpp +++ b/aws-cpp-sdk-iam/source/model/PasswordPolicy.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + PasswordPolicy::PasswordPolicy() : m_minimumPasswordLength(0), m_minimumPasswordLengthHasBeenSet(false), @@ -230,3 +236,7 @@ void PasswordPolicy::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".HardExpiry=" << m_hardExpiry << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iam/source/model/Policy.cpp b/aws-cpp-sdk-iam/source/model/Policy.cpp index 605a8dd428a..fc50f8929a4 100644 --- a/aws-cpp-sdk-iam/source/model/Policy.cpp +++ b/aws-cpp-sdk-iam/source/model/Policy.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + Policy::Policy() : m_policyNameHasBeenSet(false), m_policyIdHasBeenSet(false), @@ -214,3 +220,7 @@ void Policy::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".UpdateDate=" << StringUtils::URLEncode(m_updateDate.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/PolicyDetail.cpp b/aws-cpp-sdk-iam/source/model/PolicyDetail.cpp index 35aa41201ba..0416e36e1be 100644 --- a/aws-cpp-sdk-iam/source/model/PolicyDetail.cpp +++ b/aws-cpp-sdk-iam/source/model/PolicyDetail.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + PolicyDetail::PolicyDetail() : m_policyNameHasBeenSet(false), m_policyDocumentHasBeenSet(false) @@ -82,3 +88,7 @@ void PolicyDetail::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".PolicyDocument=" << StringUtils::URLEncode(m_policyDocument.c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iam/source/model/PolicyEvaluationDecisionType.cpp b/aws-cpp-sdk-iam/source/model/PolicyEvaluationDecisionType.cpp index 778de95c51e..686607e6309 100644 --- a/aws-cpp-sdk-iam/source/model/PolicyEvaluationDecisionType.cpp +++ b/aws-cpp-sdk-iam/source/model/PolicyEvaluationDecisionType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int allowed_HASH = HashingUtils::HashString("allowed"); -static const int explicitDeny_HASH = HashingUtils::HashString("explicitDeny"); -static const int implicitDeny_HASH = HashingUtils::HashString("implicitDeny"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace PolicyEvaluationDecisionTypeMapper { + static const int allowed_HASH = HashingUtils::HashString("allowed"); + static const int explicitDeny_HASH = HashingUtils::HashString("explicitDeny"); + static const int implicitDeny_HASH = HashingUtils::HashString("implicitDeny"); + PolicyEvaluationDecisionType GetPolicyEvaluationDecisionTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-iam/source/model/PolicyGroup.cpp b/aws-cpp-sdk-iam/source/model/PolicyGroup.cpp index 88e03bbf39f..4826ae12a61 100644 --- a/aws-cpp-sdk-iam/source/model/PolicyGroup.cpp +++ b/aws-cpp-sdk-iam/source/model/PolicyGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + PolicyGroup::PolicyGroup() : m_groupNameHasBeenSet(false), m_groupIdHasBeenSet(false) @@ -82,3 +88,7 @@ void PolicyGroup::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".GroupId=" << StringUtils::URLEncode(m_groupId.c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/PolicyRole.cpp b/aws-cpp-sdk-iam/source/model/PolicyRole.cpp index dcc35275494..833f7d8391e 100644 --- a/aws-cpp-sdk-iam/source/model/PolicyRole.cpp +++ b/aws-cpp-sdk-iam/source/model/PolicyRole.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + PolicyRole::PolicyRole() : m_roleNameHasBeenSet(false), m_roleIdHasBeenSet(false) @@ -82,3 +88,7 @@ void PolicyRole::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".RoleId=" << StringUtils::URLEncode(m_roleId.c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/PolicyScopeType.cpp b/aws-cpp-sdk-iam/source/model/PolicyScopeType.cpp index 3702d4eba5a..88a769e32c0 100644 --- a/aws-cpp-sdk-iam/source/model/PolicyScopeType.cpp +++ b/aws-cpp-sdk-iam/source/model/PolicyScopeType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int All_HASH = HashingUtils::HashString("All"); -static const int AWS_HASH = HashingUtils::HashString("AWS"); -static const int Local_HASH = HashingUtils::HashString("Local"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace PolicyScopeTypeMapper { + static const int All_HASH = HashingUtils::HashString("All"); + static const int AWS_HASH = HashingUtils::HashString("AWS"); + static const int Local_HASH = HashingUtils::HashString("Local"); + PolicyScopeType GetPolicyScopeTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-iam/source/model/PolicySourceType.cpp b/aws-cpp-sdk-iam/source/model/PolicySourceType.cpp index fd43e8341aa..907405d8116 100644 --- a/aws-cpp-sdk-iam/source/model/PolicySourceType.cpp +++ b/aws-cpp-sdk-iam/source/model/PolicySourceType.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int user_HASH = HashingUtils::HashString("user"); -static const int group_HASH = HashingUtils::HashString("group"); -static const int role_HASH = HashingUtils::HashString("role"); -static const int aws_managed_HASH = HashingUtils::HashString("aws-managed"); -static const int user_managed_HASH = HashingUtils::HashString("user-managed"); -static const int resource_HASH = HashingUtils::HashString("resource"); -static const int none_HASH = HashingUtils::HashString("none"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace PolicySourceTypeMapper { + static const int user_HASH = HashingUtils::HashString("user"); + static const int group_HASH = HashingUtils::HashString("group"); + static const int role_HASH = HashingUtils::HashString("role"); + static const int aws_managed_HASH = HashingUtils::HashString("aws-managed"); + static const int user_managed_HASH = HashingUtils::HashString("user-managed"); + static const int resource_HASH = HashingUtils::HashString("resource"); + static const int none_HASH = HashingUtils::HashString("none"); + PolicySourceType GetPolicySourceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-iam/source/model/PolicyUser.cpp b/aws-cpp-sdk-iam/source/model/PolicyUser.cpp index 7ef6037dd5d..78339284b28 100644 --- a/aws-cpp-sdk-iam/source/model/PolicyUser.cpp +++ b/aws-cpp-sdk-iam/source/model/PolicyUser.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + PolicyUser::PolicyUser() : m_userNameHasBeenSet(false), m_userIdHasBeenSet(false) @@ -82,3 +88,7 @@ void PolicyUser::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".UserId=" << StringUtils::URLEncode(m_userId.c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/PolicyVersion.cpp b/aws-cpp-sdk-iam/source/model/PolicyVersion.cpp index 669283a178b..086dd21b5a4 100644 --- a/aws-cpp-sdk-iam/source/model/PolicyVersion.cpp +++ b/aws-cpp-sdk-iam/source/model/PolicyVersion.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + PolicyVersion::PolicyVersion() : m_documentHasBeenSet(false), m_versionIdHasBeenSet(false), @@ -116,3 +122,7 @@ void PolicyVersion::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".CreateDate=" << StringUtils::URLEncode(m_createDate.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/Position.cpp b/aws-cpp-sdk-iam/source/model/Position.cpp index b9d8fdcab4b..943efb921a8 100644 --- a/aws-cpp-sdk-iam/source/model/Position.cpp +++ b/aws-cpp-sdk-iam/source/model/Position.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + Position::Position() : m_line(0), m_lineHasBeenSet(false), @@ -86,3 +92,7 @@ void Position::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Column=" << m_column << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iam/source/model/ReportFormatType.cpp b/aws-cpp-sdk-iam/source/model/ReportFormatType.cpp index 78d0950803e..38d0e46207d 100644 --- a/aws-cpp-sdk-iam/source/model/ReportFormatType.cpp +++ b/aws-cpp-sdk-iam/source/model/ReportFormatType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int text_csv_HASH = HashingUtils::HashString("text/csv"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace ReportFormatTypeMapper { + static const int text_csv_HASH = HashingUtils::HashString("text/csv"); + ReportFormatType GetReportFormatTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-iam/source/model/ReportStateType.cpp b/aws-cpp-sdk-iam/source/model/ReportStateType.cpp index 1c7956a92cc..996078c89ff 100644 --- a/aws-cpp-sdk-iam/source/model/ReportStateType.cpp +++ b/aws-cpp-sdk-iam/source/model/ReportStateType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int STARTED_HASH = HashingUtils::HashString("STARTED"); -static const int INPROGRESS_HASH = HashingUtils::HashString("INPROGRESS"); -static const int COMPLETE_HASH = HashingUtils::HashString("COMPLETE"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ReportStateTypeMapper { + static const int STARTED_HASH = HashingUtils::HashString("STARTED"); + static const int INPROGRESS_HASH = HashingUtils::HashString("INPROGRESS"); + static const int COMPLETE_HASH = HashingUtils::HashString("COMPLETE"); + ReportStateType GetReportStateTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-iam/source/model/ResourceSpecificResult.cpp b/aws-cpp-sdk-iam/source/model/ResourceSpecificResult.cpp index 7087f6d0a8a..832893757e8 100644 --- a/aws-cpp-sdk-iam/source/model/ResourceSpecificResult.cpp +++ b/aws-cpp-sdk-iam/source/model/ResourceSpecificResult.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + ResourceSpecificResult::ResourceSpecificResult() : m_evalResourceNameHasBeenSet(false), m_evalResourceDecisionHasBeenSet(false), @@ -170,3 +176,7 @@ void ResourceSpecificResult::OutputToStream(Aws::OStream& oStream, const char* l { } } + +} // namespace Model +} // namespace IAM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iam/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-iam/source/model/ResponseMetadata.cpp index 619f4b74958..2e61476ffea 100644 --- a/aws-cpp-sdk-iam/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-iam/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iam/source/model/Role.cpp b/aws-cpp-sdk-iam/source/model/Role.cpp index aa9c1abd21f..d9504ec1480 100644 --- a/aws-cpp-sdk-iam/source/model/Role.cpp +++ b/aws-cpp-sdk-iam/source/model/Role.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + Role::Role() : m_pathHasBeenSet(false), m_roleNameHasBeenSet(false), @@ -146,3 +152,7 @@ void Role::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".AssumeRolePolicyDocument=" << StringUtils::URLEncode(m_assumeRolePolicyDocument.c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/RoleDetail.cpp b/aws-cpp-sdk-iam/source/model/RoleDetail.cpp index 84f7108423d..33de96f6cd6 100644 --- a/aws-cpp-sdk-iam/source/model/RoleDetail.cpp +++ b/aws-cpp-sdk-iam/source/model/RoleDetail.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + RoleDetail::RoleDetail() : m_pathHasBeenSet(false), m_roleNameHasBeenSet(false), @@ -248,3 +254,7 @@ void RoleDetail::OutputToStream(Aws::OStream& oStream, const char* location) con } } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/SAMLProviderListEntry.cpp b/aws-cpp-sdk-iam/source/model/SAMLProviderListEntry.cpp index 58df25ac6a4..aa7f2d2e716 100644 --- a/aws-cpp-sdk-iam/source/model/SAMLProviderListEntry.cpp +++ b/aws-cpp-sdk-iam/source/model/SAMLProviderListEntry.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + SAMLProviderListEntry::SAMLProviderListEntry() : m_arnHasBeenSet(false), m_validUntilHasBeenSet(false), @@ -98,3 +104,7 @@ void SAMLProviderListEntry::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".CreateDate=" << StringUtils::URLEncode(m_createDate.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/SSHPublicKey.cpp b/aws-cpp-sdk-iam/source/model/SSHPublicKey.cpp index e5823cc6852..181567ebf5f 100644 --- a/aws-cpp-sdk-iam/source/model/SSHPublicKey.cpp +++ b/aws-cpp-sdk-iam/source/model/SSHPublicKey.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + SSHPublicKey::SSHPublicKey() : m_userNameHasBeenSet(false), m_sSHPublicKeyIdHasBeenSet(false), @@ -146,3 +152,7 @@ void SSHPublicKey::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".UploadDate=" << StringUtils::URLEncode(m_uploadDate.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/SSHPublicKeyMetadata.cpp b/aws-cpp-sdk-iam/source/model/SSHPublicKeyMetadata.cpp index f294969c6d0..987a05f964e 100644 --- a/aws-cpp-sdk-iam/source/model/SSHPublicKeyMetadata.cpp +++ b/aws-cpp-sdk-iam/source/model/SSHPublicKeyMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + SSHPublicKeyMetadata::SSHPublicKeyMetadata() : m_userNameHasBeenSet(false), m_sSHPublicKeyIdHasBeenSet(false), @@ -114,3 +120,7 @@ void SSHPublicKeyMetadata::OutputToStream(Aws::OStream& oStream, const char* loc oStream << location << ".UploadDate=" << StringUtils::URLEncode(m_uploadDate.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/ServerCertificate.cpp b/aws-cpp-sdk-iam/source/model/ServerCertificate.cpp index 1b1cd12ebae..c26ae70e38c 100644 --- a/aws-cpp-sdk-iam/source/model/ServerCertificate.cpp +++ b/aws-cpp-sdk-iam/source/model/ServerCertificate.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + ServerCertificate::ServerCertificate() : m_serverCertificateMetadataHasBeenSet(false), m_certificateBodyHasBeenSet(false), @@ -102,3 +108,7 @@ void ServerCertificate::OutputToStream(Aws::OStream& oStream, const char* locati oStream << location << ".CertificateChain=" << StringUtils::URLEncode(m_certificateChain.c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iam/source/model/ServerCertificateMetadata.cpp b/aws-cpp-sdk-iam/source/model/ServerCertificateMetadata.cpp index 2d99b065b96..ef6931ed0bd 100644 --- a/aws-cpp-sdk-iam/source/model/ServerCertificateMetadata.cpp +++ b/aws-cpp-sdk-iam/source/model/ServerCertificateMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + ServerCertificateMetadata::ServerCertificateMetadata() : m_pathHasBeenSet(false), m_serverCertificateNameHasBeenSet(false), @@ -146,3 +152,7 @@ void ServerCertificateMetadata::OutputToStream(Aws::OStream& oStream, const char oStream << location << ".Expiration=" << StringUtils::URLEncode(m_expiration.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/SigningCertificate.cpp b/aws-cpp-sdk-iam/source/model/SigningCertificate.cpp index 9424b760e1b..dd13cd4f4e0 100644 --- a/aws-cpp-sdk-iam/source/model/SigningCertificate.cpp +++ b/aws-cpp-sdk-iam/source/model/SigningCertificate.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + SigningCertificate::SigningCertificate() : m_userNameHasBeenSet(false), m_certificateIdHasBeenSet(false), @@ -130,3 +136,7 @@ void SigningCertificate::OutputToStream(Aws::OStream& oStream, const char* locat oStream << location << ".UploadDate=" << StringUtils::URLEncode(m_uploadDate.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/Statement.cpp b/aws-cpp-sdk-iam/source/model/Statement.cpp index 4816c934ff0..b0689832121 100644 --- a/aws-cpp-sdk-iam/source/model/Statement.cpp +++ b/aws-cpp-sdk-iam/source/model/Statement.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + Statement::Statement() : m_sourcePolicyIdHasBeenSet(false), m_sourcePolicyTypeHasBeenSet(false), @@ -122,3 +128,7 @@ void Statement::OutputToStream(Aws::OStream& oStream, const char* location) cons m_endPosition.OutputToStream(oStream, endPositionLocationAndMember.c_str()); } } + +} // namespace Model +} // namespace IAM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iam/source/model/StatusType.cpp b/aws-cpp-sdk-iam/source/model/StatusType.cpp index e88165894b9..f13dc128837 100644 --- a/aws-cpp-sdk-iam/source/model/StatusType.cpp +++ b/aws-cpp-sdk-iam/source/model/StatusType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Active_HASH = HashingUtils::HashString("Active"); -static const int Inactive_HASH = HashingUtils::HashString("Inactive"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace StatusTypeMapper { + static const int Active_HASH = HashingUtils::HashString("Active"); + static const int Inactive_HASH = HashingUtils::HashString("Inactive"); + StatusType GetStatusTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-iam/source/model/SummaryKeyType.cpp b/aws-cpp-sdk-iam/source/model/SummaryKeyType.cpp index 76beb427bec..54b13f5989d 100644 --- a/aws-cpp-sdk-iam/source/model/SummaryKeyType.cpp +++ b/aws-cpp-sdk-iam/source/model/SummaryKeyType.cpp @@ -19,31 +19,6 @@ using namespace Aws::Utils; -static const int Users_HASH = HashingUtils::HashString("Users"); -static const int UsersQuota_HASH = HashingUtils::HashString("UsersQuota"); -static const int Groups_HASH = HashingUtils::HashString("Groups"); -static const int GroupsQuota_HASH = HashingUtils::HashString("GroupsQuota"); -static const int ServerCertificates_HASH = HashingUtils::HashString("ServerCertificates"); -static const int ServerCertificatesQuota_HASH = HashingUtils::HashString("ServerCertificatesQuota"); -static const int UserPolicySizeQuota_HASH = HashingUtils::HashString("UserPolicySizeQuota"); -static const int GroupPolicySizeQuota_HASH = HashingUtils::HashString("GroupPolicySizeQuota"); -static const int GroupsPerUserQuota_HASH = HashingUtils::HashString("GroupsPerUserQuota"); -static const int SigningCertificatesPerUserQuota_HASH = HashingUtils::HashString("SigningCertificatesPerUserQuota"); -static const int AccessKeysPerUserQuota_HASH = HashingUtils::HashString("AccessKeysPerUserQuota"); -static const int MFADevices_HASH = HashingUtils::HashString("MFADevices"); -static const int MFADevicesInUse_HASH = HashingUtils::HashString("MFADevicesInUse"); -static const int AccountMFAEnabled_HASH = HashingUtils::HashString("AccountMFAEnabled"); -static const int AccountAccessKeysPresent_HASH = HashingUtils::HashString("AccountAccessKeysPresent"); -static const int AccountSigningCertificatesPresent_HASH = HashingUtils::HashString("AccountSigningCertificatesPresent"); -static const int AttachedPoliciesPerGroupQuota_HASH = HashingUtils::HashString("AttachedPoliciesPerGroupQuota"); -static const int AttachedPoliciesPerRoleQuota_HASH = HashingUtils::HashString("AttachedPoliciesPerRoleQuota"); -static const int AttachedPoliciesPerUserQuota_HASH = HashingUtils::HashString("AttachedPoliciesPerUserQuota"); -static const int Policies_HASH = HashingUtils::HashString("Policies"); -static const int PoliciesQuota_HASH = HashingUtils::HashString("PoliciesQuota"); -static const int PolicySizeQuota_HASH = HashingUtils::HashString("PolicySizeQuota"); -static const int PolicyVersionsInUse_HASH = HashingUtils::HashString("PolicyVersionsInUse"); -static const int PolicyVersionsInUseQuota_HASH = HashingUtils::HashString("PolicyVersionsInUseQuota"); -static const int VersionsPerPolicyQuota_HASH = HashingUtils::HashString("VersionsPerPolicyQuota"); namespace Aws { @@ -54,6 +29,32 @@ namespace Aws namespace SummaryKeyTypeMapper { + static const int Users_HASH = HashingUtils::HashString("Users"); + static const int UsersQuota_HASH = HashingUtils::HashString("UsersQuota"); + static const int Groups_HASH = HashingUtils::HashString("Groups"); + static const int GroupsQuota_HASH = HashingUtils::HashString("GroupsQuota"); + static const int ServerCertificates_HASH = HashingUtils::HashString("ServerCertificates"); + static const int ServerCertificatesQuota_HASH = HashingUtils::HashString("ServerCertificatesQuota"); + static const int UserPolicySizeQuota_HASH = HashingUtils::HashString("UserPolicySizeQuota"); + static const int GroupPolicySizeQuota_HASH = HashingUtils::HashString("GroupPolicySizeQuota"); + static const int GroupsPerUserQuota_HASH = HashingUtils::HashString("GroupsPerUserQuota"); + static const int SigningCertificatesPerUserQuota_HASH = HashingUtils::HashString("SigningCertificatesPerUserQuota"); + static const int AccessKeysPerUserQuota_HASH = HashingUtils::HashString("AccessKeysPerUserQuota"); + static const int MFADevices_HASH = HashingUtils::HashString("MFADevices"); + static const int MFADevicesInUse_HASH = HashingUtils::HashString("MFADevicesInUse"); + static const int AccountMFAEnabled_HASH = HashingUtils::HashString("AccountMFAEnabled"); + static const int AccountAccessKeysPresent_HASH = HashingUtils::HashString("AccountAccessKeysPresent"); + static const int AccountSigningCertificatesPresent_HASH = HashingUtils::HashString("AccountSigningCertificatesPresent"); + static const int AttachedPoliciesPerGroupQuota_HASH = HashingUtils::HashString("AttachedPoliciesPerGroupQuota"); + static const int AttachedPoliciesPerRoleQuota_HASH = HashingUtils::HashString("AttachedPoliciesPerRoleQuota"); + static const int AttachedPoliciesPerUserQuota_HASH = HashingUtils::HashString("AttachedPoliciesPerUserQuota"); + static const int Policies_HASH = HashingUtils::HashString("Policies"); + static const int PoliciesQuota_HASH = HashingUtils::HashString("PoliciesQuota"); + static const int PolicySizeQuota_HASH = HashingUtils::HashString("PolicySizeQuota"); + static const int PolicyVersionsInUse_HASH = HashingUtils::HashString("PolicyVersionsInUse"); + static const int PolicyVersionsInUseQuota_HASH = HashingUtils::HashString("PolicyVersionsInUseQuota"); + static const int VersionsPerPolicyQuota_HASH = HashingUtils::HashString("VersionsPerPolicyQuota"); + SummaryKeyType GetSummaryKeyTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-iam/source/model/User.cpp b/aws-cpp-sdk-iam/source/model/User.cpp index 0affaeaabe1..90f5500595b 100644 --- a/aws-cpp-sdk-iam/source/model/User.cpp +++ b/aws-cpp-sdk-iam/source/model/User.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + User::User() : m_pathHasBeenSet(false), m_userNameHasBeenSet(false), @@ -146,3 +152,7 @@ void User::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".PasswordLastUsed=" << StringUtils::URLEncode(m_passwordLastUsed.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/UserDetail.cpp b/aws-cpp-sdk-iam/source/model/UserDetail.cpp index 9a6c7c24525..0df04266322 100644 --- a/aws-cpp-sdk-iam/source/model/UserDetail.cpp +++ b/aws-cpp-sdk-iam/source/model/UserDetail.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + UserDetail::UserDetail() : m_pathHasBeenSet(false), m_userNameHasBeenSet(false), @@ -228,3 +234,7 @@ void UserDetail::OutputToStream(Aws::OStream& oStream, const char* location) con } } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-iam/source/model/VirtualMFADevice.cpp b/aws-cpp-sdk-iam/source/model/VirtualMFADevice.cpp index 5b90698a3dc..399ff40a79b 100644 --- a/aws-cpp-sdk-iam/source/model/VirtualMFADevice.cpp +++ b/aws-cpp-sdk-iam/source/model/VirtualMFADevice.cpp @@ -20,10 +20,16 @@ #include -using namespace Aws::IAM::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace IAM +{ +namespace Model +{ + VirtualMFADevice::VirtualMFADevice() : m_serialNumberHasBeenSet(false), m_base32StringSeedHasBeenSet(false), @@ -135,3 +141,7 @@ void VirtualMFADevice::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".EnableDate=" << StringUtils::URLEncode(m_enableDate.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace IAM +} // namespace Aws diff --git a/aws-cpp-sdk-identity-management-tests/auth/PersistentCognitoIdentityProvider_JsonFileImplTest.cpp b/aws-cpp-sdk-identity-management-tests/auth/PersistentCognitoIdentityProvider_JsonFileImplTest.cpp index d1551ae529a..5ab3ed44319 100644 --- a/aws-cpp-sdk-identity-management-tests/auth/PersistentCognitoIdentityProvider_JsonFileImplTest.cpp +++ b/aws-cpp-sdk-identity-management-tests/auth/PersistentCognitoIdentityProvider_JsonFileImplTest.cpp @@ -20,66 +20,49 @@ #include #include #include +#include #include -#ifdef _MSC_VER -#pragma warning(disable: 4996) // _CRT_SECURE_NO_WARNINGS -#endif - using namespace Aws::Auth; using namespace Aws::Utils; using namespace Aws::Utils::Json; -#ifdef _WIN32 -Aws::String ComputeIdentityFilePath() +class PersistentCognitoIdentityProvider_JsonImpl_Test : public ::testing::Test { - static bool s_initialized = false; - static char s_tempName[L_tmpnam_s+1]; - - /* - Prior to VS 2014, tmpnam/tmpnam_s generated root level files ("\filename") which were not appropriate for our usage, so for the windows version, we prepended a '.' to make it a - tempfile in the current directory. Starting with VS2014, the behavior of tmpnam/tmpnam_s was changed to be a full, valid filepath based on the - current user ("C:\Users\username\AppData\Local\Temp\..."). - - See the tmpnam section in http://blogs.msdn.com/b/vcblog/archive/2014/06/18/crt-features-fixes-and-breaking-changes-in-visual-studio-14-ctp1.aspx - for more details. - */ - if(!s_initialized) +public: + + void SetUp() { -#if _MSC_VER >= 1900 - tmpnam_s(s_tempName, L_tmpnam_s); + Aws::String dateTime = DateTime::Now().CalculateGmtTimestampAsString("%H_%M_%S_%Y_%m_%d"); +#ifdef __ANDROID__ + tempFile = Aws::Platform::GetCacheDirectory() + dateTime; #else - s_tempName[0] = '.'; - tmpnam_s(s_tempName + 1, L_tmpnam_s); -#endif // _MSC_VER - s_initialized = true; + tempFile = dateTime; +#endif // __ANDROID__ } - return Aws::String(s_tempName); -} -#else -Aws::String ComputeIdentityFilePath() -{ - //tempnam is deprecated on gcc linker, just compute a unique timestamp - static Aws::String tempFile(DateTime::Now().CalculateGmtTimestampAsString("%H_%M_%S_%Y_%m_%d")); - return tempFile; -} -#endif + void TearDown() + { + FileSystemUtils::RemoveFileIfExists(tempFile.c_str()); + } -TEST(PersistentCognitoIdentityProvider_JsonImpl_Test, TestConstructorWhenNoFileIsAvailable) + Aws::String tempFile; +}; + +TEST_F(PersistentCognitoIdentityProvider_JsonImpl_Test, TestConstructorWhenNoFileIsAvailable) { - PersistentCognitoIdentityProvider_JsonFileImpl identityProvider("identityPoolId", "accountId", ComputeIdentityFilePath().c_str()); + PersistentCognitoIdentityProvider_JsonFileImpl identityProvider("identityPoolId", "accountId", tempFile.c_str()); ASSERT_FALSE(identityProvider.HasIdentityId()); ASSERT_FALSE(identityProvider.HasLogins()); ASSERT_EQ("identityPoolId", identityProvider.GetIdentityPoolId()); ASSERT_EQ("accountId", identityProvider.GetAccountId()); - Aws::String filePath = ComputeIdentityFilePath(); + Aws::String filePath = tempFile; std::ifstream shouldNotExist(filePath.c_str()); ASSERT_FALSE(shouldNotExist.good()); } -TEST(PersistentCognitoIdentityProvider_JsonImpl_Test, TestConstructorWhenFileIsAvaiable) +TEST_F(PersistentCognitoIdentityProvider_JsonImpl_Test, TestConstructorWhenFileIsAvaiable) { JsonValue theIdentityPoolWeWant; theIdentityPoolWeWant.WithString("IdentityId", "TheIdentityWeWant"); @@ -97,7 +80,7 @@ TEST(PersistentCognitoIdentityProvider_JsonImpl_Test, TestConstructorWhenFileIsA identityDoc.WithObject("IdentityPoolWeWant", theIdentityPoolWeWant); identityDoc.WithObject("SomeOtherIdentityPool", someOtherIdentityPool); - Aws::String filePath = ComputeIdentityFilePath(); + Aws::String filePath = tempFile; std::ofstream identityFile(filePath.c_str()); identityFile << identityDoc.WriteReadable(); identityFile.flush(); @@ -114,7 +97,7 @@ TEST(PersistentCognitoIdentityProvider_JsonImpl_Test, TestConstructorWhenFileIsA ASSERT_EQ("TestLoginValue", identityProvider.GetLogins().begin()->second.accessToken); } -TEST(PersistentCognitoIdentityProvider_JsonImpl_Test, TestPersistance) +TEST_F(PersistentCognitoIdentityProvider_JsonImpl_Test, TestPersistance) { JsonValue someOtherIdentityPool; someOtherIdentityPool.WithString("IdentityId", "SomeOtherIdentity"); @@ -122,7 +105,7 @@ TEST(PersistentCognitoIdentityProvider_JsonImpl_Test, TestPersistance) JsonValue identityDoc; identityDoc.WithObject("SomeOtherIdentityPool", someOtherIdentityPool); - Aws::String filePath = ComputeIdentityFilePath(); + Aws::String filePath = tempFile; FileSystemUtils::RemoveFileIfExists(filePath.c_str()); std::ofstream identityFile(filePath.c_str()); identityFile << identityDoc.WriteReadable(); @@ -154,7 +137,7 @@ TEST(PersistentCognitoIdentityProvider_JsonImpl_Test, TestPersistance) ASSERT_TRUE(loginsCallbackFired); } - PersistentCognitoIdentityProvider_JsonFileImpl identityProvider("IdentityPoolWeWant", "accountId", filePath.c_str()); + PersistentCognitoIdentityProvider_JsonFileImpl identityProvider("IdentityPoolWeWant", "accountId", m_PersistentIdentityFilename.c_str()); EXPECT_EQ("IdentityWeWant", identityProvider.GetIdentityId()); EXPECT_EQ("LoginName", identityProvider.GetLogins().begin()->first); diff --git a/aws-cpp-sdk-identity-management/include/aws/identity-management/auth/PersistentCognitoIdentityProvider.h b/aws-cpp-sdk-identity-management/include/aws/identity-management/auth/PersistentCognitoIdentityProvider.h index cc46b8920ff..675524263cb 100644 --- a/aws-cpp-sdk-identity-management/include/aws/identity-management/auth/PersistentCognitoIdentityProvider.h +++ b/aws-cpp-sdk-identity-management/include/aws/identity-management/auth/PersistentCognitoIdentityProvider.h @@ -12,6 +12,8 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ +#pragma once + #include #include #include @@ -70,15 +72,15 @@ namespace Aws class AWS_IDENTITY_MANAGEMENT_API PersistentCognitoIdentityProvider_JsonFileImpl : public PersistentCognitoIdentityProvider { public: - PersistentCognitoIdentityProvider_JsonFileImpl(const Aws::String& identityPoolId, const Aws::String& accountId); - PersistentCognitoIdentityProvider_JsonFileImpl(const Aws::String& identityPoolId, const Aws::String& accountId, const char* identitiesFilePath); + PersistentCognitoIdentityProvider_JsonFileImpl(const Aws::String& identityPoolId, const Aws::String& accountId, bool disableCaching = false); + PersistentCognitoIdentityProvider_JsonFileImpl(const Aws::String& identityPoolId, const Aws::String& accountId, const char* identitiesFilePath, bool disableCaching = false); - bool HasIdentityId() const override { return !m_identityId.empty(); } - bool HasLogins() const override { return !m_logins.empty(); } - Aws::String GetIdentityId() const override { return m_identityId; } - Aws::Map GetLogins() override { return m_logins; } - inline Aws::String GetAccountId() const override { return m_accountId; } - inline Aws::String GetIdentityPoolId() const override { return m_identityPoolId; } + bool HasIdentityId() const override; + bool HasLogins() const override; + Aws::String GetIdentityId() const override; + Aws::Map GetLogins() override; + Aws::String GetAccountId() const override { return m_accountId; } + Aws::String GetIdentityPoolId() const override { return m_identityPoolId; } void PersistIdentityId(const Aws::String&) override; void PersistLogins(const Aws::Map&) override; @@ -87,12 +89,15 @@ namespace Aws void PersistChangesToFile(const Utils::Json::JsonValue&) const; void LoadAndParseDoc(); + static void BuildLoginsMap(Aws::Map, Aws::Map& logins); + std::mutex m_docMutex; Aws::String m_identityPoolId; Aws::String m_accountId; Aws::String m_identityId; Aws::Map m_logins; Aws::String m_identityFilePath; + bool m_disableCaching; }; typedef PersistentCognitoIdentityProvider_JsonFileImpl DefaultPersistentCognitoIdentityProvider; diff --git a/aws-cpp-sdk-identity-management/source/auth/PersistentCognitoIdentityProvider_JsonFileImpl.cpp b/aws-cpp-sdk-identity-management/source/auth/PersistentCognitoIdentityProvider_JsonFileImpl.cpp index 1b2a8d4bea7..6f790f7cc3e 100644 --- a/aws-cpp-sdk-identity-management/source/auth/PersistentCognitoIdentityProvider_JsonFileImpl.cpp +++ b/aws-cpp-sdk-identity-management/source/auth/PersistentCognitoIdentityProvider_JsonFileImpl.cpp @@ -33,8 +33,10 @@ static const char* FILENAME = ".identities"; static const char* DIR = ".aws"; static const char* LOG_TAG = "PersistentCognitoIdentityProvider_JsonFileImpl"; -PersistentCognitoIdentityProvider_JsonFileImpl::PersistentCognitoIdentityProvider_JsonFileImpl(const Aws::String& identityPoolId, const Aws::String& accountId) - : m_identityPoolId(identityPoolId), m_accountId(accountId) +PersistentCognitoIdentityProvider_JsonFileImpl::PersistentCognitoIdentityProvider_JsonFileImpl(const Aws::String& identityPoolId, const Aws::String& accountId, bool disableCaching) : + m_identityPoolId(identityPoolId), + m_accountId(accountId), + m_disableCaching(disableCaching) { Aws::String identitiesDir = FileSystemUtils::GetHomeDirectory() + DIR; @@ -43,14 +45,25 @@ PersistentCognitoIdentityProvider_JsonFileImpl::PersistentCognitoIdentityProvide m_identityFilePath = identitiesDir + PATH_DELIM + FILENAME; } - LoadAndParseDoc(); + if(!m_disableCaching) + { + LoadAndParseDoc(); + } } PersistentCognitoIdentityProvider_JsonFileImpl::PersistentCognitoIdentityProvider_JsonFileImpl(const Aws::String& identityPoolId, - const Aws::String& accountId, const char* identitiesFilePath) - : m_identityPoolId(identityPoolId), m_accountId(accountId), m_identityFilePath(identitiesFilePath) + const Aws::String& accountId, + const char* identitiesFilePath, + bool disableCaching) : + m_identityPoolId(identityPoolId), + m_accountId(accountId), + m_identityFilePath(identitiesFilePath), + m_disableCaching(disableCaching) { - LoadAndParseDoc(); + if(!m_disableCaching) + { + LoadAndParseDoc(); + } } void PersistentCognitoIdentityProvider_JsonFileImpl::PersistIdentityId(const Aws::String& identityId) @@ -156,38 +169,129 @@ void PersistentCognitoIdentityProvider_JsonFileImpl::LoadAndParseDoc() if (identityNode.ValueExists(LOGINS)) { auto logins = identityNode.GetObject(LOGINS).GetAllObjects(); - for (auto& login : logins) + BuildLoginsMap(logins, m_logins); + } + } +} + +bool PersistentCognitoIdentityProvider_JsonFileImpl::HasIdentityId() const +{ + if(m_disableCaching) + { + auto jsonDoc = LoadJsonDocFromFile(); + if (jsonDoc.ValueExists(m_identityPoolId)) + { + auto identityNode = jsonDoc.GetObject(m_identityPoolId); + return !identityNode.GetString(IDENTITY_ID).empty(); + } + + return false; + } + else + { + return !m_identityId.empty(); + } +} + +bool PersistentCognitoIdentityProvider_JsonFileImpl::HasLogins() const +{ + if(m_disableCaching) + { + auto jsonDoc = LoadJsonDocFromFile(); + if (jsonDoc.ValueExists(m_identityPoolId)) + { + auto identityNode = jsonDoc.GetObject(m_identityPoolId); + if (identityNode.ValueExists(LOGINS)) { - auto& loginTokens = login.second; - LoginAccessTokens loginAccessTokens; - - /*this block is for backwards compatibility with the previous implementation. - This used to be a string: string mapping, if access token is not a member, - then fallback and assign the value to the accessToken field. Now, next time - it will save it in the new format.*/ - if(loginTokens.IsString()) - { - loginAccessTokens.accessToken = loginTokens.AsString(); - } - else - { - if (loginTokens.ValueExists(ACCESS_TOKEN)) - { - loginAccessTokens.accessToken = loginTokens.GetString(ACCESS_TOKEN); - } - - if (loginTokens.ValueExists(LONG_TERM_TOKEN)) - { - loginAccessTokens.longTermToken = loginTokens.GetString(LONG_TERM_TOKEN); - } - if (loginTokens.ValueExists(EXPIRY)) - { - loginAccessTokens.longTermTokenExpiry = loginTokens.GetInt64(EXPIRY); - } - } - - m_logins[login.first] = loginAccessTokens; + auto logins = identityNode.GetObject(LOGINS).GetAllObjects(); + return logins.size() > 0; } } - } + + return false; + } + else + { + return !m_logins.empty(); + } +} + +Aws::String PersistentCognitoIdentityProvider_JsonFileImpl::GetIdentityId() const +{ + if(m_disableCaching) + { + auto jsonDoc = LoadJsonDocFromFile(); + if (jsonDoc.ValueExists(m_identityPoolId)) + { + auto identityNode = jsonDoc.GetObject(m_identityPoolId); + return identityNode.GetString(IDENTITY_ID); + } + + return ""; + } + else + { + return m_identityId; + } +} + +Aws::Map PersistentCognitoIdentityProvider_JsonFileImpl::GetLogins() +{ + if(m_disableCaching) + { + Aws::Map logins; + + auto jsonDoc = LoadJsonDocFromFile(); + if (jsonDoc.ValueExists(m_identityPoolId)) + { + auto identityNode = jsonDoc.GetObject(m_identityPoolId); + if (identityNode.ValueExists(LOGINS)) + { + auto loginsJsonMap = identityNode.GetObject(LOGINS).GetAllObjects(); + BuildLoginsMap(loginsJsonMap, logins); + } + } + + return logins; + } + else + { + return m_logins; + } } + +void PersistentCognitoIdentityProvider_JsonFileImpl::BuildLoginsMap(Aws::Map loginJsonMap, Aws::Map& logins) +{ + for (auto& login : loginJsonMap) + { + auto& loginTokens = login.second; + LoginAccessTokens loginAccessTokens; + + /*this block is for backwards compatibility with the previous implementation. + This used to be a string: string mapping, if access token is not a member, + then fallback and assign the value to the accessToken field. Now, next time + it will save it in the new format.*/ + if(loginTokens.IsString()) + { + loginAccessTokens.accessToken = loginTokens.AsString(); + } + else + { + if (loginTokens.ValueExists(ACCESS_TOKEN)) + { + loginAccessTokens.accessToken = loginTokens.GetString(ACCESS_TOKEN); + } + + if (loginTokens.ValueExists(LONG_TERM_TOKEN)) + { + loginAccessTokens.longTermToken = loginTokens.GetString(LONG_TERM_TOKEN); + } + if (loginTokens.ValueExists(EXPIRY)) + { + loginAccessTokens.longTermTokenExpiry = loginTokens.GetInt64(EXPIRY); + } + } + + logins[login.first] = loginAccessTokens; + } +} \ No newline at end of file diff --git a/aws-cpp-sdk-importexport/CMakeLists.txt b/aws-cpp-sdk-importexport/CMakeLists.txt index eb3c6b20a8f..706249f10be 100644 --- a/aws-cpp-sdk-importexport/CMakeLists.txt +++ b/aws-cpp-sdk-importexport/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-importexport) "source/model/*.cpp" ) - file(GLOB IMPORTEXPORT_SRC + file(GLOB IMPORTEXPORT_UNIFIED_HEADERS ${AWS_IMPORTEXPORT_HEADERS} ${AWS_IMPORTEXPORT_MODEL_HEADERS} + ) + + file(GLOB IMPORTEXPORT_UNITY_SRC ${AWS_IMPORTEXPORT_SOURCE} ${AWS_IMPORTEXPORT_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("IMPORTEXPORT" IMPORTEXPORT_UNITY_SRC) + endif() + + file(GLOB IMPORTEXPORT_SRC + ${IMPORTEXPORT_UNIFIED_HEADERS} + ${IMPORTEXPORT_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-importexport/source/ImportExportErrors.cpp b/aws-cpp-sdk-importexport/source/ImportExportErrors.cpp index 9b7cea84c5e..6b2f3134f5c 100644 --- a/aws-cpp-sdk-importexport/source/ImportExportErrors.cpp +++ b/aws-cpp-sdk-importexport/source/ImportExportErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::ImportExport; using namespace Aws::Utils; +namespace Aws +{ +namespace ImportExport +{ +namespace ImportExportErrorMapper +{ + static const int UNABLE_TO_CANCEL_JOB_ID_HASH = HashingUtils::HashString("UnableToCancelJobIdException"); static const int MULTIPLE_REGIONS_HASH = HashingUtils::HashString("MultipleRegionsException"); static const int INVALID_ACCESS_KEY_ID_HASH = HashingUtils::HashString("InvalidAccessKeyIdException"); @@ -40,12 +47,6 @@ static const int MISSING_CUSTOMS_HASH = HashingUtils::HashString("MissingCustoms static const int MISSING_MANIFEST_FIELD_HASH = HashingUtils::HashString("MissingManifestFieldException"); static const int CANCELED_JOB_ID_HASH = HashingUtils::HashString("CanceledJobIdException"); -namespace Aws -{ -namespace ImportExport -{ -namespace ImportExportErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-importexport/source/model/Artifact.cpp b/aws-cpp-sdk-importexport/source/model/Artifact.cpp index 68f6dcd34ce..6fd5f14646b 100644 --- a/aws-cpp-sdk-importexport/source/model/Artifact.cpp +++ b/aws-cpp-sdk-importexport/source/model/Artifact.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ImportExport::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ImportExport +{ +namespace Model +{ + Artifact::Artifact() : m_descriptionHasBeenSet(false), m_uRLHasBeenSet(false) @@ -82,3 +88,7 @@ void Artifact::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".URL=" << StringUtils::URLEncode(m_uRL.c_str()) << "&"; } } + +} // namespace Model +} // namespace ImportExport +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-importexport/source/model/Job.cpp b/aws-cpp-sdk-importexport/source/model/Job.cpp index 995fda7d048..7fb995b060e 100644 --- a/aws-cpp-sdk-importexport/source/model/Job.cpp +++ b/aws-cpp-sdk-importexport/source/model/Job.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ImportExport::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ImportExport +{ +namespace Model +{ + Job::Job() : m_jobIdHasBeenSet(false), m_creationDateHasBeenSet(false), @@ -116,3 +122,7 @@ void Job::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".JobType=" << JobTypeMapper::GetNameForJobType(m_jobType) << "&"; } } + +} // namespace Model +} // namespace ImportExport +} // namespace Aws diff --git a/aws-cpp-sdk-importexport/source/model/JobType.cpp b/aws-cpp-sdk-importexport/source/model/JobType.cpp index 9b97adcd720..5febaa6b06f 100644 --- a/aws-cpp-sdk-importexport/source/model/JobType.cpp +++ b/aws-cpp-sdk-importexport/source/model/JobType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Import_HASH = HashingUtils::HashString("Import"); -static const int Export_HASH = HashingUtils::HashString("Export"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace JobTypeMapper { + static const int Import_HASH = HashingUtils::HashString("Import"); + static const int Export_HASH = HashingUtils::HashString("Export"); + JobType GetJobTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-importexport/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-importexport/source/model/ResponseMetadata.cpp index f4de59fd144..39ff92b0ff5 100644 --- a/aws-cpp-sdk-importexport/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-importexport/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::ImportExport::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ImportExport +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace ImportExport +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/CMakeLists.txt b/aws-cpp-sdk-inspector/CMakeLists.txt index 71803c966b2..8ee613eefab 100644 --- a/aws-cpp-sdk-inspector/CMakeLists.txt +++ b/aws-cpp-sdk-inspector/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-inspector) "source/model/*.cpp" ) - file(GLOB INSPECTOR_SRC + file(GLOB INSPECTOR_UNIFIED_HEADERS ${AWS_INSPECTOR_HEADERS} ${AWS_INSPECTOR_MODEL_HEADERS} + ) + + file(GLOB INSPECTOR_UNITY_SRC ${AWS_INSPECTOR_SOURCE} ${AWS_INSPECTOR_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("INSPECTOR" INSPECTOR_UNITY_SRC) + endif() + + file(GLOB INSPECTOR_SRC + ${INSPECTOR_UNIFIED_HEADERS} + ${INSPECTOR_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-inspector/include/aws/inspector/InspectorClient.h b/aws-cpp-sdk-inspector/include/aws/inspector/InspectorClient.h index 6d5d577fc0c..d431c6d2d4a 100644 --- a/aws-cpp-sdk-inspector/include/aws/inspector/InspectorClient.h +++ b/aws-cpp-sdk-inspector/include/aws/inspector/InspectorClient.h @@ -927,13 +927,13 @@ namespace Model virtual void RemoveAttributesFromFindingsAsync(const Model::RemoveAttributesFromFindingsRequest& request, const RemoveAttributesFromFindingsResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; /** - *

Starts the analysis of the application’s behavior against selected rule + *

Starts the analysis of the application?s behavior against selected rule * packages for the assessment specified by the assessment ARN.

*/ virtual Model::RunAssessmentOutcome RunAssessment(const Model::RunAssessmentRequest& request) const; /** - *

Starts the analysis of the application’s behavior against selected rule + *

Starts the analysis of the application?s behavior against selected rule * packages for the assessment specified by the assessment ARN.

* * returns a future to the operation so that it can be executed in parallel to other requests. @@ -941,7 +941,7 @@ namespace Model virtual Model::RunAssessmentOutcomeCallable RunAssessmentCallable(const Model::RunAssessmentRequest& request) const; /** - *

Starts the analysis of the application’s behavior against selected rule + *

Starts the analysis of the application?s behavior against selected rule * packages for the assessment specified by the assessment ARN.

* * Queues the request into a thread executor and triggers associated callback when operation has finished. diff --git a/aws-cpp-sdk-inspector/source/InspectorErrors.cpp b/aws-cpp-sdk-inspector/source/InspectorErrors.cpp index 7efe63817c3..33e3774ea48 100644 --- a/aws-cpp-sdk-inspector/source/InspectorErrors.cpp +++ b/aws-cpp-sdk-inspector/source/InspectorErrors.cpp @@ -20,12 +20,6 @@ using namespace Aws::Client; using namespace Aws::Inspector; using namespace Aws::Utils; -static const int INTERNAL_HASH = HashingUtils::HashString("InternalException"); -static const int OPERATION_IN_PROGRESS_HASH = HashingUtils::HashString("OperationInProgressException"); -static const int INVALID_INPUT_HASH = HashingUtils::HashString("InvalidInputException"); -static const int INVALID_CROSS_ACCOUNT_ROLE_HASH = HashingUtils::HashString("InvalidCrossAccountRoleException"); -static const int NO_SUCH_ENTITY_HASH = HashingUtils::HashString("NoSuchEntityException"); - namespace Aws { namespace Inspector @@ -33,6 +27,13 @@ namespace Inspector namespace InspectorErrorMapper { +static const int INTERNAL_HASH = HashingUtils::HashString("InternalException"); +static const int OPERATION_IN_PROGRESS_HASH = HashingUtils::HashString("OperationInProgressException"); +static const int INVALID_INPUT_HASH = HashingUtils::HashString("InvalidInputException"); +static const int INVALID_CROSS_ACCOUNT_ROLE_HASH = HashingUtils::HashString("InvalidCrossAccountRoleException"); +static const int NO_SUCH_ENTITY_HASH = HashingUtils::HashString("NoSuchEntityException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-inspector/source/model/Agent.cpp b/aws-cpp-sdk-inspector/source/model/Agent.cpp index d72d0875b49..b04b90a6620 100644 --- a/aws-cpp-sdk-inspector/source/model/Agent.cpp +++ b/aws-cpp-sdk-inspector/source/model/Agent.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + Agent::Agent() : m_agentIdHasBeenSet(false), m_assessmentArnHasBeenSet(false), @@ -168,4 +174,8 @@ JsonValue Agent::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/AgentPreview.cpp b/aws-cpp-sdk-inspector/source/model/AgentPreview.cpp index 3294b49981f..837734bab38 100644 --- a/aws-cpp-sdk-inspector/source/model/AgentPreview.cpp +++ b/aws-cpp-sdk-inspector/source/model/AgentPreview.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + AgentPreview::AgentPreview() : m_agentIdHasBeenSet(false), m_autoScalingGroupHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue AgentPreview::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/AgentsFilter.cpp b/aws-cpp-sdk-inspector/source/model/AgentsFilter.cpp index e4e43e05aef..2458c613e47 100644 --- a/aws-cpp-sdk-inspector/source/model/AgentsFilter.cpp +++ b/aws-cpp-sdk-inspector/source/model/AgentsFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + AgentsFilter::AgentsFilter() : m_agentHealthListHasBeenSet(false) { @@ -63,4 +69,8 @@ JsonValue AgentsFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/Application.cpp b/aws-cpp-sdk-inspector/source/model/Application.cpp index da526879aa0..88fa6630014 100644 --- a/aws-cpp-sdk-inspector/source/model/Application.cpp +++ b/aws-cpp-sdk-inspector/source/model/Application.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + Application::Application() : m_applicationArnHasBeenSet(false), m_applicationNameHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue Application::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/ApplicationsFilter.cpp b/aws-cpp-sdk-inspector/source/model/ApplicationsFilter.cpp index d20253b4d36..bd3d3b44ba4 100644 --- a/aws-cpp-sdk-inspector/source/model/ApplicationsFilter.cpp +++ b/aws-cpp-sdk-inspector/source/model/ApplicationsFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + ApplicationsFilter::ApplicationsFilter() : m_applicationNamePatternsHasBeenSet(false) { @@ -63,4 +69,8 @@ JsonValue ApplicationsFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/Assessment.cpp b/aws-cpp-sdk-inspector/source/model/Assessment.cpp index 725f9708795..7191d23d9b1 100644 --- a/aws-cpp-sdk-inspector/source/model/Assessment.cpp +++ b/aws-cpp-sdk-inspector/source/model/Assessment.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + Assessment::Assessment() : m_assessmentArnHasBeenSet(false), m_assessmentNameHasBeenSet(false), @@ -200,4 +206,8 @@ JsonValue Assessment::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws diff --git a/aws-cpp-sdk-inspector/source/model/AssessmentsFilter.cpp b/aws-cpp-sdk-inspector/source/model/AssessmentsFilter.cpp index 8fad86eaab9..2e218141887 100644 --- a/aws-cpp-sdk-inspector/source/model/AssessmentsFilter.cpp +++ b/aws-cpp-sdk-inspector/source/model/AssessmentsFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + AssessmentsFilter::AssessmentsFilter() : m_assessmentNamePatternsHasBeenSet(false), m_assessmentStatesHasBeenSet(false), @@ -148,4 +154,8 @@ JsonValue AssessmentsFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/Attribute.cpp b/aws-cpp-sdk-inspector/source/model/Attribute.cpp index 2d74093046a..c9fa2fc27ea 100644 --- a/aws-cpp-sdk-inspector/source/model/Attribute.cpp +++ b/aws-cpp-sdk-inspector/source/model/Attribute.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + Attribute::Attribute() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Attribute::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/DurationRange.cpp b/aws-cpp-sdk-inspector/source/model/DurationRange.cpp index e43cb978e79..c852eb247fc 100644 --- a/aws-cpp-sdk-inspector/source/model/DurationRange.cpp +++ b/aws-cpp-sdk-inspector/source/model/DurationRange.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + DurationRange::DurationRange() : m_minimum(0), m_minimumHasBeenSet(false), @@ -74,4 +80,8 @@ JsonValue DurationRange::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/Finding.cpp b/aws-cpp-sdk-inspector/source/model/Finding.cpp index 360f5a6ffac..5f86661a15f 100644 --- a/aws-cpp-sdk-inspector/source/model/Finding.cpp +++ b/aws-cpp-sdk-inspector/source/model/Finding.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + Finding::Finding() : m_findingArnHasBeenSet(false), m_runArnHasBeenSet(false), @@ -236,4 +242,8 @@ JsonValue Finding::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/FindingsFilter.cpp b/aws-cpp-sdk-inspector/source/model/FindingsFilter.cpp index cf93a03e2c1..401489114ae 100644 --- a/aws-cpp-sdk-inspector/source/model/FindingsFilter.cpp +++ b/aws-cpp-sdk-inspector/source/model/FindingsFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + FindingsFilter::FindingsFilter() : m_rulesPackageArnsHasBeenSet(false), m_ruleNamesHasBeenSet(false), @@ -155,4 +161,8 @@ JsonValue FindingsFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/LocalizedText.cpp b/aws-cpp-sdk-inspector/source/model/LocalizedText.cpp index b7387dd2115..12f3c7f6df9 100644 --- a/aws-cpp-sdk-inspector/source/model/LocalizedText.cpp +++ b/aws-cpp-sdk-inspector/source/model/LocalizedText.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + LocalizedText::LocalizedText() : m_keyHasBeenSet(false), m_parametersHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue LocalizedText::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/LocalizedTextKey.cpp b/aws-cpp-sdk-inspector/source/model/LocalizedTextKey.cpp index d9302a0f9e6..f5a7db041bb 100644 --- a/aws-cpp-sdk-inspector/source/model/LocalizedTextKey.cpp +++ b/aws-cpp-sdk-inspector/source/model/LocalizedTextKey.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + LocalizedTextKey::LocalizedTextKey() : m_facilityHasBeenSet(false), m_idHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue LocalizedTextKey::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/MessageTypeTelemetry.cpp b/aws-cpp-sdk-inspector/source/model/MessageTypeTelemetry.cpp index b26013c805c..8e68274dd13 100644 --- a/aws-cpp-sdk-inspector/source/model/MessageTypeTelemetry.cpp +++ b/aws-cpp-sdk-inspector/source/model/MessageTypeTelemetry.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + MessageTypeTelemetry::MessageTypeTelemetry() : m_messageTypeHasBeenSet(false), m_count(0), @@ -89,4 +95,8 @@ JsonValue MessageTypeTelemetry::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/Parameter.cpp b/aws-cpp-sdk-inspector/source/model/Parameter.cpp index 37d4f4f25a3..57e5e6eb54d 100644 --- a/aws-cpp-sdk-inspector/source/model/Parameter.cpp +++ b/aws-cpp-sdk-inspector/source/model/Parameter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + Parameter::Parameter() : m_nameHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Parameter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/ResourceGroup.cpp b/aws-cpp-sdk-inspector/source/model/ResourceGroup.cpp index b726f8d119e..f88d16fa471 100644 --- a/aws-cpp-sdk-inspector/source/model/ResourceGroup.cpp +++ b/aws-cpp-sdk-inspector/source/model/ResourceGroup.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + ResourceGroup::ResourceGroup() : m_resourceGroupArnHasBeenSet(false), m_resourceGroupTagsHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue ResourceGroup::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/RulesPackage.cpp b/aws-cpp-sdk-inspector/source/model/RulesPackage.cpp index dbe309937d7..cc3257da4c0 100644 --- a/aws-cpp-sdk-inspector/source/model/RulesPackage.cpp +++ b/aws-cpp-sdk-inspector/source/model/RulesPackage.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + RulesPackage::RulesPackage() : m_rulesPackageArnHasBeenSet(false), m_rulesPackageNameHasBeenSet(false), @@ -115,4 +121,8 @@ JsonValue RulesPackage::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/Run.cpp b/aws-cpp-sdk-inspector/source/model/Run.cpp index 5cae5a6d55e..72e4e0ad507 100644 --- a/aws-cpp-sdk-inspector/source/model/Run.cpp +++ b/aws-cpp-sdk-inspector/source/model/Run.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + Run::Run() : m_runArnHasBeenSet(false), m_runNameHasBeenSet(false), @@ -151,4 +157,8 @@ JsonValue Run::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws diff --git a/aws-cpp-sdk-inspector/source/model/RunsFilter.cpp b/aws-cpp-sdk-inspector/source/model/RunsFilter.cpp index 1ca04bf1d06..92c9fb7f857 100644 --- a/aws-cpp-sdk-inspector/source/model/RunsFilter.cpp +++ b/aws-cpp-sdk-inspector/source/model/RunsFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + RunsFilter::RunsFilter() : m_runNamePatternsHasBeenSet(false), m_runStatesHasBeenSet(false), @@ -139,4 +145,8 @@ JsonValue RunsFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/Tag.cpp b/aws-cpp-sdk-inspector/source/model/Tag.cpp index 53a57f0200d..e2fbfaddf25 100644 --- a/aws-cpp-sdk-inspector/source/model/Tag.cpp +++ b/aws-cpp-sdk-inspector/source/model/Tag.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Tag::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/Telemetry.cpp b/aws-cpp-sdk-inspector/source/model/Telemetry.cpp index 3fdc7da37f1..769448abf4a 100644 --- a/aws-cpp-sdk-inspector/source/model/Telemetry.cpp +++ b/aws-cpp-sdk-inspector/source/model/Telemetry.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + Telemetry::Telemetry() : m_statusHasBeenSet(false), m_messageTypeTelemetriesHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue Telemetry::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-inspector/source/model/TimestampRange.cpp b/aws-cpp-sdk-inspector/source/model/TimestampRange.cpp index 0b8f8f6b150..0e1db56fb7c 100644 --- a/aws-cpp-sdk-inspector/source/model/TimestampRange.cpp +++ b/aws-cpp-sdk-inspector/source/model/TimestampRange.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Inspector::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Inspector +{ +namespace Model +{ + TimestampRange::TimestampRange() : m_minimumHasBeenSet(false), m_maximumHasBeenSet(false) @@ -68,4 +74,8 @@ JsonValue TimestampRange::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Inspector +} // namespace Aws diff --git a/aws-cpp-sdk-iot/CMakeLists.txt b/aws-cpp-sdk-iot/CMakeLists.txt index 298b4582129..183c32b3154 100644 --- a/aws-cpp-sdk-iot/CMakeLists.txt +++ b/aws-cpp-sdk-iot/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-iot) "source/model/*.cpp" ) - file(GLOB IOT_SRC + file(GLOB IOT_UNIFIED_HEADERS ${AWS_IOT_HEADERS} ${AWS_IOT_MODEL_HEADERS} + ) + + file(GLOB IOT_UNITY_SRC ${AWS_IOT_SOURCE} ${AWS_IOT_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("IOT" IOT_UNITY_SRC) + endif() + + file(GLOB IOT_SRC + ${IOT_UNIFIED_HEADERS} + ${IOT_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-iot/include/aws/iot/model/LogLevel.h b/aws-cpp-sdk-iot/include/aws/iot/model/LogLevel.h index 4c7c0e34910..0f12321cfd4 100644 --- a/aws-cpp-sdk-iot/include/aws/iot/model/LogLevel.h +++ b/aws-cpp-sdk-iot/include/aws/iot/model/LogLevel.h @@ -25,7 +25,7 @@ namespace Model enum class LogLevel { NOT_SET, - DEBUG, + DEBUG_, INFO, ERROR_, WARN, diff --git a/aws-cpp-sdk-iot/source/IoTErrors.cpp b/aws-cpp-sdk-iot/source/IoTErrors.cpp index d88ff26fa02..567e5cd0168 100644 --- a/aws-cpp-sdk-iot/source/IoTErrors.cpp +++ b/aws-cpp-sdk-iot/source/IoTErrors.cpp @@ -20,38 +20,32 @@ using namespace Aws::Client; using namespace Aws::IoT; using namespace Aws::Utils; -static const int CERTIFICATE_VALIDATION_HASH = HashingUtils::HashString("CertificateValidationException"); +namespace Aws +{ +namespace IoT +{ +namespace IoTErrorMapper +{ + static const int TRANSFER_ALREADY_COMPLETED_HASH = HashingUtils::HashString("TransferAlreadyCompletedException"); static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); static const int VERSIONS_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("VersionsLimitExceededException"); static const int SQL_PARSE_HASH = HashingUtils::HashString("SqlParseException"); -static const int UNAUTHORIZED_HASH = HashingUtils::HashString("UnauthorizedException"); -static const int REGISTRATION_CODE_VALIDATION_HASH = HashingUtils::HashString("RegistrationCodeValidationException"); -static const int CERTIFICATE_CONFLICT_HASH = HashingUtils::HashString("CertificateConflictException"); -static const int INVALID_REQUEST_HASH = HashingUtils::HashString("InvalidRequestException"); +static const int TRANSFER_CONFLICT_HASH = HashingUtils::HashString("TransferConflictException"); static const int INTERNAL_HASH = HashingUtils::HashString("InternalException"); static const int RESOURCE_ALREADY_EXISTS_HASH = HashingUtils::HashString("ResourceAlreadyExistsException"); +static const int UNAUTHORIZED_HASH = HashingUtils::HashString("UnauthorizedException"); +static const int INVALID_REQUEST_HASH = HashingUtils::HashString("InvalidRequestException"); static const int CERTIFICATE_STATE_HASH = HashingUtils::HashString("CertificateStateException"); static const int MALFORMED_POLICY_HASH = HashingUtils::HashString("MalformedPolicyException"); static const int DELETE_CONFLICT_HASH = HashingUtils::HashString("DeleteConflictException"); -static const int TRANSFER_CONFLICT_HASH = HashingUtils::HashString("TransferConflictException"); -namespace Aws -{ -namespace IoT -{ -namespace IoTErrorMapper -{ AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); - if (hashCode == CERTIFICATE_VALIDATION_HASH) - { - return AWSError(static_cast(IoTErrors::CERTIFICATE_VALIDATION), false); - } - else if (hashCode == TRANSFER_ALREADY_COMPLETED_HASH) + if (hashCode == TRANSFER_ALREADY_COMPLETED_HASH) { return AWSError(static_cast(IoTErrors::TRANSFER_ALREADY_COMPLETED), false); } @@ -67,21 +61,9 @@ AWSError GetErrorForName(const char* errorName) { return AWSError(static_cast(IoTErrors::SQL_PARSE), false); } - else if (hashCode == UNAUTHORIZED_HASH) - { - return AWSError(static_cast(IoTErrors::UNAUTHORIZED), false); - } - else if (hashCode == REGISTRATION_CODE_VALIDATION_HASH) - { - return AWSError(static_cast(IoTErrors::REGISTRATION_CODE_VALIDATION), false); - } - else if (hashCode == CERTIFICATE_CONFLICT_HASH) - { - return AWSError(static_cast(IoTErrors::CERTIFICATE_CONFLICT), false); - } - else if (hashCode == INVALID_REQUEST_HASH) + else if (hashCode == TRANSFER_CONFLICT_HASH) { - return AWSError(static_cast(IoTErrors::INVALID_REQUEST), false); + return AWSError(static_cast(IoTErrors::TRANSFER_CONFLICT), false); } else if (hashCode == INTERNAL_HASH) { @@ -91,6 +73,14 @@ AWSError GetErrorForName(const char* errorName) { return AWSError(static_cast(IoTErrors::RESOURCE_ALREADY_EXISTS), false); } + else if (hashCode == UNAUTHORIZED_HASH) + { + return AWSError(static_cast(IoTErrors::UNAUTHORIZED), false); + } + else if (hashCode == INVALID_REQUEST_HASH) + { + return AWSError(static_cast(IoTErrors::INVALID_REQUEST), false); + } else if (hashCode == CERTIFICATE_STATE_HASH) { return AWSError(static_cast(IoTErrors::CERTIFICATE_STATE), false); @@ -103,10 +93,6 @@ AWSError GetErrorForName(const char* errorName) { return AWSError(static_cast(IoTErrors::DELETE_CONFLICT), false); } - else if (hashCode == TRANSFER_CONFLICT_HASH) - { - return AWSError(static_cast(IoTErrors::TRANSFER_CONFLICT), false); - } return AWSError(CoreErrors::UNKNOWN, false); } diff --git a/aws-cpp-sdk-iot/source/model/Action.cpp b/aws-cpp-sdk-iot/source/model/Action.cpp index 2e8e09f3f12..1c092f7cb4d 100644 --- a/aws-cpp-sdk-iot/source/model/Action.cpp +++ b/aws-cpp-sdk-iot/source/model/Action.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + Action::Action() : m_dynamoDBHasBeenSet(false), m_lambdaHasBeenSet(false), @@ -205,4 +211,8 @@ JsonValue Action::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws diff --git a/aws-cpp-sdk-iot/source/model/AttributePayload.cpp b/aws-cpp-sdk-iot/source/model/AttributePayload.cpp index 5639654f5eb..a8d57d95950 100644 --- a/aws-cpp-sdk-iot/source/model/AttributePayload.cpp +++ b/aws-cpp-sdk-iot/source/model/AttributePayload.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + AttributePayload::AttributePayload() : m_attributesHasBeenSet(false) { @@ -63,4 +69,8 @@ JsonValue AttributePayload::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iot/source/model/Certificate.cpp b/aws-cpp-sdk-iot/source/model/Certificate.cpp index 70f3d9d2155..b46d81e66aa 100644 --- a/aws-cpp-sdk-iot/source/model/Certificate.cpp +++ b/aws-cpp-sdk-iot/source/model/Certificate.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + Certificate::Certificate() : m_certificateArnHasBeenSet(false), m_certificateIdHasBeenSet(false), @@ -98,4 +104,8 @@ JsonValue Certificate::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws diff --git a/aws-cpp-sdk-iot/source/model/CertificateDescription.cpp b/aws-cpp-sdk-iot/source/model/CertificateDescription.cpp index af564a7c923..60485f593c2 100644 --- a/aws-cpp-sdk-iot/source/model/CertificateDescription.cpp +++ b/aws-cpp-sdk-iot/source/model/CertificateDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + CertificateDescription::CertificateDescription() : m_certificateArnHasBeenSet(false), m_certificateIdHasBeenSet(false), @@ -187,4 +193,8 @@ JsonValue CertificateDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws diff --git a/aws-cpp-sdk-iot/source/model/CertificateStatus.cpp b/aws-cpp-sdk-iot/source/model/CertificateStatus.cpp index da7a2a173f5..68d5bcba297 100644 --- a/aws-cpp-sdk-iot/source/model/CertificateStatus.cpp +++ b/aws-cpp-sdk-iot/source/model/CertificateStatus.cpp @@ -15,15 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); -static const int INACTIVE_HASH = HashingUtils::HashString("INACTIVE"); -static const int REVOKED_HASH = HashingUtils::HashString("REVOKED"); -static const int PENDING_TRANSFER_HASH = HashingUtils::HashString("PENDING_TRANSFER"); -static const int REGISTER_INACTIVE_HASH = HashingUtils::HashString("REGISTER_INACTIVE"); namespace Aws { @@ -34,6 +28,11 @@ namespace Aws namespace CertificateStatusMapper { + static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); + static const int INACTIVE_HASH = HashingUtils::HashString("INACTIVE"); + static const int REVOKED_HASH = HashingUtils::HashString("REVOKED"); + static const int PENDING_TRANSFER_HASH = HashingUtils::HashString("PENDING_TRANSFER"); + CertificateStatus GetCertificateStatusForName(const Aws::String& name) { @@ -54,11 +53,7 @@ namespace Aws { return CertificateStatus::PENDING_TRANSFER; } - else if (hashCode == REGISTER_INACTIVE_HASH) - { - return CertificateStatus::REGISTER_INACTIVE; - } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -80,10 +75,8 @@ namespace Aws return "REVOKED"; case CertificateStatus::PENDING_TRANSFER: return "PENDING_TRANSFER"; - case CertificateStatus::REGISTER_INACTIVE: - return "REGISTER_INACTIVE"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-iot/source/model/DynamoDBAction.cpp b/aws-cpp-sdk-iot/source/model/DynamoDBAction.cpp index 2e351b4aa9f..b776ab5430c 100644 --- a/aws-cpp-sdk-iot/source/model/DynamoDBAction.cpp +++ b/aws-cpp-sdk-iot/source/model/DynamoDBAction.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + DynamoDBAction::DynamoDBAction() : m_tableNameHasBeenSet(false), m_roleArnHasBeenSet(false), @@ -145,4 +151,8 @@ JsonValue DynamoDBAction::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iot/source/model/FirehoseAction.cpp b/aws-cpp-sdk-iot/source/model/FirehoseAction.cpp index 82aba36e2eb..c095c843735 100644 --- a/aws-cpp-sdk-iot/source/model/FirehoseAction.cpp +++ b/aws-cpp-sdk-iot/source/model/FirehoseAction.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + FirehoseAction::FirehoseAction() : m_roleArnHasBeenSet(false), m_deliveryStreamNameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue FirehoseAction::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iot/source/model/KeyPair.cpp b/aws-cpp-sdk-iot/source/model/KeyPair.cpp index b9f4ee669c5..16e3f7f6a7d 100644 --- a/aws-cpp-sdk-iot/source/model/KeyPair.cpp +++ b/aws-cpp-sdk-iot/source/model/KeyPair.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + KeyPair::KeyPair() : m_publicKeyHasBeenSet(false), m_privateKeyHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue KeyPair::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iot/source/model/KinesisAction.cpp b/aws-cpp-sdk-iot/source/model/KinesisAction.cpp index e2e7567353e..823ef075e37 100644 --- a/aws-cpp-sdk-iot/source/model/KinesisAction.cpp +++ b/aws-cpp-sdk-iot/source/model/KinesisAction.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + KinesisAction::KinesisAction() : m_roleArnHasBeenSet(false), m_streamNameHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue KinesisAction::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iot/source/model/LambdaAction.cpp b/aws-cpp-sdk-iot/source/model/LambdaAction.cpp index 7c575ea3674..1887a47cb31 100644 --- a/aws-cpp-sdk-iot/source/model/LambdaAction.cpp +++ b/aws-cpp-sdk-iot/source/model/LambdaAction.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + LambdaAction::LambdaAction() : m_functionArnHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue LambdaAction::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iot/source/model/LogLevel.cpp b/aws-cpp-sdk-iot/source/model/LogLevel.cpp index fe5fc1789a7..83e30e0417c 100644 --- a/aws-cpp-sdk-iot/source/model/LogLevel.cpp +++ b/aws-cpp-sdk-iot/source/model/LogLevel.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int DEBUG_HASH = HashingUtils::HashString("DEBUG"); -static const int INFO_HASH = HashingUtils::HashString("INFO"); -static const int ERROR__HASH = HashingUtils::HashString("ERROR"); -static const int WARN_HASH = HashingUtils::HashString("WARN"); -static const int DISABLED_HASH = HashingUtils::HashString("DISABLED"); namespace Aws { @@ -34,13 +29,19 @@ namespace Aws namespace LogLevelMapper { + static const int DEBUG_HASH = HashingUtils::HashString("DEBUG"); + static const int INFO_HASH = HashingUtils::HashString("INFO"); + static const int ERROR__HASH = HashingUtils::HashString("ERROR"); + static const int WARN_HASH = HashingUtils::HashString("WARN"); + static const int DISABLED_HASH = HashingUtils::HashString("DISABLED"); + LogLevel GetLogLevelForName(const Aws::String& name) { int hashCode = HashingUtils::HashString(name.c_str()); if (hashCode == DEBUG_HASH) { - return LogLevel::DEBUG; + return LogLevel::DEBUG_; } else if (hashCode == INFO_HASH) { @@ -72,7 +73,7 @@ namespace Aws { switch(enumValue) { - case LogLevel::DEBUG: + case LogLevel::DEBUG_: return "DEBUG"; case LogLevel::INFO: return "INFO"; diff --git a/aws-cpp-sdk-iot/source/model/LoggingOptionsPayload.cpp b/aws-cpp-sdk-iot/source/model/LoggingOptionsPayload.cpp index c64b9b726fd..c53e2aad4d9 100644 --- a/aws-cpp-sdk-iot/source/model/LoggingOptionsPayload.cpp +++ b/aws-cpp-sdk-iot/source/model/LoggingOptionsPayload.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + LoggingOptionsPayload::LoggingOptionsPayload() : m_roleArnHasBeenSet(false), m_logLevelHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue LoggingOptionsPayload::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iot/source/model/Policy.cpp b/aws-cpp-sdk-iot/source/model/Policy.cpp index dfa2220f404..354b582614d 100644 --- a/aws-cpp-sdk-iot/source/model/Policy.cpp +++ b/aws-cpp-sdk-iot/source/model/Policy.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + Policy::Policy() : m_policyNameHasBeenSet(false), m_policyArnHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Policy::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iot/source/model/PolicyVersion.cpp b/aws-cpp-sdk-iot/source/model/PolicyVersion.cpp index 687eb312c0c..e6b32c96ed4 100644 --- a/aws-cpp-sdk-iot/source/model/PolicyVersion.cpp +++ b/aws-cpp-sdk-iot/source/model/PolicyVersion.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + PolicyVersion::PolicyVersion() : m_versionIdHasBeenSet(false), m_isDefaultVersion(false), @@ -86,4 +92,8 @@ JsonValue PolicyVersion::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws diff --git a/aws-cpp-sdk-iot/source/model/RepublishAction.cpp b/aws-cpp-sdk-iot/source/model/RepublishAction.cpp index 13e955da857..3c5bddc6880 100644 --- a/aws-cpp-sdk-iot/source/model/RepublishAction.cpp +++ b/aws-cpp-sdk-iot/source/model/RepublishAction.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + RepublishAction::RepublishAction() : m_roleArnHasBeenSet(false), m_topicHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue RepublishAction::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iot/source/model/S3Action.cpp b/aws-cpp-sdk-iot/source/model/S3Action.cpp index 94bbf40be88..542497b5a59 100644 --- a/aws-cpp-sdk-iot/source/model/S3Action.cpp +++ b/aws-cpp-sdk-iot/source/model/S3Action.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + S3Action::S3Action() : m_roleArnHasBeenSet(false), m_bucketNameHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue S3Action::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iot/source/model/SnsAction.cpp b/aws-cpp-sdk-iot/source/model/SnsAction.cpp index 91baf678cb5..b4391c7d7f9 100644 --- a/aws-cpp-sdk-iot/source/model/SnsAction.cpp +++ b/aws-cpp-sdk-iot/source/model/SnsAction.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + SnsAction::SnsAction() : m_targetArnHasBeenSet(false), m_roleArnHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue SnsAction::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws diff --git a/aws-cpp-sdk-iot/source/model/SqsAction.cpp b/aws-cpp-sdk-iot/source/model/SqsAction.cpp index bde916d50b1..38658a71fd9 100644 --- a/aws-cpp-sdk-iot/source/model/SqsAction.cpp +++ b/aws-cpp-sdk-iot/source/model/SqsAction.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + SqsAction::SqsAction() : m_roleArnHasBeenSet(false), m_queueUrlHasBeenSet(false), @@ -87,4 +93,8 @@ JsonValue SqsAction::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iot/source/model/ThingAttribute.cpp b/aws-cpp-sdk-iot/source/model/ThingAttribute.cpp index fd6cf11cd73..5cb4fa7e113 100644 --- a/aws-cpp-sdk-iot/source/model/ThingAttribute.cpp +++ b/aws-cpp-sdk-iot/source/model/ThingAttribute.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + ThingAttribute::ThingAttribute() : m_thingNameHasBeenSet(false), m_attributesHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue ThingAttribute::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-iot/source/model/TopicRule.cpp b/aws-cpp-sdk-iot/source/model/TopicRule.cpp index 2fbcecb13d6..3aec7234d06 100644 --- a/aws-cpp-sdk-iot/source/model/TopicRule.cpp +++ b/aws-cpp-sdk-iot/source/model/TopicRule.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + TopicRule::TopicRule() : m_ruleNameHasBeenSet(false), m_sqlHasBeenSet(false), @@ -154,4 +160,8 @@ JsonValue TopicRule::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws diff --git a/aws-cpp-sdk-iot/source/model/TopicRuleListItem.cpp b/aws-cpp-sdk-iot/source/model/TopicRuleListItem.cpp index ce1636a692f..ce8f8ecd7cd 100644 --- a/aws-cpp-sdk-iot/source/model/TopicRuleListItem.cpp +++ b/aws-cpp-sdk-iot/source/model/TopicRuleListItem.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + TopicRuleListItem::TopicRuleListItem() : m_ruleArnHasBeenSet(false), m_ruleNameHasBeenSet(false), @@ -116,4 +122,8 @@ JsonValue TopicRuleListItem::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws diff --git a/aws-cpp-sdk-iot/source/model/TopicRulePayload.cpp b/aws-cpp-sdk-iot/source/model/TopicRulePayload.cpp index 46abf8cd152..59f8ddfc565 100644 --- a/aws-cpp-sdk-iot/source/model/TopicRulePayload.cpp +++ b/aws-cpp-sdk-iot/source/model/TopicRulePayload.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::IoT::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace IoT +{ +namespace Model +{ + TopicRulePayload::TopicRulePayload() : m_sqlHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -125,4 +131,8 @@ JsonValue TopicRulePayload::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace IoT +} // namespace Aws diff --git a/aws-cpp-sdk-kinesis/CMakeLists.txt b/aws-cpp-sdk-kinesis/CMakeLists.txt index 775adc2ce6f..e52ef0a4a63 100644 --- a/aws-cpp-sdk-kinesis/CMakeLists.txt +++ b/aws-cpp-sdk-kinesis/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-kinesis) "source/model/*.cpp" ) - file(GLOB KINESIS_SRC + file(GLOB KINESIS_UNIFIED_HEADERS ${AWS_KINESIS_HEADERS} ${AWS_KINESIS_MODEL_HEADERS} + ) + + file(GLOB KINESIS_UNITY_SRC ${AWS_KINESIS_SOURCE} ${AWS_KINESIS_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("KINESIS" KINESIS_UNITY_SRC) + endif() + + file(GLOB KINESIS_SRC + ${KINESIS_UNIFIED_HEADERS} + ${KINESIS_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-kinesis/include/aws/kinesis/KinesisClient.h b/aws-cpp-sdk-kinesis/include/aws/kinesis/KinesisClient.h index 6a167f6c6a2..53aac094e54 100644 --- a/aws-cpp-sdk-kinesis/include/aws/kinesis/KinesisClient.h +++ b/aws-cpp-sdk-kinesis/include/aws/kinesis/KinesisClient.h @@ -21,8 +21,6 @@ #include #include #include -#include -#include #include #include #include @@ -80,8 +78,6 @@ namespace Model class DecreaseStreamRetentionPeriodRequest; class DeleteStreamRequest; class DescribeStreamRequest; - class DisableEnhancedMonitoringRequest; - class EnableEnhancedMonitoringRequest; class GetRecordsRequest; class GetShardIteratorRequest; class IncreaseStreamRetentionPeriodRequest; @@ -98,8 +94,6 @@ namespace Model typedef Aws::Utils::Outcome> DecreaseStreamRetentionPeriodOutcome; typedef Aws::Utils::Outcome> DeleteStreamOutcome; typedef Aws::Utils::Outcome> DescribeStreamOutcome; - typedef Aws::Utils::Outcome> DisableEnhancedMonitoringOutcome; - typedef Aws::Utils::Outcome> EnableEnhancedMonitoringOutcome; typedef Aws::Utils::Outcome> GetRecordsOutcome; typedef Aws::Utils::Outcome> GetShardIteratorOutcome; typedef Aws::Utils::Outcome> IncreaseStreamRetentionPeriodOutcome; @@ -116,8 +110,6 @@ namespace Model typedef std::future DecreaseStreamRetentionPeriodOutcomeCallable; typedef std::future DeleteStreamOutcomeCallable; typedef std::future DescribeStreamOutcomeCallable; - typedef std::future DisableEnhancedMonitoringOutcomeCallable; - typedef std::future EnableEnhancedMonitoringOutcomeCallable; typedef std::future GetRecordsOutcomeCallable; typedef std::future GetShardIteratorOutcomeCallable; typedef std::future IncreaseStreamRetentionPeriodOutcomeCallable; @@ -137,8 +129,6 @@ namespace Model typedef std::function&) > DecreaseStreamRetentionPeriodResponseReceivedHandler; typedef std::function&) > DeleteStreamResponseReceivedHandler; typedef std::function&) > DescribeStreamResponseReceivedHandler; - typedef std::function&) > DisableEnhancedMonitoringResponseReceivedHandler; - typedef std::function&) > EnableEnhancedMonitoringResponseReceivedHandler; typedef std::function&) > GetRecordsResponseReceivedHandler; typedef std::function&) > GetShardIteratorResponseReceivedHandler; typedef std::function&) > IncreaseStreamRetentionPeriodResponseReceivedHandler; @@ -151,9 +141,9 @@ namespace Model typedef std::function&) > SplitShardResponseReceivedHandler; /** - * Amazon Kinesis Streams Service API Reference

Amazon - * Kinesis Streams is a managed service that scales elastically for real time - * processing of streaming big data.

+ * Amazon Kinesis Service API Reference

Amazon Kinesis is a + * managed service that scales elastically for real time processing of streaming + * big data.

*/ class AWS_KINESIS_API KinesisClient : public Aws::Client::AWSJsonClient { @@ -211,33 +201,32 @@ namespace Model virtual void AddTagsToStreamAsync(const Model::AddTagsToStreamRequest& request, const AddTagsToStreamResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; /** - *

Creates an Amazon Kinesis stream. A stream captures and transports data + *

Creates a Amazon Kinesis stream. A stream captures and transports data * records that are continuously emitted from different data sources or - * producers. Scale-out within a stream is explicitly supported by means of - * shards, which are uniquely identified groups of data records in a stream.

- *

You specify and control the number of shards that a stream is composed of. - * Each shard can support reads up to 5 transactions per second, up to a maximum - * data read total of 2 MB per second. Each shard can support writes up to 1,000 - * records per second, up to a maximum data write total of 1 MB per second. You can - * add shards to a stream if the amount of data input increases and you can remove - * shards if the amount of data input decreases.

The stream name identifies - * the stream. The name is scoped to the AWS account used by the application. It is - * also scoped by region. That is, two streams in two different accounts can have - * the same name, and two streams in the same account, but in two different - * regions, can have the same name.

CreateStream is an - * asynchronous operation. Upon receiving a CreateStream request, - * Amazon Kinesis immediately returns and sets the stream status to - * CREATING. After the stream is created, Amazon Kinesis sets the - * stream status to ACTIVE. You should perform read and write - * operations only on an ACTIVE stream.

You receive a - * LimitExceededException when making a CreateStream - * request if you try to do one of the following:

  • Have more than five - * streams in the CREATING state at any point in time.
  • Create - * more shards than are authorized for your account.

For the default - * shard limit for an AWS account, see Streams - * Limits in the Amazon Kinesis Streams Developer Guide. If you need to - * increase this limit, producers. Scale-out within an Amazon Kinesis stream is explicitly + * supported by means of shards, which are uniquely identified groups of data + * records in an Amazon Kinesis stream.

You specify and control the number + * of shards that a stream is composed of. Each shard can support reads up to 5 + * transactions per second, up to a maximum data read total of 2 MB per second. + * Each shard can support writes up to 1,000 records per second, up to a maximum + * data write total of 1 MB per second. You can add shards to a stream if the + * amount of data input increases and you can remove shards if the amount of data + * input decreases.

The stream name identifies the stream. The name is + * scoped to the AWS account used by the application. It is also scoped by region. + * That is, two streams in two different accounts can have the same name, and two + * streams in the same account, but in two different regions, can have the same + * name.

CreateStream is an asynchronous operation. Upon + * receiving a CreateStream request, Amazon Kinesis immediately + * returns and sets the stream status to CREATING. After the stream is + * created, Amazon Kinesis sets the stream status to ACTIVE. You + * should perform read and write operations only on an ACTIVE stream. + *

You receive a LimitExceededException when making a + * CreateStream request if you try to do one of the following:

+ *
  • Have more than five streams in the CREATING state at any + * point in time.
  • Create more shards than are authorized for your + * account.

For the default shard limit for an AWS account, see Amazon + * Kinesis Limits. If you need to increase this limit, contact * AWS Support.

You can use DescribeStream to check the * stream status, which is returned in StreamStatus.

@@ -246,33 +235,32 @@ namespace Model virtual Model::CreateStreamOutcome CreateStream(const Model::CreateStreamRequest& request) const; /** - *

Creates an Amazon Kinesis stream. A stream captures and transports data + *

Creates a Amazon Kinesis stream. A stream captures and transports data * records that are continuously emitted from different data sources or - * producers. Scale-out within a stream is explicitly supported by means of - * shards, which are uniquely identified groups of data records in a stream.

- *

You specify and control the number of shards that a stream is composed of. - * Each shard can support reads up to 5 transactions per second, up to a maximum - * data read total of 2 MB per second. Each shard can support writes up to 1,000 - * records per second, up to a maximum data write total of 1 MB per second. You can - * add shards to a stream if the amount of data input increases and you can remove - * shards if the amount of data input decreases.

The stream name identifies - * the stream. The name is scoped to the AWS account used by the application. It is - * also scoped by region. That is, two streams in two different accounts can have - * the same name, and two streams in the same account, but in two different - * regions, can have the same name.

CreateStream is an - * asynchronous operation. Upon receiving a CreateStream request, - * Amazon Kinesis immediately returns and sets the stream status to - * CREATING. After the stream is created, Amazon Kinesis sets the - * stream status to ACTIVE. You should perform read and write - * operations only on an ACTIVE stream.

You receive a - * LimitExceededException when making a CreateStream - * request if you try to do one of the following:

  • Have more than five - * streams in the CREATING state at any point in time.
  • Create - * more shards than are authorized for your account.

For the default - * shard limit for an AWS account, see Streams - * Limits in the Amazon Kinesis Streams Developer Guide. If you need to - * increase this limit, producers. Scale-out within an Amazon Kinesis stream is explicitly + * supported by means of shards, which are uniquely identified groups of data + * records in an Amazon Kinesis stream.

You specify and control the number + * of shards that a stream is composed of. Each shard can support reads up to 5 + * transactions per second, up to a maximum data read total of 2 MB per second. + * Each shard can support writes up to 1,000 records per second, up to a maximum + * data write total of 1 MB per second. You can add shards to a stream if the + * amount of data input increases and you can remove shards if the amount of data + * input decreases.

The stream name identifies the stream. The name is + * scoped to the AWS account used by the application. It is also scoped by region. + * That is, two streams in two different accounts can have the same name, and two + * streams in the same account, but in two different regions, can have the same + * name.

CreateStream is an asynchronous operation. Upon + * receiving a CreateStream request, Amazon Kinesis immediately + * returns and sets the stream status to CREATING. After the stream is + * created, Amazon Kinesis sets the stream status to ACTIVE. You + * should perform read and write operations only on an ACTIVE stream. + *

You receive a LimitExceededException when making a + * CreateStream request if you try to do one of the following:

+ *
  • Have more than five streams in the CREATING state at any + * point in time.
  • Create more shards than are authorized for your + * account.

For the default shard limit for an AWS account, see Amazon + * Kinesis Limits. If you need to increase this limit, contact * AWS Support.

You can use DescribeStream to check the * stream status, which is returned in StreamStatus.

@@ -283,33 +271,32 @@ namespace Model virtual Model::CreateStreamOutcomeCallable CreateStreamCallable(const Model::CreateStreamRequest& request) const; /** - *

Creates an Amazon Kinesis stream. A stream captures and transports data + *

Creates a Amazon Kinesis stream. A stream captures and transports data * records that are continuously emitted from different data sources or - * producers. Scale-out within a stream is explicitly supported by means of - * shards, which are uniquely identified groups of data records in a stream.

- *

You specify and control the number of shards that a stream is composed of. - * Each shard can support reads up to 5 transactions per second, up to a maximum - * data read total of 2 MB per second. Each shard can support writes up to 1,000 - * records per second, up to a maximum data write total of 1 MB per second. You can - * add shards to a stream if the amount of data input increases and you can remove - * shards if the amount of data input decreases.

The stream name identifies - * the stream. The name is scoped to the AWS account used by the application. It is - * also scoped by region. That is, two streams in two different accounts can have - * the same name, and two streams in the same account, but in two different - * regions, can have the same name.

CreateStream is an - * asynchronous operation. Upon receiving a CreateStream request, - * Amazon Kinesis immediately returns and sets the stream status to - * CREATING. After the stream is created, Amazon Kinesis sets the - * stream status to ACTIVE. You should perform read and write - * operations only on an ACTIVE stream.

You receive a - * LimitExceededException when making a CreateStream - * request if you try to do one of the following:

  • Have more than five - * streams in the CREATING state at any point in time.
  • Create - * more shards than are authorized for your account.

For the default - * shard limit for an AWS account, see Streams - * Limits in the Amazon Kinesis Streams Developer Guide. If you need to - * increase this limit, producers. Scale-out within an Amazon Kinesis stream is explicitly + * supported by means of shards, which are uniquely identified groups of data + * records in an Amazon Kinesis stream.

You specify and control the number + * of shards that a stream is composed of. Each shard can support reads up to 5 + * transactions per second, up to a maximum data read total of 2 MB per second. + * Each shard can support writes up to 1,000 records per second, up to a maximum + * data write total of 1 MB per second. You can add shards to a stream if the + * amount of data input increases and you can remove shards if the amount of data + * input decreases.

The stream name identifies the stream. The name is + * scoped to the AWS account used by the application. It is also scoped by region. + * That is, two streams in two different accounts can have the same name, and two + * streams in the same account, but in two different regions, can have the same + * name.

CreateStream is an asynchronous operation. Upon + * receiving a CreateStream request, Amazon Kinesis immediately + * returns and sets the stream status to CREATING. After the stream is + * created, Amazon Kinesis sets the stream status to ACTIVE. You + * should perform read and write operations only on an ACTIVE stream. + *

You receive a LimitExceededException when making a + * CreateStream request if you try to do one of the following:

+ *
  • Have more than five streams in the CREATING state at any + * point in time.
  • Create more shards than are authorized for your + * account.

For the default shard limit for an AWS account, see Amazon + * Kinesis Limits. If you need to increase this limit, contact * AWS Support.

You can use DescribeStream to check the * stream status, which is returned in StreamStatus.

@@ -320,233 +307,180 @@ namespace Model virtual void CreateStreamAsync(const Model::CreateStreamRequest& request, const CreateStreamResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; /** - *

Decreases the Amazon Kinesis stream's retention period, which is the length - * of time data records are accessible after they are added to the stream. The - * minimum value of a stream's retention period is 24 hours.

This operation - * may result in lost data. For example, if the stream's retention period is 48 - * hours and is decreased to 24 hours, any data already in the stream that is older - * than 24 hours is inaccessible.

+ *

Decreases the stream's retention period, which is the length of time data + * records are accessible after they are added to the stream. The minimum value of + * a stream?s retention period is 24 hours.

This operation may result in + * lost data. For example, if the stream's retention period is 48 hours and is + * decreased to 24 hours, any data already in the stream that is older than 24 + * hours is inaccessible.

*/ virtual Model::DecreaseStreamRetentionPeriodOutcome DecreaseStreamRetentionPeriod(const Model::DecreaseStreamRetentionPeriodRequest& request) const; /** - *

Decreases the Amazon Kinesis stream's retention period, which is the length - * of time data records are accessible after they are added to the stream. The - * minimum value of a stream's retention period is 24 hours.

This operation - * may result in lost data. For example, if the stream's retention period is 48 - * hours and is decreased to 24 hours, any data already in the stream that is older - * than 24 hours is inaccessible.

+ *

Decreases the stream's retention period, which is the length of time data + * records are accessible after they are added to the stream. The minimum value of + * a stream?s retention period is 24 hours.

This operation may result in + * lost data. For example, if the stream's retention period is 48 hours and is + * decreased to 24 hours, any data already in the stream that is older than 24 + * hours is inaccessible.

* * returns a future to the operation so that it can be executed in parallel to other requests. */ virtual Model::DecreaseStreamRetentionPeriodOutcomeCallable DecreaseStreamRetentionPeriodCallable(const Model::DecreaseStreamRetentionPeriodRequest& request) const; /** - *

Decreases the Amazon Kinesis stream's retention period, which is the length - * of time data records are accessible after they are added to the stream. The - * minimum value of a stream's retention period is 24 hours.

This operation - * may result in lost data. For example, if the stream's retention period is 48 - * hours and is decreased to 24 hours, any data already in the stream that is older - * than 24 hours is inaccessible.

+ *

Decreases the stream's retention period, which is the length of time data + * records are accessible after they are added to the stream. The minimum value of + * a stream?s retention period is 24 hours.

This operation may result in + * lost data. For example, if the stream's retention period is 48 hours and is + * decreased to 24 hours, any data already in the stream that is older than 24 + * hours is inaccessible.

* * Queues the request into a thread executor and triggers associated callback when operation has finished. */ virtual void DecreaseStreamRetentionPeriodAsync(const Model::DecreaseStreamRetentionPeriodRequest& request, const DecreaseStreamRetentionPeriodResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; /** - *

Deletes an Amazon Kinesis stream and all its shards and data. You must shut - * down any applications that are operating on the stream before you delete the - * stream. If an application attempts to operate on a deleted stream, it will - * receive the exception ResourceNotFoundException.

If the - * stream is in the ACTIVE state, you can delete it. After a - * DeleteStream request, the specified stream is in the - * DELETING state until Amazon Kinesis completes the deletion.

- *

Note: Amazon Kinesis might continue to accept data read and write - * operations, such as PutRecord, PutRecords, and GetRecords, - * on a stream in the DELETING state until the stream deletion is - * complete.

When you delete a stream, any shards in that stream are also - * deleted, and any tags are dissociated from the stream.

You can use the - * DescribeStream operation to check the state of the stream, which is - * returned in StreamStatus.

DeleteStream has a limit of - * 5 transactions per second per account.

+ *

Deletes a stream and all its shards and data. You must shut down any + * applications that are operating on the stream before you delete the stream. If + * an application attempts to operate on a deleted stream, it will receive the + * exception ResourceNotFoundException.

If the stream is in the + * ACTIVE state, you can delete it. After a DeleteStream + * request, the specified stream is in the DELETING state until Amazon + * Kinesis completes the deletion.

Note: Amazon Kinesis might + * continue to accept data read and write operations, such as PutRecord, + * PutRecords, and GetRecords, on a stream in the + * DELETING state until the stream deletion is complete.

When + * you delete a stream, any shards in that stream are also deleted, and any tags + * are dissociated from the stream.

You can use the DescribeStream + * operation to check the state of the stream, which is returned in + * StreamStatus.

DeleteStream has a limit of 5 + * transactions per second per account.

*/ virtual Model::DeleteStreamOutcome DeleteStream(const Model::DeleteStreamRequest& request) const; /** - *

Deletes an Amazon Kinesis stream and all its shards and data. You must shut - * down any applications that are operating on the stream before you delete the - * stream. If an application attempts to operate on a deleted stream, it will - * receive the exception ResourceNotFoundException.

If the - * stream is in the ACTIVE state, you can delete it. After a - * DeleteStream request, the specified stream is in the - * DELETING state until Amazon Kinesis completes the deletion.

- *

Note: Amazon Kinesis might continue to accept data read and write - * operations, such as PutRecord, PutRecords, and GetRecords, - * on a stream in the DELETING state until the stream deletion is - * complete.

When you delete a stream, any shards in that stream are also - * deleted, and any tags are dissociated from the stream.

You can use the - * DescribeStream operation to check the state of the stream, which is - * returned in StreamStatus.

DeleteStream has a limit of - * 5 transactions per second per account.

+ *

Deletes a stream and all its shards and data. You must shut down any + * applications that are operating on the stream before you delete the stream. If + * an application attempts to operate on a deleted stream, it will receive the + * exception ResourceNotFoundException.

If the stream is in the + * ACTIVE state, you can delete it. After a DeleteStream + * request, the specified stream is in the DELETING state until Amazon + * Kinesis completes the deletion.

Note: Amazon Kinesis might + * continue to accept data read and write operations, such as PutRecord, + * PutRecords, and GetRecords, on a stream in the + * DELETING state until the stream deletion is complete.

When + * you delete a stream, any shards in that stream are also deleted, and any tags + * are dissociated from the stream.

You can use the DescribeStream + * operation to check the state of the stream, which is returned in + * StreamStatus.

DeleteStream has a limit of 5 + * transactions per second per account.

* * returns a future to the operation so that it can be executed in parallel to other requests. */ virtual Model::DeleteStreamOutcomeCallable DeleteStreamCallable(const Model::DeleteStreamRequest& request) const; /** - *

Deletes an Amazon Kinesis stream and all its shards and data. You must shut - * down any applications that are operating on the stream before you delete the - * stream. If an application attempts to operate on a deleted stream, it will - * receive the exception ResourceNotFoundException.

If the - * stream is in the ACTIVE state, you can delete it. After a - * DeleteStream request, the specified stream is in the - * DELETING state until Amazon Kinesis completes the deletion.

- *

Note: Amazon Kinesis might continue to accept data read and write - * operations, such as PutRecord, PutRecords, and GetRecords, - * on a stream in the DELETING state until the stream deletion is - * complete.

When you delete a stream, any shards in that stream are also - * deleted, and any tags are dissociated from the stream.

You can use the - * DescribeStream operation to check the state of the stream, which is - * returned in StreamStatus.

DeleteStream has a limit of - * 5 transactions per second per account.

+ *

Deletes a stream and all its shards and data. You must shut down any + * applications that are operating on the stream before you delete the stream. If + * an application attempts to operate on a deleted stream, it will receive the + * exception ResourceNotFoundException.

If the stream is in the + * ACTIVE state, you can delete it. After a DeleteStream + * request, the specified stream is in the DELETING state until Amazon + * Kinesis completes the deletion.

Note: Amazon Kinesis might + * continue to accept data read and write operations, such as PutRecord, + * PutRecords, and GetRecords, on a stream in the + * DELETING state until the stream deletion is complete.

When + * you delete a stream, any shards in that stream are also deleted, and any tags + * are dissociated from the stream.

You can use the DescribeStream + * operation to check the state of the stream, which is returned in + * StreamStatus.

DeleteStream has a limit of 5 + * transactions per second per account.

* * Queues the request into a thread executor and triggers associated callback when operation has finished. */ virtual void DeleteStreamAsync(const Model::DeleteStreamRequest& request, const DeleteStreamResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; /** - *

Describes the specified Amazon Kinesis stream.

The information about - * the stream includes its current status, its Amazon Resource Name (ARN), and an - * array of shard objects. For each shard object, there is information about the - * hash key and sequence number ranges that the shard spans, and the IDs of any - * earlier shards that played in a role in creating the shard. A sequence number is - * the identifier associated with every record ingested in the stream. The sequence - * number is assigned when a record is put into the stream.

You can limit - * the number of returned shards using the Limit parameter. The number - * of shards in a stream may be too large to return from a single call to - * DescribeStream. You can detect this by using the + *

Describes the specified stream.

The information about the stream + * includes its current status, its Amazon Resource Name (ARN), and an array of + * shard objects. For each shard object, there is information about the hash key + * and sequence number ranges that the shard spans, and the IDs of any earlier + * shards that played in a role in creating the shard. A sequence number is the + * identifier associated with every record ingested in the Amazon Kinesis stream. + * The sequence number is assigned when a record is put into the stream.

You + * can limit the number of returned shards using the Limit parameter. + * The number of shards in a stream may be too large to return from a single call + * to DescribeStream. You can detect this by using the * HasMoreShards flag in the returned output. * HasMoreShards is set to true when there is more data * available.

DescribeStream is a paginated operation. If * there are more shards available, you can request them using the shard ID of the * last shard returned. Specify this ID in the ExclusiveStartShardId - * parameter in a subsequent request to DescribeStream.

There - * are no guarantees about the chronological order shards returned in - * DescribeStream results. If you want to process shards in - * chronological order, use ParentShardId to track lineage to the - * oldest shard.

DescribeStream has a limit of 10 transactions per - * second per account.

+ * parameter in a subsequent request to DescribeStream.

+ *

DescribeStream has a limit of 10 transactions per second per + * account.

*/ virtual Model::DescribeStreamOutcome DescribeStream(const Model::DescribeStreamRequest& request) const; /** - *

Describes the specified Amazon Kinesis stream.

The information about - * the stream includes its current status, its Amazon Resource Name (ARN), and an - * array of shard objects. For each shard object, there is information about the - * hash key and sequence number ranges that the shard spans, and the IDs of any - * earlier shards that played in a role in creating the shard. A sequence number is - * the identifier associated with every record ingested in the stream. The sequence - * number is assigned when a record is put into the stream.

You can limit - * the number of returned shards using the Limit parameter. The number - * of shards in a stream may be too large to return from a single call to - * DescribeStream. You can detect this by using the + *

Describes the specified stream.

The information about the stream + * includes its current status, its Amazon Resource Name (ARN), and an array of + * shard objects. For each shard object, there is information about the hash key + * and sequence number ranges that the shard spans, and the IDs of any earlier + * shards that played in a role in creating the shard. A sequence number is the + * identifier associated with every record ingested in the Amazon Kinesis stream. + * The sequence number is assigned when a record is put into the stream.

You + * can limit the number of returned shards using the Limit parameter. + * The number of shards in a stream may be too large to return from a single call + * to DescribeStream. You can detect this by using the * HasMoreShards flag in the returned output. * HasMoreShards is set to true when there is more data * available.

DescribeStream is a paginated operation. If * there are more shards available, you can request them using the shard ID of the * last shard returned. Specify this ID in the ExclusiveStartShardId - * parameter in a subsequent request to DescribeStream.

There - * are no guarantees about the chronological order shards returned in - * DescribeStream results. If you want to process shards in - * chronological order, use ParentShardId to track lineage to the - * oldest shard.

DescribeStream has a limit of 10 transactions per - * second per account.

+ * parameter in a subsequent request to DescribeStream.

+ *

DescribeStream has a limit of 10 transactions per second per + * account.

* * returns a future to the operation so that it can be executed in parallel to other requests. */ virtual Model::DescribeStreamOutcomeCallable DescribeStreamCallable(const Model::DescribeStreamRequest& request) const; /** - *

Describes the specified Amazon Kinesis stream.

The information about - * the stream includes its current status, its Amazon Resource Name (ARN), and an - * array of shard objects. For each shard object, there is information about the - * hash key and sequence number ranges that the shard spans, and the IDs of any - * earlier shards that played in a role in creating the shard. A sequence number is - * the identifier associated with every record ingested in the stream. The sequence - * number is assigned when a record is put into the stream.

You can limit - * the number of returned shards using the Limit parameter. The number - * of shards in a stream may be too large to return from a single call to - * DescribeStream. You can detect this by using the + *

Describes the specified stream.

The information about the stream + * includes its current status, its Amazon Resource Name (ARN), and an array of + * shard objects. For each shard object, there is information about the hash key + * and sequence number ranges that the shard spans, and the IDs of any earlier + * shards that played in a role in creating the shard. A sequence number is the + * identifier associated with every record ingested in the Amazon Kinesis stream. + * The sequence number is assigned when a record is put into the stream.

You + * can limit the number of returned shards using the Limit parameter. + * The number of shards in a stream may be too large to return from a single call + * to DescribeStream. You can detect this by using the * HasMoreShards flag in the returned output. * HasMoreShards is set to true when there is more data * available.

DescribeStream is a paginated operation. If * there are more shards available, you can request them using the shard ID of the * last shard returned. Specify this ID in the ExclusiveStartShardId - * parameter in a subsequent request to DescribeStream.

There - * are no guarantees about the chronological order shards returned in - * DescribeStream results. If you want to process shards in - * chronological order, use ParentShardId to track lineage to the - * oldest shard.

DescribeStream has a limit of 10 transactions per - * second per account.

+ * parameter in a subsequent request to DescribeStream.

+ *

DescribeStream has a limit of 10 transactions per second per + * account.

* * Queues the request into a thread executor and triggers associated callback when operation has finished. */ virtual void DescribeStreamAsync(const Model::DescribeStreamRequest& request, const DescribeStreamResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; /** - *

Disables enhanced monitoring.

- */ - virtual Model::DisableEnhancedMonitoringOutcome DisableEnhancedMonitoring(const Model::DisableEnhancedMonitoringRequest& request) const; - - /** - *

Disables enhanced monitoring.

- * - * returns a future to the operation so that it can be executed in parallel to other requests. - */ - virtual Model::DisableEnhancedMonitoringOutcomeCallable DisableEnhancedMonitoringCallable(const Model::DisableEnhancedMonitoringRequest& request) const; - - /** - *

Disables enhanced monitoring.

- * - * Queues the request into a thread executor and triggers associated callback when operation has finished. - */ - virtual void DisableEnhancedMonitoringAsync(const Model::DisableEnhancedMonitoringRequest& request, const DisableEnhancedMonitoringResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; - - /** - *

Enables enhanced Amazon Kinesis stream monitoring for shard-level - * metrics.

- */ - virtual Model::EnableEnhancedMonitoringOutcome EnableEnhancedMonitoring(const Model::EnableEnhancedMonitoringRequest& request) const; - - /** - *

Enables enhanced Amazon Kinesis stream monitoring for shard-level - * metrics.

- * - * returns a future to the operation so that it can be executed in parallel to other requests. - */ - virtual Model::EnableEnhancedMonitoringOutcomeCallable EnableEnhancedMonitoringCallable(const Model::EnableEnhancedMonitoringRequest& request) const; - - /** - *

Enables enhanced Amazon Kinesis stream monitoring for shard-level - * metrics.

- * - * Queues the request into a thread executor and triggers associated callback when operation has finished. - */ - virtual void EnableEnhancedMonitoringAsync(const Model::EnableEnhancedMonitoringRequest& request, const EnableEnhancedMonitoringResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; - - /** - *

Gets data records from an Amazon Kinesis stream's shard.

Specify a - * shard iterator using the ShardIterator parameter. The shard - * iterator specifies the position in the shard from which you want to start - * reading data records sequentially. If there are no records available in the - * portion of the shard that the iterator points to, GetRecords returns an - * empty list. Note that it might take multiple calls to get to a portion of the - * shard that contains records.

You can scale by provisioning multiple - * shards per stream while considering service limits (for more information, see Streams - * Limits in the Amazon Kinesis Streams Developer Guide). Your - * application should have one thread per shard, each reading continuously from its - * stream. To read from a stream continually, call GetRecords in a loop. Use + *

Gets data records from a shard.

Specify a shard iterator using the + * ShardIterator parameter. The shard iterator specifies the position + * in the shard from which you want to start reading data records sequentially. If + * there are no records available in the portion of the shard that the iterator + * points to, GetRecords returns an empty list. Note that it might take + * multiple calls to get to a portion of the shard that contains records.

+ *

You can scale by provisioning multiple shards. Your application should have + * one thread per shard, each reading continuously from its stream. To read from a + * stream continually, call GetRecords in a loop. Use * GetShardIterator to get the shard iterator to specify in the first * GetRecords call. GetRecords returns a new shard iterator in * NextShardIterator. Specify the shard iterator returned in @@ -560,7 +494,7 @@ namespace Model * don't exceed the maximum supported size or throughput by using the * Limit parameter to specify the maximum number of records that * GetRecords can return. Consider your average record size when determining - * this limit.

The size of the data returned by GetRecords varies + * this limit.

The size of the data returned by GetRecords will vary * depending on the utilization of the shard. The maximum size of data that * GetRecords can return is 10 MB. If a call returns this amount of data, * subsequent calls made within the next 5 seconds throw @@ -572,35 +506,32 @@ namespace Model * GetRecords; however, it's possible that the application will get * exceptions for longer than 1 second.

To detect whether the application is * falling behind in processing, you can use the MillisBehindLatest - * response attribute. You can also monitor the stream using CloudWatch metrics and - * other mechanisms (see Monitoring - * in the Amazon Kinesis Streams Developer Guide).

Each Amazon - * Kinesis record includes a value, ApproximateArrivalTimestamp, that - * is set when a stream successfully receives and stores a record. This is commonly - * referred to as a server-side timestamp, whereas a client-side timestamp is set - * when a data producer creates or sends the record to a stream (a data producer is - * any data source putting data records into a stream, for example with - * PutRecords). The timestamp has millisecond precision. There are no - * guarantees about the timestamp accuracy, or that the timestamp is always - * increasing. For example, records in a shard or across a stream might have - * timestamps that are out of order.

+ * response attribute. You can also monitor the stream using CloudWatch metrics + * (see Monitoring + * Amazon Kinesis in the Amazon Kinesis Developer Guide).

Each + * Amazon Kinesis record includes a value, + * ApproximateArrivalTimestamp, that is set when an Amazon Kinesis + * stream successfully receives and stores a record. This is commonly referred to + * as a server-side timestamp, which is different than a client-side timestamp, + * where the timestamp is set when a data producer creates or sends the record to a + * stream. The timestamp has millisecond precision. There are no guarantees about + * the timestamp accuracy, or that the timestamp is always increasing. For example, + * records in a shard or across a stream might have timestamps that are out of + * order.

*/ virtual Model::GetRecordsOutcome GetRecords(const Model::GetRecordsRequest& request) const; /** - *

Gets data records from an Amazon Kinesis stream's shard.

Specify a - * shard iterator using the ShardIterator parameter. The shard - * iterator specifies the position in the shard from which you want to start - * reading data records sequentially. If there are no records available in the - * portion of the shard that the iterator points to, GetRecords returns an - * empty list. Note that it might take multiple calls to get to a portion of the - * shard that contains records.

You can scale by provisioning multiple - * shards per stream while considering service limits (for more information, see Streams - * Limits in the Amazon Kinesis Streams Developer Guide). Your - * application should have one thread per shard, each reading continuously from its - * stream. To read from a stream continually, call GetRecords in a loop. Use + *

Gets data records from a shard.

Specify a shard iterator using the + * ShardIterator parameter. The shard iterator specifies the position + * in the shard from which you want to start reading data records sequentially. If + * there are no records available in the portion of the shard that the iterator + * points to, GetRecords returns an empty list. Note that it might take + * multiple calls to get to a portion of the shard that contains records.

+ *

You can scale by provisioning multiple shards. Your application should have + * one thread per shard, each reading continuously from its stream. To read from a + * stream continually, call GetRecords in a loop. Use * GetShardIterator to get the shard iterator to specify in the first * GetRecords call. GetRecords returns a new shard iterator in * NextShardIterator. Specify the shard iterator returned in @@ -614,7 +545,7 @@ namespace Model * don't exceed the maximum supported size or throughput by using the * Limit parameter to specify the maximum number of records that * GetRecords can return. Consider your average record size when determining - * this limit.

The size of the data returned by GetRecords varies + * this limit.

The size of the data returned by GetRecords will vary * depending on the utilization of the shard. The maximum size of data that * GetRecords can return is 10 MB. If a call returns this amount of data, * subsequent calls made within the next 5 seconds throw @@ -626,37 +557,34 @@ namespace Model * GetRecords; however, it's possible that the application will get * exceptions for longer than 1 second.

To detect whether the application is * falling behind in processing, you can use the MillisBehindLatest - * response attribute. You can also monitor the stream using CloudWatch metrics and - * other mechanisms (see Monitoring - * in the Amazon Kinesis Streams Developer Guide).

Each Amazon - * Kinesis record includes a value, ApproximateArrivalTimestamp, that - * is set when a stream successfully receives and stores a record. This is commonly - * referred to as a server-side timestamp, whereas a client-side timestamp is set - * when a data producer creates or sends the record to a stream (a data producer is - * any data source putting data records into a stream, for example with - * PutRecords). The timestamp has millisecond precision. There are no - * guarantees about the timestamp accuracy, or that the timestamp is always - * increasing. For example, records in a shard or across a stream might have - * timestamps that are out of order.

+ * response attribute. You can also monitor the stream using CloudWatch metrics + * (see Monitoring + * Amazon Kinesis in the Amazon Kinesis Developer Guide).

Each + * Amazon Kinesis record includes a value, + * ApproximateArrivalTimestamp, that is set when an Amazon Kinesis + * stream successfully receives and stores a record. This is commonly referred to + * as a server-side timestamp, which is different than a client-side timestamp, + * where the timestamp is set when a data producer creates or sends the record to a + * stream. The timestamp has millisecond precision. There are no guarantees about + * the timestamp accuracy, or that the timestamp is always increasing. For example, + * records in a shard or across a stream might have timestamps that are out of + * order.

* * returns a future to the operation so that it can be executed in parallel to other requests. */ virtual Model::GetRecordsOutcomeCallable GetRecordsCallable(const Model::GetRecordsRequest& request) const; /** - *

Gets data records from an Amazon Kinesis stream's shard.

Specify a - * shard iterator using the ShardIterator parameter. The shard - * iterator specifies the position in the shard from which you want to start - * reading data records sequentially. If there are no records available in the - * portion of the shard that the iterator points to, GetRecords returns an - * empty list. Note that it might take multiple calls to get to a portion of the - * shard that contains records.

You can scale by provisioning multiple - * shards per stream while considering service limits (for more information, see Streams - * Limits in the Amazon Kinesis Streams Developer Guide). Your - * application should have one thread per shard, each reading continuously from its - * stream. To read from a stream continually, call GetRecords in a loop. Use + *

Gets data records from a shard.

Specify a shard iterator using the + * ShardIterator parameter. The shard iterator specifies the position + * in the shard from which you want to start reading data records sequentially. If + * there are no records available in the portion of the shard that the iterator + * points to, GetRecords returns an empty list. Note that it might take + * multiple calls to get to a portion of the shard that contains records.

+ *

You can scale by provisioning multiple shards. Your application should have + * one thread per shard, each reading continuously from its stream. To read from a + * stream continually, call GetRecords in a loop. Use * GetShardIterator to get the shard iterator to specify in the first * GetRecords call. GetRecords returns a new shard iterator in * NextShardIterator. Specify the shard iterator returned in @@ -670,7 +598,7 @@ namespace Model * don't exceed the maximum supported size or throughput by using the * Limit parameter to specify the maximum number of records that * GetRecords can return. Consider your average record size when determining - * this limit.

The size of the data returned by GetRecords varies + * this limit.

The size of the data returned by GetRecords will vary * depending on the utilization of the shard. The maximum size of data that * GetRecords can return is 10 MB. If a call returns this amount of data, * subsequent calls made within the next 5 seconds throw @@ -682,93 +610,91 @@ namespace Model * GetRecords; however, it's possible that the application will get * exceptions for longer than 1 second.

To detect whether the application is * falling behind in processing, you can use the MillisBehindLatest - * response attribute. You can also monitor the stream using CloudWatch metrics and - * other mechanisms (see Monitoring - * in the Amazon Kinesis Streams Developer Guide).

Each Amazon - * Kinesis record includes a value, ApproximateArrivalTimestamp, that - * is set when a stream successfully receives and stores a record. This is commonly - * referred to as a server-side timestamp, whereas a client-side timestamp is set - * when a data producer creates or sends the record to a stream (a data producer is - * any data source putting data records into a stream, for example with - * PutRecords). The timestamp has millisecond precision. There are no - * guarantees about the timestamp accuracy, or that the timestamp is always - * increasing. For example, records in a shard or across a stream might have - * timestamps that are out of order.

+ * response attribute. You can also monitor the stream using CloudWatch metrics + * (see Monitoring + * Amazon Kinesis in the Amazon Kinesis Developer Guide).

Each + * Amazon Kinesis record includes a value, + * ApproximateArrivalTimestamp, that is set when an Amazon Kinesis + * stream successfully receives and stores a record. This is commonly referred to + * as a server-side timestamp, which is different than a client-side timestamp, + * where the timestamp is set when a data producer creates or sends the record to a + * stream. The timestamp has millisecond precision. There are no guarantees about + * the timestamp accuracy, or that the timestamp is always increasing. For example, + * records in a shard or across a stream might have timestamps that are out of + * order.

* * Queues the request into a thread executor and triggers associated callback when operation has finished. */ virtual void GetRecordsAsync(const Model::GetRecordsRequest& request, const GetRecordsResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; /** - *

Gets an Amazon Kinesis shard iterator. A shard iterator expires five minutes - * after it is returned to the requester.

A shard iterator specifies the - * shard position from which to start reading data records sequentially. The - * position is specified using the sequence number of a data record in a shard. A + *

Gets a shard iterator. A shard iterator expires five minutes after it is + * returned to the requester.

A shard iterator specifies the position in the + * shard from which to start reading data records sequentially. A shard iterator + * specifies this position using the sequence number of a data record in a shard. A * sequence number is the identifier associated with every record ingested in the - * stream, and is assigned when a record is put into the stream. Each stream has - * one or more shards.

You must specify the shard iterator type. For - * example, you can set the ShardIteratorType parameter to read - * exactly from the position denoted by a specific sequence number by using the + * Amazon Kinesis stream. The sequence number is assigned when a record is put into + * the stream.

You must specify the shard iterator type. For example, you + * can set the ShardIteratorType parameter to read exactly from the + * position denoted by a specific sequence number by using the * AT_SEQUENCE_NUMBER shard iterator type, or right after the sequence * number by using the AFTER_SEQUENCE_NUMBER shard iterator type, * using sequence numbers returned by earlier calls to PutRecord, - * PutRecords, GetRecords, or DescribeStream. In the request, - * you can specify the shard iterator type AT_TIMESTAMP to read - * records from an arbitrary point in time, TRIM_HORIZON to cause + * PutRecords, GetRecords, or DescribeStream. You can specify + * the shard iterator type TRIM_HORIZON in the request to cause * ShardIterator to point to the last untrimmed record in the shard in - * the system (the oldest data record in the shard), or LATEST so that - * you always read the most recent data in the shard.

When you read - * repeatedly from a stream, use a GetShardIterator request to get the first - * shard iterator for use in your first GetRecords request and for - * subsequent reads use the shard iterator returned by the GetRecords - * request in NextShardIterator. A new shard iterator is returned by - * every GetRecords request in NextShardIterator, which you use - * in the ShardIterator parameter of the next GetRecords - * request.

If a GetShardIterator request is made too often, you - * receive a ProvisionedThroughputExceededException. For more - * information about throughput limits, see GetRecords, and Streams - * Limits in the Amazon Kinesis Streams Developer Guide.

If the - * shard is closed, GetShardIterator returns a valid iterator for the last - * sequence number of the shard. Note that a shard can be closed as a result of + * the system, which is the oldest data record in the shard. Or you can point to + * just after the most recent record in the shard, by using the shard iterator type + * LATEST, so that you always read the most recent data in the shard. + *

When you repeatedly read from an Amazon Kinesis stream use a + * GetShardIterator request to get the first shard iterator for use in your + * first GetRecords request and then use the shard iterator returned by the + * GetRecords request in NextShardIterator for subsequent + * reads. A new shard iterator is returned by every GetRecords request in + * NextShardIterator, which you use in the ShardIterator + * parameter of the next GetRecords request.

If a + * GetShardIterator request is made too often, you receive a + * ProvisionedThroughputExceededException. For more information about + * throughput limits, see GetRecords.

If the shard is closed, the + * iterator can't return more data, and GetShardIterator returns + * null for its ShardIterator. A shard can be closed * using SplitShard or MergeShards.

GetShardIterator * has a limit of 5 transactions per second per account per open shard.

*/ virtual Model::GetShardIteratorOutcome GetShardIterator(const Model::GetShardIteratorRequest& request) const; /** - *

Gets an Amazon Kinesis shard iterator. A shard iterator expires five minutes - * after it is returned to the requester.

A shard iterator specifies the - * shard position from which to start reading data records sequentially. The - * position is specified using the sequence number of a data record in a shard. A + *

Gets a shard iterator. A shard iterator expires five minutes after it is + * returned to the requester.

A shard iterator specifies the position in the + * shard from which to start reading data records sequentially. A shard iterator + * specifies this position using the sequence number of a data record in a shard. A * sequence number is the identifier associated with every record ingested in the - * stream, and is assigned when a record is put into the stream. Each stream has - * one or more shards.

You must specify the shard iterator type. For - * example, you can set the ShardIteratorType parameter to read - * exactly from the position denoted by a specific sequence number by using the + * Amazon Kinesis stream. The sequence number is assigned when a record is put into + * the stream.

You must specify the shard iterator type. For example, you + * can set the ShardIteratorType parameter to read exactly from the + * position denoted by a specific sequence number by using the * AT_SEQUENCE_NUMBER shard iterator type, or right after the sequence * number by using the AFTER_SEQUENCE_NUMBER shard iterator type, * using sequence numbers returned by earlier calls to PutRecord, - * PutRecords, GetRecords, or DescribeStream. In the request, - * you can specify the shard iterator type AT_TIMESTAMP to read - * records from an arbitrary point in time, TRIM_HORIZON to cause + * PutRecords, GetRecords, or DescribeStream. You can specify + * the shard iterator type TRIM_HORIZON in the request to cause * ShardIterator to point to the last untrimmed record in the shard in - * the system (the oldest data record in the shard), or LATEST so that - * you always read the most recent data in the shard.

When you read - * repeatedly from a stream, use a GetShardIterator request to get the first - * shard iterator for use in your first GetRecords request and for - * subsequent reads use the shard iterator returned by the GetRecords - * request in NextShardIterator. A new shard iterator is returned by - * every GetRecords request in NextShardIterator, which you use - * in the ShardIterator parameter of the next GetRecords - * request.

If a GetShardIterator request is made too often, you - * receive a ProvisionedThroughputExceededException. For more - * information about throughput limits, see GetRecords, and Streams - * Limits in the Amazon Kinesis Streams Developer Guide.

If the - * shard is closed, GetShardIterator returns a valid iterator for the last - * sequence number of the shard. Note that a shard can be closed as a result of + * the system, which is the oldest data record in the shard. Or you can point to + * just after the most recent record in the shard, by using the shard iterator type + * LATEST, so that you always read the most recent data in the shard. + *

When you repeatedly read from an Amazon Kinesis stream use a + * GetShardIterator request to get the first shard iterator for use in your + * first GetRecords request and then use the shard iterator returned by the + * GetRecords request in NextShardIterator for subsequent + * reads. A new shard iterator is returned by every GetRecords request in + * NextShardIterator, which you use in the ShardIterator + * parameter of the next GetRecords request.

If a + * GetShardIterator request is made too often, you receive a + * ProvisionedThroughputExceededException. For more information about + * throughput limits, see GetRecords.

If the shard is closed, the + * iterator can't return more data, and GetShardIterator returns + * null for its ShardIterator. A shard can be closed * using SplitShard or MergeShards.

GetShardIterator * has a limit of 5 transactions per second per account per open shard.

* @@ -777,37 +703,36 @@ namespace Model virtual Model::GetShardIteratorOutcomeCallable GetShardIteratorCallable(const Model::GetShardIteratorRequest& request) const; /** - *

Gets an Amazon Kinesis shard iterator. A shard iterator expires five minutes - * after it is returned to the requester.

A shard iterator specifies the - * shard position from which to start reading data records sequentially. The - * position is specified using the sequence number of a data record in a shard. A + *

Gets a shard iterator. A shard iterator expires five minutes after it is + * returned to the requester.

A shard iterator specifies the position in the + * shard from which to start reading data records sequentially. A shard iterator + * specifies this position using the sequence number of a data record in a shard. A * sequence number is the identifier associated with every record ingested in the - * stream, and is assigned when a record is put into the stream. Each stream has - * one or more shards.

You must specify the shard iterator type. For - * example, you can set the ShardIteratorType parameter to read - * exactly from the position denoted by a specific sequence number by using the + * Amazon Kinesis stream. The sequence number is assigned when a record is put into + * the stream.

You must specify the shard iterator type. For example, you + * can set the ShardIteratorType parameter to read exactly from the + * position denoted by a specific sequence number by using the * AT_SEQUENCE_NUMBER shard iterator type, or right after the sequence * number by using the AFTER_SEQUENCE_NUMBER shard iterator type, * using sequence numbers returned by earlier calls to PutRecord, - * PutRecords, GetRecords, or DescribeStream. In the request, - * you can specify the shard iterator type AT_TIMESTAMP to read - * records from an arbitrary point in time, TRIM_HORIZON to cause + * PutRecords, GetRecords, or DescribeStream. You can specify + * the shard iterator type TRIM_HORIZON in the request to cause * ShardIterator to point to the last untrimmed record in the shard in - * the system (the oldest data record in the shard), or LATEST so that - * you always read the most recent data in the shard.

When you read - * repeatedly from a stream, use a GetShardIterator request to get the first - * shard iterator for use in your first GetRecords request and for - * subsequent reads use the shard iterator returned by the GetRecords - * request in NextShardIterator. A new shard iterator is returned by - * every GetRecords request in NextShardIterator, which you use - * in the ShardIterator parameter of the next GetRecords - * request.

If a GetShardIterator request is made too often, you - * receive a ProvisionedThroughputExceededException. For more - * information about throughput limits, see GetRecords, and Streams - * Limits in the Amazon Kinesis Streams Developer Guide.

If the - * shard is closed, GetShardIterator returns a valid iterator for the last - * sequence number of the shard. Note that a shard can be closed as a result of + * the system, which is the oldest data record in the shard. Or you can point to + * just after the most recent record in the shard, by using the shard iterator type + * LATEST, so that you always read the most recent data in the shard. + *

When you repeatedly read from an Amazon Kinesis stream use a + * GetShardIterator request to get the first shard iterator for use in your + * first GetRecords request and then use the shard iterator returned by the + * GetRecords request in NextShardIterator for subsequent + * reads. A new shard iterator is returned by every GetRecords request in + * NextShardIterator, which you use in the ShardIterator + * parameter of the next GetRecords request.

If a + * GetShardIterator request is made too often, you receive a + * ProvisionedThroughputExceededException. For more information about + * throughput limits, see GetRecords.

If the shard is closed, the + * iterator can't return more data, and GetShardIterator returns + * null for its ShardIterator. A shard can be closed * using SplitShard or MergeShards.

GetShardIterator * has a limit of 5 transactions per second per account per open shard.

* @@ -816,60 +741,57 @@ namespace Model virtual void GetShardIteratorAsync(const Model::GetShardIteratorRequest& request, const GetShardIteratorResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; /** - *

Increases the Amazon Kinesis stream's retention period, which is the length - * of time data records are accessible after they are added to the stream. The - * maximum value of a stream's retention period is 168 hours (7 days).

Upon - * choosing a longer stream retention period, this operation will increase the time - * period records are accessible that have not yet expired. However, it will not - * make previous data that has expired (older than the stream's previous retention - * period) accessible after the operation has been called. For example, if a - * stream's retention period is set to 24 hours and is increased to 168 hours, any - * data that is older than 24 hours will remain inaccessible to consumer - * applications.

+ *

Increases the stream's retention period, which is the length of time data + * records are accessible after they are added to the stream. The maximum value of + * a stream?s retention period is 168 hours (7 days).

Upon choosing a longer + * stream retention period, this operation will increase the time period records + * are accessible that have not yet expired. However, it will not make previous + * data that has expired (older than the stream?s previous retention period) + * accessible after the operation has been called. For example, if a stream?s + * retention period is set to 24 hours and is increased to 168 hours, any data that + * is older than 24 hours will remain inaccessible to consumer applications.

*/ virtual Model::IncreaseStreamRetentionPeriodOutcome IncreaseStreamRetentionPeriod(const Model::IncreaseStreamRetentionPeriodRequest& request) const; /** - *

Increases the Amazon Kinesis stream's retention period, which is the length - * of time data records are accessible after they are added to the stream. The - * maximum value of a stream's retention period is 168 hours (7 days).

Upon - * choosing a longer stream retention period, this operation will increase the time - * period records are accessible that have not yet expired. However, it will not - * make previous data that has expired (older than the stream's previous retention - * period) accessible after the operation has been called. For example, if a - * stream's retention period is set to 24 hours and is increased to 168 hours, any - * data that is older than 24 hours will remain inaccessible to consumer - * applications.

+ *

Increases the stream's retention period, which is the length of time data + * records are accessible after they are added to the stream. The maximum value of + * a stream?s retention period is 168 hours (7 days).

Upon choosing a longer + * stream retention period, this operation will increase the time period records + * are accessible that have not yet expired. However, it will not make previous + * data that has expired (older than the stream?s previous retention period) + * accessible after the operation has been called. For example, if a stream?s + * retention period is set to 24 hours and is increased to 168 hours, any data that + * is older than 24 hours will remain inaccessible to consumer applications.

* * returns a future to the operation so that it can be executed in parallel to other requests. */ virtual Model::IncreaseStreamRetentionPeriodOutcomeCallable IncreaseStreamRetentionPeriodCallable(const Model::IncreaseStreamRetentionPeriodRequest& request) const; /** - *

Increases the Amazon Kinesis stream's retention period, which is the length - * of time data records are accessible after they are added to the stream. The - * maximum value of a stream's retention period is 168 hours (7 days).

Upon - * choosing a longer stream retention period, this operation will increase the time - * period records are accessible that have not yet expired. However, it will not - * make previous data that has expired (older than the stream's previous retention - * period) accessible after the operation has been called. For example, if a - * stream's retention period is set to 24 hours and is increased to 168 hours, any - * data that is older than 24 hours will remain inaccessible to consumer - * applications.

+ *

Increases the stream's retention period, which is the length of time data + * records are accessible after they are added to the stream. The maximum value of + * a stream?s retention period is 168 hours (7 days).

Upon choosing a longer + * stream retention period, this operation will increase the time period records + * are accessible that have not yet expired. However, it will not make previous + * data that has expired (older than the stream?s previous retention period) + * accessible after the operation has been called. For example, if a stream?s + * retention period is set to 24 hours and is increased to 168 hours, any data that + * is older than 24 hours will remain inaccessible to consumer applications.

* * Queues the request into a thread executor and triggers associated callback when operation has finished. */ virtual void IncreaseStreamRetentionPeriodAsync(const Model::IncreaseStreamRetentionPeriodRequest& request, const IncreaseStreamRetentionPeriodResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; /** - *

Lists your Amazon Kinesis streams.

The number of streams may be too - * large to return from a single call to ListStreams. You can limit - * the number of returned streams using the Limit parameter. If you do - * not specify a value for the Limit parameter, Amazon Kinesis uses - * the default limit, which is currently 10.

You can detect if there are - * more streams available to list by using the HasMoreStreams flag - * from the returned output. If there are more streams available, you can request - * more streams by using the name of the last stream returned by the + *

Lists your streams.

The number of streams may be too large to return + * from a single call to ListStreams. You can limit the number of + * returned streams using the Limit parameter. If you do not specify a + * value for the Limit parameter, Amazon Kinesis uses the default + * limit, which is currently 10.

You can detect if there are more streams + * available to list by using the HasMoreStreams flag from the + * returned output. If there are more streams available, you can request more + * streams by using the name of the last stream returned by the * ListStreams request in the ExclusiveStartStreamName * parameter in a subsequent request to ListStreams. The group of * stream names returned by the subsequent request is then added to the list. You @@ -880,14 +802,14 @@ namespace Model virtual Model::ListStreamsOutcome ListStreams(const Model::ListStreamsRequest& request) const; /** - *

Lists your Amazon Kinesis streams.

The number of streams may be too - * large to return from a single call to ListStreams. You can limit - * the number of returned streams using the Limit parameter. If you do - * not specify a value for the Limit parameter, Amazon Kinesis uses - * the default limit, which is currently 10.

You can detect if there are - * more streams available to list by using the HasMoreStreams flag - * from the returned output. If there are more streams available, you can request - * more streams by using the name of the last stream returned by the + *

Lists your streams.

The number of streams may be too large to return + * from a single call to ListStreams. You can limit the number of + * returned streams using the Limit parameter. If you do not specify a + * value for the Limit parameter, Amazon Kinesis uses the default + * limit, which is currently 10.

You can detect if there are more streams + * available to list by using the HasMoreStreams flag from the + * returned output. If there are more streams available, you can request more + * streams by using the name of the last stream returned by the * ListStreams request in the ExclusiveStartStreamName * parameter in a subsequent request to ListStreams. The group of * stream names returned by the subsequent request is then added to the list. You @@ -900,14 +822,14 @@ namespace Model virtual Model::ListStreamsOutcomeCallable ListStreamsCallable(const Model::ListStreamsRequest& request) const; /** - *

Lists your Amazon Kinesis streams.

The number of streams may be too - * large to return from a single call to ListStreams. You can limit - * the number of returned streams using the Limit parameter. If you do - * not specify a value for the Limit parameter, Amazon Kinesis uses - * the default limit, which is currently 10.

You can detect if there are - * more streams available to list by using the HasMoreStreams flag - * from the returned output. If there are more streams available, you can request - * more streams by using the name of the last stream returned by the + *

Lists your streams.

The number of streams may be too large to return + * from a single call to ListStreams. You can limit the number of + * returned streams using the Limit parameter. If you do not specify a + * value for the Limit parameter, Amazon Kinesis uses the default + * limit, which is currently 10.

You can detect if there are more streams + * available to list by using the HasMoreStreams flag from the + * returned output. If there are more streams available, you can request more + * streams by using the name of the last stream returned by the * ListStreams request in the ExclusiveStartStreamName * parameter in a subsequent request to ListStreams. The group of * stream names returned by the subsequent request is then added to the list. You @@ -939,21 +861,21 @@ namespace Model virtual void ListTagsForStreamAsync(const Model::ListTagsForStreamRequest& request, const ListTagsForStreamResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; /** - *

Merges two adjacent shards in an Amazon Kinesis stream and combines them into - * a single shard to reduce the stream's capacity to ingest and transport data. Two - * shards are considered adjacent if the union of the hash key ranges for the two - * shards form a contiguous set with no gaps. For example, if you have two shards, - * one with a hash key range of 276...381 and the other with a hash key range of - * 382...454, then you could merge these two shards into a single shard that would - * have a hash key range of 276...454. After the merge, the single child shard - * receives data for all hash key values covered by the two parent shards.

+ *

Merges two adjacent shards in a stream and combines them into a single shard + * to reduce the stream's capacity to ingest and transport data. Two shards are + * considered adjacent if the union of the hash key ranges for the two shards form + * a contiguous set with no gaps. For example, if you have two shards, one with a + * hash key range of 276...381 and the other with a hash key range of 382...454, + * then you could merge these two shards into a single shard that would have a hash + * key range of 276...454. After the merge, the single child shard receives data + * for all hash key values covered by the two parent shards.

*

MergeShards is called when there is a need to reduce the overall * capacity of a stream because of excess capacity that is not being used. You must * specify the shard to be merged and the adjacent shard for a stream. For more * information about merging shards, see Merge - * Two Shards in the Amazon Kinesis Streams Developer Guide.

If - * the stream is in the ACTIVE state, you can call + * Two Shards in the Amazon Kinesis Developer Guide.

If the + * stream is in the ACTIVE state, you can call * MergeShards. If a stream is in the CREATING, * UPDATING, or DELETING state, MergeShards * returns a ResourceInUseException. If the specified stream does not @@ -976,21 +898,21 @@ namespace Model virtual Model::MergeShardsOutcome MergeShards(const Model::MergeShardsRequest& request) const; /** - *

Merges two adjacent shards in an Amazon Kinesis stream and combines them into - * a single shard to reduce the stream's capacity to ingest and transport data. Two - * shards are considered adjacent if the union of the hash key ranges for the two - * shards form a contiguous set with no gaps. For example, if you have two shards, - * one with a hash key range of 276...381 and the other with a hash key range of - * 382...454, then you could merge these two shards into a single shard that would - * have a hash key range of 276...454. After the merge, the single child shard - * receives data for all hash key values covered by the two parent shards.

+ *

Merges two adjacent shards in a stream and combines them into a single shard + * to reduce the stream's capacity to ingest and transport data. Two shards are + * considered adjacent if the union of the hash key ranges for the two shards form + * a contiguous set with no gaps. For example, if you have two shards, one with a + * hash key range of 276...381 and the other with a hash key range of 382...454, + * then you could merge these two shards into a single shard that would have a hash + * key range of 276...454. After the merge, the single child shard receives data + * for all hash key values covered by the two parent shards.

*

MergeShards is called when there is a need to reduce the overall * capacity of a stream because of excess capacity that is not being used. You must * specify the shard to be merged and the adjacent shard for a stream. For more * information about merging shards, see Merge - * Two Shards in the Amazon Kinesis Streams Developer Guide.

If - * the stream is in the ACTIVE state, you can call + * Two Shards in the Amazon Kinesis Developer Guide.

If the + * stream is in the ACTIVE state, you can call * MergeShards. If a stream is in the CREATING, * UPDATING, or DELETING state, MergeShards * returns a ResourceInUseException. If the specified stream does not @@ -1015,21 +937,21 @@ namespace Model virtual Model::MergeShardsOutcomeCallable MergeShardsCallable(const Model::MergeShardsRequest& request) const; /** - *

Merges two adjacent shards in an Amazon Kinesis stream and combines them into - * a single shard to reduce the stream's capacity to ingest and transport data. Two - * shards are considered adjacent if the union of the hash key ranges for the two - * shards form a contiguous set with no gaps. For example, if you have two shards, - * one with a hash key range of 276...381 and the other with a hash key range of - * 382...454, then you could merge these two shards into a single shard that would - * have a hash key range of 276...454. After the merge, the single child shard - * receives data for all hash key values covered by the two parent shards.

+ *

Merges two adjacent shards in a stream and combines them into a single shard + * to reduce the stream's capacity to ingest and transport data. Two shards are + * considered adjacent if the union of the hash key ranges for the two shards form + * a contiguous set with no gaps. For example, if you have two shards, one with a + * hash key range of 276...381 and the other with a hash key range of 382...454, + * then you could merge these two shards into a single shard that would have a hash + * key range of 276...454. After the merge, the single child shard receives data + * for all hash key values covered by the two parent shards.

*

MergeShards is called when there is a need to reduce the overall * capacity of a stream because of excess capacity that is not being used. You must * specify the shard to be merged and the adjacent shard for a stream. For more * information about merging shards, see Merge - * Two Shards in the Amazon Kinesis Streams Developer Guide.

If - * the stream is in the ACTIVE state, you can call + * Two Shards in the Amazon Kinesis Developer Guide.

If the + * stream is in the ACTIVE state, you can call * MergeShards. If a stream is in the CREATING, * UPDATING, or DELETING state, MergeShards * returns a ResourceInUseException. If the specified stream does not @@ -1054,148 +976,154 @@ namespace Model virtual void MergeShardsAsync(const Model::MergeShardsRequest& request, const MergeShardsResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; /** - *

Writes a single data record into an Amazon Kinesis stream. Call - * PutRecord to send data into the stream for real-time ingestion and - * subsequent processing, one record at a time. Each shard can support writes up to - * 1,000 records per second, up to a maximum data write total of 1 MB per - * second.

You must specify the name of the stream that captures, stores, - * and transports the data; a partition key; and the data blob itself.

The - * data blob can be any type of data; for example, a segment from a log file, - * geographic/location data, website clickstream data, and so on.

The - * partition key is used by Amazon Kinesis to distribute data across shards. Amazon - * Kinesis segregates the data records that belong to a stream into multiple - * shards, using the partition key associated with each data record to determine - * which shard a given data record belongs to.

Partition keys are Unicode - * strings, with a maximum length limit of 256 characters for each key. An MD5 hash - * function is used to map partition keys to 128-bit integer values and to map - * associated data records to shards using the hash key ranges of the shards. You - * can override hashing the partition key to determine the shard by explicitly - * specifying a hash value using the ExplicitHashKey parameter. For - * more information, see Writes a single data record from a producer into an Amazon Kinesis stream. + * Call PutRecord to send data from the producer into the Amazon + * Kinesis stream for real-time ingestion and subsequent processing, one record at + * a time. Each shard can support writes up to 1,000 records per second, up to a + * maximum data write total of 1 MB per second.

You must specify the name of + * the stream that captures, stores, and transports the data; a partition key; and + * the data blob itself.

The data blob can be any type of data; for example, + * a segment from a log file, geographic/location data, website clickstream data, + * and so on.

The partition key is used by Amazon Kinesis to distribute data + * across shards. Amazon Kinesis segregates the data records that belong to a data + * stream into multiple shards, using the partition key associated with each data + * record to determine which shard a given data record belongs to.

+ *

Partition keys are Unicode strings, with a maximum length limit of 256 + * characters for each key. An MD5 hash function is used to map partition keys to + * 128-bit integer values and to map associated data records to shards using the + * hash key ranges of the shards. You can override hashing the partition key to + * determine the shard by explicitly specifying a hash value using the + * ExplicitHashKey parameter. For more information, see Adding - * Data to a Stream in the Amazon Kinesis Streams Developer Guide.

+ * Data to a Stream in the Amazon Kinesis Developer Guide.

*

PutRecord returns the shard ID of where the data record was * placed and the sequence number that was assigned to the data record.

- *

Sequence numbers increase over time and are specific to a shard within a - * stream, not across all shards within a stream. To guarantee strictly increasing - * ordering, write serially to a shard and use the - * SequenceNumberForOrdering parameter. For more information, see Sequence numbers generally increase over time. To guarantee strictly + * increasing ordering, use the SequenceNumberForOrdering parameter. + * For more information, see Adding - * Data to a Stream in the Amazon Kinesis Streams Developer Guide.

- *

If a PutRecord request cannot be processed because of - * insufficient provisioned throughput on the shard involved in the request, + * Data to a Stream in the Amazon Kinesis Developer Guide.

If a + * PutRecord request cannot be processed because of insufficient + * provisioned throughput on the shard involved in the request, * PutRecord throws - * ProvisionedThroughputExceededException.

Data records are - * accessible for only 24 hours from the time that they are added to a stream.

+ * ProvisionedThroughputExceededException.

By default, data + * records are accessible for only 24 hours from the time that they are added to an + * Amazon Kinesis stream. This retention period can be modified using the + * DecreaseStreamRetentionPeriod and IncreaseStreamRetentionPeriod + * operations.

*/ virtual Model::PutRecordOutcome PutRecord(const Model::PutRecordRequest& request) const; /** - *

Writes a single data record into an Amazon Kinesis stream. Call - * PutRecord to send data into the stream for real-time ingestion and - * subsequent processing, one record at a time. Each shard can support writes up to - * 1,000 records per second, up to a maximum data write total of 1 MB per - * second.

You must specify the name of the stream that captures, stores, - * and transports the data; a partition key; and the data blob itself.

The - * data blob can be any type of data; for example, a segment from a log file, - * geographic/location data, website clickstream data, and so on.

The - * partition key is used by Amazon Kinesis to distribute data across shards. Amazon - * Kinesis segregates the data records that belong to a stream into multiple - * shards, using the partition key associated with each data record to determine - * which shard a given data record belongs to.

Partition keys are Unicode - * strings, with a maximum length limit of 256 characters for each key. An MD5 hash - * function is used to map partition keys to 128-bit integer values and to map - * associated data records to shards using the hash key ranges of the shards. You - * can override hashing the partition key to determine the shard by explicitly - * specifying a hash value using the ExplicitHashKey parameter. For - * more information, see Writes a single data record from a producer into an Amazon Kinesis stream. + * Call PutRecord to send data from the producer into the Amazon + * Kinesis stream for real-time ingestion and subsequent processing, one record at + * a time. Each shard can support writes up to 1,000 records per second, up to a + * maximum data write total of 1 MB per second.

You must specify the name of + * the stream that captures, stores, and transports the data; a partition key; and + * the data blob itself.

The data blob can be any type of data; for example, + * a segment from a log file, geographic/location data, website clickstream data, + * and so on.

The partition key is used by Amazon Kinesis to distribute data + * across shards. Amazon Kinesis segregates the data records that belong to a data + * stream into multiple shards, using the partition key associated with each data + * record to determine which shard a given data record belongs to.

+ *

Partition keys are Unicode strings, with a maximum length limit of 256 + * characters for each key. An MD5 hash function is used to map partition keys to + * 128-bit integer values and to map associated data records to shards using the + * hash key ranges of the shards. You can override hashing the partition key to + * determine the shard by explicitly specifying a hash value using the + * ExplicitHashKey parameter. For more information, see Adding - * Data to a Stream in the Amazon Kinesis Streams Developer Guide.

+ * Data to a Stream in the Amazon Kinesis Developer Guide.

*

PutRecord returns the shard ID of where the data record was * placed and the sequence number that was assigned to the data record.

- *

Sequence numbers increase over time and are specific to a shard within a - * stream, not across all shards within a stream. To guarantee strictly increasing - * ordering, write serially to a shard and use the - * SequenceNumberForOrdering parameter. For more information, see Sequence numbers generally increase over time. To guarantee strictly + * increasing ordering, use the SequenceNumberForOrdering parameter. + * For more information, see Adding - * Data to a Stream in the Amazon Kinesis Streams Developer Guide.

- *

If a PutRecord request cannot be processed because of - * insufficient provisioned throughput on the shard involved in the request, + * Data to a Stream in the Amazon Kinesis Developer Guide.

If a + * PutRecord request cannot be processed because of insufficient + * provisioned throughput on the shard involved in the request, * PutRecord throws - * ProvisionedThroughputExceededException.

Data records are - * accessible for only 24 hours from the time that they are added to a stream.

+ * ProvisionedThroughputExceededException.

By default, data + * records are accessible for only 24 hours from the time that they are added to an + * Amazon Kinesis stream. This retention period can be modified using the + * DecreaseStreamRetentionPeriod and IncreaseStreamRetentionPeriod + * operations.

* * returns a future to the operation so that it can be executed in parallel to other requests. */ virtual Model::PutRecordOutcomeCallable PutRecordCallable(const Model::PutRecordRequest& request) const; /** - *

Writes a single data record into an Amazon Kinesis stream. Call - * PutRecord to send data into the stream for real-time ingestion and - * subsequent processing, one record at a time. Each shard can support writes up to - * 1,000 records per second, up to a maximum data write total of 1 MB per - * second.

You must specify the name of the stream that captures, stores, - * and transports the data; a partition key; and the data blob itself.

The - * data blob can be any type of data; for example, a segment from a log file, - * geographic/location data, website clickstream data, and so on.

The - * partition key is used by Amazon Kinesis to distribute data across shards. Amazon - * Kinesis segregates the data records that belong to a stream into multiple - * shards, using the partition key associated with each data record to determine - * which shard a given data record belongs to.

Partition keys are Unicode - * strings, with a maximum length limit of 256 characters for each key. An MD5 hash - * function is used to map partition keys to 128-bit integer values and to map - * associated data records to shards using the hash key ranges of the shards. You - * can override hashing the partition key to determine the shard by explicitly - * specifying a hash value using the ExplicitHashKey parameter. For - * more information, see Writes a single data record from a producer into an Amazon Kinesis stream. + * Call PutRecord to send data from the producer into the Amazon + * Kinesis stream for real-time ingestion and subsequent processing, one record at + * a time. Each shard can support writes up to 1,000 records per second, up to a + * maximum data write total of 1 MB per second.

You must specify the name of + * the stream that captures, stores, and transports the data; a partition key; and + * the data blob itself.

The data blob can be any type of data; for example, + * a segment from a log file, geographic/location data, website clickstream data, + * and so on.

The partition key is used by Amazon Kinesis to distribute data + * across shards. Amazon Kinesis segregates the data records that belong to a data + * stream into multiple shards, using the partition key associated with each data + * record to determine which shard a given data record belongs to.

+ *

Partition keys are Unicode strings, with a maximum length limit of 256 + * characters for each key. An MD5 hash function is used to map partition keys to + * 128-bit integer values and to map associated data records to shards using the + * hash key ranges of the shards. You can override hashing the partition key to + * determine the shard by explicitly specifying a hash value using the + * ExplicitHashKey parameter. For more information, see Adding - * Data to a Stream in the Amazon Kinesis Streams Developer Guide.

+ * Data to a Stream in the Amazon Kinesis Developer Guide.

*

PutRecord returns the shard ID of where the data record was * placed and the sequence number that was assigned to the data record.

- *

Sequence numbers increase over time and are specific to a shard within a - * stream, not across all shards within a stream. To guarantee strictly increasing - * ordering, write serially to a shard and use the - * SequenceNumberForOrdering parameter. For more information, see Sequence numbers generally increase over time. To guarantee strictly + * increasing ordering, use the SequenceNumberForOrdering parameter. + * For more information, see Adding - * Data to a Stream in the Amazon Kinesis Streams Developer Guide.

- *

If a PutRecord request cannot be processed because of - * insufficient provisioned throughput on the shard involved in the request, + * Data to a Stream in the Amazon Kinesis Developer Guide.

If a + * PutRecord request cannot be processed because of insufficient + * provisioned throughput on the shard involved in the request, * PutRecord throws - * ProvisionedThroughputExceededException.

Data records are - * accessible for only 24 hours from the time that they are added to a stream.

+ * ProvisionedThroughputExceededException.

By default, data + * records are accessible for only 24 hours from the time that they are added to an + * Amazon Kinesis stream. This retention period can be modified using the + * DecreaseStreamRetentionPeriod and IncreaseStreamRetentionPeriod + * operations.

* * Queues the request into a thread executor and triggers associated callback when operation has finished. */ virtual void PutRecordAsync(const Model::PutRecordRequest& request, const PutRecordResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; /** - *

Writes multiple data records into an Amazon Kinesis stream in a single call - * (also referred to as a PutRecords request). Use this operation to - * send data into the stream for data ingestion and processing.

Each - * PutRecords request can support up to 500 records. Each record in - * the request can be as large as 1 MB, up to a limit of 5 MB for the entire - * request, including partition keys. Each shard can support writes up to 1,000 - * records per second, up to a maximum data write total of 1 MB per second.

- *

You must specify the name of the stream that captures, stores, and transports - * the data; and an array of request Records, with each record in the - * array requiring a partition key and data blob. The record size limit applies to - * the total size of the partition key and data blob.

The data blob can be - * any type of data; for example, a segment from a log file, geographic/location - * data, website clickstream data, and so on.

The partition key is used by - * Amazon Kinesis as input to a hash function that maps the partition key and - * associated data to a specific shard. An MD5 hash function is used to map - * partition keys to 128-bit integer values and to map associated data records to - * shards. As a result of this hashing mechanism, all data records with the same - * partition key map to the same shard within the stream. For more information, see - * Writes multiple data records from a producer into an Amazon Kinesis stream in + * a single call (also referred to as a PutRecords request). Use this + * operation to send data from a data producer into the Amazon Kinesis stream for + * data ingestion and processing.

Each PutRecords request can + * support up to 500 records. Each record in the request can be as large as 1 MB, + * up to a limit of 5 MB for the entire request, including partition keys. Each + * shard can support writes up to 1,000 records per second, up to a maximum data + * write total of 1 MB per second.

You must specify the name of the stream + * that captures, stores, and transports the data; and an array of request + * Records, with each record in the array requiring a partition key + * and data blob. The record size limit applies to the total size of the partition + * key and data blob.

The data blob can be any type of data; for example, a + * segment from a log file, geographic/location data, website clickstream data, and + * so on.

The partition key is used by Amazon Kinesis as input to a hash + * function that maps the partition key and associated data to a specific shard. An + * MD5 hash function is used to map partition keys to 128-bit integer values and to + * map associated data records to shards. As a result of this hashing mechanism, + * all data records with the same partition key map to the same shard within the + * stream. For more information, see Adding - * Data to a Stream in the Amazon Kinesis Streams Developer Guide.

- *

Each record in the Records array may include an optional - * parameter, ExplicitHashKey, which overrides the partition key to - * shard mapping. This parameter allows a data producer to determine explicitly the - * shard where the record is stored. For more information, see in the Amazon Kinesis Developer Guide.

Each + * record in the Records array may include an optional parameter, + * ExplicitHashKey, which overrides the partition key to shard + * mapping. This parameter allows a data producer to determine explicitly the shard + * where the record is stored. For more information, see Adding - * Multiple Records with PutRecords in the Amazon Kinesis Streams Developer + * Multiple Records with PutRecords in the Amazon Kinesis Developer * Guide.

The PutRecords response includes an array of * response Records. Each record in the response array directly * correlates with a record in the request array using natural ordering, from the @@ -1218,7 +1146,7 @@ namespace Model * exception including the account ID, stream name, and shard ID of the record that * was throttled. For more information about partially successful responses, see Adding - * Multiple Records with PutRecords in the Amazon Kinesis Streams Developer + * Multiple Records with PutRecords in the Amazon Kinesis Developer * Guide.

By default, data records are accessible for only 24 hours from * the time that they are added to an Amazon Kinesis stream. This retention period * can be modified using the DecreaseStreamRetentionPeriod and @@ -1227,33 +1155,33 @@ namespace Model virtual Model::PutRecordsOutcome PutRecords(const Model::PutRecordsRequest& request) const; /** - *

Writes multiple data records into an Amazon Kinesis stream in a single call - * (also referred to as a PutRecords request). Use this operation to - * send data into the stream for data ingestion and processing.

Each - * PutRecords request can support up to 500 records. Each record in - * the request can be as large as 1 MB, up to a limit of 5 MB for the entire - * request, including partition keys. Each shard can support writes up to 1,000 - * records per second, up to a maximum data write total of 1 MB per second.

- *

You must specify the name of the stream that captures, stores, and transports - * the data; and an array of request Records, with each record in the - * array requiring a partition key and data blob. The record size limit applies to - * the total size of the partition key and data blob.

The data blob can be - * any type of data; for example, a segment from a log file, geographic/location - * data, website clickstream data, and so on.

The partition key is used by - * Amazon Kinesis as input to a hash function that maps the partition key and - * associated data to a specific shard. An MD5 hash function is used to map - * partition keys to 128-bit integer values and to map associated data records to - * shards. As a result of this hashing mechanism, all data records with the same - * partition key map to the same shard within the stream. For more information, see - * Writes multiple data records from a producer into an Amazon Kinesis stream in + * a single call (also referred to as a PutRecords request). Use this + * operation to send data from a data producer into the Amazon Kinesis stream for + * data ingestion and processing.

Each PutRecords request can + * support up to 500 records. Each record in the request can be as large as 1 MB, + * up to a limit of 5 MB for the entire request, including partition keys. Each + * shard can support writes up to 1,000 records per second, up to a maximum data + * write total of 1 MB per second.

You must specify the name of the stream + * that captures, stores, and transports the data; and an array of request + * Records, with each record in the array requiring a partition key + * and data blob. The record size limit applies to the total size of the partition + * key and data blob.

The data blob can be any type of data; for example, a + * segment from a log file, geographic/location data, website clickstream data, and + * so on.

The partition key is used by Amazon Kinesis as input to a hash + * function that maps the partition key and associated data to a specific shard. An + * MD5 hash function is used to map partition keys to 128-bit integer values and to + * map associated data records to shards. As a result of this hashing mechanism, + * all data records with the same partition key map to the same shard within the + * stream. For more information, see Adding - * Data to a Stream in the Amazon Kinesis Streams Developer Guide.

- *

Each record in the Records array may include an optional - * parameter, ExplicitHashKey, which overrides the partition key to - * shard mapping. This parameter allows a data producer to determine explicitly the - * shard where the record is stored. For more information, see in the Amazon Kinesis Developer Guide.

Each + * record in the Records array may include an optional parameter, + * ExplicitHashKey, which overrides the partition key to shard + * mapping. This parameter allows a data producer to determine explicitly the shard + * where the record is stored. For more information, see Adding - * Multiple Records with PutRecords in the Amazon Kinesis Streams Developer + * Multiple Records with PutRecords in the Amazon Kinesis Developer * Guide.

The PutRecords response includes an array of * response Records. Each record in the response array directly * correlates with a record in the request array using natural ordering, from the @@ -1276,7 +1204,7 @@ namespace Model * exception including the account ID, stream name, and shard ID of the record that * was throttled. For more information about partially successful responses, see Adding - * Multiple Records with PutRecords in the Amazon Kinesis Streams Developer + * Multiple Records with PutRecords in the Amazon Kinesis Developer * Guide.

By default, data records are accessible for only 24 hours from * the time that they are added to an Amazon Kinesis stream. This retention period * can be modified using the DecreaseStreamRetentionPeriod and @@ -1287,33 +1215,33 @@ namespace Model virtual Model::PutRecordsOutcomeCallable PutRecordsCallable(const Model::PutRecordsRequest& request) const; /** - *

Writes multiple data records into an Amazon Kinesis stream in a single call - * (also referred to as a PutRecords request). Use this operation to - * send data into the stream for data ingestion and processing.

Each - * PutRecords request can support up to 500 records. Each record in - * the request can be as large as 1 MB, up to a limit of 5 MB for the entire - * request, including partition keys. Each shard can support writes up to 1,000 - * records per second, up to a maximum data write total of 1 MB per second.

- *

You must specify the name of the stream that captures, stores, and transports - * the data; and an array of request Records, with each record in the - * array requiring a partition key and data blob. The record size limit applies to - * the total size of the partition key and data blob.

The data blob can be - * any type of data; for example, a segment from a log file, geographic/location - * data, website clickstream data, and so on.

The partition key is used by - * Amazon Kinesis as input to a hash function that maps the partition key and - * associated data to a specific shard. An MD5 hash function is used to map - * partition keys to 128-bit integer values and to map associated data records to - * shards. As a result of this hashing mechanism, all data records with the same - * partition key map to the same shard within the stream. For more information, see - * Writes multiple data records from a producer into an Amazon Kinesis stream in + * a single call (also referred to as a PutRecords request). Use this + * operation to send data from a data producer into the Amazon Kinesis stream for + * data ingestion and processing.

Each PutRecords request can + * support up to 500 records. Each record in the request can be as large as 1 MB, + * up to a limit of 5 MB for the entire request, including partition keys. Each + * shard can support writes up to 1,000 records per second, up to a maximum data + * write total of 1 MB per second.

You must specify the name of the stream + * that captures, stores, and transports the data; and an array of request + * Records, with each record in the array requiring a partition key + * and data blob. The record size limit applies to the total size of the partition + * key and data blob.

The data blob can be any type of data; for example, a + * segment from a log file, geographic/location data, website clickstream data, and + * so on.

The partition key is used by Amazon Kinesis as input to a hash + * function that maps the partition key and associated data to a specific shard. An + * MD5 hash function is used to map partition keys to 128-bit integer values and to + * map associated data records to shards. As a result of this hashing mechanism, + * all data records with the same partition key map to the same shard within the + * stream. For more information, see Adding - * Data to a Stream in the Amazon Kinesis Streams Developer Guide.

- *

Each record in the Records array may include an optional - * parameter, ExplicitHashKey, which overrides the partition key to - * shard mapping. This parameter allows a data producer to determine explicitly the - * shard where the record is stored. For more information, see in the Amazon Kinesis Developer Guide.

Each + * record in the Records array may include an optional parameter, + * ExplicitHashKey, which overrides the partition key to shard + * mapping. This parameter allows a data producer to determine explicitly the shard + * where the record is stored. For more information, see Adding - * Multiple Records with PutRecords in the Amazon Kinesis Streams Developer + * Multiple Records with PutRecords in the Amazon Kinesis Developer * Guide.

The PutRecords response includes an array of * response Records. Each record in the response array directly * correlates with a record in the request array using natural ordering, from the @@ -1336,7 +1264,7 @@ namespace Model * exception including the account ID, stream name, and shard ID of the record that * was throttled. For more information about partially successful responses, see Adding - * Multiple Records with PutRecords in the Amazon Kinesis Streams Developer + * Multiple Records with PutRecords in the Amazon Kinesis Developer * Guide.

By default, data records are accessible for only 24 hours from * the time that they are added to an Amazon Kinesis stream. This retention period * can be modified using the DecreaseStreamRetentionPeriod and @@ -1347,48 +1275,45 @@ namespace Model virtual void PutRecordsAsync(const Model::PutRecordsRequest& request, const PutRecordsResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; /** - *

Removes tags from the specified Amazon Kinesis stream. Removed tags are - * deleted and cannot be recovered after this operation successfully completes.

- *

If you specify a tag that does not exist, it is ignored.

+ *

Deletes tags from the specified Amazon Kinesis stream.

If you specify + * a tag that does not exist, it is ignored.

*/ virtual Model::RemoveTagsFromStreamOutcome RemoveTagsFromStream(const Model::RemoveTagsFromStreamRequest& request) const; /** - *

Removes tags from the specified Amazon Kinesis stream. Removed tags are - * deleted and cannot be recovered after this operation successfully completes.

- *

If you specify a tag that does not exist, it is ignored.

+ *

Deletes tags from the specified Amazon Kinesis stream.

If you specify + * a tag that does not exist, it is ignored.

* * returns a future to the operation so that it can be executed in parallel to other requests. */ virtual Model::RemoveTagsFromStreamOutcomeCallable RemoveTagsFromStreamCallable(const Model::RemoveTagsFromStreamRequest& request) const; /** - *

Removes tags from the specified Amazon Kinesis stream. Removed tags are - * deleted and cannot be recovered after this operation successfully completes.

- *

If you specify a tag that does not exist, it is ignored.

+ *

Deletes tags from the specified Amazon Kinesis stream.

If you specify + * a tag that does not exist, it is ignored.

* * Queues the request into a thread executor and triggers associated callback when operation has finished. */ virtual void RemoveTagsFromStreamAsync(const Model::RemoveTagsFromStreamRequest& request, const RemoveTagsFromStreamResponseReceivedHandler& handler, const std::shared_ptr& context = nullptr) const; /** - *

Splits a shard into two new shards in the Amazon Kinesis stream to increase - * the stream's capacity to ingest and transport data. SplitShard is - * called when there is a need to increase the overall capacity of a stream because - * of an expected increase in the volume of data records being ingested.

- *

You can also use SplitShard when a shard appears to be - * approaching its maximum utilization; for example, the producers sending data - * into the specific shard are suddenly sending more than previously anticipated. - * You can also call SplitShard to increase stream capacity, so that - * more Amazon Kinesis applications can simultaneously read data from the stream - * for real-time processing.

You must specify the shard to be split and the - * new hash key, which is the position in the shard where the shard gets split in - * two. In many cases, the new hash key might simply be the average of the - * beginning and ending hash key, but it can be any hash key value in the range - * being mapped into the shard. For more information about splitting shards, see Splits a shard into two new shards in the stream, to increase the stream's + * capacity to ingest and transport data. SplitShard is called when + * there is a need to increase the overall capacity of stream because of an + * expected increase in the volume of data records being ingested.

You can + * also use SplitShard when a shard appears to be approaching its + * maximum utilization, for example, when the set of producers sending data into + * the specific shard are suddenly sending more than previously anticipated. You + * can also call SplitShard to increase stream capacity, so that more + * Amazon Kinesis applications can simultaneously read data from the stream for + * real-time processing.

You must specify the shard to be split and the new + * hash key, which is the position in the shard where the shard gets split in two. + * In many cases, the new hash key might simply be the average of the beginning and + * ending hash key, but it can be any hash key value in the range being mapped into + * the shard. For more information about splitting shards, see Split - * a Shard in the Amazon Kinesis Streams Developer Guide.

You can - * use DescribeStream to determine the shard ID and hash key values for the + * a Shard in the Amazon Kinesis Developer Guide.

You can use + * DescribeStream to determine the shard ID and hash key values for the * ShardToSplit and NewStartingHashKey parameters that * are specified in the SplitShard request.

*

SplitShard is an asynchronous operation. Upon receiving a @@ -1407,12 +1332,11 @@ namespace Model * are authorized for your account, you receive a * LimitExceededException.

For the default shard limit for an * AWS account, see Streams - * Limits in the Amazon Kinesis Streams Developer Guide. If you need to - * increase this limit, Amazon + * Kinesis Limits. If you need to increase this limit, contact - * AWS Support.

If you try to operate on too many streams simultaneously - * using CreateStream, DeleteStream, MergeShards, and/or + * AWS Support.

If you try to operate on too many streams in parallel + * using CreateStream, DeleteStream, MergeShards or * SplitShard, you receive a LimitExceededException.

*

SplitShard has limit of 5 transactions per second per * account.

@@ -1420,23 +1344,23 @@ namespace Model virtual Model::SplitShardOutcome SplitShard(const Model::SplitShardRequest& request) const; /** - *

Splits a shard into two new shards in the Amazon Kinesis stream to increase - * the stream's capacity to ingest and transport data. SplitShard is - * called when there is a need to increase the overall capacity of a stream because - * of an expected increase in the volume of data records being ingested.

- *

You can also use SplitShard when a shard appears to be - * approaching its maximum utilization; for example, the producers sending data - * into the specific shard are suddenly sending more than previously anticipated. - * You can also call SplitShard to increase stream capacity, so that - * more Amazon Kinesis applications can simultaneously read data from the stream - * for real-time processing.

You must specify the shard to be split and the - * new hash key, which is the position in the shard where the shard gets split in - * two. In many cases, the new hash key might simply be the average of the - * beginning and ending hash key, but it can be any hash key value in the range - * being mapped into the shard. For more information about splitting shards, see Splits a shard into two new shards in the stream, to increase the stream's + * capacity to ingest and transport data. SplitShard is called when + * there is a need to increase the overall capacity of stream because of an + * expected increase in the volume of data records being ingested.

You can + * also use SplitShard when a shard appears to be approaching its + * maximum utilization, for example, when the set of producers sending data into + * the specific shard are suddenly sending more than previously anticipated. You + * can also call SplitShard to increase stream capacity, so that more + * Amazon Kinesis applications can simultaneously read data from the stream for + * real-time processing.

You must specify the shard to be split and the new + * hash key, which is the position in the shard where the shard gets split in two. + * In many cases, the new hash key might simply be the average of the beginning and + * ending hash key, but it can be any hash key value in the range being mapped into + * the shard. For more information about splitting shards, see Split - * a Shard in the Amazon Kinesis Streams Developer Guide.

You can - * use DescribeStream to determine the shard ID and hash key values for the + * a Shard in the Amazon Kinesis Developer Guide.

You can use + * DescribeStream to determine the shard ID and hash key values for the * ShardToSplit and NewStartingHashKey parameters that * are specified in the SplitShard request.

*

SplitShard is an asynchronous operation. Upon receiving a @@ -1455,12 +1379,11 @@ namespace Model * are authorized for your account, you receive a * LimitExceededException.

For the default shard limit for an * AWS account, see Streams - * Limits in the Amazon Kinesis Streams Developer Guide. If you need to - * increase this limit, Amazon + * Kinesis Limits. If you need to increase this limit, contact - * AWS Support.

If you try to operate on too many streams simultaneously - * using CreateStream, DeleteStream, MergeShards, and/or + * AWS Support.

If you try to operate on too many streams in parallel + * using CreateStream, DeleteStream, MergeShards or * SplitShard, you receive a LimitExceededException.

*

SplitShard has limit of 5 transactions per second per * account.

@@ -1470,23 +1393,23 @@ namespace Model virtual Model::SplitShardOutcomeCallable SplitShardCallable(const Model::SplitShardRequest& request) const; /** - *

Splits a shard into two new shards in the Amazon Kinesis stream to increase - * the stream's capacity to ingest and transport data. SplitShard is - * called when there is a need to increase the overall capacity of a stream because - * of an expected increase in the volume of data records being ingested.

- *

You can also use SplitShard when a shard appears to be - * approaching its maximum utilization; for example, the producers sending data - * into the specific shard are suddenly sending more than previously anticipated. - * You can also call SplitShard to increase stream capacity, so that - * more Amazon Kinesis applications can simultaneously read data from the stream - * for real-time processing.

You must specify the shard to be split and the - * new hash key, which is the position in the shard where the shard gets split in - * two. In many cases, the new hash key might simply be the average of the - * beginning and ending hash key, but it can be any hash key value in the range - * being mapped into the shard. For more information about splitting shards, see Splits a shard into two new shards in the stream, to increase the stream's + * capacity to ingest and transport data. SplitShard is called when + * there is a need to increase the overall capacity of stream because of an + * expected increase in the volume of data records being ingested.

You can + * also use SplitShard when a shard appears to be approaching its + * maximum utilization, for example, when the set of producers sending data into + * the specific shard are suddenly sending more than previously anticipated. You + * can also call SplitShard to increase stream capacity, so that more + * Amazon Kinesis applications can simultaneously read data from the stream for + * real-time processing.

You must specify the shard to be split and the new + * hash key, which is the position in the shard where the shard gets split in two. + * In many cases, the new hash key might simply be the average of the beginning and + * ending hash key, but it can be any hash key value in the range being mapped into + * the shard. For more information about splitting shards, see Split - * a Shard in the Amazon Kinesis Streams Developer Guide.

You can - * use DescribeStream to determine the shard ID and hash key values for the + * a Shard in the Amazon Kinesis Developer Guide.

You can use + * DescribeStream to determine the shard ID and hash key values for the * ShardToSplit and NewStartingHashKey parameters that * are specified in the SplitShard request.

*

SplitShard is an asynchronous operation. Upon receiving a @@ -1505,12 +1428,11 @@ namespace Model * are authorized for your account, you receive a * LimitExceededException.

For the default shard limit for an * AWS account, see Streams - * Limits in the Amazon Kinesis Streams Developer Guide. If you need to - * increase this limit, Amazon + * Kinesis Limits. If you need to increase this limit, contact - * AWS Support.

If you try to operate on too many streams simultaneously - * using CreateStream, DeleteStream, MergeShards, and/or + * AWS Support.

If you try to operate on too many streams in parallel + * using CreateStream, DeleteStream, MergeShards or * SplitShard, you receive a LimitExceededException.

*

SplitShard has limit of 5 transactions per second per * account.

@@ -1529,8 +1451,6 @@ namespace Model void DecreaseStreamRetentionPeriodAsyncHelper(const Model::DecreaseStreamRetentionPeriodRequest& request, const DecreaseStreamRetentionPeriodResponseReceivedHandler& handler, const std::shared_ptr& context) const; void DeleteStreamAsyncHelper(const Model::DeleteStreamRequest& request, const DeleteStreamResponseReceivedHandler& handler, const std::shared_ptr& context) const; void DescribeStreamAsyncHelper(const Model::DescribeStreamRequest& request, const DescribeStreamResponseReceivedHandler& handler, const std::shared_ptr& context) const; - void DisableEnhancedMonitoringAsyncHelper(const Model::DisableEnhancedMonitoringRequest& request, const DisableEnhancedMonitoringResponseReceivedHandler& handler, const std::shared_ptr& context) const; - void EnableEnhancedMonitoringAsyncHelper(const Model::EnableEnhancedMonitoringRequest& request, const EnableEnhancedMonitoringResponseReceivedHandler& handler, const std::shared_ptr& context) const; void GetRecordsAsyncHelper(const Model::GetRecordsRequest& request, const GetRecordsResponseReceivedHandler& handler, const std::shared_ptr& context) const; void GetShardIteratorAsyncHelper(const Model::GetShardIteratorRequest& request, const GetShardIteratorResponseReceivedHandler& handler, const std::shared_ptr& context) const; void IncreaseStreamRetentionPeriodAsyncHelper(const Model::IncreaseStreamRetentionPeriodRequest& request, const IncreaseStreamRetentionPeriodResponseReceivedHandler& handler, const std::shared_ptr& context) const; diff --git a/aws-cpp-sdk-kinesis/source/KinesisErrors.cpp b/aws-cpp-sdk-kinesis/source/KinesisErrors.cpp index 38aa4cb0ac1..c3d9e460a4c 100644 --- a/aws-cpp-sdk-kinesis/source/KinesisErrors.cpp +++ b/aws-cpp-sdk-kinesis/source/KinesisErrors.cpp @@ -20,12 +20,6 @@ using namespace Aws::Client; using namespace Aws::Kinesis; using namespace Aws::Utils; -static const int RESOURCE_IN_USE_HASH = HashingUtils::HashString("ResourceInUseException"); -static const int PROVISIONED_THROUGHPUT_EXCEEDED_HASH = HashingUtils::HashString("ProvisionedThroughputExceededException"); -static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); -static const int EXPIRED_ITERATOR_HASH = HashingUtils::HashString("ExpiredIteratorException"); -static const int INVALID_ARGUMENT_HASH = HashingUtils::HashString("InvalidArgumentException"); - namespace Aws { namespace Kinesis @@ -33,19 +27,18 @@ namespace Kinesis namespace KinesisErrorMapper { +static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); +static const int EXPIRED_ITERATOR_HASH = HashingUtils::HashString("ExpiredIteratorException"); +static const int RESOURCE_IN_USE_HASH = HashingUtils::HashString("ResourceInUseException"); +static const int INVALID_ARGUMENT_HASH = HashingUtils::HashString("InvalidArgumentException"); +static const int PROVISIONED_THROUGHPUT_EXCEEDED_HASH = HashingUtils::HashString("ProvisionedThroughputExceededException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); - if (hashCode == RESOURCE_IN_USE_HASH) - { - return AWSError(static_cast(KinesisErrors::RESOURCE_IN_USE), false); - } - else if (hashCode == PROVISIONED_THROUGHPUT_EXCEEDED_HASH) - { - return AWSError(static_cast(KinesisErrors::PROVISIONED_THROUGHPUT_EXCEEDED), false); - } - else if (hashCode == LIMIT_EXCEEDED_HASH) + if (hashCode == LIMIT_EXCEEDED_HASH) { return AWSError(static_cast(KinesisErrors::LIMIT_EXCEEDED), false); } @@ -53,10 +46,18 @@ AWSError GetErrorForName(const char* errorName) { return AWSError(static_cast(KinesisErrors::EXPIRED_ITERATOR), false); } + else if (hashCode == RESOURCE_IN_USE_HASH) + { + return AWSError(static_cast(KinesisErrors::RESOURCE_IN_USE), false); + } else if (hashCode == INVALID_ARGUMENT_HASH) { return AWSError(static_cast(KinesisErrors::INVALID_ARGUMENT), false); } + else if (hashCode == PROVISIONED_THROUGHPUT_EXCEEDED_HASH) + { + return AWSError(static_cast(KinesisErrors::PROVISIONED_THROUGHPUT_EXCEEDED), false); + } return AWSError(CoreErrors::UNKNOWN, false); } diff --git a/aws-cpp-sdk-kinesis/source/model/HashKeyRange.cpp b/aws-cpp-sdk-kinesis/source/model/HashKeyRange.cpp index ddc24878489..d514c087f31 100644 --- a/aws-cpp-sdk-kinesis/source/model/HashKeyRange.cpp +++ b/aws-cpp-sdk-kinesis/source/model/HashKeyRange.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Kinesis::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Kinesis +{ +namespace Model +{ + HashKeyRange::HashKeyRange() : m_startingHashKeyHasBeenSet(false), m_endingHashKeyHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue HashKeyRange::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Kinesis +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-kinesis/source/model/PutRecordsRequestEntry.cpp b/aws-cpp-sdk-kinesis/source/model/PutRecordsRequestEntry.cpp index db0bb3ba343..5fd9961cb6b 100644 --- a/aws-cpp-sdk-kinesis/source/model/PutRecordsRequestEntry.cpp +++ b/aws-cpp-sdk-kinesis/source/model/PutRecordsRequestEntry.cpp @@ -18,10 +18,16 @@ #include -using namespace Aws::Kinesis::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Kinesis +{ +namespace Model +{ + PutRecordsRequestEntry::PutRecordsRequestEntry() : m_dataHasBeenSet(false), m_explicitHashKeyHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue PutRecordsRequestEntry::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Kinesis +} // namespace Aws diff --git a/aws-cpp-sdk-kinesis/source/model/PutRecordsResultEntry.cpp b/aws-cpp-sdk-kinesis/source/model/PutRecordsResultEntry.cpp index cbda2d2a2fb..66f0ad617ef 100644 --- a/aws-cpp-sdk-kinesis/source/model/PutRecordsResultEntry.cpp +++ b/aws-cpp-sdk-kinesis/source/model/PutRecordsResultEntry.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Kinesis::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Kinesis +{ +namespace Model +{ + PutRecordsResultEntry::PutRecordsResultEntry() : m_sequenceNumberHasBeenSet(false), m_shardIdHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue PutRecordsResultEntry::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Kinesis +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-kinesis/source/model/Record.cpp b/aws-cpp-sdk-kinesis/source/model/Record.cpp index 5792cd458a8..0e6bdd144ea 100644 --- a/aws-cpp-sdk-kinesis/source/model/Record.cpp +++ b/aws-cpp-sdk-kinesis/source/model/Record.cpp @@ -18,10 +18,16 @@ #include -using namespace Aws::Kinesis::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Kinesis +{ +namespace Model +{ + Record::Record() : m_sequenceNumberHasBeenSet(false), m_approximateArrivalTimestampHasBeenSet(false), @@ -98,4 +104,8 @@ JsonValue Record::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Kinesis +} // namespace Aws diff --git a/aws-cpp-sdk-kinesis/source/model/SequenceNumberRange.cpp b/aws-cpp-sdk-kinesis/source/model/SequenceNumberRange.cpp index ba416d9591c..885ed5178b9 100644 --- a/aws-cpp-sdk-kinesis/source/model/SequenceNumberRange.cpp +++ b/aws-cpp-sdk-kinesis/source/model/SequenceNumberRange.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Kinesis::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Kinesis +{ +namespace Model +{ + SequenceNumberRange::SequenceNumberRange() : m_startingSequenceNumberHasBeenSet(false), m_endingSequenceNumberHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue SequenceNumberRange::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Kinesis +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-kinesis/source/model/Shard.cpp b/aws-cpp-sdk-kinesis/source/model/Shard.cpp index d57c8fb1afa..6cdd3a9d397 100644 --- a/aws-cpp-sdk-kinesis/source/model/Shard.cpp +++ b/aws-cpp-sdk-kinesis/source/model/Shard.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Kinesis::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Kinesis +{ +namespace Model +{ + Shard::Shard() : m_shardIdHasBeenSet(false), m_parentShardIdHasBeenSet(false), @@ -115,4 +121,8 @@ JsonValue Shard::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Kinesis +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-kinesis/source/model/ShardIteratorType.cpp b/aws-cpp-sdk-kinesis/source/model/ShardIteratorType.cpp index cfcfe15e600..7636c4b785d 100644 --- a/aws-cpp-sdk-kinesis/source/model/ShardIteratorType.cpp +++ b/aws-cpp-sdk-kinesis/source/model/ShardIteratorType.cpp @@ -15,15 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int AT_SEQUENCE_NUMBER_HASH = HashingUtils::HashString("AT_SEQUENCE_NUMBER"); -static const int AFTER_SEQUENCE_NUMBER_HASH = HashingUtils::HashString("AFTER_SEQUENCE_NUMBER"); -static const int TRIM_HORIZON_HASH = HashingUtils::HashString("TRIM_HORIZON"); -static const int LATEST_HASH = HashingUtils::HashString("LATEST"); -static const int AT_TIMESTAMP_HASH = HashingUtils::HashString("AT_TIMESTAMP"); namespace Aws { @@ -34,6 +28,11 @@ namespace Aws namespace ShardIteratorTypeMapper { + static const int AT_SEQUENCE_NUMBER_HASH = HashingUtils::HashString("AT_SEQUENCE_NUMBER"); + static const int AFTER_SEQUENCE_NUMBER_HASH = HashingUtils::HashString("AFTER_SEQUENCE_NUMBER"); + static const int TRIM_HORIZON_HASH = HashingUtils::HashString("TRIM_HORIZON"); + static const int LATEST_HASH = HashingUtils::HashString("LATEST"); + ShardIteratorType GetShardIteratorTypeForName(const Aws::String& name) { @@ -54,11 +53,7 @@ namespace Aws { return ShardIteratorType::LATEST; } - else if (hashCode == AT_TIMESTAMP_HASH) - { - return ShardIteratorType::AT_TIMESTAMP; - } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -80,10 +75,8 @@ namespace Aws return "TRIM_HORIZON"; case ShardIteratorType::LATEST: return "LATEST"; - case ShardIteratorType::AT_TIMESTAMP: - return "AT_TIMESTAMP"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-kinesis/source/model/StreamDescription.cpp b/aws-cpp-sdk-kinesis/source/model/StreamDescription.cpp index 8e3a7bbc9f6..6449f232c7c 100644 --- a/aws-cpp-sdk-kinesis/source/model/StreamDescription.cpp +++ b/aws-cpp-sdk-kinesis/source/model/StreamDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Kinesis::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Kinesis +{ +namespace Model +{ + StreamDescription::StreamDescription() : m_streamNameHasBeenSet(false), m_streamARNHasBeenSet(false), @@ -164,4 +170,8 @@ JsonValue StreamDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Kinesis +} // namespace Aws diff --git a/aws-cpp-sdk-kinesis/source/model/StreamStatus.cpp b/aws-cpp-sdk-kinesis/source/model/StreamStatus.cpp index 11f389a355f..92b370a360a 100644 --- a/aws-cpp-sdk-kinesis/source/model/StreamStatus.cpp +++ b/aws-cpp-sdk-kinesis/source/model/StreamStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int CREATING_HASH = HashingUtils::HashString("CREATING"); -static const int DELETING_HASH = HashingUtils::HashString("DELETING"); -static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); -static const int UPDATING_HASH = HashingUtils::HashString("UPDATING"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace StreamStatusMapper { + static const int CREATING_HASH = HashingUtils::HashString("CREATING"); + static const int DELETING_HASH = HashingUtils::HashString("DELETING"); + static const int ACTIVE_HASH = HashingUtils::HashString("ACTIVE"); + static const int UPDATING_HASH = HashingUtils::HashString("UPDATING"); + StreamStatus GetStreamStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-kinesis/source/model/Tag.cpp b/aws-cpp-sdk-kinesis/source/model/Tag.cpp index 096ca8279fd..8ef1c861a5e 100644 --- a/aws-cpp-sdk-kinesis/source/model/Tag.cpp +++ b/aws-cpp-sdk-kinesis/source/model/Tag.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Kinesis::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Kinesis +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Tag::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Kinesis +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-kms/CMakeLists.txt b/aws-cpp-sdk-kms/CMakeLists.txt index 2588b6c11b0..327d57eb434 100644 --- a/aws-cpp-sdk-kms/CMakeLists.txt +++ b/aws-cpp-sdk-kms/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-kms) "source/model/*.cpp" ) - file(GLOB KMS_SRC + file(GLOB KMS_UNIFIED_HEADERS ${AWS_KMS_HEADERS} ${AWS_KMS_MODEL_HEADERS} + ) + + file(GLOB KMS_UNITY_SRC ${AWS_KMS_SOURCE} ${AWS_KMS_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("KMS" KMS_UNITY_SRC) + endif() + + file(GLOB KMS_SRC + ${KMS_UNIFIED_HEADERS} + ${KMS_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-kms/source/KMSErrors.cpp b/aws-cpp-sdk-kms/source/KMSErrors.cpp index b8a750ec903..f90af42aa51 100644 --- a/aws-cpp-sdk-kms/source/KMSErrors.cpp +++ b/aws-cpp-sdk-kms/source/KMSErrors.cpp @@ -20,24 +20,6 @@ using namespace Aws::Client; using namespace Aws::KMS; using namespace Aws::Utils; -static const int INVALID_ALIAS_NAME_HASH = HashingUtils::HashString("InvalidAliasNameException"); -static const int K_M_S_INTERNAL_HASH = HashingUtils::HashString("KMSInternalException"); -static const int INVALID_KEY_USAGE_HASH = HashingUtils::HashString("InvalidKeyUsageException"); -static const int INVALID_GRANT_ID_HASH = HashingUtils::HashString("InvalidGrantIdException"); -static const int NOT_FOUND_HASH = HashingUtils::HashString("NotFoundException"); -static const int UNSUPPORTED_OPERATION_HASH = HashingUtils::HashString("UnsupportedOperationException"); -static const int DISABLED_HASH = HashingUtils::HashString("DisabledException"); -static const int INVALID_CIPHERTEXT_HASH = HashingUtils::HashString("InvalidCiphertextException"); -static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); -static const int INVALID_GRANT_TOKEN_HASH = HashingUtils::HashString("InvalidGrantTokenException"); -static const int K_M_S_INVALID_STATE_HASH = HashingUtils::HashString("KMSInvalidStateException"); -static const int DEPENDENCY_TIMEOUT_HASH = HashingUtils::HashString("DependencyTimeoutException"); -static const int INVALID_ARN_HASH = HashingUtils::HashString("InvalidArnException"); -static const int INVALID_MARKER_HASH = HashingUtils::HashString("InvalidMarkerException"); -static const int ALREADY_EXISTS_HASH = HashingUtils::HashString("AlreadyExistsException"); -static const int KEY_UNAVAILABLE_HASH = HashingUtils::HashString("KeyUnavailableException"); -static const int MALFORMED_POLICY_DOCUMENT_HASH = HashingUtils::HashString("MalformedPolicyDocumentException"); - namespace Aws { namespace KMS @@ -45,37 +27,56 @@ namespace KMS namespace KMSErrorMapper { +static const int DEPENDENCY_TIMEOUT_HASH = HashingUtils::HashString("DependencyTimeout"); +static const int INVALID_ALIAS_NAME_HASH = HashingUtils::HashString("InvalidAliasName"); +static const int UNSUPPORTED_OPERATION_HASH = HashingUtils::HashString("UnsupportedOperation"); +static const int DISABLED_HASH = HashingUtils::HashString("Disabled"); +static const int MALFORMED_POLICY_DOCUMENT_HASH = HashingUtils::HashString("MalformedPolicyDocument"); +static const int NOT_FOUND_HASH = HashingUtils::HashString("NotFound"); +static const int INVALID_ARN_HASH = HashingUtils::HashString("InvalidArn"); +static const int INVALID_CIPHERTEXT_HASH = HashingUtils::HashString("InvalidCiphertext"); +static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceeded"); +static const int INVALID_GRANT_TOKEN_HASH = HashingUtils::HashString("InvalidGrantToken"); +static const int INVALID_MARKER_HASH = HashingUtils::HashString("InvalidMarker"); +static const int INVALID_GRANT_ID_HASH = HashingUtils::HashString("InvalidGrantId"); +static const int KEY_UNAVAILABLE_HASH = HashingUtils::HashString("KeyUnavailable"); +static const int K_M_S_INVALID_STATE_HASH = HashingUtils::HashString("KMSInvalidStateException"); +static const int K_M_S_INTERNAL_HASH = HashingUtils::HashString("KMSInternal"); +static const int ALREADY_EXISTS_HASH = HashingUtils::HashString("AlreadyExists"); +static const int INVALID_KEY_USAGE_HASH = HashingUtils::HashString("InvalidKeyUsage"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); - if (hashCode == INVALID_ALIAS_NAME_HASH) + if (hashCode == DEPENDENCY_TIMEOUT_HASH) + { + return AWSError(static_cast(KMSErrors::DEPENDENCY_TIMEOUT), true); + } + else if (hashCode == INVALID_ALIAS_NAME_HASH) { return AWSError(static_cast(KMSErrors::INVALID_ALIAS_NAME), false); } - else if (hashCode == K_M_S_INTERNAL_HASH) + else if (hashCode == UNSUPPORTED_OPERATION_HASH) { - return AWSError(static_cast(KMSErrors::K_M_S_INTERNAL), false); + return AWSError(static_cast(KMSErrors::UNSUPPORTED_OPERATION), false); } - else if (hashCode == INVALID_KEY_USAGE_HASH) + else if (hashCode == DISABLED_HASH) { - return AWSError(static_cast(KMSErrors::INVALID_KEY_USAGE), false); + return AWSError(static_cast(KMSErrors::DISABLED), false); } - else if (hashCode == INVALID_GRANT_ID_HASH) + else if (hashCode == MALFORMED_POLICY_DOCUMENT_HASH) { - return AWSError(static_cast(KMSErrors::INVALID_GRANT_ID), false); + return AWSError(static_cast(KMSErrors::MALFORMED_POLICY_DOCUMENT), false); } else if (hashCode == NOT_FOUND_HASH) { return AWSError(static_cast(KMSErrors::NOT_FOUND), false); } - else if (hashCode == UNSUPPORTED_OPERATION_HASH) - { - return AWSError(static_cast(KMSErrors::UNSUPPORTED_OPERATION), false); - } - else if (hashCode == DISABLED_HASH) + else if (hashCode == INVALID_ARN_HASH) { - return AWSError(static_cast(KMSErrors::DISABLED), false); + return AWSError(static_cast(KMSErrors::INVALID_ARN), false); } else if (hashCode == INVALID_CIPHERTEXT_HASH) { @@ -89,33 +90,33 @@ AWSError GetErrorForName(const char* errorName) { return AWSError(static_cast(KMSErrors::INVALID_GRANT_TOKEN), false); } - else if (hashCode == K_M_S_INVALID_STATE_HASH) + else if (hashCode == INVALID_MARKER_HASH) { - return AWSError(static_cast(KMSErrors::K_M_S_INVALID_STATE), false); + return AWSError(static_cast(KMSErrors::INVALID_MARKER), false); } - else if (hashCode == DEPENDENCY_TIMEOUT_HASH) + else if (hashCode == INVALID_GRANT_ID_HASH) { - return AWSError(static_cast(KMSErrors::DEPENDENCY_TIMEOUT), false); + return AWSError(static_cast(KMSErrors::INVALID_GRANT_ID), false); } - else if (hashCode == INVALID_ARN_HASH) + else if (hashCode == KEY_UNAVAILABLE_HASH) { - return AWSError(static_cast(KMSErrors::INVALID_ARN), false); + return AWSError(static_cast(KMSErrors::KEY_UNAVAILABLE), true); } - else if (hashCode == INVALID_MARKER_HASH) + else if (hashCode == K_M_S_INVALID_STATE_HASH) { - return AWSError(static_cast(KMSErrors::INVALID_MARKER), false); + return AWSError(static_cast(KMSErrors::K_M_S_INVALID_STATE), false); } - else if (hashCode == ALREADY_EXISTS_HASH) + else if (hashCode == K_M_S_INTERNAL_HASH) { - return AWSError(static_cast(KMSErrors::ALREADY_EXISTS), false); + return AWSError(static_cast(KMSErrors::K_M_S_INTERNAL), true); } - else if (hashCode == KEY_UNAVAILABLE_HASH) + else if (hashCode == ALREADY_EXISTS_HASH) { - return AWSError(static_cast(KMSErrors::KEY_UNAVAILABLE), false); + return AWSError(static_cast(KMSErrors::ALREADY_EXISTS), false); } - else if (hashCode == MALFORMED_POLICY_DOCUMENT_HASH) + else if (hashCode == INVALID_KEY_USAGE_HASH) { - return AWSError(static_cast(KMSErrors::MALFORMED_POLICY_DOCUMENT), false); + return AWSError(static_cast(KMSErrors::INVALID_KEY_USAGE), false); } return AWSError(CoreErrors::UNKNOWN, false); } diff --git a/aws-cpp-sdk-kms/source/model/AliasListEntry.cpp b/aws-cpp-sdk-kms/source/model/AliasListEntry.cpp index 794867c3105..aa7e2182b38 100644 --- a/aws-cpp-sdk-kms/source/model/AliasListEntry.cpp +++ b/aws-cpp-sdk-kms/source/model/AliasListEntry.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::KMS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace KMS +{ +namespace Model +{ + AliasListEntry::AliasListEntry() : m_aliasNameHasBeenSet(false), m_aliasArnHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue AliasListEntry::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace KMS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-kms/source/model/DataKeySpec.cpp b/aws-cpp-sdk-kms/source/model/DataKeySpec.cpp index 0e2f581f429..331408c77ee 100644 --- a/aws-cpp-sdk-kms/source/model/DataKeySpec.cpp +++ b/aws-cpp-sdk-kms/source/model/DataKeySpec.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int AES_256_HASH = HashingUtils::HashString("AES_256"); -static const int AES_128_HASH = HashingUtils::HashString("AES_128"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace DataKeySpecMapper { + static const int AES_256_HASH = HashingUtils::HashString("AES_256"); + static const int AES_128_HASH = HashingUtils::HashString("AES_128"); + DataKeySpec GetDataKeySpecForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-kms/source/model/GrantConstraints.cpp b/aws-cpp-sdk-kms/source/model/GrantConstraints.cpp index 3a628ca0999..dfc5379d218 100644 --- a/aws-cpp-sdk-kms/source/model/GrantConstraints.cpp +++ b/aws-cpp-sdk-kms/source/model/GrantConstraints.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::KMS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace KMS +{ +namespace Model +{ + GrantConstraints::GrantConstraints() : m_encryptionContextSubsetHasBeenSet(false), m_encryptionContextEqualsHasBeenSet(false) @@ -86,4 +92,8 @@ JsonValue GrantConstraints::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace KMS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-kms/source/model/GrantListEntry.cpp b/aws-cpp-sdk-kms/source/model/GrantListEntry.cpp index 2bb516b85e9..6c10e420be5 100644 --- a/aws-cpp-sdk-kms/source/model/GrantListEntry.cpp +++ b/aws-cpp-sdk-kms/source/model/GrantListEntry.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::KMS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace KMS +{ +namespace Model +{ + GrantListEntry::GrantListEntry() : m_keyIdHasBeenSet(false), m_grantIdHasBeenSet(false), @@ -182,4 +188,8 @@ JsonValue GrantListEntry::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace KMS +} // namespace Aws diff --git a/aws-cpp-sdk-kms/source/model/GrantOperation.cpp b/aws-cpp-sdk-kms/source/model/GrantOperation.cpp index 1b55bd96dc4..9259273e096 100644 --- a/aws-cpp-sdk-kms/source/model/GrantOperation.cpp +++ b/aws-cpp-sdk-kms/source/model/GrantOperation.cpp @@ -19,15 +19,6 @@ using namespace Aws::Utils; -static const int Decrypt_HASH = HashingUtils::HashString("Decrypt"); -static const int Encrypt_HASH = HashingUtils::HashString("Encrypt"); -static const int GenerateDataKey_HASH = HashingUtils::HashString("GenerateDataKey"); -static const int GenerateDataKeyWithoutPlaintext_HASH = HashingUtils::HashString("GenerateDataKeyWithoutPlaintext"); -static const int ReEncryptFrom_HASH = HashingUtils::HashString("ReEncryptFrom"); -static const int ReEncryptTo_HASH = HashingUtils::HashString("ReEncryptTo"); -static const int CreateGrant_HASH = HashingUtils::HashString("CreateGrant"); -static const int RetireGrant_HASH = HashingUtils::HashString("RetireGrant"); -static const int DescribeKey_HASH = HashingUtils::HashString("DescribeKey"); namespace Aws { @@ -38,6 +29,16 @@ namespace Aws namespace GrantOperationMapper { + static const int Decrypt_HASH = HashingUtils::HashString("Decrypt"); + static const int Encrypt_HASH = HashingUtils::HashString("Encrypt"); + static const int GenerateDataKey_HASH = HashingUtils::HashString("GenerateDataKey"); + static const int GenerateDataKeyWithoutPlaintext_HASH = HashingUtils::HashString("GenerateDataKeyWithoutPlaintext"); + static const int ReEncryptFrom_HASH = HashingUtils::HashString("ReEncryptFrom"); + static const int ReEncryptTo_HASH = HashingUtils::HashString("ReEncryptTo"); + static const int CreateGrant_HASH = HashingUtils::HashString("CreateGrant"); + static const int RetireGrant_HASH = HashingUtils::HashString("RetireGrant"); + static const int DescribeKey_HASH = HashingUtils::HashString("DescribeKey"); + GrantOperation GetGrantOperationForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-kms/source/model/KeyListEntry.cpp b/aws-cpp-sdk-kms/source/model/KeyListEntry.cpp index b7570814dc5..c748f89fd8b 100644 --- a/aws-cpp-sdk-kms/source/model/KeyListEntry.cpp +++ b/aws-cpp-sdk-kms/source/model/KeyListEntry.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::KMS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace KMS +{ +namespace Model +{ + KeyListEntry::KeyListEntry() : m_keyIdHasBeenSet(false), m_keyArnHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue KeyListEntry::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace KMS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-kms/source/model/KeyMetadata.cpp b/aws-cpp-sdk-kms/source/model/KeyMetadata.cpp index 831a37643b7..b546f672647 100644 --- a/aws-cpp-sdk-kms/source/model/KeyMetadata.cpp +++ b/aws-cpp-sdk-kms/source/model/KeyMetadata.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::KMS::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace KMS +{ +namespace Model +{ + KeyMetadata::KeyMetadata() : m_aWSAccountIdHasBeenSet(false), m_keyIdHasBeenSet(false), @@ -173,4 +179,8 @@ JsonValue KeyMetadata::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace KMS +} // namespace Aws diff --git a/aws-cpp-sdk-kms/source/model/KeyState.cpp b/aws-cpp-sdk-kms/source/model/KeyState.cpp index 482859864a3..ffee603eb58 100644 --- a/aws-cpp-sdk-kms/source/model/KeyState.cpp +++ b/aws-cpp-sdk-kms/source/model/KeyState.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int Enabled_HASH = HashingUtils::HashString("Enabled"); -static const int Disabled_HASH = HashingUtils::HashString("Disabled"); -static const int PendingDeletion_HASH = HashingUtils::HashString("PendingDeletion"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace KeyStateMapper { + static const int Enabled_HASH = HashingUtils::HashString("Enabled"); + static const int Disabled_HASH = HashingUtils::HashString("Disabled"); + static const int PendingDeletion_HASH = HashingUtils::HashString("PendingDeletion"); + KeyState GetKeyStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-kms/source/model/KeyUsageType.cpp b/aws-cpp-sdk-kms/source/model/KeyUsageType.cpp index 338d3d108dd..f14b87ecb91 100644 --- a/aws-cpp-sdk-kms/source/model/KeyUsageType.cpp +++ b/aws-cpp-sdk-kms/source/model/KeyUsageType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int ENCRYPT_DECRYPT_HASH = HashingUtils::HashString("ENCRYPT_DECRYPT"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace KeyUsageTypeMapper { + static const int ENCRYPT_DECRYPT_HASH = HashingUtils::HashString("ENCRYPT_DECRYPT"); + KeyUsageType GetKeyUsageTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-lambda-integration-tests/CMakeLists.txt b/aws-cpp-sdk-lambda-integration-tests/CMakeLists.txt index 8f9271fa4c9..106a1ad5ab0 100644 --- a/aws-cpp-sdk-lambda-integration-tests/CMakeLists.txt +++ b/aws-cpp-sdk-lambda-integration-tests/CMakeLists.txt @@ -25,7 +25,12 @@ set(AWS_LAMBDA_INTEGRATION_TEST_APPLICATION_INCLUDES project(${PROJECT_NAME}) include_directories(${AWS_LAMBDA_INTEGRATION_TEST_APPLICATION_INCLUDES}) -add_definitions(-DRESOURCES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/resources") + +if(PLATFORM_ANDROID) + add_definitions(-DRESOURCES_DIR="resources") +else() + add_definitions(-DRESOURCES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/resources") +endif() if(MSVC AND BUILD_SHARED_LIBS) add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1) diff --git a/aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp b/aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp index 39cdd83016e..5f5de5b2ce0 100644 --- a/aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp +++ b/aws-cpp-sdk-lambda-integration-tests/FunctionTest.cpp @@ -18,7 +18,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -86,8 +88,18 @@ class FunctionTest : public ::testing::Test { static std::shared_ptr m_limiter; static std::shared_ptr m_role; static std::shared_ptr m_accessManagementClient; + protected: + static Aws::String MakeFilePath(const Aws::String& localFile) + { + #ifdef __ANDROID__ + return Aws::Platform::GetCacheDirectory() + localFile; + #else + return localFile; + #endif + } + static void SetUpTestCase() { m_limiter = Aws::MakeShared>(ALLOCATION_TAG, 200000); @@ -235,6 +247,8 @@ class FunctionTest : public ::testing::Test { //Get the ARN off the IAM role. We'll need this for creating the functions. auto & roleARN = m_role->GetArn(); + std::cout << "Creating function " << functionName << " from location " << zipLocation << " with role arn " << roleARN << std::endl; + //Now attempt to create the function. CreateFunctionRequest createFunctionRequest; createFunctionRequest.SetHandler("test.handler"); @@ -242,10 +256,13 @@ class FunctionTest : public ::testing::Test { createFunctionRequest.SetRole(roleARN); FunctionCode functionCode; - std::ifstream fc(zipLocation.c_str(), std::ios_base::in | std::ios_base::binary); + auto filePath = MakeFilePath(zipLocation); + std::ifstream fc(filePath.c_str(), std::ios_base::in | std::ios_base::binary); Aws::StringStream buffer; buffer << fc.rdbuf(); + std::cout << "read zip file " << filePath << " of length " << buffer.str().length() << std::endl; + functionCode.SetZipFile(Aws::Utils::ByteBuffer((unsigned char*)buffer.str().c_str(), buffer.str().length())); createFunctionRequest.SetCode(functionCode); createFunctionRequest.SetRuntime(Aws::Lambda::Model::Runtime::nodejs); @@ -646,6 +663,7 @@ TEST_F(FunctionTest, TestEventSources) EXPECT_TRUE(deleteOutcome.IsSuccess()); } -} // anonymous namespace +#endif // NEVER +} // anonymous namespace diff --git a/aws-cpp-sdk-lambda/CMakeLists.txt b/aws-cpp-sdk-lambda/CMakeLists.txt index 57597762d47..2e8fb209c79 100644 --- a/aws-cpp-sdk-lambda/CMakeLists.txt +++ b/aws-cpp-sdk-lambda/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-lambda) "source/model/*.cpp" ) - file(GLOB LAMBDA_SRC + file(GLOB LAMBDA_UNIFIED_HEADERS ${AWS_LAMBDA_HEADERS} ${AWS_LAMBDA_MODEL_HEADERS} + ) + + file(GLOB LAMBDA_UNITY_SRC ${AWS_LAMBDA_SOURCE} ${AWS_LAMBDA_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("LAMBDA" LAMBDA_UNITY_SRC) + endif() + + file(GLOB LAMBDA_SRC + ${LAMBDA_UNIFIED_HEADERS} + ${LAMBDA_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-lambda/source/LambdaErrors.cpp b/aws-cpp-sdk-lambda/source/LambdaErrors.cpp index 2963e99d51c..a7ecf25d57e 100644 --- a/aws-cpp-sdk-lambda/source/LambdaErrors.cpp +++ b/aws-cpp-sdk-lambda/source/LambdaErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::Lambda; using namespace Aws::Utils; +namespace Aws +{ +namespace Lambda +{ +namespace LambdaErrorMapper +{ + static const int SERVICE_HASH = HashingUtils::HashString("ServiceException"); static const int TOO_MANY_REQUESTS_HASH = HashingUtils::HashString("TooManyRequestsException"); static const int INVALID_SECURITY_GROUP_I_D_HASH = HashingUtils::HashString("InvalidSecurityGroupIDException"); @@ -36,12 +43,6 @@ static const int E_C2_ACCESS_DENIED_HASH = HashingUtils::HashString("EC2AccessDe static const int E_C2_THROTTLED_HASH = HashingUtils::HashString("EC2ThrottledException"); static const int POLICY_LENGTH_EXCEEDED_HASH = HashingUtils::HashString("PolicyLengthExceededException"); -namespace Aws -{ -namespace Lambda -{ -namespace LambdaErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-lambda/source/model/AliasConfiguration.cpp b/aws-cpp-sdk-lambda/source/model/AliasConfiguration.cpp index 80e6d84afad..bfadab9f663 100644 --- a/aws-cpp-sdk-lambda/source/model/AliasConfiguration.cpp +++ b/aws-cpp-sdk-lambda/source/model/AliasConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Lambda::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Lambda +{ +namespace Model +{ + AliasConfiguration::AliasConfiguration() : m_aliasArnHasBeenSet(false), m_nameHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue AliasConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Lambda +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-lambda/source/model/EventSourceMappingConfiguration.cpp b/aws-cpp-sdk-lambda/source/model/EventSourceMappingConfiguration.cpp index f5062ef4764..7e13815d269 100644 --- a/aws-cpp-sdk-lambda/source/model/EventSourceMappingConfiguration.cpp +++ b/aws-cpp-sdk-lambda/source/model/EventSourceMappingConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Lambda::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Lambda +{ +namespace Model +{ + EventSourceMappingConfiguration::EventSourceMappingConfiguration() : m_uUIDHasBeenSet(false), m_batchSize(0), @@ -161,4 +167,8 @@ JsonValue EventSourceMappingConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Lambda +} // namespace Aws diff --git a/aws-cpp-sdk-lambda/source/model/EventSourcePosition.cpp b/aws-cpp-sdk-lambda/source/model/EventSourcePosition.cpp index 3810ba3a331..952f87feb3c 100644 --- a/aws-cpp-sdk-lambda/source/model/EventSourcePosition.cpp +++ b/aws-cpp-sdk-lambda/source/model/EventSourcePosition.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int TRIM_HORIZON_HASH = HashingUtils::HashString("TRIM_HORIZON"); -static const int LATEST_HASH = HashingUtils::HashString("LATEST"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace EventSourcePositionMapper { + static const int TRIM_HORIZON_HASH = HashingUtils::HashString("TRIM_HORIZON"); + static const int LATEST_HASH = HashingUtils::HashString("LATEST"); + EventSourcePosition GetEventSourcePositionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-lambda/source/model/FunctionCode.cpp b/aws-cpp-sdk-lambda/source/model/FunctionCode.cpp index 907e8d870bd..1cd11d7abc0 100644 --- a/aws-cpp-sdk-lambda/source/model/FunctionCode.cpp +++ b/aws-cpp-sdk-lambda/source/model/FunctionCode.cpp @@ -18,10 +18,16 @@ #include -using namespace Aws::Lambda::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Lambda +{ +namespace Model +{ + FunctionCode::FunctionCode() : m_zipFileHasBeenSet(false), m_s3BucketHasBeenSet(false), @@ -99,4 +105,8 @@ JsonValue FunctionCode::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Lambda +} // namespace Aws diff --git a/aws-cpp-sdk-lambda/source/model/FunctionCodeLocation.cpp b/aws-cpp-sdk-lambda/source/model/FunctionCodeLocation.cpp index f6eafdb64a8..71c6db8c415 100644 --- a/aws-cpp-sdk-lambda/source/model/FunctionCodeLocation.cpp +++ b/aws-cpp-sdk-lambda/source/model/FunctionCodeLocation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Lambda::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Lambda +{ +namespace Model +{ + FunctionCodeLocation::FunctionCodeLocation() : m_repositoryTypeHasBeenSet(false), m_locationHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue FunctionCodeLocation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Lambda +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-lambda/source/model/FunctionConfiguration.cpp b/aws-cpp-sdk-lambda/source/model/FunctionConfiguration.cpp index 52b3937419d..1cdf4038a68 100644 --- a/aws-cpp-sdk-lambda/source/model/FunctionConfiguration.cpp +++ b/aws-cpp-sdk-lambda/source/model/FunctionConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Lambda::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Lambda +{ +namespace Model +{ + FunctionConfiguration::FunctionConfiguration() : m_functionNameHasBeenSet(false), m_functionArnHasBeenSet(false), @@ -240,4 +246,8 @@ JsonValue FunctionConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Lambda +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-lambda/source/model/InvocationType.cpp b/aws-cpp-sdk-lambda/source/model/InvocationType.cpp index cf51e9351c7..6fd1fed64e6 100644 --- a/aws-cpp-sdk-lambda/source/model/InvocationType.cpp +++ b/aws-cpp-sdk-lambda/source/model/InvocationType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int Event_HASH = HashingUtils::HashString("Event"); -static const int RequestResponse_HASH = HashingUtils::HashString("RequestResponse"); -static const int DryRun_HASH = HashingUtils::HashString("DryRun"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace InvocationTypeMapper { + static const int Event_HASH = HashingUtils::HashString("Event"); + static const int RequestResponse_HASH = HashingUtils::HashString("RequestResponse"); + static const int DryRun_HASH = HashingUtils::HashString("DryRun"); + InvocationType GetInvocationTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-lambda/source/model/LogType.cpp b/aws-cpp-sdk-lambda/source/model/LogType.cpp index 7b9814e1422..5f3f0dc7a6c 100644 --- a/aws-cpp-sdk-lambda/source/model/LogType.cpp +++ b/aws-cpp-sdk-lambda/source/model/LogType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int None_HASH = HashingUtils::HashString("None"); -static const int Tail_HASH = HashingUtils::HashString("Tail"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace LogTypeMapper { + static const int None_HASH = HashingUtils::HashString("None"); + static const int Tail_HASH = HashingUtils::HashString("Tail"); + LogType GetLogTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-lambda/source/model/Runtime.cpp b/aws-cpp-sdk-lambda/source/model/Runtime.cpp index 9ee9c4365bf..db7abd71de4 100644 --- a/aws-cpp-sdk-lambda/source/model/Runtime.cpp +++ b/aws-cpp-sdk-lambda/source/model/Runtime.cpp @@ -15,14 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int nodejs_HASH = HashingUtils::HashString("nodejs"); -static const int nodejs4_3_HASH = HashingUtils::HashString("nodejs4.3"); -static const int java8_HASH = HashingUtils::HashString("java8"); -static const int python2_7_HASH = HashingUtils::HashString("python2.7"); namespace Aws { @@ -33,6 +28,10 @@ namespace Aws namespace RuntimeMapper { + static const int nodejs_HASH = HashingUtils::HashString("nodejs"); + static const int java8_HASH = HashingUtils::HashString("java8"); + static const int python2_7_HASH = HashingUtils::HashString("python2.7"); + Runtime GetRuntimeForName(const Aws::String& name) { @@ -41,10 +40,6 @@ namespace Aws { return Runtime::nodejs; } - else if (hashCode == nodejs4_3_HASH) - { - return Runtime::nodejs4_3; - } else if (hashCode == java8_HASH) { return Runtime::java8; @@ -53,7 +48,7 @@ namespace Aws { return Runtime::python2_7; } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -69,14 +64,12 @@ namespace Aws { case Runtime::nodejs: return "nodejs"; - case Runtime::nodejs4_3: - return "nodejs4.3"; case Runtime::java8: return "java8"; case Runtime::python2_7: return "python2.7"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-lambda/source/model/VpcConfig.cpp b/aws-cpp-sdk-lambda/source/model/VpcConfig.cpp index 15ca0d4dde7..562eda0d7e9 100644 --- a/aws-cpp-sdk-lambda/source/model/VpcConfig.cpp +++ b/aws-cpp-sdk-lambda/source/model/VpcConfig.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Lambda::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Lambda +{ +namespace Model +{ + VpcConfig::VpcConfig() : m_subnetIdsHasBeenSet(false), m_securityGroupIdsHasBeenSet(false) @@ -86,4 +92,8 @@ JsonValue VpcConfig::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Lambda +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-lambda/source/model/VpcConfigResponse.cpp b/aws-cpp-sdk-lambda/source/model/VpcConfigResponse.cpp index 9e5bc7b821a..dbddb12226c 100644 --- a/aws-cpp-sdk-lambda/source/model/VpcConfigResponse.cpp +++ b/aws-cpp-sdk-lambda/source/model/VpcConfigResponse.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Lambda::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Lambda +{ +namespace Model +{ + VpcConfigResponse::VpcConfigResponse() : m_subnetIdsHasBeenSet(false), m_securityGroupIdsHasBeenSet(false), @@ -101,4 +107,8 @@ JsonValue VpcConfigResponse::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Lambda +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/CMakeLists.txt b/aws-cpp-sdk-logs/CMakeLists.txt index b026bc928c0..5c356fd7125 100644 --- a/aws-cpp-sdk-logs/CMakeLists.txt +++ b/aws-cpp-sdk-logs/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-logs) "source/model/*.cpp" ) - file(GLOB LOGS_SRC + file(GLOB LOGS_UNIFIED_HEADERS ${AWS_LOGS_HEADERS} ${AWS_LOGS_MODEL_HEADERS} + ) + + file(GLOB LOGS_UNITY_SRC ${AWS_LOGS_SOURCE} ${AWS_LOGS_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("LOGS" LOGS_UNITY_SRC) + endif() + + file(GLOB LOGS_SRC + ${LOGS_UNIFIED_HEADERS} + ${LOGS_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-logs/source/CloudWatchLogsErrors.cpp b/aws-cpp-sdk-logs/source/CloudWatchLogsErrors.cpp index c5a0c94f7e2..1af4216d7d2 100644 --- a/aws-cpp-sdk-logs/source/CloudWatchLogsErrors.cpp +++ b/aws-cpp-sdk-logs/source/CloudWatchLogsErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::CloudWatchLogs; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace CloudWatchLogsErrorMapper +{ + static const int OPERATION_ABORTED_HASH = HashingUtils::HashString("OperationAbortedException"); static const int INVALID_OPERATION_HASH = HashingUtils::HashString("InvalidOperationException"); static const int RESOURCE_ALREADY_EXISTS_HASH = HashingUtils::HashString("ResourceAlreadyExistsException"); @@ -28,12 +35,6 @@ static const int INVALID_SEQUENCE_TOKEN_HASH = HashingUtils::HashString("Invalid static const int DATA_ALREADY_ACCEPTED_HASH = HashingUtils::HashString("DataAlreadyAcceptedException"); static const int INVALID_PARAMETER_HASH = HashingUtils::HashString("InvalidParameterException"); -namespace Aws -{ -namespace CloudWatchLogs -{ -namespace CloudWatchLogsErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-logs/source/model/Destination.cpp b/aws-cpp-sdk-logs/source/model/Destination.cpp index 51a06207c95..47de16f2ab2 100644 --- a/aws-cpp-sdk-logs/source/model/Destination.cpp +++ b/aws-cpp-sdk-logs/source/model/Destination.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + Destination::Destination() : m_destinationNameHasBeenSet(false), m_targetArnHasBeenSet(false), @@ -132,4 +138,8 @@ JsonValue Destination::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/source/model/ExportTask.cpp b/aws-cpp-sdk-logs/source/model/ExportTask.cpp index 5661c6e64c7..62f6cd962da 100644 --- a/aws-cpp-sdk-logs/source/model/ExportTask.cpp +++ b/aws-cpp-sdk-logs/source/model/ExportTask.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + ExportTask::ExportTask() : m_taskIdHasBeenSet(false), m_taskNameHasBeenSet(false), @@ -179,4 +185,8 @@ JsonValue ExportTask::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/source/model/ExportTaskExecutionInfo.cpp b/aws-cpp-sdk-logs/source/model/ExportTaskExecutionInfo.cpp index d664832e05e..4f6d7e05ca5 100644 --- a/aws-cpp-sdk-logs/source/model/ExportTaskExecutionInfo.cpp +++ b/aws-cpp-sdk-logs/source/model/ExportTaskExecutionInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + ExportTaskExecutionInfo::ExportTaskExecutionInfo() : m_creationTime(0), m_creationTimeHasBeenSet(false), @@ -74,4 +80,8 @@ JsonValue ExportTaskExecutionInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/source/model/ExportTaskStatus.cpp b/aws-cpp-sdk-logs/source/model/ExportTaskStatus.cpp index 9a29ed1574d..e5ef1982718 100644 --- a/aws-cpp-sdk-logs/source/model/ExportTaskStatus.cpp +++ b/aws-cpp-sdk-logs/source/model/ExportTaskStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + ExportTaskStatus::ExportTaskStatus() : m_codeHasBeenSet(false), m_messageHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue ExportTaskStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/source/model/ExportTaskStatusCode.cpp b/aws-cpp-sdk-logs/source/model/ExportTaskStatusCode.cpp index 48b59aba442..d4056442187 100644 --- a/aws-cpp-sdk-logs/source/model/ExportTaskStatusCode.cpp +++ b/aws-cpp-sdk-logs/source/model/ExportTaskStatusCode.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int CANCELLED_HASH = HashingUtils::HashString("CANCELLED"); -static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); -static const int PENDING_HASH = HashingUtils::HashString("PENDING"); -static const int PENDING_CANCEL_HASH = HashingUtils::HashString("PENDING_CANCEL"); -static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace ExportTaskStatusCodeMapper { + static const int CANCELLED_HASH = HashingUtils::HashString("CANCELLED"); + static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + static const int PENDING_HASH = HashingUtils::HashString("PENDING"); + static const int PENDING_CANCEL_HASH = HashingUtils::HashString("PENDING_CANCEL"); + static const int RUNNING_HASH = HashingUtils::HashString("RUNNING"); + ExportTaskStatusCode GetExportTaskStatusCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-logs/source/model/FilteredLogEvent.cpp b/aws-cpp-sdk-logs/source/model/FilteredLogEvent.cpp index 8f83c05422d..5fad1a63737 100644 --- a/aws-cpp-sdk-logs/source/model/FilteredLogEvent.cpp +++ b/aws-cpp-sdk-logs/source/model/FilteredLogEvent.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + FilteredLogEvent::FilteredLogEvent() : m_logStreamNameHasBeenSet(false), m_timestamp(0), @@ -119,4 +125,8 @@ JsonValue FilteredLogEvent::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/source/model/InputLogEvent.cpp b/aws-cpp-sdk-logs/source/model/InputLogEvent.cpp index 57b9623913b..58681160567 100644 --- a/aws-cpp-sdk-logs/source/model/InputLogEvent.cpp +++ b/aws-cpp-sdk-logs/source/model/InputLogEvent.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + InputLogEvent::InputLogEvent() : m_timestamp(0), m_timestampHasBeenSet(false), @@ -72,4 +78,8 @@ JsonValue InputLogEvent::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/source/model/LogGroup.cpp b/aws-cpp-sdk-logs/source/model/LogGroup.cpp index 84f7ba0daa2..d17a5e2f9cf 100644 --- a/aws-cpp-sdk-logs/source/model/LogGroup.cpp +++ b/aws-cpp-sdk-logs/source/model/LogGroup.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + LogGroup::LogGroup() : m_logGroupNameHasBeenSet(false), m_creationTime(0), @@ -138,4 +144,8 @@ JsonValue LogGroup::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/source/model/LogStream.cpp b/aws-cpp-sdk-logs/source/model/LogStream.cpp index 44f5e7591cc..0f2e09db04b 100644 --- a/aws-cpp-sdk-logs/source/model/LogStream.cpp +++ b/aws-cpp-sdk-logs/source/model/LogStream.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + LogStream::LogStream() : m_logStreamNameHasBeenSet(false), m_creationTime(0), @@ -170,4 +176,8 @@ JsonValue LogStream::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/source/model/MetricFilter.cpp b/aws-cpp-sdk-logs/source/model/MetricFilter.cpp index a8f410490ee..c78bb370782 100644 --- a/aws-cpp-sdk-logs/source/model/MetricFilter.cpp +++ b/aws-cpp-sdk-logs/source/model/MetricFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + MetricFilter::MetricFilter() : m_filterNameHasBeenSet(false), m_filterPatternHasBeenSet(false), @@ -110,4 +116,8 @@ JsonValue MetricFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/source/model/MetricFilterMatchRecord.cpp b/aws-cpp-sdk-logs/source/model/MetricFilterMatchRecord.cpp index 07eb3d585b7..d39139f5ad0 100644 --- a/aws-cpp-sdk-logs/source/model/MetricFilterMatchRecord.cpp +++ b/aws-cpp-sdk-logs/source/model/MetricFilterMatchRecord.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + MetricFilterMatchRecord::MetricFilterMatchRecord() : m_eventNumber(0), m_eventNumberHasBeenSet(false), @@ -95,4 +101,8 @@ JsonValue MetricFilterMatchRecord::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/source/model/MetricTransformation.cpp b/aws-cpp-sdk-logs/source/model/MetricTransformation.cpp index 22911d67c7f..03e8dedc281 100644 --- a/aws-cpp-sdk-logs/source/model/MetricTransformation.cpp +++ b/aws-cpp-sdk-logs/source/model/MetricTransformation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + MetricTransformation::MetricTransformation() : m_metricNameHasBeenSet(false), m_metricNamespaceHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue MetricTransformation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/source/model/OrderBy.cpp b/aws-cpp-sdk-logs/source/model/OrderBy.cpp index 055a5d6886b..a2a982f4ce7 100644 --- a/aws-cpp-sdk-logs/source/model/OrderBy.cpp +++ b/aws-cpp-sdk-logs/source/model/OrderBy.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int LogStreamName_HASH = HashingUtils::HashString("LogStreamName"); -static const int LastEventTime_HASH = HashingUtils::HashString("LastEventTime"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace OrderByMapper { + static const int LogStreamName_HASH = HashingUtils::HashString("LogStreamName"); + static const int LastEventTime_HASH = HashingUtils::HashString("LastEventTime"); + OrderBy GetOrderByForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-logs/source/model/OutputLogEvent.cpp b/aws-cpp-sdk-logs/source/model/OutputLogEvent.cpp index 1a895330158..6c97be077be 100644 --- a/aws-cpp-sdk-logs/source/model/OutputLogEvent.cpp +++ b/aws-cpp-sdk-logs/source/model/OutputLogEvent.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + OutputLogEvent::OutputLogEvent() : m_timestamp(0), m_timestampHasBeenSet(false), @@ -89,4 +95,8 @@ JsonValue OutputLogEvent::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/source/model/RejectedLogEventsInfo.cpp b/aws-cpp-sdk-logs/source/model/RejectedLogEventsInfo.cpp index ef01545f826..d33b80bfa98 100644 --- a/aws-cpp-sdk-logs/source/model/RejectedLogEventsInfo.cpp +++ b/aws-cpp-sdk-logs/source/model/RejectedLogEventsInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + RejectedLogEventsInfo::RejectedLogEventsInfo() : m_tooNewLogEventStartIndex(0), m_tooNewLogEventStartIndexHasBeenSet(false), @@ -91,4 +97,8 @@ JsonValue RejectedLogEventsInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/source/model/SearchedLogStream.cpp b/aws-cpp-sdk-logs/source/model/SearchedLogStream.cpp index 063f2f03b48..fc5976a3cac 100644 --- a/aws-cpp-sdk-logs/source/model/SearchedLogStream.cpp +++ b/aws-cpp-sdk-logs/source/model/SearchedLogStream.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + SearchedLogStream::SearchedLogStream() : m_logStreamNameHasBeenSet(false), m_searchedCompletely(false), @@ -72,4 +78,8 @@ JsonValue SearchedLogStream::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-logs/source/model/SubscriptionFilter.cpp b/aws-cpp-sdk-logs/source/model/SubscriptionFilter.cpp index e5910db4f6d..602f68fe272 100644 --- a/aws-cpp-sdk-logs/source/model/SubscriptionFilter.cpp +++ b/aws-cpp-sdk-logs/source/model/SubscriptionFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::CloudWatchLogs::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatchLogs +{ +namespace Model +{ + SubscriptionFilter::SubscriptionFilter() : m_filterNameHasBeenSet(false), m_logGroupNameHasBeenSet(false), @@ -132,4 +138,8 @@ JsonValue SubscriptionFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace CloudWatchLogs +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-machinelearning/CMakeLists.txt b/aws-cpp-sdk-machinelearning/CMakeLists.txt index 6e0857edae5..f6329b50065 100644 --- a/aws-cpp-sdk-machinelearning/CMakeLists.txt +++ b/aws-cpp-sdk-machinelearning/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-machinelearning) "source/model/*.cpp" ) - file(GLOB MACHINELEARNING_SRC + file(GLOB MACHINELEARNING_UNIFIED_HEADERS ${AWS_MACHINELEARNING_HEADERS} ${AWS_MACHINELEARNING_MODEL_HEADERS} + ) + + file(GLOB MACHINELEARNING_UNITY_SRC ${AWS_MACHINELEARNING_SOURCE} ${AWS_MACHINELEARNING_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("MACHINELEARNING" MACHINELEARNING_UNITY_SRC) + endif() + + file(GLOB MACHINELEARNING_SRC + ${MACHINELEARNING_UNIFIED_HEADERS} + ${MACHINELEARNING_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-machinelearning/include/aws/machinelearning/model/CreateDataSourceFromRDSRequest.h b/aws-cpp-sdk-machinelearning/include/aws/machinelearning/model/CreateDataSourceFromRDSRequest.h index 11af74314f9..75358b0d8c9 100644 --- a/aws-cpp-sdk-machinelearning/include/aws/machinelearning/model/CreateDataSourceFromRDSRequest.h +++ b/aws-cpp-sdk-machinelearning/include/aws/machinelearning/model/CreateDataSourceFromRDSRequest.h @@ -296,49 +296,49 @@ namespace Model /** *

The role that Amazon ML assumes on behalf of the user to create and activate - * a data pipeline in the user’s account and copy data (using the + * a data pipeline in the user?s account and copy data (using the * SelectSqlQuery) query from Amazon RDS to Amazon S3.

*/ inline const Aws::String& GetRoleARN() const{ return m_roleARN; } /** *

The role that Amazon ML assumes on behalf of the user to create and activate - * a data pipeline in the user’s account and copy data (using the + * a data pipeline in the user?s account and copy data (using the * SelectSqlQuery) query from Amazon RDS to Amazon S3.

*/ inline void SetRoleARN(const Aws::String& value) { m_roleARNHasBeenSet = true; m_roleARN = value; } /** *

The role that Amazon ML assumes on behalf of the user to create and activate - * a data pipeline in the user’s account and copy data (using the + * a data pipeline in the user?s account and copy data (using the * SelectSqlQuery) query from Amazon RDS to Amazon S3.

*/ inline void SetRoleARN(Aws::String&& value) { m_roleARNHasBeenSet = true; m_roleARN = value; } /** *

The role that Amazon ML assumes on behalf of the user to create and activate - * a data pipeline in the user’s account and copy data (using the + * a data pipeline in the user?s account and copy data (using the * SelectSqlQuery) query from Amazon RDS to Amazon S3.

*/ inline void SetRoleARN(const char* value) { m_roleARNHasBeenSet = true; m_roleARN.assign(value); } /** *

The role that Amazon ML assumes on behalf of the user to create and activate - * a data pipeline in the user’s account and copy data (using the + * a data pipeline in the user?s account and copy data (using the * SelectSqlQuery) query from Amazon RDS to Amazon S3.

*/ inline CreateDataSourceFromRDSRequest& WithRoleARN(const Aws::String& value) { SetRoleARN(value); return *this;} /** *

The role that Amazon ML assumes on behalf of the user to create and activate - * a data pipeline in the user’s account and copy data (using the + * a data pipeline in the user?s account and copy data (using the * SelectSqlQuery) query from Amazon RDS to Amazon S3.

*/ inline CreateDataSourceFromRDSRequest& WithRoleARN(Aws::String&& value) { SetRoleARN(value); return *this;} /** *

The role that Amazon ML assumes on behalf of the user to create and activate - * a data pipeline in the user’s account and copy data (using the + * a data pipeline in the user?s account and copy data (using the * SelectSqlQuery) query from Amazon RDS to Amazon S3.

*/ inline CreateDataSourceFromRDSRequest& WithRoleARN(const char* value) { SetRoleARN(value); return *this;} diff --git a/aws-cpp-sdk-machinelearning/include/aws/machinelearning/model/CreateMLModelRequest.h b/aws-cpp-sdk-machinelearning/include/aws/machinelearning/model/CreateMLModelRequest.h index 3f8f2626793..213caf8430a 100644 --- a/aws-cpp-sdk-machinelearning/include/aws/machinelearning/model/CreateMLModelRequest.h +++ b/aws-cpp-sdk-machinelearning/include/aws/machinelearning/model/CreateMLModelRequest.h @@ -532,49 +532,49 @@ namespace Model /** *

The data recipe for creating MLModel. You must specify either - * the recipe or its URI. If you don’t specify a recipe or its URI, Amazon ML + * the recipe or its URI. If you don?t specify a recipe or its URI, Amazon ML * creates a default.

*/ inline const Aws::String& GetRecipe() const{ return m_recipe; } /** *

The data recipe for creating MLModel. You must specify either - * the recipe or its URI. If you don’t specify a recipe or its URI, Amazon ML + * the recipe or its URI. If you don?t specify a recipe or its URI, Amazon ML * creates a default.

*/ inline void SetRecipe(const Aws::String& value) { m_recipeHasBeenSet = true; m_recipe = value; } /** *

The data recipe for creating MLModel. You must specify either - * the recipe or its URI. If you don’t specify a recipe or its URI, Amazon ML + * the recipe or its URI. If you don?t specify a recipe or its URI, Amazon ML * creates a default.

*/ inline void SetRecipe(Aws::String&& value) { m_recipeHasBeenSet = true; m_recipe = value; } /** *

The data recipe for creating MLModel. You must specify either - * the recipe or its URI. If you don’t specify a recipe or its URI, Amazon ML + * the recipe or its URI. If you don?t specify a recipe or its URI, Amazon ML * creates a default.

*/ inline void SetRecipe(const char* value) { m_recipeHasBeenSet = true; m_recipe.assign(value); } /** *

The data recipe for creating MLModel. You must specify either - * the recipe or its URI. If you don’t specify a recipe or its URI, Amazon ML + * the recipe or its URI. If you don?t specify a recipe or its URI, Amazon ML * creates a default.

*/ inline CreateMLModelRequest& WithRecipe(const Aws::String& value) { SetRecipe(value); return *this;} /** *

The data recipe for creating MLModel. You must specify either - * the recipe or its URI. If you don’t specify a recipe or its URI, Amazon ML + * the recipe or its URI. If you don?t specify a recipe or its URI, Amazon ML * creates a default.

*/ inline CreateMLModelRequest& WithRecipe(Aws::String&& value) { SetRecipe(value); return *this;} /** *

The data recipe for creating MLModel. You must specify either - * the recipe or its URI. If you don’t specify a recipe or its URI, Amazon ML + * the recipe or its URI. If you don?t specify a recipe or its URI, Amazon ML * creates a default.

*/ inline CreateMLModelRequest& WithRecipe(const char* value) { SetRecipe(value); return *this;} @@ -582,7 +582,7 @@ namespace Model /** *

The Amazon Simple Storage Service (Amazon S3) location and file name that * contains the MLModel recipe. You must specify either the recipe or - * its URI. If you don’t specify a recipe or its URI, Amazon ML creates a + * its URI. If you don?t specify a recipe or its URI, Amazon ML creates a * default.

*/ inline const Aws::String& GetRecipeUri() const{ return m_recipeUri; } @@ -590,7 +590,7 @@ namespace Model /** *

The Amazon Simple Storage Service (Amazon S3) location and file name that * contains the MLModel recipe. You must specify either the recipe or - * its URI. If you don’t specify a recipe or its URI, Amazon ML creates a + * its URI. If you don?t specify a recipe or its URI, Amazon ML creates a * default.

*/ inline void SetRecipeUri(const Aws::String& value) { m_recipeUriHasBeenSet = true; m_recipeUri = value; } @@ -598,7 +598,7 @@ namespace Model /** *

The Amazon Simple Storage Service (Amazon S3) location and file name that * contains the MLModel recipe. You must specify either the recipe or - * its URI. If you don’t specify a recipe or its URI, Amazon ML creates a + * its URI. If you don?t specify a recipe or its URI, Amazon ML creates a * default.

*/ inline void SetRecipeUri(Aws::String&& value) { m_recipeUriHasBeenSet = true; m_recipeUri = value; } @@ -606,7 +606,7 @@ namespace Model /** *

The Amazon Simple Storage Service (Amazon S3) location and file name that * contains the MLModel recipe. You must specify either the recipe or - * its URI. If you don’t specify a recipe or its URI, Amazon ML creates a + * its URI. If you don?t specify a recipe or its URI, Amazon ML creates a * default.

*/ inline void SetRecipeUri(const char* value) { m_recipeUriHasBeenSet = true; m_recipeUri.assign(value); } @@ -614,7 +614,7 @@ namespace Model /** *

The Amazon Simple Storage Service (Amazon S3) location and file name that * contains the MLModel recipe. You must specify either the recipe or - * its URI. If you don’t specify a recipe or its URI, Amazon ML creates a + * its URI. If you don?t specify a recipe or its URI, Amazon ML creates a * default.

*/ inline CreateMLModelRequest& WithRecipeUri(const Aws::String& value) { SetRecipeUri(value); return *this;} @@ -622,7 +622,7 @@ namespace Model /** *

The Amazon Simple Storage Service (Amazon S3) location and file name that * contains the MLModel recipe. You must specify either the recipe or - * its URI. If you don’t specify a recipe or its URI, Amazon ML creates a + * its URI. If you don?t specify a recipe or its URI, Amazon ML creates a * default.

*/ inline CreateMLModelRequest& WithRecipeUri(Aws::String&& value) { SetRecipeUri(value); return *this;} @@ -630,7 +630,7 @@ namespace Model /** *

The Amazon Simple Storage Service (Amazon S3) location and file name that * contains the MLModel recipe. You must specify either the recipe or - * its URI. If you don’t specify a recipe or its URI, Amazon ML creates a + * its URI. If you don?t specify a recipe or its URI, Amazon ML creates a * default.

*/ inline CreateMLModelRequest& WithRecipeUri(const char* value) { SetRecipeUri(value); return *this;} diff --git a/aws-cpp-sdk-machinelearning/source/MachineLearningErrors.cpp b/aws-cpp-sdk-machinelearning/source/MachineLearningErrors.cpp index c6e4c72182a..a84b291270b 100644 --- a/aws-cpp-sdk-machinelearning/source/MachineLearningErrors.cpp +++ b/aws-cpp-sdk-machinelearning/source/MachineLearningErrors.cpp @@ -20,12 +20,6 @@ using namespace Aws::Client; using namespace Aws::MachineLearning; using namespace Aws::Utils; -static const int INTERNAL_SERVER_HASH = HashingUtils::HashString("InternalServerException"); -static const int PREDICTOR_NOT_MOUNTED_HASH = HashingUtils::HashString("PredictorNotMountedException"); -static const int IDEMPOTENT_PARAMETER_MISMATCH_HASH = HashingUtils::HashString("IdempotentParameterMismatchException"); -static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); -static const int INVALID_INPUT_HASH = HashingUtils::HashString("InvalidInputException"); - namespace Aws { namespace MachineLearning @@ -33,6 +27,13 @@ namespace MachineLearning namespace MachineLearningErrorMapper { +static const int INTERNAL_SERVER_HASH = HashingUtils::HashString("InternalServerException"); +static const int PREDICTOR_NOT_MOUNTED_HASH = HashingUtils::HashString("PredictorNotMountedException"); +static const int IDEMPOTENT_PARAMETER_MISMATCH_HASH = HashingUtils::HashString("IdempotentParameterMismatchException"); +static const int LIMIT_EXCEEDED_HASH = HashingUtils::HashString("LimitExceededException"); +static const int INVALID_INPUT_HASH = HashingUtils::HashString("InvalidInputException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-machinelearning/source/model/Algorithm.cpp b/aws-cpp-sdk-machinelearning/source/model/Algorithm.cpp index febc2ad5544..746a4729708 100644 --- a/aws-cpp-sdk-machinelearning/source/model/Algorithm.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/Algorithm.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int sgd_HASH = HashingUtils::HashString("sgd"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace AlgorithmMapper { + static const int sgd_HASH = HashingUtils::HashString("sgd"); + Algorithm GetAlgorithmForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-machinelearning/source/model/BatchPrediction.cpp b/aws-cpp-sdk-machinelearning/source/model/BatchPrediction.cpp index c6ab480ca5e..132911c9000 100644 --- a/aws-cpp-sdk-machinelearning/source/model/BatchPrediction.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/BatchPrediction.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + BatchPrediction::BatchPrediction() : m_batchPredictionIdHasBeenSet(false), m_mLModelIdHasBeenSet(false), @@ -202,4 +208,8 @@ JsonValue BatchPrediction::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws diff --git a/aws-cpp-sdk-machinelearning/source/model/BatchPredictionFilterVariable.cpp b/aws-cpp-sdk-machinelearning/source/model/BatchPredictionFilterVariable.cpp index c56f5e3219f..24f4320b7c6 100644 --- a/aws-cpp-sdk-machinelearning/source/model/BatchPredictionFilterVariable.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/BatchPredictionFilterVariable.cpp @@ -19,14 +19,6 @@ using namespace Aws::Utils; -static const int CreatedAt_HASH = HashingUtils::HashString("CreatedAt"); -static const int LastUpdatedAt_HASH = HashingUtils::HashString("LastUpdatedAt"); -static const int Status_HASH = HashingUtils::HashString("Status"); -static const int Name_HASH = HashingUtils::HashString("Name"); -static const int IAMUser_HASH = HashingUtils::HashString("IAMUser"); -static const int MLModelId_HASH = HashingUtils::HashString("MLModelId"); -static const int DataSourceId_HASH = HashingUtils::HashString("DataSourceId"); -static const int DataURI_HASH = HashingUtils::HashString("DataURI"); namespace Aws { @@ -37,6 +29,15 @@ namespace Aws namespace BatchPredictionFilterVariableMapper { + static const int CreatedAt_HASH = HashingUtils::HashString("CreatedAt"); + static const int LastUpdatedAt_HASH = HashingUtils::HashString("LastUpdatedAt"); + static const int Status_HASH = HashingUtils::HashString("Status"); + static const int Name_HASH = HashingUtils::HashString("Name"); + static const int IAMUser_HASH = HashingUtils::HashString("IAMUser"); + static const int MLModelId_HASH = HashingUtils::HashString("MLModelId"); + static const int DataSourceId_HASH = HashingUtils::HashString("DataSourceId"); + static const int DataURI_HASH = HashingUtils::HashString("DataURI"); + BatchPredictionFilterVariable GetBatchPredictionFilterVariableForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-machinelearning/source/model/DataSource.cpp b/aws-cpp-sdk-machinelearning/source/model/DataSource.cpp index 32141b988fd..f6f7694dc32 100644 --- a/aws-cpp-sdk-machinelearning/source/model/DataSource.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/DataSource.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + DataSource::DataSource() : m_dataSourceIdHasBeenSet(false), m_dataLocationS3HasBeenSet(false), @@ -268,4 +274,8 @@ JsonValue DataSource::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws diff --git a/aws-cpp-sdk-machinelearning/source/model/DataSourceFilterVariable.cpp b/aws-cpp-sdk-machinelearning/source/model/DataSourceFilterVariable.cpp index 7c321e54009..6812eb47152 100644 --- a/aws-cpp-sdk-machinelearning/source/model/DataSourceFilterVariable.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/DataSourceFilterVariable.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int CreatedAt_HASH = HashingUtils::HashString("CreatedAt"); -static const int LastUpdatedAt_HASH = HashingUtils::HashString("LastUpdatedAt"); -static const int Status_HASH = HashingUtils::HashString("Status"); -static const int Name_HASH = HashingUtils::HashString("Name"); -static const int DataLocationS3_HASH = HashingUtils::HashString("DataLocationS3"); -static const int IAMUser_HASH = HashingUtils::HashString("IAMUser"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace DataSourceFilterVariableMapper { + static const int CreatedAt_HASH = HashingUtils::HashString("CreatedAt"); + static const int LastUpdatedAt_HASH = HashingUtils::HashString("LastUpdatedAt"); + static const int Status_HASH = HashingUtils::HashString("Status"); + static const int Name_HASH = HashingUtils::HashString("Name"); + static const int DataLocationS3_HASH = HashingUtils::HashString("DataLocationS3"); + static const int IAMUser_HASH = HashingUtils::HashString("IAMUser"); + DataSourceFilterVariable GetDataSourceFilterVariableForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-machinelearning/source/model/DetailsAttributes.cpp b/aws-cpp-sdk-machinelearning/source/model/DetailsAttributes.cpp index e91be764e07..a6231f4e6e7 100644 --- a/aws-cpp-sdk-machinelearning/source/model/DetailsAttributes.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/DetailsAttributes.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int PredictiveModelType_HASH = HashingUtils::HashString("PredictiveModelType"); -static const int Algorithm_HASH = HashingUtils::HashString("Algorithm"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace DetailsAttributesMapper { + static const int PredictiveModelType_HASH = HashingUtils::HashString("PredictiveModelType"); + static const int Algorithm_HASH = HashingUtils::HashString("Algorithm"); + DetailsAttributes GetDetailsAttributesForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-machinelearning/source/model/EntityStatus.cpp b/aws-cpp-sdk-machinelearning/source/model/EntityStatus.cpp index c56f0b45ed0..f4d4c77dfa9 100644 --- a/aws-cpp-sdk-machinelearning/source/model/EntityStatus.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/EntityStatus.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int PENDING_HASH = HashingUtils::HashString("PENDING"); -static const int INPROGRESS_HASH = HashingUtils::HashString("INPROGRESS"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); -static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); -static const int DELETED_HASH = HashingUtils::HashString("DELETED"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace EntityStatusMapper { + static const int PENDING_HASH = HashingUtils::HashString("PENDING"); + static const int INPROGRESS_HASH = HashingUtils::HashString("INPROGRESS"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); + static const int DELETED_HASH = HashingUtils::HashString("DELETED"); + EntityStatus GetEntityStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-machinelearning/source/model/Evaluation.cpp b/aws-cpp-sdk-machinelearning/source/model/Evaluation.cpp index 1267e9e035b..b0035ee08d3 100644 --- a/aws-cpp-sdk-machinelearning/source/model/Evaluation.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/Evaluation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + Evaluation::Evaluation() : m_evaluationIdHasBeenSet(false), m_mLModelIdHasBeenSet(false), @@ -202,4 +208,8 @@ JsonValue Evaluation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws diff --git a/aws-cpp-sdk-machinelearning/source/model/EvaluationFilterVariable.cpp b/aws-cpp-sdk-machinelearning/source/model/EvaluationFilterVariable.cpp index b07f891425d..8e44f1a089c 100644 --- a/aws-cpp-sdk-machinelearning/source/model/EvaluationFilterVariable.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/EvaluationFilterVariable.cpp @@ -19,14 +19,6 @@ using namespace Aws::Utils; -static const int CreatedAt_HASH = HashingUtils::HashString("CreatedAt"); -static const int LastUpdatedAt_HASH = HashingUtils::HashString("LastUpdatedAt"); -static const int Status_HASH = HashingUtils::HashString("Status"); -static const int Name_HASH = HashingUtils::HashString("Name"); -static const int IAMUser_HASH = HashingUtils::HashString("IAMUser"); -static const int MLModelId_HASH = HashingUtils::HashString("MLModelId"); -static const int DataSourceId_HASH = HashingUtils::HashString("DataSourceId"); -static const int DataURI_HASH = HashingUtils::HashString("DataURI"); namespace Aws { @@ -37,6 +29,15 @@ namespace Aws namespace EvaluationFilterVariableMapper { + static const int CreatedAt_HASH = HashingUtils::HashString("CreatedAt"); + static const int LastUpdatedAt_HASH = HashingUtils::HashString("LastUpdatedAt"); + static const int Status_HASH = HashingUtils::HashString("Status"); + static const int Name_HASH = HashingUtils::HashString("Name"); + static const int IAMUser_HASH = HashingUtils::HashString("IAMUser"); + static const int MLModelId_HASH = HashingUtils::HashString("MLModelId"); + static const int DataSourceId_HASH = HashingUtils::HashString("DataSourceId"); + static const int DataURI_HASH = HashingUtils::HashString("DataURI"); + EvaluationFilterVariable GetEvaluationFilterVariableForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-machinelearning/source/model/MLModel.cpp b/aws-cpp-sdk-machinelearning/source/model/MLModel.cpp index a1680e5f94b..89a5b5dede8 100644 --- a/aws-cpp-sdk-machinelearning/source/model/MLModel.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/MLModel.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + MLModel::MLModel() : m_mLModelIdHasBeenSet(false), m_trainingDataSourceIdHasBeenSet(false), @@ -286,4 +292,8 @@ JsonValue MLModel::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws diff --git a/aws-cpp-sdk-machinelearning/source/model/MLModelFilterVariable.cpp b/aws-cpp-sdk-machinelearning/source/model/MLModelFilterVariable.cpp index e59f07d38d8..c1255beb18e 100644 --- a/aws-cpp-sdk-machinelearning/source/model/MLModelFilterVariable.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/MLModelFilterVariable.cpp @@ -19,16 +19,6 @@ using namespace Aws::Utils; -static const int CreatedAt_HASH = HashingUtils::HashString("CreatedAt"); -static const int LastUpdatedAt_HASH = HashingUtils::HashString("LastUpdatedAt"); -static const int Status_HASH = HashingUtils::HashString("Status"); -static const int Name_HASH = HashingUtils::HashString("Name"); -static const int IAMUser_HASH = HashingUtils::HashString("IAMUser"); -static const int TrainingDataSourceId_HASH = HashingUtils::HashString("TrainingDataSourceId"); -static const int RealtimeEndpointStatus_HASH = HashingUtils::HashString("RealtimeEndpointStatus"); -static const int MLModelType_HASH = HashingUtils::HashString("MLModelType"); -static const int Algorithm_HASH = HashingUtils::HashString("Algorithm"); -static const int TrainingDataURI_HASH = HashingUtils::HashString("TrainingDataURI"); namespace Aws { @@ -39,6 +29,17 @@ namespace Aws namespace MLModelFilterVariableMapper { + static const int CreatedAt_HASH = HashingUtils::HashString("CreatedAt"); + static const int LastUpdatedAt_HASH = HashingUtils::HashString("LastUpdatedAt"); + static const int Status_HASH = HashingUtils::HashString("Status"); + static const int Name_HASH = HashingUtils::HashString("Name"); + static const int IAMUser_HASH = HashingUtils::HashString("IAMUser"); + static const int TrainingDataSourceId_HASH = HashingUtils::HashString("TrainingDataSourceId"); + static const int RealtimeEndpointStatus_HASH = HashingUtils::HashString("RealtimeEndpointStatus"); + static const int MLModelType_HASH = HashingUtils::HashString("MLModelType"); + static const int Algorithm_HASH = HashingUtils::HashString("Algorithm"); + static const int TrainingDataURI_HASH = HashingUtils::HashString("TrainingDataURI"); + MLModelFilterVariable GetMLModelFilterVariableForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-machinelearning/source/model/MLModelType.cpp b/aws-cpp-sdk-machinelearning/source/model/MLModelType.cpp index b2d42d90b19..4b5abb4f28d 100644 --- a/aws-cpp-sdk-machinelearning/source/model/MLModelType.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/MLModelType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int REGRESSION_HASH = HashingUtils::HashString("REGRESSION"); -static const int BINARY_HASH = HashingUtils::HashString("BINARY"); -static const int MULTICLASS_HASH = HashingUtils::HashString("MULTICLASS"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace MLModelTypeMapper { + static const int REGRESSION_HASH = HashingUtils::HashString("REGRESSION"); + static const int BINARY_HASH = HashingUtils::HashString("BINARY"); + static const int MULTICLASS_HASH = HashingUtils::HashString("MULTICLASS"); + MLModelType GetMLModelTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-machinelearning/source/model/PerformanceMetrics.cpp b/aws-cpp-sdk-machinelearning/source/model/PerformanceMetrics.cpp index 02dcf6691d9..c9dda544dcd 100644 --- a/aws-cpp-sdk-machinelearning/source/model/PerformanceMetrics.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/PerformanceMetrics.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + PerformanceMetrics::PerformanceMetrics() : m_propertiesHasBeenSet(false) { @@ -63,4 +69,8 @@ JsonValue PerformanceMetrics::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-machinelearning/source/model/Prediction.cpp b/aws-cpp-sdk-machinelearning/source/model/Prediction.cpp index 3f5f5696f9a..2d327e68c34 100644 --- a/aws-cpp-sdk-machinelearning/source/model/Prediction.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/Prediction.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + Prediction::Prediction() : m_predictedLabelHasBeenSet(false), m_predictedValue(0.0), @@ -118,4 +124,8 @@ JsonValue Prediction::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-machinelearning/source/model/RDSDataSpec.cpp b/aws-cpp-sdk-machinelearning/source/model/RDSDataSpec.cpp index 7a2472e687f..80b7791a75d 100644 --- a/aws-cpp-sdk-machinelearning/source/model/RDSDataSpec.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/RDSDataSpec.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + RDSDataSpec::RDSDataSpec() : m_databaseInformationHasBeenSet(false), m_selectSqlQueryHasBeenSet(false), @@ -213,4 +219,8 @@ JsonValue RDSDataSpec::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-machinelearning/source/model/RDSDatabase.cpp b/aws-cpp-sdk-machinelearning/source/model/RDSDatabase.cpp index a851b90406e..407f0eb0e3c 100644 --- a/aws-cpp-sdk-machinelearning/source/model/RDSDatabase.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/RDSDatabase.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + RDSDatabase::RDSDatabase() : m_instanceIdentifierHasBeenSet(false), m_databaseNameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue RDSDatabase::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-machinelearning/source/model/RDSDatabaseCredentials.cpp b/aws-cpp-sdk-machinelearning/source/model/RDSDatabaseCredentials.cpp index 8ffa22605ae..ebe45f09479 100644 --- a/aws-cpp-sdk-machinelearning/source/model/RDSDatabaseCredentials.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/RDSDatabaseCredentials.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + RDSDatabaseCredentials::RDSDatabaseCredentials() : m_usernameHasBeenSet(false), m_passwordHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue RDSDatabaseCredentials::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-machinelearning/source/model/RDSMetadata.cpp b/aws-cpp-sdk-machinelearning/source/model/RDSMetadata.cpp index e75b6a5f5ba..eefd940663f 100644 --- a/aws-cpp-sdk-machinelearning/source/model/RDSMetadata.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/RDSMetadata.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + RDSMetadata::RDSMetadata() : m_databaseHasBeenSet(false), m_databaseUserNameHasBeenSet(false), @@ -130,4 +136,8 @@ JsonValue RDSMetadata::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-machinelearning/source/model/RealtimeEndpointInfo.cpp b/aws-cpp-sdk-machinelearning/source/model/RealtimeEndpointInfo.cpp index 42921cdca29..d775094c8e5 100644 --- a/aws-cpp-sdk-machinelearning/source/model/RealtimeEndpointInfo.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/RealtimeEndpointInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + RealtimeEndpointInfo::RealtimeEndpointInfo() : m_peakRequestsPerSecond(0), m_peakRequestsPerSecondHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue RealtimeEndpointInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws diff --git a/aws-cpp-sdk-machinelearning/source/model/RealtimeEndpointStatus.cpp b/aws-cpp-sdk-machinelearning/source/model/RealtimeEndpointStatus.cpp index ee333f916c6..d63439851cf 100644 --- a/aws-cpp-sdk-machinelearning/source/model/RealtimeEndpointStatus.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/RealtimeEndpointStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int NONE_HASH = HashingUtils::HashString("NONE"); -static const int READY_HASH = HashingUtils::HashString("READY"); -static const int UPDATING_HASH = HashingUtils::HashString("UPDATING"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace RealtimeEndpointStatusMapper { + static const int NONE_HASH = HashingUtils::HashString("NONE"); + static const int READY_HASH = HashingUtils::HashString("READY"); + static const int UPDATING_HASH = HashingUtils::HashString("UPDATING"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + RealtimeEndpointStatus GetRealtimeEndpointStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-machinelearning/source/model/RedshiftDataSpec.cpp b/aws-cpp-sdk-machinelearning/source/model/RedshiftDataSpec.cpp index 4a2c67988bd..47871c4ea1a 100644 --- a/aws-cpp-sdk-machinelearning/source/model/RedshiftDataSpec.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/RedshiftDataSpec.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + RedshiftDataSpec::RedshiftDataSpec() : m_databaseInformationHasBeenSet(false), m_selectSqlQueryHasBeenSet(false), @@ -145,4 +151,8 @@ JsonValue RedshiftDataSpec::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-machinelearning/source/model/RedshiftDatabase.cpp b/aws-cpp-sdk-machinelearning/source/model/RedshiftDatabase.cpp index d664dc329ed..5ec2a9f3416 100644 --- a/aws-cpp-sdk-machinelearning/source/model/RedshiftDatabase.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/RedshiftDatabase.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + RedshiftDatabase::RedshiftDatabase() : m_databaseNameHasBeenSet(false), m_clusterIdentifierHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue RedshiftDatabase::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-machinelearning/source/model/RedshiftDatabaseCredentials.cpp b/aws-cpp-sdk-machinelearning/source/model/RedshiftDatabaseCredentials.cpp index 9ce9aecf864..7f3e80f99d9 100644 --- a/aws-cpp-sdk-machinelearning/source/model/RedshiftDatabaseCredentials.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/RedshiftDatabaseCredentials.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + RedshiftDatabaseCredentials::RedshiftDatabaseCredentials() : m_usernameHasBeenSet(false), m_passwordHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue RedshiftDatabaseCredentials::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-machinelearning/source/model/RedshiftMetadata.cpp b/aws-cpp-sdk-machinelearning/source/model/RedshiftMetadata.cpp index 1760c8a0613..8a2beb696d2 100644 --- a/aws-cpp-sdk-machinelearning/source/model/RedshiftMetadata.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/RedshiftMetadata.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + RedshiftMetadata::RedshiftMetadata() : m_redshiftDatabaseHasBeenSet(false), m_databaseUserNameHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue RedshiftMetadata::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-machinelearning/source/model/S3DataSpec.cpp b/aws-cpp-sdk-machinelearning/source/model/S3DataSpec.cpp index 5d470af1d62..bb4b00f0e51 100644 --- a/aws-cpp-sdk-machinelearning/source/model/S3DataSpec.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/S3DataSpec.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MachineLearning::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MachineLearning +{ +namespace Model +{ + S3DataSpec::S3DataSpec() : m_dataLocationS3HasBeenSet(false), m_dataRearrangementHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue S3DataSpec::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MachineLearning +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-machinelearning/source/model/SortOrder.cpp b/aws-cpp-sdk-machinelearning/source/model/SortOrder.cpp index 2910c483ebf..fa184c87a6a 100644 --- a/aws-cpp-sdk-machinelearning/source/model/SortOrder.cpp +++ b/aws-cpp-sdk-machinelearning/source/model/SortOrder.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int asc_HASH = HashingUtils::HashString("asc"); -static const int dsc_HASH = HashingUtils::HashString("dsc"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace SortOrderMapper { + static const int asc_HASH = HashingUtils::HashString("asc"); + static const int dsc_HASH = HashingUtils::HashString("dsc"); + SortOrder GetSortOrderForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-marketplacecommerceanalytics/CMakeLists.txt b/aws-cpp-sdk-marketplacecommerceanalytics/CMakeLists.txt index 64520879a79..b8f81217638 100644 --- a/aws-cpp-sdk-marketplacecommerceanalytics/CMakeLists.txt +++ b/aws-cpp-sdk-marketplacecommerceanalytics/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-marketplacecommerceanalytics) "source/model/*.cpp" ) - file(GLOB MARKETPLACECOMMERCEANALYTICS_SRC + file(GLOB MARKETPLACECOMMERCEANALYTICS_UNIFIED_HEADERS ${AWS_MARKETPLACECOMMERCEANALYTICS_HEADERS} ${AWS_MARKETPLACECOMMERCEANALYTICS_MODEL_HEADERS} + ) + + file(GLOB MARKETPLACECOMMERCEANALYTICS_UNITY_SRC ${AWS_MARKETPLACECOMMERCEANALYTICS_SOURCE} ${AWS_MARKETPLACECOMMERCEANALYTICS_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("MARKETPLACECOMMERCEANALYTICS" MARKETPLACECOMMERCEANALYTICS_UNITY_SRC) + endif() + + file(GLOB MARKETPLACECOMMERCEANALYTICS_SRC + ${MARKETPLACECOMMERCEANALYTICS_UNIFIED_HEADERS} + ${MARKETPLACECOMMERCEANALYTICS_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-marketplacecommerceanalytics/source/MarketplaceCommerceAnalyticsErrors.cpp b/aws-cpp-sdk-marketplacecommerceanalytics/source/MarketplaceCommerceAnalyticsErrors.cpp index 738421cf0a4..3a59280bcf6 100644 --- a/aws-cpp-sdk-marketplacecommerceanalytics/source/MarketplaceCommerceAnalyticsErrors.cpp +++ b/aws-cpp-sdk-marketplacecommerceanalytics/source/MarketplaceCommerceAnalyticsErrors.cpp @@ -20,8 +20,6 @@ using namespace Aws::Client; using namespace Aws::MarketplaceCommerceAnalytics; using namespace Aws::Utils; -static const int MARKETPLACE_COMMERCE_ANALYTICS_HASH = HashingUtils::HashString("MarketplaceCommerceAnalyticsException"); - namespace Aws { namespace MarketplaceCommerceAnalytics @@ -29,6 +27,9 @@ namespace MarketplaceCommerceAnalytics namespace MarketplaceCommerceAnalyticsErrorMapper { +static const int MARKETPLACE_COMMERCE_ANALYTICS_HASH = HashingUtils::HashString("MarketplaceCommerceAnalyticsException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-marketplacecommerceanalytics/source/model/DataSetType.cpp b/aws-cpp-sdk-marketplacecommerceanalytics/source/model/DataSetType.cpp index d6766fc4335..a4c80c87dc8 100644 --- a/aws-cpp-sdk-marketplacecommerceanalytics/source/model/DataSetType.cpp +++ b/aws-cpp-sdk-marketplacecommerceanalytics/source/model/DataSetType.cpp @@ -19,24 +19,6 @@ using namespace Aws::Utils; -static const int customer_subscriber_hourly_monthly_subscriptions_HASH = HashingUtils::HashString("customer_subscriber_hourly_monthly_subscriptions"); -static const int customer_subscriber_annual_subscriptions_HASH = HashingUtils::HashString("customer_subscriber_annual_subscriptions"); -static const int daily_business_usage_by_instance_type_HASH = HashingUtils::HashString("daily_business_usage_by_instance_type"); -static const int daily_business_fees_HASH = HashingUtils::HashString("daily_business_fees"); -static const int daily_business_free_trial_conversions_HASH = HashingUtils::HashString("daily_business_free_trial_conversions"); -static const int daily_business_new_instances_HASH = HashingUtils::HashString("daily_business_new_instances"); -static const int daily_business_new_product_subscribers_HASH = HashingUtils::HashString("daily_business_new_product_subscribers"); -static const int daily_business_canceled_product_subscribers_HASH = HashingUtils::HashString("daily_business_canceled_product_subscribers"); -static const int monthly_revenue_billing_and_revenue_data_HASH = HashingUtils::HashString("monthly_revenue_billing_and_revenue_data"); -static const int monthly_revenue_annual_subscriptions_HASH = HashingUtils::HashString("monthly_revenue_annual_subscriptions"); -static const int disbursed_amount_by_product_HASH = HashingUtils::HashString("disbursed_amount_by_product"); -static const int disbursed_amount_by_product_with_uncollected_funds_HASH = HashingUtils::HashString("disbursed_amount_by_product_with_uncollected_funds"); -static const int disbursed_amount_by_customer_geo_HASH = HashingUtils::HashString("disbursed_amount_by_customer_geo"); -static const int disbursed_amount_by_age_of_uncollected_funds_HASH = HashingUtils::HashString("disbursed_amount_by_age_of_uncollected_funds"); -static const int disbursed_amount_by_age_of_disbursed_funds_HASH = HashingUtils::HashString("disbursed_amount_by_age_of_disbursed_funds"); -static const int customer_profile_by_industry_HASH = HashingUtils::HashString("customer_profile_by_industry"); -static const int customer_profile_by_revenue_HASH = HashingUtils::HashString("customer_profile_by_revenue"); -static const int customer_profile_by_geography_HASH = HashingUtils::HashString("customer_profile_by_geography"); namespace Aws { @@ -47,6 +29,25 @@ namespace Aws namespace DataSetTypeMapper { + static const int customer_subscriber_hourly_monthly_subscriptions_HASH = HashingUtils::HashString("customer_subscriber_hourly_monthly_subscriptions"); + static const int customer_subscriber_annual_subscriptions_HASH = HashingUtils::HashString("customer_subscriber_annual_subscriptions"); + static const int daily_business_usage_by_instance_type_HASH = HashingUtils::HashString("daily_business_usage_by_instance_type"); + static const int daily_business_fees_HASH = HashingUtils::HashString("daily_business_fees"); + static const int daily_business_free_trial_conversions_HASH = HashingUtils::HashString("daily_business_free_trial_conversions"); + static const int daily_business_new_instances_HASH = HashingUtils::HashString("daily_business_new_instances"); + static const int daily_business_new_product_subscribers_HASH = HashingUtils::HashString("daily_business_new_product_subscribers"); + static const int daily_business_canceled_product_subscribers_HASH = HashingUtils::HashString("daily_business_canceled_product_subscribers"); + static const int monthly_revenue_billing_and_revenue_data_HASH = HashingUtils::HashString("monthly_revenue_billing_and_revenue_data"); + static const int monthly_revenue_annual_subscriptions_HASH = HashingUtils::HashString("monthly_revenue_annual_subscriptions"); + static const int disbursed_amount_by_product_HASH = HashingUtils::HashString("disbursed_amount_by_product"); + static const int disbursed_amount_by_product_with_uncollected_funds_HASH = HashingUtils::HashString("disbursed_amount_by_product_with_uncollected_funds"); + static const int disbursed_amount_by_customer_geo_HASH = HashingUtils::HashString("disbursed_amount_by_customer_geo"); + static const int disbursed_amount_by_age_of_uncollected_funds_HASH = HashingUtils::HashString("disbursed_amount_by_age_of_uncollected_funds"); + static const int disbursed_amount_by_age_of_disbursed_funds_HASH = HashingUtils::HashString("disbursed_amount_by_age_of_disbursed_funds"); + static const int customer_profile_by_industry_HASH = HashingUtils::HashString("customer_profile_by_industry"); + static const int customer_profile_by_revenue_HASH = HashingUtils::HashString("customer_profile_by_revenue"); + static const int customer_profile_by_geography_HASH = HashingUtils::HashString("customer_profile_by_geography"); + DataSetType GetDataSetTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-mobileanalytics/CMakeLists.txt b/aws-cpp-sdk-mobileanalytics/CMakeLists.txt index 162bae41095..76c1fbc9ea4 100644 --- a/aws-cpp-sdk-mobileanalytics/CMakeLists.txt +++ b/aws-cpp-sdk-mobileanalytics/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-mobileanalytics) "source/model/*.cpp" ) - file(GLOB MOBILEANALYTICS_SRC + file(GLOB MOBILEANALYTICS_UNIFIED_HEADERS ${AWS_MOBILEANALYTICS_HEADERS} ${AWS_MOBILEANALYTICS_MODEL_HEADERS} + ) + + file(GLOB MOBILEANALYTICS_UNITY_SRC ${AWS_MOBILEANALYTICS_SOURCE} ${AWS_MOBILEANALYTICS_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("MOBILEANALYTICS" MOBILEANALYTICS_UNITY_SRC) + endif() + + file(GLOB MOBILEANALYTICS_SRC + ${MOBILEANALYTICS_UNIFIED_HEADERS} + ${MOBILEANALYTICS_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-mobileanalytics/source/MobileAnalyticsErrors.cpp b/aws-cpp-sdk-mobileanalytics/source/MobileAnalyticsErrors.cpp index 8fc263510de..c2db880a862 100644 --- a/aws-cpp-sdk-mobileanalytics/source/MobileAnalyticsErrors.cpp +++ b/aws-cpp-sdk-mobileanalytics/source/MobileAnalyticsErrors.cpp @@ -20,8 +20,6 @@ using namespace Aws::Client; using namespace Aws::MobileAnalytics; using namespace Aws::Utils; -static const int BAD_REQUEST_HASH = HashingUtils::HashString("BadRequestException"); - namespace Aws { namespace MobileAnalytics @@ -29,6 +27,9 @@ namespace MobileAnalytics namespace MobileAnalyticsErrorMapper { +static const int BAD_REQUEST_HASH = HashingUtils::HashString("BadRequestException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-mobileanalytics/source/model/Event.cpp b/aws-cpp-sdk-mobileanalytics/source/model/Event.cpp index fc948d6b185..d0aae27b18c 100644 --- a/aws-cpp-sdk-mobileanalytics/source/model/Event.cpp +++ b/aws-cpp-sdk-mobileanalytics/source/model/Event.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MobileAnalytics::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MobileAnalytics +{ +namespace Model +{ + Event::Event() : m_eventTypeHasBeenSet(false), m_timestampHasBeenSet(false), @@ -146,4 +152,8 @@ JsonValue Event::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MobileAnalytics +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-mobileanalytics/source/model/Session.cpp b/aws-cpp-sdk-mobileanalytics/source/model/Session.cpp index 275faf75a1a..2a82c129815 100644 --- a/aws-cpp-sdk-mobileanalytics/source/model/Session.cpp +++ b/aws-cpp-sdk-mobileanalytics/source/model/Session.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::MobileAnalytics::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace MobileAnalytics +{ +namespace Model +{ + Session::Session() : m_idHasBeenSet(false), m_duration(0), @@ -102,4 +108,8 @@ JsonValue Session::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace MobileAnalytics +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-monitoring/CMakeLists.txt b/aws-cpp-sdk-monitoring/CMakeLists.txt index 8cc40be3a65..0d21cafaf25 100644 --- a/aws-cpp-sdk-monitoring/CMakeLists.txt +++ b/aws-cpp-sdk-monitoring/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-monitoring) "source/model/*.cpp" ) - file(GLOB MONITORING_SRC + file(GLOB MONITORING_UNIFIED_HEADERS ${AWS_MONITORING_HEADERS} ${AWS_MONITORING_MODEL_HEADERS} + ) + + file(GLOB MONITORING_UNITY_SRC ${AWS_MONITORING_SOURCE} ${AWS_MONITORING_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("MONITORING" MONITORING_UNITY_SRC) + endif() + + file(GLOB MONITORING_SRC + ${MONITORING_UNIFIED_HEADERS} + ${MONITORING_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-monitoring/source/CloudWatchErrors.cpp b/aws-cpp-sdk-monitoring/source/CloudWatchErrors.cpp index 07fbbe9b7b2..f98d333fafa 100644 --- a/aws-cpp-sdk-monitoring/source/CloudWatchErrors.cpp +++ b/aws-cpp-sdk-monitoring/source/CloudWatchErrors.cpp @@ -20,12 +20,6 @@ using namespace Aws::Client; using namespace Aws::CloudWatch; using namespace Aws::Utils; -static const int LIMIT_EXCEEDED_FAULT_HASH = HashingUtils::HashString("LimitExceeded"); -static const int INVALID_NEXT_TOKEN_HASH = HashingUtils::HashString("InvalidNextToken"); -static const int MISSING_REQUIRED_PARAMETER_HASH = HashingUtils::HashString("MissingParameter"); -static const int INTERNAL_SERVICE_FAULT_HASH = HashingUtils::HashString("InternalServiceError"); -static const int INVALID_FORMAT_FAULT_HASH = HashingUtils::HashString("InvalidFormat"); - namespace Aws { namespace CloudWatch @@ -33,6 +27,13 @@ namespace CloudWatch namespace CloudWatchErrorMapper { +static const int LIMIT_EXCEEDED_FAULT_HASH = HashingUtils::HashString("LimitExceeded"); +static const int INVALID_NEXT_TOKEN_HASH = HashingUtils::HashString("InvalidNextToken"); +static const int MISSING_REQUIRED_PARAMETER_HASH = HashingUtils::HashString("MissingParameter"); +static const int INTERNAL_SERVICE_FAULT_HASH = HashingUtils::HashString("InternalServiceError"); +static const int INVALID_FORMAT_FAULT_HASH = HashingUtils::HashString("InvalidFormat"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-monitoring/source/model/AlarmHistoryItem.cpp b/aws-cpp-sdk-monitoring/source/model/AlarmHistoryItem.cpp index 7ec4e2b30fe..19cd35ff53f 100644 --- a/aws-cpp-sdk-monitoring/source/model/AlarmHistoryItem.cpp +++ b/aws-cpp-sdk-monitoring/source/model/AlarmHistoryItem.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudWatch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatch +{ +namespace Model +{ + AlarmHistoryItem::AlarmHistoryItem() : m_alarmNameHasBeenSet(false), m_timestampHasBeenSet(false), @@ -130,3 +136,7 @@ void AlarmHistoryItem::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".HistoryData=" << StringUtils::URLEncode(m_historyData.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudWatch +} // namespace Aws diff --git a/aws-cpp-sdk-monitoring/source/model/ComparisonOperator.cpp b/aws-cpp-sdk-monitoring/source/model/ComparisonOperator.cpp index 7cb128ede34..554bf338d6a 100644 --- a/aws-cpp-sdk-monitoring/source/model/ComparisonOperator.cpp +++ b/aws-cpp-sdk-monitoring/source/model/ComparisonOperator.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int GreaterThanOrEqualToThreshold_HASH = HashingUtils::HashString("GreaterThanOrEqualToThreshold"); -static const int GreaterThanThreshold_HASH = HashingUtils::HashString("GreaterThanThreshold"); -static const int LessThanThreshold_HASH = HashingUtils::HashString("LessThanThreshold"); -static const int LessThanOrEqualToThreshold_HASH = HashingUtils::HashString("LessThanOrEqualToThreshold"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace ComparisonOperatorMapper { + static const int GreaterThanOrEqualToThreshold_HASH = HashingUtils::HashString("GreaterThanOrEqualToThreshold"); + static const int GreaterThanThreshold_HASH = HashingUtils::HashString("GreaterThanThreshold"); + static const int LessThanThreshold_HASH = HashingUtils::HashString("LessThanThreshold"); + static const int LessThanOrEqualToThreshold_HASH = HashingUtils::HashString("LessThanOrEqualToThreshold"); + ComparisonOperator GetComparisonOperatorForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-monitoring/source/model/Datapoint.cpp b/aws-cpp-sdk-monitoring/source/model/Datapoint.cpp index 63b0a6e1329..86d3deade58 100644 --- a/aws-cpp-sdk-monitoring/source/model/Datapoint.cpp +++ b/aws-cpp-sdk-monitoring/source/model/Datapoint.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudWatch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatch +{ +namespace Model +{ + Datapoint::Datapoint() : m_timestampHasBeenSet(false), m_sampleCount(0.0), @@ -172,3 +178,7 @@ void Datapoint::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".Unit=" << StandardUnitMapper::GetNameForStandardUnit(m_unit) << "&"; } } + +} // namespace Model +} // namespace CloudWatch +} // namespace Aws diff --git a/aws-cpp-sdk-monitoring/source/model/Dimension.cpp b/aws-cpp-sdk-monitoring/source/model/Dimension.cpp index 7a042aa29cb..0d3f48df7e1 100644 --- a/aws-cpp-sdk-monitoring/source/model/Dimension.cpp +++ b/aws-cpp-sdk-monitoring/source/model/Dimension.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudWatch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatch +{ +namespace Model +{ + Dimension::Dimension() : m_nameHasBeenSet(false), m_valueHasBeenSet(false) @@ -82,3 +88,7 @@ void Dimension::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudWatch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-monitoring/source/model/DimensionFilter.cpp b/aws-cpp-sdk-monitoring/source/model/DimensionFilter.cpp index 68c8a610efe..bed4416cd79 100644 --- a/aws-cpp-sdk-monitoring/source/model/DimensionFilter.cpp +++ b/aws-cpp-sdk-monitoring/source/model/DimensionFilter.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudWatch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatch +{ +namespace Model +{ + DimensionFilter::DimensionFilter() : m_nameHasBeenSet(false), m_valueHasBeenSet(false) @@ -82,3 +88,7 @@ void DimensionFilter::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudWatch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-monitoring/source/model/HistoryItemType.cpp b/aws-cpp-sdk-monitoring/source/model/HistoryItemType.cpp index 8a1cd4d31fc..44eb298246a 100644 --- a/aws-cpp-sdk-monitoring/source/model/HistoryItemType.cpp +++ b/aws-cpp-sdk-monitoring/source/model/HistoryItemType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int ConfigurationUpdate_HASH = HashingUtils::HashString("ConfigurationUpdate"); -static const int StateUpdate_HASH = HashingUtils::HashString("StateUpdate"); -static const int Action_HASH = HashingUtils::HashString("Action"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace HistoryItemTypeMapper { + static const int ConfigurationUpdate_HASH = HashingUtils::HashString("ConfigurationUpdate"); + static const int StateUpdate_HASH = HashingUtils::HashString("StateUpdate"); + static const int Action_HASH = HashingUtils::HashString("Action"); + HistoryItemType GetHistoryItemTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-monitoring/source/model/Metric.cpp b/aws-cpp-sdk-monitoring/source/model/Metric.cpp index 6bb5aa3045c..9e0b20d8140 100644 --- a/aws-cpp-sdk-monitoring/source/model/Metric.cpp +++ b/aws-cpp-sdk-monitoring/source/model/Metric.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudWatch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatch +{ +namespace Model +{ + Metric::Metric() : m_namespaceHasBeenSet(false), m_metricNameHasBeenSet(false), @@ -116,3 +122,7 @@ void Metric::OutputToStream(Aws::OStream& oStream, const char* location) const } } } + +} // namespace Model +} // namespace CloudWatch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-monitoring/source/model/MetricAlarm.cpp b/aws-cpp-sdk-monitoring/source/model/MetricAlarm.cpp index 352e22f069e..897148369fc 100644 --- a/aws-cpp-sdk-monitoring/source/model/MetricAlarm.cpp +++ b/aws-cpp-sdk-monitoring/source/model/MetricAlarm.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudWatch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatch +{ +namespace Model +{ + MetricAlarm::MetricAlarm() : m_alarmNameHasBeenSet(false), m_alarmArnHasBeenSet(false), @@ -454,3 +460,7 @@ void MetricAlarm::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".ComparisonOperator=" << ComparisonOperatorMapper::GetNameForComparisonOperator(m_comparisonOperator) << "&"; } } + +} // namespace Model +} // namespace CloudWatch +} // namespace Aws diff --git a/aws-cpp-sdk-monitoring/source/model/MetricDatum.cpp b/aws-cpp-sdk-monitoring/source/model/MetricDatum.cpp index 0ca46a63069..ce879f5c6e6 100644 --- a/aws-cpp-sdk-monitoring/source/model/MetricDatum.cpp +++ b/aws-cpp-sdk-monitoring/source/model/MetricDatum.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudWatch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatch +{ +namespace Model +{ + MetricDatum::MetricDatum() : m_metricNameHasBeenSet(false), m_dimensionsHasBeenSet(false), @@ -170,3 +176,7 @@ void MetricDatum::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".Unit=" << StandardUnitMapper::GetNameForStandardUnit(m_unit) << "&"; } } + +} // namespace Model +} // namespace CloudWatch +} // namespace Aws diff --git a/aws-cpp-sdk-monitoring/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-monitoring/source/model/ResponseMetadata.cpp index cfcfb9cb2f7..6ba470b7bd8 100644 --- a/aws-cpp-sdk-monitoring/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-monitoring/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudWatch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatch +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace CloudWatch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-monitoring/source/model/StandardUnit.cpp b/aws-cpp-sdk-monitoring/source/model/StandardUnit.cpp index 2adf2a206fa..16e2adaa095 100644 --- a/aws-cpp-sdk-monitoring/source/model/StandardUnit.cpp +++ b/aws-cpp-sdk-monitoring/source/model/StandardUnit.cpp @@ -19,33 +19,6 @@ using namespace Aws::Utils; -static const int Seconds_HASH = HashingUtils::HashString("Seconds"); -static const int Microseconds_HASH = HashingUtils::HashString("Microseconds"); -static const int Milliseconds_HASH = HashingUtils::HashString("Milliseconds"); -static const int Bytes_HASH = HashingUtils::HashString("Bytes"); -static const int Kilobytes_HASH = HashingUtils::HashString("Kilobytes"); -static const int Megabytes_HASH = HashingUtils::HashString("Megabytes"); -static const int Gigabytes_HASH = HashingUtils::HashString("Gigabytes"); -static const int Terabytes_HASH = HashingUtils::HashString("Terabytes"); -static const int Bits_HASH = HashingUtils::HashString("Bits"); -static const int Kilobits_HASH = HashingUtils::HashString("Kilobits"); -static const int Megabits_HASH = HashingUtils::HashString("Megabits"); -static const int Gigabits_HASH = HashingUtils::HashString("Gigabits"); -static const int Terabits_HASH = HashingUtils::HashString("Terabits"); -static const int Percent_HASH = HashingUtils::HashString("Percent"); -static const int Count_HASH = HashingUtils::HashString("Count"); -static const int Bytes_Second_HASH = HashingUtils::HashString("Bytes/Second"); -static const int Kilobytes_Second_HASH = HashingUtils::HashString("Kilobytes/Second"); -static const int Megabytes_Second_HASH = HashingUtils::HashString("Megabytes/Second"); -static const int Gigabytes_Second_HASH = HashingUtils::HashString("Gigabytes/Second"); -static const int Terabytes_Second_HASH = HashingUtils::HashString("Terabytes/Second"); -static const int Bits_Second_HASH = HashingUtils::HashString("Bits/Second"); -static const int Kilobits_Second_HASH = HashingUtils::HashString("Kilobits/Second"); -static const int Megabits_Second_HASH = HashingUtils::HashString("Megabits/Second"); -static const int Gigabits_Second_HASH = HashingUtils::HashString("Gigabits/Second"); -static const int Terabits_Second_HASH = HashingUtils::HashString("Terabits/Second"); -static const int Count_Second_HASH = HashingUtils::HashString("Count/Second"); -static const int None_HASH = HashingUtils::HashString("None"); namespace Aws { @@ -56,6 +29,34 @@ namespace Aws namespace StandardUnitMapper { + static const int Seconds_HASH = HashingUtils::HashString("Seconds"); + static const int Microseconds_HASH = HashingUtils::HashString("Microseconds"); + static const int Milliseconds_HASH = HashingUtils::HashString("Milliseconds"); + static const int Bytes_HASH = HashingUtils::HashString("Bytes"); + static const int Kilobytes_HASH = HashingUtils::HashString("Kilobytes"); + static const int Megabytes_HASH = HashingUtils::HashString("Megabytes"); + static const int Gigabytes_HASH = HashingUtils::HashString("Gigabytes"); + static const int Terabytes_HASH = HashingUtils::HashString("Terabytes"); + static const int Bits_HASH = HashingUtils::HashString("Bits"); + static const int Kilobits_HASH = HashingUtils::HashString("Kilobits"); + static const int Megabits_HASH = HashingUtils::HashString("Megabits"); + static const int Gigabits_HASH = HashingUtils::HashString("Gigabits"); + static const int Terabits_HASH = HashingUtils::HashString("Terabits"); + static const int Percent_HASH = HashingUtils::HashString("Percent"); + static const int Count_HASH = HashingUtils::HashString("Count"); + static const int Bytes_Second_HASH = HashingUtils::HashString("Bytes/Second"); + static const int Kilobytes_Second_HASH = HashingUtils::HashString("Kilobytes/Second"); + static const int Megabytes_Second_HASH = HashingUtils::HashString("Megabytes/Second"); + static const int Gigabytes_Second_HASH = HashingUtils::HashString("Gigabytes/Second"); + static const int Terabytes_Second_HASH = HashingUtils::HashString("Terabytes/Second"); + static const int Bits_Second_HASH = HashingUtils::HashString("Bits/Second"); + static const int Kilobits_Second_HASH = HashingUtils::HashString("Kilobits/Second"); + static const int Megabits_Second_HASH = HashingUtils::HashString("Megabits/Second"); + static const int Gigabits_Second_HASH = HashingUtils::HashString("Gigabits/Second"); + static const int Terabits_Second_HASH = HashingUtils::HashString("Terabits/Second"); + static const int Count_Second_HASH = HashingUtils::HashString("Count/Second"); + static const int None_HASH = HashingUtils::HashString("None"); + StandardUnit GetStandardUnitForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-monitoring/source/model/StateValue.cpp b/aws-cpp-sdk-monitoring/source/model/StateValue.cpp index 3bf52b99016..6b1ae4f1107 100644 --- a/aws-cpp-sdk-monitoring/source/model/StateValue.cpp +++ b/aws-cpp-sdk-monitoring/source/model/StateValue.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int OK_HASH = HashingUtils::HashString("OK"); -static const int ALARM_HASH = HashingUtils::HashString("ALARM"); -static const int INSUFFICIENT_DATA_HASH = HashingUtils::HashString("INSUFFICIENT_DATA"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace StateValueMapper { + static const int OK_HASH = HashingUtils::HashString("OK"); + static const int ALARM_HASH = HashingUtils::HashString("ALARM"); + static const int INSUFFICIENT_DATA_HASH = HashingUtils::HashString("INSUFFICIENT_DATA"); + StateValue GetStateValueForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-monitoring/source/model/Statistic.cpp b/aws-cpp-sdk-monitoring/source/model/Statistic.cpp index df54246349f..27229547911 100644 --- a/aws-cpp-sdk-monitoring/source/model/Statistic.cpp +++ b/aws-cpp-sdk-monitoring/source/model/Statistic.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int SampleCount_HASH = HashingUtils::HashString("SampleCount"); -static const int Average_HASH = HashingUtils::HashString("Average"); -static const int Sum_HASH = HashingUtils::HashString("Sum"); -static const int Minimum_HASH = HashingUtils::HashString("Minimum"); -static const int Maximum_HASH = HashingUtils::HashString("Maximum"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace StatisticMapper { + static const int SampleCount_HASH = HashingUtils::HashString("SampleCount"); + static const int Average_HASH = HashingUtils::HashString("Average"); + static const int Sum_HASH = HashingUtils::HashString("Sum"); + static const int Minimum_HASH = HashingUtils::HashString("Minimum"); + static const int Maximum_HASH = HashingUtils::HashString("Maximum"); + Statistic GetStatisticForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-monitoring/source/model/StatisticSet.cpp b/aws-cpp-sdk-monitoring/source/model/StatisticSet.cpp index 033a605fb37..4b6ff12b6da 100644 --- a/aws-cpp-sdk-monitoring/source/model/StatisticSet.cpp +++ b/aws-cpp-sdk-monitoring/source/model/StatisticSet.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::CloudWatch::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace CloudWatch +{ +namespace Model +{ + StatisticSet::StatisticSet() : m_sampleCount(0.0), m_sampleCountHasBeenSet(false), @@ -122,3 +128,7 @@ void StatisticSet::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".Maximum=" << StringUtils::URLEncode(m_maximum) << "&"; } } + +} // namespace Model +} // namespace CloudWatch +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/CMakeLists.txt b/aws-cpp-sdk-opsworks/CMakeLists.txt index cdefe1316a9..d5713c337c6 100644 --- a/aws-cpp-sdk-opsworks/CMakeLists.txt +++ b/aws-cpp-sdk-opsworks/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-opsworks) "source/model/*.cpp" ) - file(GLOB OPSWORKS_SRC + file(GLOB OPSWORKS_UNIFIED_HEADERS ${AWS_OPSWORKS_HEADERS} ${AWS_OPSWORKS_MODEL_HEADERS} + ) + + file(GLOB OPSWORKS_UNITY_SRC ${AWS_OPSWORKS_SOURCE} ${AWS_OPSWORKS_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("OPSWORKS" OPSWORKS_UNITY_SRC) + endif() + + file(GLOB OPSWORKS_SRC + ${OPSWORKS_UNIFIED_HEADERS} + ${OPSWORKS_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-opsworks/source/OpsWorksErrors.cpp b/aws-cpp-sdk-opsworks/source/OpsWorksErrors.cpp index 70cd6cb6158..5bcf22113a7 100644 --- a/aws-cpp-sdk-opsworks/source/OpsWorksErrors.cpp +++ b/aws-cpp-sdk-opsworks/source/OpsWorksErrors.cpp @@ -21,7 +21,6 @@ using namespace Aws::Client; using namespace Aws::OpsWorks; using namespace Aws::Utils; - namespace Aws { namespace OpsWorks @@ -29,6 +28,8 @@ namespace OpsWorks namespace OpsWorksErrorMapper { + + AWSError GetErrorForName(const char* errorName) { AWS_UNREFERENCED_PARAM(errorName); diff --git a/aws-cpp-sdk-opsworks/source/model/AgentVersion.cpp b/aws-cpp-sdk-opsworks/source/model/AgentVersion.cpp index b29abc45739..6616eae6efb 100644 --- a/aws-cpp-sdk-opsworks/source/model/AgentVersion.cpp +++ b/aws-cpp-sdk-opsworks/source/model/AgentVersion.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + AgentVersion::AgentVersion() : m_versionHasBeenSet(false), m_configurationManagerHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue AgentVersion::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/App.cpp b/aws-cpp-sdk-opsworks/source/model/App.cpp index 8b49f041c73..d398d432bfc 100644 --- a/aws-cpp-sdk-opsworks/source/model/App.cpp +++ b/aws-cpp-sdk-opsworks/source/model/App.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + App::App() : m_appIdHasBeenSet(false), m_stackIdHasBeenSet(false), @@ -283,4 +289,8 @@ JsonValue App::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/AppAttributesKeys.cpp b/aws-cpp-sdk-opsworks/source/model/AppAttributesKeys.cpp index 1f1d0d69ff1..566e990e2e2 100644 --- a/aws-cpp-sdk-opsworks/source/model/AppAttributesKeys.cpp +++ b/aws-cpp-sdk-opsworks/source/model/AppAttributesKeys.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int DocumentRoot_HASH = HashingUtils::HashString("DocumentRoot"); -static const int RailsEnv_HASH = HashingUtils::HashString("RailsEnv"); -static const int AutoBundleOnDeploy_HASH = HashingUtils::HashString("AutoBundleOnDeploy"); -static const int AwsFlowRubySettings_HASH = HashingUtils::HashString("AwsFlowRubySettings"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace AppAttributesKeysMapper { + static const int DocumentRoot_HASH = HashingUtils::HashString("DocumentRoot"); + static const int RailsEnv_HASH = HashingUtils::HashString("RailsEnv"); + static const int AutoBundleOnDeploy_HASH = HashingUtils::HashString("AutoBundleOnDeploy"); + static const int AwsFlowRubySettings_HASH = HashingUtils::HashString("AwsFlowRubySettings"); + AppAttributesKeys GetAppAttributesKeysForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-opsworks/source/model/AppType.cpp b/aws-cpp-sdk-opsworks/source/model/AppType.cpp index ec87170b4dd..32f3f627902 100644 --- a/aws-cpp-sdk-opsworks/source/model/AppType.cpp +++ b/aws-cpp-sdk-opsworks/source/model/AppType.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int aws_flow_ruby_HASH = HashingUtils::HashString("aws-flow-ruby"); -static const int java_HASH = HashingUtils::HashString("java"); -static const int rails_HASH = HashingUtils::HashString("rails"); -static const int php_HASH = HashingUtils::HashString("php"); -static const int nodejs_HASH = HashingUtils::HashString("nodejs"); -static const int static__HASH = HashingUtils::HashString("static"); -static const int other_HASH = HashingUtils::HashString("other"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace AppTypeMapper { + static const int aws_flow_ruby_HASH = HashingUtils::HashString("aws-flow-ruby"); + static const int java_HASH = HashingUtils::HashString("java"); + static const int rails_HASH = HashingUtils::HashString("rails"); + static const int php_HASH = HashingUtils::HashString("php"); + static const int nodejs_HASH = HashingUtils::HashString("nodejs"); + static const int static__HASH = HashingUtils::HashString("static"); + static const int other_HASH = HashingUtils::HashString("other"); + AppType GetAppTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-opsworks/source/model/Architecture.cpp b/aws-cpp-sdk-opsworks/source/model/Architecture.cpp index 1fc46288e4c..bcd974148de 100644 --- a/aws-cpp-sdk-opsworks/source/model/Architecture.cpp +++ b/aws-cpp-sdk-opsworks/source/model/Architecture.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int x86_64_HASH = HashingUtils::HashString("x86_64"); -static const int i386_HASH = HashingUtils::HashString("i386"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ArchitectureMapper { + static const int x86_64_HASH = HashingUtils::HashString("x86_64"); + static const int i386_HASH = HashingUtils::HashString("i386"); + Architecture GetArchitectureForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-opsworks/source/model/AutoScalingThresholds.cpp b/aws-cpp-sdk-opsworks/source/model/AutoScalingThresholds.cpp index 297dbb5bc9e..433f623cae3 100644 --- a/aws-cpp-sdk-opsworks/source/model/AutoScalingThresholds.cpp +++ b/aws-cpp-sdk-opsworks/source/model/AutoScalingThresholds.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + AutoScalingThresholds::AutoScalingThresholds() : m_instanceCount(0), m_instanceCountHasBeenSet(false), @@ -165,4 +171,8 @@ JsonValue AutoScalingThresholds::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/AutoScalingType.cpp b/aws-cpp-sdk-opsworks/source/model/AutoScalingType.cpp index 8afcff1f4f1..7abac8c7f3f 100644 --- a/aws-cpp-sdk-opsworks/source/model/AutoScalingType.cpp +++ b/aws-cpp-sdk-opsworks/source/model/AutoScalingType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int load_HASH = HashingUtils::HashString("load"); -static const int timer_HASH = HashingUtils::HashString("timer"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace AutoScalingTypeMapper { + static const int load_HASH = HashingUtils::HashString("load"); + static const int timer_HASH = HashingUtils::HashString("timer"); + AutoScalingType GetAutoScalingTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-opsworks/source/model/BlockDeviceMapping.cpp b/aws-cpp-sdk-opsworks/source/model/BlockDeviceMapping.cpp index 40d78d7bb16..4b07e65037d 100644 --- a/aws-cpp-sdk-opsworks/source/model/BlockDeviceMapping.cpp +++ b/aws-cpp-sdk-opsworks/source/model/BlockDeviceMapping.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + BlockDeviceMapping::BlockDeviceMapping() : m_deviceNameHasBeenSet(false), m_noDeviceHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue BlockDeviceMapping::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/ChefConfiguration.cpp b/aws-cpp-sdk-opsworks/source/model/ChefConfiguration.cpp index 40fa2135134..c2de7c23d48 100644 --- a/aws-cpp-sdk-opsworks/source/model/ChefConfiguration.cpp +++ b/aws-cpp-sdk-opsworks/source/model/ChefConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + ChefConfiguration::ChefConfiguration() : m_manageBerkshelf(false), m_manageBerkshelfHasBeenSet(false), @@ -72,4 +78,8 @@ JsonValue ChefConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/Command.cpp b/aws-cpp-sdk-opsworks/source/model/Command.cpp index 7cb55d383d9..348e4bc7a9a 100644 --- a/aws-cpp-sdk-opsworks/source/model/Command.cpp +++ b/aws-cpp-sdk-opsworks/source/model/Command.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + Command::Command() : m_commandIdHasBeenSet(false), m_instanceIdHasBeenSet(false), @@ -192,4 +198,8 @@ JsonValue Command::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/DataSource.cpp b/aws-cpp-sdk-opsworks/source/model/DataSource.cpp index f66af3d3471..6e0608f786a 100644 --- a/aws-cpp-sdk-opsworks/source/model/DataSource.cpp +++ b/aws-cpp-sdk-opsworks/source/model/DataSource.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + DataSource::DataSource() : m_typeHasBeenSet(false), m_arnHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue DataSource::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/Deployment.cpp b/aws-cpp-sdk-opsworks/source/model/Deployment.cpp index b8e6544bf5f..f43da91e7ea 100644 --- a/aws-cpp-sdk-opsworks/source/model/Deployment.cpp +++ b/aws-cpp-sdk-opsworks/source/model/Deployment.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + Deployment::Deployment() : m_deploymentIdHasBeenSet(false), m_stackIdHasBeenSet(false), @@ -230,4 +236,8 @@ JsonValue Deployment::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/DeploymentCommand.cpp b/aws-cpp-sdk-opsworks/source/model/DeploymentCommand.cpp index d02f575503f..5c93b834d21 100644 --- a/aws-cpp-sdk-opsworks/source/model/DeploymentCommand.cpp +++ b/aws-cpp-sdk-opsworks/source/model/DeploymentCommand.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + DeploymentCommand::DeploymentCommand() : m_nameHasBeenSet(false), m_argsHasBeenSet(false) @@ -88,4 +94,8 @@ JsonValue DeploymentCommand::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/DeploymentCommandName.cpp b/aws-cpp-sdk-opsworks/source/model/DeploymentCommandName.cpp index 34f1ad52f52..1c84891332b 100644 --- a/aws-cpp-sdk-opsworks/source/model/DeploymentCommandName.cpp +++ b/aws-cpp-sdk-opsworks/source/model/DeploymentCommandName.cpp @@ -19,18 +19,6 @@ using namespace Aws::Utils; -static const int install_dependencies_HASH = HashingUtils::HashString("install_dependencies"); -static const int update_dependencies_HASH = HashingUtils::HashString("update_dependencies"); -static const int update_custom_cookbooks_HASH = HashingUtils::HashString("update_custom_cookbooks"); -static const int execute_recipes_HASH = HashingUtils::HashString("execute_recipes"); -static const int configure_HASH = HashingUtils::HashString("configure"); -static const int setup_HASH = HashingUtils::HashString("setup"); -static const int deploy_HASH = HashingUtils::HashString("deploy"); -static const int rollback_HASH = HashingUtils::HashString("rollback"); -static const int start_HASH = HashingUtils::HashString("start"); -static const int stop_HASH = HashingUtils::HashString("stop"); -static const int restart_HASH = HashingUtils::HashString("restart"); -static const int undeploy_HASH = HashingUtils::HashString("undeploy"); namespace Aws { @@ -41,6 +29,19 @@ namespace Aws namespace DeploymentCommandNameMapper { + static const int install_dependencies_HASH = HashingUtils::HashString("install_dependencies"); + static const int update_dependencies_HASH = HashingUtils::HashString("update_dependencies"); + static const int update_custom_cookbooks_HASH = HashingUtils::HashString("update_custom_cookbooks"); + static const int execute_recipes_HASH = HashingUtils::HashString("execute_recipes"); + static const int configure_HASH = HashingUtils::HashString("configure"); + static const int setup_HASH = HashingUtils::HashString("setup"); + static const int deploy_HASH = HashingUtils::HashString("deploy"); + static const int rollback_HASH = HashingUtils::HashString("rollback"); + static const int start_HASH = HashingUtils::HashString("start"); + static const int stop_HASH = HashingUtils::HashString("stop"); + static const int restart_HASH = HashingUtils::HashString("restart"); + static const int undeploy_HASH = HashingUtils::HashString("undeploy"); + DeploymentCommandName GetDeploymentCommandNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-opsworks/source/model/EbsBlockDevice.cpp b/aws-cpp-sdk-opsworks/source/model/EbsBlockDevice.cpp index 3cf6e949d84..6b597acd78f 100644 --- a/aws-cpp-sdk-opsworks/source/model/EbsBlockDevice.cpp +++ b/aws-cpp-sdk-opsworks/source/model/EbsBlockDevice.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + EbsBlockDevice::EbsBlockDevice() : m_snapshotIdHasBeenSet(false), m_iops(0), @@ -120,4 +126,8 @@ JsonValue EbsBlockDevice::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/EcsCluster.cpp b/aws-cpp-sdk-opsworks/source/model/EcsCluster.cpp index b08a941172f..05202f108f0 100644 --- a/aws-cpp-sdk-opsworks/source/model/EcsCluster.cpp +++ b/aws-cpp-sdk-opsworks/source/model/EcsCluster.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + EcsCluster::EcsCluster() : m_ecsClusterArnHasBeenSet(false), m_ecsClusterNameHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue EcsCluster::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/ElasticIp.cpp b/aws-cpp-sdk-opsworks/source/model/ElasticIp.cpp index b2b2c09e626..9483fc86d08 100644 --- a/aws-cpp-sdk-opsworks/source/model/ElasticIp.cpp +++ b/aws-cpp-sdk-opsworks/source/model/ElasticIp.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + ElasticIp::ElasticIp() : m_ipHasBeenSet(false), m_nameHasBeenSet(false), @@ -115,4 +121,8 @@ JsonValue ElasticIp::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/ElasticLoadBalancer.cpp b/aws-cpp-sdk-opsworks/source/model/ElasticLoadBalancer.cpp index 80dc401cbe9..cdd2ed97471 100644 --- a/aws-cpp-sdk-opsworks/source/model/ElasticLoadBalancer.cpp +++ b/aws-cpp-sdk-opsworks/source/model/ElasticLoadBalancer.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + ElasticLoadBalancer::ElasticLoadBalancer() : m_elasticLoadBalancerNameHasBeenSet(false), m_regionHasBeenSet(false), @@ -199,4 +205,8 @@ JsonValue ElasticLoadBalancer::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/EnvironmentVariable.cpp b/aws-cpp-sdk-opsworks/source/model/EnvironmentVariable.cpp index 57073b5097b..bb026dcfa19 100644 --- a/aws-cpp-sdk-opsworks/source/model/EnvironmentVariable.cpp +++ b/aws-cpp-sdk-opsworks/source/model/EnvironmentVariable.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + EnvironmentVariable::EnvironmentVariable() : m_keyHasBeenSet(false), m_valueHasBeenSet(false), @@ -87,4 +93,8 @@ JsonValue EnvironmentVariable::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/Instance.cpp b/aws-cpp-sdk-opsworks/source/model/Instance.cpp index 19875f9c6e5..8266551255f 100644 --- a/aws-cpp-sdk-opsworks/source/model/Instance.cpp +++ b/aws-cpp-sdk-opsworks/source/model/Instance.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + Instance::Instance() : m_agentVersionHasBeenSet(false), m_amiIdHasBeenSet(false), @@ -664,4 +670,8 @@ JsonValue Instance::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws diff --git a/aws-cpp-sdk-opsworks/source/model/InstanceIdentity.cpp b/aws-cpp-sdk-opsworks/source/model/InstanceIdentity.cpp index 8c288e8275a..1701c11630f 100644 --- a/aws-cpp-sdk-opsworks/source/model/InstanceIdentity.cpp +++ b/aws-cpp-sdk-opsworks/source/model/InstanceIdentity.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + InstanceIdentity::InstanceIdentity() : m_documentHasBeenSet(false), m_signatureHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue InstanceIdentity::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/InstancesCount.cpp b/aws-cpp-sdk-opsworks/source/model/InstancesCount.cpp index 0f24f20ba35..d8a64529894 100644 --- a/aws-cpp-sdk-opsworks/source/model/InstancesCount.cpp +++ b/aws-cpp-sdk-opsworks/source/model/InstancesCount.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + InstancesCount::InstancesCount() : m_assigning(0), m_assigningHasBeenSet(false), @@ -363,4 +369,8 @@ JsonValue InstancesCount::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/Layer.cpp b/aws-cpp-sdk-opsworks/source/model/Layer.cpp index b4413976b75..a7105897bac 100644 --- a/aws-cpp-sdk-opsworks/source/model/Layer.cpp +++ b/aws-cpp-sdk-opsworks/source/model/Layer.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + Layer::Layer() : m_stackIdHasBeenSet(false), m_layerIdHasBeenSet(false), @@ -404,4 +410,8 @@ JsonValue Layer::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/LayerAttributesKeys.cpp b/aws-cpp-sdk-opsworks/source/model/LayerAttributesKeys.cpp index 5d394d8a057..2734ffc0283 100644 --- a/aws-cpp-sdk-opsworks/source/model/LayerAttributesKeys.cpp +++ b/aws-cpp-sdk-opsworks/source/model/LayerAttributesKeys.cpp @@ -19,31 +19,6 @@ using namespace Aws::Utils; -static const int EcsClusterArn_HASH = HashingUtils::HashString("EcsClusterArn"); -static const int EnableHaproxyStats_HASH = HashingUtils::HashString("EnableHaproxyStats"); -static const int HaproxyStatsUrl_HASH = HashingUtils::HashString("HaproxyStatsUrl"); -static const int HaproxyStatsUser_HASH = HashingUtils::HashString("HaproxyStatsUser"); -static const int HaproxyStatsPassword_HASH = HashingUtils::HashString("HaproxyStatsPassword"); -static const int HaproxyHealthCheckUrl_HASH = HashingUtils::HashString("HaproxyHealthCheckUrl"); -static const int HaproxyHealthCheckMethod_HASH = HashingUtils::HashString("HaproxyHealthCheckMethod"); -static const int MysqlRootPassword_HASH = HashingUtils::HashString("MysqlRootPassword"); -static const int MysqlRootPasswordUbiquitous_HASH = HashingUtils::HashString("MysqlRootPasswordUbiquitous"); -static const int GangliaUrl_HASH = HashingUtils::HashString("GangliaUrl"); -static const int GangliaUser_HASH = HashingUtils::HashString("GangliaUser"); -static const int GangliaPassword_HASH = HashingUtils::HashString("GangliaPassword"); -static const int MemcachedMemory_HASH = HashingUtils::HashString("MemcachedMemory"); -static const int NodejsVersion_HASH = HashingUtils::HashString("NodejsVersion"); -static const int RubyVersion_HASH = HashingUtils::HashString("RubyVersion"); -static const int RubygemsVersion_HASH = HashingUtils::HashString("RubygemsVersion"); -static const int ManageBundler_HASH = HashingUtils::HashString("ManageBundler"); -static const int BundlerVersion_HASH = HashingUtils::HashString("BundlerVersion"); -static const int RailsStack_HASH = HashingUtils::HashString("RailsStack"); -static const int PassengerVersion_HASH = HashingUtils::HashString("PassengerVersion"); -static const int Jvm_HASH = HashingUtils::HashString("Jvm"); -static const int JvmVersion_HASH = HashingUtils::HashString("JvmVersion"); -static const int JvmOptions_HASH = HashingUtils::HashString("JvmOptions"); -static const int JavaAppServer_HASH = HashingUtils::HashString("JavaAppServer"); -static const int JavaAppServerVersion_HASH = HashingUtils::HashString("JavaAppServerVersion"); namespace Aws { @@ -54,6 +29,32 @@ namespace Aws namespace LayerAttributesKeysMapper { + static const int EcsClusterArn_HASH = HashingUtils::HashString("EcsClusterArn"); + static const int EnableHaproxyStats_HASH = HashingUtils::HashString("EnableHaproxyStats"); + static const int HaproxyStatsUrl_HASH = HashingUtils::HashString("HaproxyStatsUrl"); + static const int HaproxyStatsUser_HASH = HashingUtils::HashString("HaproxyStatsUser"); + static const int HaproxyStatsPassword_HASH = HashingUtils::HashString("HaproxyStatsPassword"); + static const int HaproxyHealthCheckUrl_HASH = HashingUtils::HashString("HaproxyHealthCheckUrl"); + static const int HaproxyHealthCheckMethod_HASH = HashingUtils::HashString("HaproxyHealthCheckMethod"); + static const int MysqlRootPassword_HASH = HashingUtils::HashString("MysqlRootPassword"); + static const int MysqlRootPasswordUbiquitous_HASH = HashingUtils::HashString("MysqlRootPasswordUbiquitous"); + static const int GangliaUrl_HASH = HashingUtils::HashString("GangliaUrl"); + static const int GangliaUser_HASH = HashingUtils::HashString("GangliaUser"); + static const int GangliaPassword_HASH = HashingUtils::HashString("GangliaPassword"); + static const int MemcachedMemory_HASH = HashingUtils::HashString("MemcachedMemory"); + static const int NodejsVersion_HASH = HashingUtils::HashString("NodejsVersion"); + static const int RubyVersion_HASH = HashingUtils::HashString("RubyVersion"); + static const int RubygemsVersion_HASH = HashingUtils::HashString("RubygemsVersion"); + static const int ManageBundler_HASH = HashingUtils::HashString("ManageBundler"); + static const int BundlerVersion_HASH = HashingUtils::HashString("BundlerVersion"); + static const int RailsStack_HASH = HashingUtils::HashString("RailsStack"); + static const int PassengerVersion_HASH = HashingUtils::HashString("PassengerVersion"); + static const int Jvm_HASH = HashingUtils::HashString("Jvm"); + static const int JvmVersion_HASH = HashingUtils::HashString("JvmVersion"); + static const int JvmOptions_HASH = HashingUtils::HashString("JvmOptions"); + static const int JavaAppServer_HASH = HashingUtils::HashString("JavaAppServer"); + static const int JavaAppServerVersion_HASH = HashingUtils::HashString("JavaAppServerVersion"); + LayerAttributesKeys GetLayerAttributesKeysForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-opsworks/source/model/LayerType.cpp b/aws-cpp-sdk-opsworks/source/model/LayerType.cpp index 664933ea1dd..4dabcb063a4 100644 --- a/aws-cpp-sdk-opsworks/source/model/LayerType.cpp +++ b/aws-cpp-sdk-opsworks/source/model/LayerType.cpp @@ -19,18 +19,6 @@ using namespace Aws::Utils; -static const int aws_flow_ruby_HASH = HashingUtils::HashString("aws-flow-ruby"); -static const int ecs_cluster_HASH = HashingUtils::HashString("ecs-cluster"); -static const int java_app_HASH = HashingUtils::HashString("java-app"); -static const int lb_HASH = HashingUtils::HashString("lb"); -static const int web_HASH = HashingUtils::HashString("web"); -static const int php_app_HASH = HashingUtils::HashString("php-app"); -static const int rails_app_HASH = HashingUtils::HashString("rails-app"); -static const int nodejs_app_HASH = HashingUtils::HashString("nodejs-app"); -static const int memcached_HASH = HashingUtils::HashString("memcached"); -static const int db_master_HASH = HashingUtils::HashString("db-master"); -static const int monitoring_master_HASH = HashingUtils::HashString("monitoring-master"); -static const int custom_HASH = HashingUtils::HashString("custom"); namespace Aws { @@ -41,6 +29,19 @@ namespace Aws namespace LayerTypeMapper { + static const int aws_flow_ruby_HASH = HashingUtils::HashString("aws-flow-ruby"); + static const int ecs_cluster_HASH = HashingUtils::HashString("ecs-cluster"); + static const int java_app_HASH = HashingUtils::HashString("java-app"); + static const int lb_HASH = HashingUtils::HashString("lb"); + static const int web_HASH = HashingUtils::HashString("web"); + static const int php_app_HASH = HashingUtils::HashString("php-app"); + static const int rails_app_HASH = HashingUtils::HashString("rails-app"); + static const int nodejs_app_HASH = HashingUtils::HashString("nodejs-app"); + static const int memcached_HASH = HashingUtils::HashString("memcached"); + static const int db_master_HASH = HashingUtils::HashString("db-master"); + static const int monitoring_master_HASH = HashingUtils::HashString("monitoring-master"); + static const int custom_HASH = HashingUtils::HashString("custom"); + LayerType GetLayerTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-opsworks/source/model/LifecycleEventConfiguration.cpp b/aws-cpp-sdk-opsworks/source/model/LifecycleEventConfiguration.cpp index 56bbbe600b5..11b4be42097 100644 --- a/aws-cpp-sdk-opsworks/source/model/LifecycleEventConfiguration.cpp +++ b/aws-cpp-sdk-opsworks/source/model/LifecycleEventConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + LifecycleEventConfiguration::LifecycleEventConfiguration() : m_shutdownHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue LifecycleEventConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/LoadBasedAutoScalingConfiguration.cpp b/aws-cpp-sdk-opsworks/source/model/LoadBasedAutoScalingConfiguration.cpp index 3c9bab951f6..c108efdb009 100644 --- a/aws-cpp-sdk-opsworks/source/model/LoadBasedAutoScalingConfiguration.cpp +++ b/aws-cpp-sdk-opsworks/source/model/LoadBasedAutoScalingConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + LoadBasedAutoScalingConfiguration::LoadBasedAutoScalingConfiguration() : m_layerIdHasBeenSet(false), m_enable(false), @@ -102,4 +108,8 @@ JsonValue LoadBasedAutoScalingConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/Permission.cpp b/aws-cpp-sdk-opsworks/source/model/Permission.cpp index b4461011593..f55eca80682 100644 --- a/aws-cpp-sdk-opsworks/source/model/Permission.cpp +++ b/aws-cpp-sdk-opsworks/source/model/Permission.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + Permission::Permission() : m_stackIdHasBeenSet(false), m_iamUserArnHasBeenSet(false), @@ -119,4 +125,8 @@ JsonValue Permission::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/RaidArray.cpp b/aws-cpp-sdk-opsworks/source/model/RaidArray.cpp index b673d50cc91..53505ac126c 100644 --- a/aws-cpp-sdk-opsworks/source/model/RaidArray.cpp +++ b/aws-cpp-sdk-opsworks/source/model/RaidArray.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + RaidArray::RaidArray() : m_raidArrayIdHasBeenSet(false), m_instanceIdHasBeenSet(false), @@ -243,4 +249,8 @@ JsonValue RaidArray::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/RdsDbInstance.cpp b/aws-cpp-sdk-opsworks/source/model/RdsDbInstance.cpp index aeb63adcb69..03e3865f512 100644 --- a/aws-cpp-sdk-opsworks/source/model/RdsDbInstance.cpp +++ b/aws-cpp-sdk-opsworks/source/model/RdsDbInstance.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + RdsDbInstance::RdsDbInstance() : m_rdsDbInstanceArnHasBeenSet(false), m_dbInstanceIdentifierHasBeenSet(false), @@ -177,4 +183,8 @@ JsonValue RdsDbInstance::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/Recipes.cpp b/aws-cpp-sdk-opsworks/source/model/Recipes.cpp index 2187b2217e7..6d7f47cc3cf 100644 --- a/aws-cpp-sdk-opsworks/source/model/Recipes.cpp +++ b/aws-cpp-sdk-opsworks/source/model/Recipes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + Recipes::Recipes() : m_setupHasBeenSet(false), m_configureHasBeenSet(false), @@ -155,4 +161,8 @@ JsonValue Recipes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/ReportedOs.cpp b/aws-cpp-sdk-opsworks/source/model/ReportedOs.cpp index 322db0be6c6..8007360194f 100644 --- a/aws-cpp-sdk-opsworks/source/model/ReportedOs.cpp +++ b/aws-cpp-sdk-opsworks/source/model/ReportedOs.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + ReportedOs::ReportedOs() : m_familyHasBeenSet(false), m_nameHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue ReportedOs::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/RootDeviceType.cpp b/aws-cpp-sdk-opsworks/source/model/RootDeviceType.cpp index d7e34c8e358..e983db84c08 100644 --- a/aws-cpp-sdk-opsworks/source/model/RootDeviceType.cpp +++ b/aws-cpp-sdk-opsworks/source/model/RootDeviceType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ebs_HASH = HashingUtils::HashString("ebs"); -static const int instance_store_HASH = HashingUtils::HashString("instance-store"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace RootDeviceTypeMapper { + static const int ebs_HASH = HashingUtils::HashString("ebs"); + static const int instance_store_HASH = HashingUtils::HashString("instance-store"); + RootDeviceType GetRootDeviceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-opsworks/source/model/SelfUserProfile.cpp b/aws-cpp-sdk-opsworks/source/model/SelfUserProfile.cpp index e0f8d5194a2..0e438e0d965 100644 --- a/aws-cpp-sdk-opsworks/source/model/SelfUserProfile.cpp +++ b/aws-cpp-sdk-opsworks/source/model/SelfUserProfile.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + SelfUserProfile::SelfUserProfile() : m_iamUserArnHasBeenSet(false), m_nameHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue SelfUserProfile::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/ServiceError.cpp b/aws-cpp-sdk-opsworks/source/model/ServiceError.cpp index a780a87c255..45bf93f7905 100644 --- a/aws-cpp-sdk-opsworks/source/model/ServiceError.cpp +++ b/aws-cpp-sdk-opsworks/source/model/ServiceError.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + ServiceError::ServiceError() : m_serviceErrorIdHasBeenSet(false), m_stackIdHasBeenSet(false), @@ -130,4 +136,8 @@ JsonValue ServiceError::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/ShutdownEventConfiguration.cpp b/aws-cpp-sdk-opsworks/source/model/ShutdownEventConfiguration.cpp index f0d0619fe0e..29516f5e897 100644 --- a/aws-cpp-sdk-opsworks/source/model/ShutdownEventConfiguration.cpp +++ b/aws-cpp-sdk-opsworks/source/model/ShutdownEventConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + ShutdownEventConfiguration::ShutdownEventConfiguration() : m_executionTimeout(0), m_executionTimeoutHasBeenSet(false), @@ -74,4 +80,8 @@ JsonValue ShutdownEventConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/Source.cpp b/aws-cpp-sdk-opsworks/source/model/Source.cpp index cf0b5b67391..698bef19d88 100644 --- a/aws-cpp-sdk-opsworks/source/model/Source.cpp +++ b/aws-cpp-sdk-opsworks/source/model/Source.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + Source::Source() : m_typeHasBeenSet(false), m_urlHasBeenSet(false), @@ -129,4 +135,8 @@ JsonValue Source::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/SourceType.cpp b/aws-cpp-sdk-opsworks/source/model/SourceType.cpp index f3fa5cf90d4..ff4e05058d1 100644 --- a/aws-cpp-sdk-opsworks/source/model/SourceType.cpp +++ b/aws-cpp-sdk-opsworks/source/model/SourceType.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int git_HASH = HashingUtils::HashString("git"); -static const int svn_HASH = HashingUtils::HashString("svn"); -static const int archive_HASH = HashingUtils::HashString("archive"); -static const int s3_HASH = HashingUtils::HashString("s3"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace SourceTypeMapper { + static const int git_HASH = HashingUtils::HashString("git"); + static const int svn_HASH = HashingUtils::HashString("svn"); + static const int archive_HASH = HashingUtils::HashString("archive"); + static const int s3_HASH = HashingUtils::HashString("s3"); + SourceType GetSourceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-opsworks/source/model/SslConfiguration.cpp b/aws-cpp-sdk-opsworks/source/model/SslConfiguration.cpp index e31f889c0d6..e9ccb4e2876 100644 --- a/aws-cpp-sdk-opsworks/source/model/SslConfiguration.cpp +++ b/aws-cpp-sdk-opsworks/source/model/SslConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + SslConfiguration::SslConfiguration() : m_certificateHasBeenSet(false), m_privateKeyHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue SslConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/Stack.cpp b/aws-cpp-sdk-opsworks/source/model/Stack.cpp index a0d608c3991..847273d381e 100644 --- a/aws-cpp-sdk-opsworks/source/model/Stack.cpp +++ b/aws-cpp-sdk-opsworks/source/model/Stack.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + Stack::Stack() : m_stackIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -381,4 +387,8 @@ JsonValue Stack::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/StackAttributesKeys.cpp b/aws-cpp-sdk-opsworks/source/model/StackAttributesKeys.cpp index fbfb8cf47f5..025a809ba2e 100644 --- a/aws-cpp-sdk-opsworks/source/model/StackAttributesKeys.cpp +++ b/aws-cpp-sdk-opsworks/source/model/StackAttributesKeys.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int Color_HASH = HashingUtils::HashString("Color"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace StackAttributesKeysMapper { + static const int Color_HASH = HashingUtils::HashString("Color"); + StackAttributesKeys GetStackAttributesKeysForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-opsworks/source/model/StackConfigurationManager.cpp b/aws-cpp-sdk-opsworks/source/model/StackConfigurationManager.cpp index 7d16df6fcd2..84f79801025 100644 --- a/aws-cpp-sdk-opsworks/source/model/StackConfigurationManager.cpp +++ b/aws-cpp-sdk-opsworks/source/model/StackConfigurationManager.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + StackConfigurationManager::StackConfigurationManager() : m_nameHasBeenSet(false), m_versionHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue StackConfigurationManager::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/StackSummary.cpp b/aws-cpp-sdk-opsworks/source/model/StackSummary.cpp index 04d0bdf5eb6..ed08baeb88a 100644 --- a/aws-cpp-sdk-opsworks/source/model/StackSummary.cpp +++ b/aws-cpp-sdk-opsworks/source/model/StackSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + StackSummary::StackSummary() : m_stackIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -134,4 +140,8 @@ JsonValue StackSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/TemporaryCredential.cpp b/aws-cpp-sdk-opsworks/source/model/TemporaryCredential.cpp index d729284ddf5..df1577f9b74 100644 --- a/aws-cpp-sdk-opsworks/source/model/TemporaryCredential.cpp +++ b/aws-cpp-sdk-opsworks/source/model/TemporaryCredential.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + TemporaryCredential::TemporaryCredential() : m_usernameHasBeenSet(false), m_passwordHasBeenSet(false), @@ -102,4 +108,8 @@ JsonValue TemporaryCredential::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/TimeBasedAutoScalingConfiguration.cpp b/aws-cpp-sdk-opsworks/source/model/TimeBasedAutoScalingConfiguration.cpp index 289c5f6dd77..b34615c0f26 100644 --- a/aws-cpp-sdk-opsworks/source/model/TimeBasedAutoScalingConfiguration.cpp +++ b/aws-cpp-sdk-opsworks/source/model/TimeBasedAutoScalingConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + TimeBasedAutoScalingConfiguration::TimeBasedAutoScalingConfiguration() : m_instanceIdHasBeenSet(false), m_autoScalingScheduleHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue TimeBasedAutoScalingConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/UserProfile.cpp b/aws-cpp-sdk-opsworks/source/model/UserProfile.cpp index 6108f2fd102..8390b08a090 100644 --- a/aws-cpp-sdk-opsworks/source/model/UserProfile.cpp +++ b/aws-cpp-sdk-opsworks/source/model/UserProfile.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + UserProfile::UserProfile() : m_iamUserArnHasBeenSet(false), m_nameHasBeenSet(false), @@ -117,4 +123,8 @@ JsonValue UserProfile::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/VirtualizationType.cpp b/aws-cpp-sdk-opsworks/source/model/VirtualizationType.cpp index b218f970c98..91a67b85270 100644 --- a/aws-cpp-sdk-opsworks/source/model/VirtualizationType.cpp +++ b/aws-cpp-sdk-opsworks/source/model/VirtualizationType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int paravirtual_HASH = HashingUtils::HashString("paravirtual"); -static const int hvm_HASH = HashingUtils::HashString("hvm"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace VirtualizationTypeMapper { + static const int paravirtual_HASH = HashingUtils::HashString("paravirtual"); + static const int hvm_HASH = HashingUtils::HashString("hvm"); + VirtualizationType GetVirtualizationTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-opsworks/source/model/Volume.cpp b/aws-cpp-sdk-opsworks/source/model/Volume.cpp index 23b1826fbbc..efff3ca930e 100644 --- a/aws-cpp-sdk-opsworks/source/model/Volume.cpp +++ b/aws-cpp-sdk-opsworks/source/model/Volume.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + Volume::Volume() : m_volumeIdHasBeenSet(false), m_ec2VolumeIdHasBeenSet(false), @@ -239,4 +245,8 @@ JsonValue Volume::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/VolumeConfiguration.cpp b/aws-cpp-sdk-opsworks/source/model/VolumeConfiguration.cpp index 53d90e53303..3ef184ca14c 100644 --- a/aws-cpp-sdk-opsworks/source/model/VolumeConfiguration.cpp +++ b/aws-cpp-sdk-opsworks/source/model/VolumeConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + VolumeConfiguration::VolumeConfiguration() : m_mountPointHasBeenSet(false), m_raidLevel(0), @@ -138,4 +144,8 @@ JsonValue VolumeConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-opsworks/source/model/VolumeType.cpp b/aws-cpp-sdk-opsworks/source/model/VolumeType.cpp index 3ab1d1e7f82..96d49313ed0 100644 --- a/aws-cpp-sdk-opsworks/source/model/VolumeType.cpp +++ b/aws-cpp-sdk-opsworks/source/model/VolumeType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int gp2_HASH = HashingUtils::HashString("gp2"); -static const int io1_HASH = HashingUtils::HashString("io1"); -static const int standard_HASH = HashingUtils::HashString("standard"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace VolumeTypeMapper { + static const int gp2_HASH = HashingUtils::HashString("gp2"); + static const int io1_HASH = HashingUtils::HashString("io1"); + static const int standard_HASH = HashingUtils::HashString("standard"); + VolumeType GetVolumeTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-opsworks/source/model/WeeklyAutoScalingSchedule.cpp b/aws-cpp-sdk-opsworks/source/model/WeeklyAutoScalingSchedule.cpp index e67fcec1499..2c680bfc7dd 100644 --- a/aws-cpp-sdk-opsworks/source/model/WeeklyAutoScalingSchedule.cpp +++ b/aws-cpp-sdk-opsworks/source/model/WeeklyAutoScalingSchedule.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::OpsWorks::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace OpsWorks +{ +namespace Model +{ + WeeklyAutoScalingSchedule::WeeklyAutoScalingSchedule() : m_mondayHasBeenSet(false), m_tuesdayHasBeenSet(false), @@ -201,4 +207,8 @@ JsonValue WeeklyAutoScalingSchedule::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace OpsWorks +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/CMakeLists.txt b/aws-cpp-sdk-rds/CMakeLists.txt index feea6d346a7..6743daa03fd 100644 --- a/aws-cpp-sdk-rds/CMakeLists.txt +++ b/aws-cpp-sdk-rds/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-rds) "source/model/*.cpp" ) - file(GLOB RDS_SRC + file(GLOB RDS_UNIFIED_HEADERS ${AWS_RDS_HEADERS} ${AWS_RDS_MODEL_HEADERS} + ) + + file(GLOB RDS_UNITY_SRC ${AWS_RDS_SOURCE} ${AWS_RDS_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("RDS" RDS_UNITY_SRC) + endif() + + file(GLOB RDS_SRC + ${RDS_UNIFIED_HEADERS} + ${RDS_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-rds/source/RDSErrors.cpp b/aws-cpp-sdk-rds/source/RDSErrors.cpp index d1939155250..2cb39014b0d 100644 --- a/aws-cpp-sdk-rds/source/RDSErrors.cpp +++ b/aws-cpp-sdk-rds/source/RDSErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::RDS; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace RDSErrorMapper +{ + static const int INVALID_D_B_SNAPSHOT_STATE_FAULT_HASH = HashingUtils::HashString("InvalidDBSnapshotState"); static const int D_B_SUBNET_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("DBSubnetGroupNotFoundFault"); static const int D_B_CLUSTER_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("DBClusterNotFoundFault"); @@ -93,12 +100,6 @@ static const int SUBSCRIPTION_CATEGORY_NOT_FOUND_FAULT_HASH = HashingUtils::Hash static const int RESERVED_D_B_INSTANCE_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ReservedDBInstanceAlreadyExists"); static const int D_B_SNAPSHOT_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("DBSnapshotNotFound"); -namespace Aws -{ -namespace RDS -{ -namespace RDSErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-rds/source/model/AccountQuota.cpp b/aws-cpp-sdk-rds/source/model/AccountQuota.cpp index 7b808bd7cb5..d26b2adb9bc 100644 --- a/aws-cpp-sdk-rds/source/model/AccountQuota.cpp +++ b/aws-cpp-sdk-rds/source/model/AccountQuota.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + AccountQuota::AccountQuota() : m_accountQuotaNameHasBeenSet(false), m_used(0), @@ -102,3 +108,7 @@ void AccountQuota::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".Max=" << m_max << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/ApplyMethod.cpp b/aws-cpp-sdk-rds/source/model/ApplyMethod.cpp index 60fa1ed4515..fd11326ccda 100644 --- a/aws-cpp-sdk-rds/source/model/ApplyMethod.cpp +++ b/aws-cpp-sdk-rds/source/model/ApplyMethod.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int immediate_HASH = HashingUtils::HashString("immediate"); -static const int pending_reboot_HASH = HashingUtils::HashString("pending-reboot"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ApplyMethodMapper { + static const int immediate_HASH = HashingUtils::HashString("immediate"); + static const int pending_reboot_HASH = HashingUtils::HashString("pending-reboot"); + ApplyMethod GetApplyMethodForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-rds/source/model/AvailabilityZone.cpp b/aws-cpp-sdk-rds/source/model/AvailabilityZone.cpp index 3354e793e88..eae11466e2c 100644 --- a/aws-cpp-sdk-rds/source/model/AvailabilityZone.cpp +++ b/aws-cpp-sdk-rds/source/model/AvailabilityZone.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + AvailabilityZone::AvailabilityZone() : m_nameHasBeenSet(false) { @@ -66,3 +72,7 @@ void AvailabilityZone::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".Name=" << StringUtils::URLEncode(m_name.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/Certificate.cpp b/aws-cpp-sdk-rds/source/model/Certificate.cpp index 07991aefc6f..ceab2ca991c 100644 --- a/aws-cpp-sdk-rds/source/model/Certificate.cpp +++ b/aws-cpp-sdk-rds/source/model/Certificate.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + Certificate::Certificate() : m_certificateIdentifierHasBeenSet(false), m_certificateTypeHasBeenSet(false), @@ -130,3 +136,7 @@ void Certificate::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".ValidTill=" << StringUtils::URLEncode(m_validTill.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws diff --git a/aws-cpp-sdk-rds/source/model/CharacterSet.cpp b/aws-cpp-sdk-rds/source/model/CharacterSet.cpp index b14c90c65d9..476c9bd092b 100644 --- a/aws-cpp-sdk-rds/source/model/CharacterSet.cpp +++ b/aws-cpp-sdk-rds/source/model/CharacterSet.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + CharacterSet::CharacterSet() : m_characterSetNameHasBeenSet(false), m_characterSetDescriptionHasBeenSet(false) @@ -82,3 +88,7 @@ void CharacterSet::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".CharacterSetDescription=" << StringUtils::URLEncode(m_characterSetDescription.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/DBCluster.cpp b/aws-cpp-sdk-rds/source/model/DBCluster.cpp index 7531a3d26f1..adf766b40ee 100644 --- a/aws-cpp-sdk-rds/source/model/DBCluster.cpp +++ b/aws-cpp-sdk-rds/source/model/DBCluster.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBCluster::DBCluster() : m_allocatedStorage(0), m_allocatedStorageHasBeenSet(false), @@ -542,3 +548,7 @@ void DBCluster::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".DbClusterResourceId=" << StringUtils::URLEncode(m_dbClusterResourceId.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws diff --git a/aws-cpp-sdk-rds/source/model/DBClusterMember.cpp b/aws-cpp-sdk-rds/source/model/DBClusterMember.cpp index 65786b4775e..ae2d519bae2 100644 --- a/aws-cpp-sdk-rds/source/model/DBClusterMember.cpp +++ b/aws-cpp-sdk-rds/source/model/DBClusterMember.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBClusterMember::DBClusterMember() : m_dBInstanceIdentifierHasBeenSet(false), m_isClusterWriter(false), @@ -118,3 +124,7 @@ void DBClusterMember::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".PromotionTier=" << m_promotionTier << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws diff --git a/aws-cpp-sdk-rds/source/model/DBClusterOptionGroupStatus.cpp b/aws-cpp-sdk-rds/source/model/DBClusterOptionGroupStatus.cpp index 4163881f348..b8c4b228dd1 100644 --- a/aws-cpp-sdk-rds/source/model/DBClusterOptionGroupStatus.cpp +++ b/aws-cpp-sdk-rds/source/model/DBClusterOptionGroupStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBClusterOptionGroupStatus::DBClusterOptionGroupStatus() : m_dBClusterOptionGroupNameHasBeenSet(false), m_statusHasBeenSet(false) @@ -82,3 +88,7 @@ void DBClusterOptionGroupStatus::OutputToStream(Aws::OStream& oStream, const cha oStream << location << ".Status=" << StringUtils::URLEncode(m_status.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/DBClusterParameterGroup.cpp b/aws-cpp-sdk-rds/source/model/DBClusterParameterGroup.cpp index 4d583147733..467ce98b278 100644 --- a/aws-cpp-sdk-rds/source/model/DBClusterParameterGroup.cpp +++ b/aws-cpp-sdk-rds/source/model/DBClusterParameterGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBClusterParameterGroup::DBClusterParameterGroup() : m_dBClusterParameterGroupNameHasBeenSet(false), m_dBParameterGroupFamilyHasBeenSet(false), @@ -98,3 +104,7 @@ void DBClusterParameterGroup::OutputToStream(Aws::OStream& oStream, const char* oStream << location << ".Description=" << StringUtils::URLEncode(m_description.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/DBClusterSnapshot.cpp b/aws-cpp-sdk-rds/source/model/DBClusterSnapshot.cpp index 1a186a80fc5..d6c0098e699 100644 --- a/aws-cpp-sdk-rds/source/model/DBClusterSnapshot.cpp +++ b/aws-cpp-sdk-rds/source/model/DBClusterSnapshot.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBClusterSnapshot::DBClusterSnapshot() : m_availabilityZonesHasBeenSet(false), m_dBClusterSnapshotIdentifierHasBeenSet(false), @@ -344,3 +350,7 @@ void DBClusterSnapshot::OutputToStream(Aws::OStream& oStream, const char* locati oStream << location << ".KmsKeyId=" << StringUtils::URLEncode(m_kmsKeyId.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws diff --git a/aws-cpp-sdk-rds/source/model/DBEngineVersion.cpp b/aws-cpp-sdk-rds/source/model/DBEngineVersion.cpp index ff6bfd4dd62..0f89a71fad7 100644 --- a/aws-cpp-sdk-rds/source/model/DBEngineVersion.cpp +++ b/aws-cpp-sdk-rds/source/model/DBEngineVersion.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBEngineVersion::DBEngineVersion() : m_engineHasBeenSet(false), m_engineVersionHasBeenSet(false), @@ -218,3 +224,7 @@ void DBEngineVersion::OutputToStream(Aws::OStream& oStream, const char* location } } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/DBInstance.cpp b/aws-cpp-sdk-rds/source/model/DBInstance.cpp index 8bef7e0924a..72042d1586c 100644 --- a/aws-cpp-sdk-rds/source/model/DBInstance.cpp +++ b/aws-cpp-sdk-rds/source/model/DBInstance.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBInstance::DBInstance() : m_dBInstanceIdentifierHasBeenSet(false), m_dBInstanceClassHasBeenSet(false), @@ -926,3 +932,7 @@ void DBInstance::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".PromotionTier=" << m_promotionTier << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws diff --git a/aws-cpp-sdk-rds/source/model/DBInstanceStatusInfo.cpp b/aws-cpp-sdk-rds/source/model/DBInstanceStatusInfo.cpp index 80131f06582..cf8b8ec2e4e 100644 --- a/aws-cpp-sdk-rds/source/model/DBInstanceStatusInfo.cpp +++ b/aws-cpp-sdk-rds/source/model/DBInstanceStatusInfo.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBInstanceStatusInfo::DBInstanceStatusInfo() : m_statusTypeHasBeenSet(false), m_normal(false), @@ -116,3 +122,7 @@ void DBInstanceStatusInfo::OutputToStream(Aws::OStream& oStream, const char* loc oStream << location << ".Message=" << StringUtils::URLEncode(m_message.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/DBParameterGroup.cpp b/aws-cpp-sdk-rds/source/model/DBParameterGroup.cpp index 5249791d1e7..15d6831cdd4 100644 --- a/aws-cpp-sdk-rds/source/model/DBParameterGroup.cpp +++ b/aws-cpp-sdk-rds/source/model/DBParameterGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBParameterGroup::DBParameterGroup() : m_dBParameterGroupNameHasBeenSet(false), m_dBParameterGroupFamilyHasBeenSet(false), @@ -98,3 +104,7 @@ void DBParameterGroup::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".Description=" << StringUtils::URLEncode(m_description.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/DBParameterGroupStatus.cpp b/aws-cpp-sdk-rds/source/model/DBParameterGroupStatus.cpp index bf8de5dfb6d..05f46ebf0f1 100644 --- a/aws-cpp-sdk-rds/source/model/DBParameterGroupStatus.cpp +++ b/aws-cpp-sdk-rds/source/model/DBParameterGroupStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBParameterGroupStatus::DBParameterGroupStatus() : m_dBParameterGroupNameHasBeenSet(false), m_parameterApplyStatusHasBeenSet(false) @@ -82,3 +88,7 @@ void DBParameterGroupStatus::OutputToStream(Aws::OStream& oStream, const char* l oStream << location << ".ParameterApplyStatus=" << StringUtils::URLEncode(m_parameterApplyStatus.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/DBSecurityGroup.cpp b/aws-cpp-sdk-rds/source/model/DBSecurityGroup.cpp index 3717adf36da..017a294e397 100644 --- a/aws-cpp-sdk-rds/source/model/DBSecurityGroup.cpp +++ b/aws-cpp-sdk-rds/source/model/DBSecurityGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBSecurityGroup::DBSecurityGroup() : m_ownerIdHasBeenSet(false), m_dBSecurityGroupNameHasBeenSet(false), @@ -182,3 +188,7 @@ void DBSecurityGroup::OutputToStream(Aws::OStream& oStream, const char* location } } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/DBSecurityGroupMembership.cpp b/aws-cpp-sdk-rds/source/model/DBSecurityGroupMembership.cpp index 7e6ac2ba98c..dbded70ef44 100644 --- a/aws-cpp-sdk-rds/source/model/DBSecurityGroupMembership.cpp +++ b/aws-cpp-sdk-rds/source/model/DBSecurityGroupMembership.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBSecurityGroupMembership::DBSecurityGroupMembership() : m_dBSecurityGroupNameHasBeenSet(false), m_statusHasBeenSet(false) @@ -82,3 +88,7 @@ void DBSecurityGroupMembership::OutputToStream(Aws::OStream& oStream, const char oStream << location << ".Status=" << StringUtils::URLEncode(m_status.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/DBSnapshot.cpp b/aws-cpp-sdk-rds/source/model/DBSnapshot.cpp index 3ac3629bde9..cc047faee15 100644 --- a/aws-cpp-sdk-rds/source/model/DBSnapshot.cpp +++ b/aws-cpp-sdk-rds/source/model/DBSnapshot.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBSnapshot::DBSnapshot() : m_dBSnapshotIdentifierHasBeenSet(false), m_dBInstanceIdentifierHasBeenSet(false), @@ -428,3 +434,7 @@ void DBSnapshot::OutputToStream(Aws::OStream& oStream, const char* location) con oStream << location << ".KmsKeyId=" << StringUtils::URLEncode(m_kmsKeyId.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws diff --git a/aws-cpp-sdk-rds/source/model/DBSnapshotAttribute.cpp b/aws-cpp-sdk-rds/source/model/DBSnapshotAttribute.cpp index 19e02c95d38..85ce95a2f3d 100644 --- a/aws-cpp-sdk-rds/source/model/DBSnapshotAttribute.cpp +++ b/aws-cpp-sdk-rds/source/model/DBSnapshotAttribute.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBSnapshotAttribute::DBSnapshotAttribute() : m_attributeNameHasBeenSet(false), m_attributeValuesHasBeenSet(false) @@ -96,3 +102,7 @@ void DBSnapshotAttribute::OutputToStream(Aws::OStream& oStream, const char* loca } } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/DBSnapshotAttributesResult.cpp b/aws-cpp-sdk-rds/source/model/DBSnapshotAttributesResult.cpp index 46fe54fbfee..747f2aaaede 100644 --- a/aws-cpp-sdk-rds/source/model/DBSnapshotAttributesResult.cpp +++ b/aws-cpp-sdk-rds/source/model/DBSnapshotAttributesResult.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBSnapshotAttributesResult::DBSnapshotAttributesResult() : m_dBSnapshotIdentifierHasBeenSet(false), m_dBSnapshotAttributesHasBeenSet(false) @@ -100,3 +106,7 @@ void DBSnapshotAttributesResult::OutputToStream(Aws::OStream& oStream, const cha } } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/DBSubnetGroup.cpp b/aws-cpp-sdk-rds/source/model/DBSubnetGroup.cpp index 6fec64eb0f3..07e62e760a7 100644 --- a/aws-cpp-sdk-rds/source/model/DBSubnetGroup.cpp +++ b/aws-cpp-sdk-rds/source/model/DBSubnetGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DBSubnetGroup::DBSubnetGroup() : m_dBSubnetGroupNameHasBeenSet(false), m_dBSubnetGroupDescriptionHasBeenSet(false), @@ -148,3 +154,7 @@ void DBSubnetGroup::OutputToStream(Aws::OStream& oStream, const char* location) } } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/DescribeDBLogFilesDetails.cpp b/aws-cpp-sdk-rds/source/model/DescribeDBLogFilesDetails.cpp index 567304f10d2..6579cf43c62 100644 --- a/aws-cpp-sdk-rds/source/model/DescribeDBLogFilesDetails.cpp +++ b/aws-cpp-sdk-rds/source/model/DescribeDBLogFilesDetails.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + DescribeDBLogFilesDetails::DescribeDBLogFilesDetails() : m_logFileNameHasBeenSet(false), m_lastWritten(0), @@ -102,3 +108,7 @@ void DescribeDBLogFilesDetails::OutputToStream(Aws::OStream& oStream, const char oStream << location << ".Size=" << m_size << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/EC2SecurityGroup.cpp b/aws-cpp-sdk-rds/source/model/EC2SecurityGroup.cpp index 122da70872f..c35b23f563b 100644 --- a/aws-cpp-sdk-rds/source/model/EC2SecurityGroup.cpp +++ b/aws-cpp-sdk-rds/source/model/EC2SecurityGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + EC2SecurityGroup::EC2SecurityGroup() : m_statusHasBeenSet(false), m_eC2SecurityGroupNameHasBeenSet(false), @@ -114,3 +120,7 @@ void EC2SecurityGroup::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".EC2SecurityGroupOwnerId=" << StringUtils::URLEncode(m_eC2SecurityGroupOwnerId.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/Endpoint.cpp b/aws-cpp-sdk-rds/source/model/Endpoint.cpp index 26da09e106c..7ad031d3ef8 100644 --- a/aws-cpp-sdk-rds/source/model/Endpoint.cpp +++ b/aws-cpp-sdk-rds/source/model/Endpoint.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + Endpoint::Endpoint() : m_addressHasBeenSet(false), m_port(0), @@ -100,3 +106,7 @@ void Endpoint::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".HostedZoneId=" << StringUtils::URLEncode(m_hostedZoneId.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/EngineDefaults.cpp b/aws-cpp-sdk-rds/source/model/EngineDefaults.cpp index bd7d9feb49e..354c523e590 100644 --- a/aws-cpp-sdk-rds/source/model/EngineDefaults.cpp +++ b/aws-cpp-sdk-rds/source/model/EngineDefaults.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + EngineDefaults::EngineDefaults() : m_dBParameterGroupFamilyHasBeenSet(false), m_markerHasBeenSet(false), @@ -116,3 +122,7 @@ void EngineDefaults::OutputToStream(Aws::OStream& oStream, const char* location) } } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/Event.cpp b/aws-cpp-sdk-rds/source/model/Event.cpp index a05bbed4331..16a598a2a71 100644 --- a/aws-cpp-sdk-rds/source/model/Event.cpp +++ b/aws-cpp-sdk-rds/source/model/Event.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + Event::Event() : m_sourceIdentifierHasBeenSet(false), m_sourceTypeHasBeenSet(false), @@ -144,3 +150,7 @@ void Event::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Date=" << StringUtils::URLEncode(m_date.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws diff --git a/aws-cpp-sdk-rds/source/model/EventCategoriesMap.cpp b/aws-cpp-sdk-rds/source/model/EventCategoriesMap.cpp index e607027b168..b0041896372 100644 --- a/aws-cpp-sdk-rds/source/model/EventCategoriesMap.cpp +++ b/aws-cpp-sdk-rds/source/model/EventCategoriesMap.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + EventCategoriesMap::EventCategoriesMap() : m_sourceTypeHasBeenSet(false), m_eventCategoriesHasBeenSet(false) @@ -96,3 +102,7 @@ void EventCategoriesMap::OutputToStream(Aws::OStream& oStream, const char* locat } } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/EventSubscription.cpp b/aws-cpp-sdk-rds/source/model/EventSubscription.cpp index 3e96c0e6398..8f0be470e11 100644 --- a/aws-cpp-sdk-rds/source/model/EventSubscription.cpp +++ b/aws-cpp-sdk-rds/source/model/EventSubscription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + EventSubscription::EventSubscription() : m_customerAwsIdHasBeenSet(false), m_custSubscriptionIdHasBeenSet(false), @@ -224,3 +230,7 @@ void EventSubscription::OutputToStream(Aws::OStream& oStream, const char* locati oStream << location << ".Enabled=" << m_enabled << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/Filter.cpp b/aws-cpp-sdk-rds/source/model/Filter.cpp index d90cebbbee0..e009ea7920d 100644 --- a/aws-cpp-sdk-rds/source/model/Filter.cpp +++ b/aws-cpp-sdk-rds/source/model/Filter.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + Filter::Filter() : m_nameHasBeenSet(false), m_valuesHasBeenSet(false) @@ -96,3 +102,7 @@ void Filter::OutputToStream(Aws::OStream& oStream, const char* location) const } } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/IPRange.cpp b/aws-cpp-sdk-rds/source/model/IPRange.cpp index 7ed728283e4..9129c7ebec6 100644 --- a/aws-cpp-sdk-rds/source/model/IPRange.cpp +++ b/aws-cpp-sdk-rds/source/model/IPRange.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + IPRange::IPRange() : m_statusHasBeenSet(false), m_cIDRIPHasBeenSet(false) @@ -82,3 +88,7 @@ void IPRange::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".CIDRIP=" << StringUtils::URLEncode(m_cIDRIP.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/Option.cpp b/aws-cpp-sdk-rds/source/model/Option.cpp index f4f67b81033..87871e7cc4d 100644 --- a/aws-cpp-sdk-rds/source/model/Option.cpp +++ b/aws-cpp-sdk-rds/source/model/Option.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + Option::Option() : m_optionNameHasBeenSet(false), m_optionDescriptionHasBeenSet(false), @@ -238,3 +244,7 @@ void Option::OutputToStream(Aws::OStream& oStream, const char* location) const } } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/OptionConfiguration.cpp b/aws-cpp-sdk-rds/source/model/OptionConfiguration.cpp index 6df3599d5d1..6048a10a608 100644 --- a/aws-cpp-sdk-rds/source/model/OptionConfiguration.cpp +++ b/aws-cpp-sdk-rds/source/model/OptionConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + OptionConfiguration::OptionConfiguration() : m_optionNameHasBeenSet(false), m_port(0), @@ -178,3 +184,7 @@ void OptionConfiguration::OutputToStream(Aws::OStream& oStream, const char* loca } } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/OptionGroup.cpp b/aws-cpp-sdk-rds/source/model/OptionGroup.cpp index b36f38ffaff..f708978e5f7 100644 --- a/aws-cpp-sdk-rds/source/model/OptionGroup.cpp +++ b/aws-cpp-sdk-rds/source/model/OptionGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + OptionGroup::OptionGroup() : m_optionGroupNameHasBeenSet(false), m_optionGroupDescriptionHasBeenSet(false), @@ -182,3 +188,7 @@ void OptionGroup::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".VpcId=" << StringUtils::URLEncode(m_vpcId.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/OptionGroupMembership.cpp b/aws-cpp-sdk-rds/source/model/OptionGroupMembership.cpp index 5f795d6191e..dab3ec03f74 100644 --- a/aws-cpp-sdk-rds/source/model/OptionGroupMembership.cpp +++ b/aws-cpp-sdk-rds/source/model/OptionGroupMembership.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + OptionGroupMembership::OptionGroupMembership() : m_optionGroupNameHasBeenSet(false), m_statusHasBeenSet(false) @@ -82,3 +88,7 @@ void OptionGroupMembership::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".Status=" << StringUtils::URLEncode(m_status.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/OptionGroupOption.cpp b/aws-cpp-sdk-rds/source/model/OptionGroupOption.cpp index 29990026bc5..8e0b0088ad2 100644 --- a/aws-cpp-sdk-rds/source/model/OptionGroupOption.cpp +++ b/aws-cpp-sdk-rds/source/model/OptionGroupOption.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + OptionGroupOption::OptionGroupOption() : m_nameHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -266,3 +272,7 @@ void OptionGroupOption::OutputToStream(Aws::OStream& oStream, const char* locati } } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/OptionGroupOptionSetting.cpp b/aws-cpp-sdk-rds/source/model/OptionGroupOptionSetting.cpp index 650a7ee2c62..a10cd11dcf8 100644 --- a/aws-cpp-sdk-rds/source/model/OptionGroupOptionSetting.cpp +++ b/aws-cpp-sdk-rds/source/model/OptionGroupOptionSetting.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + OptionGroupOptionSetting::OptionGroupOptionSetting() : m_settingNameHasBeenSet(false), m_settingDescriptionHasBeenSet(false), @@ -148,3 +154,7 @@ void OptionGroupOptionSetting::OutputToStream(Aws::OStream& oStream, const char* oStream << location << ".IsModifiable=" << m_isModifiable << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/OptionSetting.cpp b/aws-cpp-sdk-rds/source/model/OptionSetting.cpp index e0ecc6b52ad..527b3a9e0fe 100644 --- a/aws-cpp-sdk-rds/source/model/OptionSetting.cpp +++ b/aws-cpp-sdk-rds/source/model/OptionSetting.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + OptionSetting::OptionSetting() : m_nameHasBeenSet(false), m_valueHasBeenSet(false), @@ -198,3 +204,7 @@ void OptionSetting::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".IsCollection=" << m_isCollection << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/OrderableDBInstanceOption.cpp b/aws-cpp-sdk-rds/source/model/OrderableDBInstanceOption.cpp index 2614624c2f3..fd7a83b8f0b 100644 --- a/aws-cpp-sdk-rds/source/model/OrderableDBInstanceOption.cpp +++ b/aws-cpp-sdk-rds/source/model/OrderableDBInstanceOption.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + OrderableDBInstanceOption::OrderableDBInstanceOption() : m_engineHasBeenSet(false), m_engineVersionHasBeenSet(false), @@ -272,3 +278,7 @@ void OrderableDBInstanceOption::OutputToStream(Aws::OStream& oStream, const char oStream << location << ".SupportsEnhancedMonitoring=" << m_supportsEnhancedMonitoring << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/Parameter.cpp b/aws-cpp-sdk-rds/source/model/Parameter.cpp index 2eb7e8d9d03..a4a7b38b934 100644 --- a/aws-cpp-sdk-rds/source/model/Parameter.cpp +++ b/aws-cpp-sdk-rds/source/model/Parameter.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + Parameter::Parameter() : m_parameterNameHasBeenSet(false), m_parameterValueHasBeenSet(false), @@ -212,3 +218,7 @@ void Parameter::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".ApplyMethod=" << ApplyMethodMapper::GetNameForApplyMethod(m_applyMethod) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/PendingMaintenanceAction.cpp b/aws-cpp-sdk-rds/source/model/PendingMaintenanceAction.cpp index 60d0723db4a..fde4221a988 100644 --- a/aws-cpp-sdk-rds/source/model/PendingMaintenanceAction.cpp +++ b/aws-cpp-sdk-rds/source/model/PendingMaintenanceAction.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + PendingMaintenanceAction::PendingMaintenanceAction() : m_actionHasBeenSet(false), m_autoAppliedAfterDateHasBeenSet(false), @@ -146,3 +152,7 @@ void PendingMaintenanceAction::OutputToStream(Aws::OStream& oStream, const char* oStream << location << ".Description=" << StringUtils::URLEncode(m_description.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws diff --git a/aws-cpp-sdk-rds/source/model/PendingModifiedValues.cpp b/aws-cpp-sdk-rds/source/model/PendingModifiedValues.cpp index b6236dd213b..fa00d3b084d 100644 --- a/aws-cpp-sdk-rds/source/model/PendingModifiedValues.cpp +++ b/aws-cpp-sdk-rds/source/model/PendingModifiedValues.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + PendingModifiedValues::PendingModifiedValues() : m_dBInstanceClassHasBeenSet(false), m_allocatedStorage(0), @@ -236,3 +242,7 @@ void PendingModifiedValues::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".CACertificateIdentifier=" << StringUtils::URLEncode(m_cACertificateIdentifier.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/RecurringCharge.cpp b/aws-cpp-sdk-rds/source/model/RecurringCharge.cpp index 0213d47ee99..7c357b72df2 100644 --- a/aws-cpp-sdk-rds/source/model/RecurringCharge.cpp +++ b/aws-cpp-sdk-rds/source/model/RecurringCharge.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + RecurringCharge::RecurringCharge() : m_recurringChargeAmount(0.0), m_recurringChargeAmountHasBeenSet(false), @@ -84,3 +90,7 @@ void RecurringCharge::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".RecurringChargeFrequency=" << StringUtils::URLEncode(m_recurringChargeFrequency.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/ReservedDBInstance.cpp b/aws-cpp-sdk-rds/source/model/ReservedDBInstance.cpp index 88720314897..0974fe796b7 100644 --- a/aws-cpp-sdk-rds/source/model/ReservedDBInstance.cpp +++ b/aws-cpp-sdk-rds/source/model/ReservedDBInstance.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + ReservedDBInstance::ReservedDBInstance() : m_reservedDBInstanceIdHasBeenSet(false), m_reservedDBInstancesOfferingIdHasBeenSet(false), @@ -302,3 +308,7 @@ void ReservedDBInstance::OutputToStream(Aws::OStream& oStream, const char* locat } } } + +} // namespace Model +} // namespace RDS +} // namespace Aws diff --git a/aws-cpp-sdk-rds/source/model/ReservedDBInstancesOffering.cpp b/aws-cpp-sdk-rds/source/model/ReservedDBInstancesOffering.cpp index 8fd549ee6ba..810363cb10a 100644 --- a/aws-cpp-sdk-rds/source/model/ReservedDBInstancesOffering.cpp +++ b/aws-cpp-sdk-rds/source/model/ReservedDBInstancesOffering.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + ReservedDBInstancesOffering::ReservedDBInstancesOffering() : m_reservedDBInstancesOfferingIdHasBeenSet(false), m_dBInstanceClassHasBeenSet(false), @@ -236,3 +242,7 @@ void ReservedDBInstancesOffering::OutputToStream(Aws::OStream& oStream, const ch } } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/ResourcePendingMaintenanceActions.cpp b/aws-cpp-sdk-rds/source/model/ResourcePendingMaintenanceActions.cpp index d59e2dabbba..302d8a20a98 100644 --- a/aws-cpp-sdk-rds/source/model/ResourcePendingMaintenanceActions.cpp +++ b/aws-cpp-sdk-rds/source/model/ResourcePendingMaintenanceActions.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + ResourcePendingMaintenanceActions::ResourcePendingMaintenanceActions() : m_resourceIdentifierHasBeenSet(false), m_pendingMaintenanceActionDetailsHasBeenSet(false) @@ -100,3 +106,7 @@ void ResourcePendingMaintenanceActions::OutputToStream(Aws::OStream& oStream, co } } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-rds/source/model/ResponseMetadata.cpp index 5c7020b18f7..55d2b1bdabe 100644 --- a/aws-cpp-sdk-rds/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-rds/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/SourceType.cpp b/aws-cpp-sdk-rds/source/model/SourceType.cpp index 1d5d843e56f..b314b9fe15c 100644 --- a/aws-cpp-sdk-rds/source/model/SourceType.cpp +++ b/aws-cpp-sdk-rds/source/model/SourceType.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int db_instance_HASH = HashingUtils::HashString("db-instance"); -static const int db_parameter_group_HASH = HashingUtils::HashString("db-parameter-group"); -static const int db_security_group_HASH = HashingUtils::HashString("db-security-group"); -static const int db_snapshot_HASH = HashingUtils::HashString("db-snapshot"); -static const int db_cluster_HASH = HashingUtils::HashString("db-cluster"); -static const int db_cluster_snapshot_HASH = HashingUtils::HashString("db-cluster-snapshot"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace SourceTypeMapper { + static const int db_instance_HASH = HashingUtils::HashString("db-instance"); + static const int db_parameter_group_HASH = HashingUtils::HashString("db-parameter-group"); + static const int db_security_group_HASH = HashingUtils::HashString("db-security-group"); + static const int db_snapshot_HASH = HashingUtils::HashString("db-snapshot"); + static const int db_cluster_HASH = HashingUtils::HashString("db-cluster"); + static const int db_cluster_snapshot_HASH = HashingUtils::HashString("db-cluster-snapshot"); + SourceType GetSourceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-rds/source/model/Subnet.cpp b/aws-cpp-sdk-rds/source/model/Subnet.cpp index bee2f2c857c..0e73efee48b 100644 --- a/aws-cpp-sdk-rds/source/model/Subnet.cpp +++ b/aws-cpp-sdk-rds/source/model/Subnet.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + Subnet::Subnet() : m_subnetIdentifierHasBeenSet(false), m_subnetAvailabilityZoneHasBeenSet(false), @@ -102,3 +108,7 @@ void Subnet::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".SubnetStatus=" << StringUtils::URLEncode(m_subnetStatus.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/Tag.cpp b/aws-cpp-sdk-rds/source/model/Tag.cpp index 25ecb299e9b..c973500887d 100644 --- a/aws-cpp-sdk-rds/source/model/Tag.cpp +++ b/aws-cpp-sdk-rds/source/model/Tag.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -82,3 +88,7 @@ void Tag::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/UpgradeTarget.cpp b/aws-cpp-sdk-rds/source/model/UpgradeTarget.cpp index 97698cdb7c4..34ffa9eec38 100644 --- a/aws-cpp-sdk-rds/source/model/UpgradeTarget.cpp +++ b/aws-cpp-sdk-rds/source/model/UpgradeTarget.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + UpgradeTarget::UpgradeTarget() : m_engineHasBeenSet(false), m_engineVersionHasBeenSet(false), @@ -134,3 +140,7 @@ void UpgradeTarget::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".IsMajorVersionUpgrade=" << m_isMajorVersionUpgrade << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-rds/source/model/VpcSecurityGroupMembership.cpp b/aws-cpp-sdk-rds/source/model/VpcSecurityGroupMembership.cpp index 12f912d44cc..60601aaacb5 100644 --- a/aws-cpp-sdk-rds/source/model/VpcSecurityGroupMembership.cpp +++ b/aws-cpp-sdk-rds/source/model/VpcSecurityGroupMembership.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::RDS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace RDS +{ +namespace Model +{ + VpcSecurityGroupMembership::VpcSecurityGroupMembership() : m_vpcSecurityGroupIdHasBeenSet(false), m_statusHasBeenSet(false) @@ -82,3 +88,7 @@ void VpcSecurityGroupMembership::OutputToStream(Aws::OStream& oStream, const cha oStream << location << ".Status=" << StringUtils::URLEncode(m_status.c_str()) << "&"; } } + +} // namespace Model +} // namespace RDS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/CMakeLists.txt b/aws-cpp-sdk-redshift/CMakeLists.txt index dcff01d36d8..f16ce7e10c2 100644 --- a/aws-cpp-sdk-redshift/CMakeLists.txt +++ b/aws-cpp-sdk-redshift/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-redshift) "source/model/*.cpp" ) - file(GLOB REDSHIFT_SRC + file(GLOB REDSHIFT_UNIFIED_HEADERS ${AWS_REDSHIFT_HEADERS} ${AWS_REDSHIFT_MODEL_HEADERS} + ) + + file(GLOB REDSHIFT_UNITY_SRC ${AWS_REDSHIFT_SOURCE} ${AWS_REDSHIFT_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("REDSHIFT" REDSHIFT_UNITY_SRC) + endif() + + file(GLOB REDSHIFT_SRC + ${REDSHIFT_UNIFIED_HEADERS} + ${REDSHIFT_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-redshift/source/RedshiftErrors.cpp b/aws-cpp-sdk-redshift/source/RedshiftErrors.cpp index 276ce4d4628..63f745afc06 100644 --- a/aws-cpp-sdk-redshift/source/RedshiftErrors.cpp +++ b/aws-cpp-sdk-redshift/source/RedshiftErrors.cpp @@ -20,432 +20,413 @@ using namespace Aws::Client; using namespace Aws::Redshift; using namespace Aws::Utils; -static const int TAG_LIMIT_EXCEEDED_FAULT_HASH = HashingUtils::HashString("TagLimitExceededFault"); +namespace Aws +{ +namespace Redshift +{ +namespace RedshiftErrorMapper +{ + +static const int INVALID_RESTORE_FAULT_HASH = HashingUtils::HashString("InvalidRestore"); +static const int INVALID_S3_KEY_PREFIX_FAULT_HASH = HashingUtils::HashString("InvalidS3KeyPrefixFault"); +static const int CLUSTER_PARAMETER_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ClusterParameterGroupNotFound"); +static const int INVALID_CLUSTER_STATE_FAULT_HASH = HashingUtils::HashString("InvalidClusterState"); +static const int UNAUTHORIZED_OPERATION_HASH = HashingUtils::HashString("UnauthorizedOperation"); +static const int UNKNOWN_SNAPSHOT_COPY_REGION_FAULT_HASH = HashingUtils::HashString("UnknownSnapshotCopyRegionFault"); +static const int INVALID_TAG_FAULT_HASH = HashingUtils::HashString("InvalidTagFault"); +static const int CLUSTER_SUBNET_GROUP_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ClusterSubnetGroupAlreadyExists"); static const int RESERVED_NODE_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ReservedNodeNotFound"); -static const int CLUSTER_PARAMETER_GROUP_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("ClusterParameterGroupQuotaExceeded"); +static const int UNSUPPORTED_OPERATION_FAULT_HASH = HashingUtils::HashString("UnsupportedOperation"); +static const int S_N_S_NO_AUTHORIZATION_FAULT_HASH = HashingUtils::HashString("SNSNoAuthorization"); +static const int CLUSTER_SNAPSHOT_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ClusterSnapshotNotFound"); static const int RESERVED_NODE_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("ReservedNodeQuotaExceeded"); +static const int INVALID_HSM_CLIENT_CERTIFICATE_STATE_FAULT_HASH = HashingUtils::HashString("InvalidHsmClientCertificateStateFault"); static const int SNAPSHOT_COPY_ALREADY_DISABLED_FAULT_HASH = HashingUtils::HashString("SnapshotCopyAlreadyDisabledFault"); -static const int INCOMPATIBLE_ORDERABLE_OPTIONS_HASH = HashingUtils::HashString("IncompatibleOrderableOptions"); -static const int IN_PROGRESS_TABLE_RESTORE_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("InProgressTableRestoreQuotaExceededFault"); -static const int CLUSTER_PARAMETER_GROUP_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ClusterParameterGroupAlreadyExists"); -static const int DEPENDENT_SERVICE_REQUEST_THROTTLING_FAULT_HASH = HashingUtils::HashString("DependentServiceRequestThrottlingFault"); static const int CLUSTER_SUBNET_GROUP_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("ClusterSubnetGroupQuotaExceeded"); -static const int SNAPSHOT_COPY_GRANT_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("SnapshotCopyGrantAlreadyExistsFault"); -static const int INVALID_CLUSTER_SECURITY_GROUP_STATE_FAULT_HASH = HashingUtils::HashString("InvalidClusterSecurityGroupState"); -static const int HSM_CLIENT_CERTIFICATE_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("HsmClientCertificateQuotaExceededFault"); -static const int CLUSTER_SUBNET_GROUP_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ClusterSubnetGroupAlreadyExists"); +static const int INVALID_HSM_CONFIGURATION_STATE_FAULT_HASH = HashingUtils::HashString("InvalidHsmConfigurationStateFault"); +static const int INVALID_S3_BUCKET_NAME_FAULT_HASH = HashingUtils::HashString("InvalidS3BucketNameFault"); +static const int CLUSTER_SUBNET_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("ClusterSubnetQuotaExceededFault"); +static const int CLUSTER_SNAPSHOT_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ClusterSnapshotAlreadyExists"); +static const int CLUSTER_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ClusterNotFound"); +static const int EVENT_SUBSCRIPTION_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("EventSubscriptionQuotaExceeded"); static const int RESERVED_NODE_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ReservedNodeAlreadyExists"); -static const int S_N_S_TOPIC_ARN_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SNSTopicArnNotFound"); +static const int INCOMPATIBLE_ORDERABLE_OPTIONS_HASH = HashingUtils::HashString("IncompatibleOrderableOptions"); +static const int AUTHORIZATION_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("AuthorizationQuotaExceeded"); +static const int SUBSCRIPTION_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SubscriptionNotFound"); +static const int AUTHORIZATION_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("AuthorizationNotFound"); +static const int CLUSTER_PARAMETER_GROUP_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ClusterParameterGroupAlreadyExists"); +static const int COPY_TO_REGION_DISABLED_FAULT_HASH = HashingUtils::HashString("CopyToRegionDisabledFault"); +static const int NUMBER_OF_NODES_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("NumberOfNodesQuotaExceeded"); static const int SUBSCRIPTION_ALREADY_EXIST_FAULT_HASH = HashingUtils::HashString("SubscriptionAlreadyExist"); -static const int CLUSTER_SECURITY_GROUP_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("QuotaExceeded.ClusterSecurityGroup"); -static const int CLUSTER_SNAPSHOT_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ClusterSnapshotAlreadyExists"); -static const int NUMBER_OF_NODES_PER_CLUSTER_LIMIT_EXCEEDED_FAULT_HASH = HashingUtils::HashString("NumberOfNodesPerClusterLimitExceeded"); -static const int HSM_CONFIGURATION_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("HsmConfigurationAlreadyExistsFault"); +static const int INVALID_SUBNET_HASH = HashingUtils::HashString("InvalidSubnet"); +static const int CLUSTER_SECURITY_GROUP_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ClusterSecurityGroupAlreadyExists"); +static const int HSM_CLIENT_CERTIFICATE_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("HsmClientCertificateNotFoundFault"); +static const int AUTHORIZATION_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("AuthorizationAlreadyExists"); +static const int CLUSTER_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("ClusterQuotaExceeded"); +static const int CLUSTER_PARAMETER_GROUP_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("ClusterParameterGroupQuotaExceeded"); +static const int SOURCE_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SourceNotFound"); +static const int INVALID_CLUSTER_SUBNET_GROUP_STATE_FAULT_HASH = HashingUtils::HashString("InvalidClusterSubnetGroupStateFault"); +static const int CLUSTER_SNAPSHOT_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("ClusterSnapshotQuotaExceeded"); +static const int HSM_CONFIGURATION_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("HsmConfigurationNotFoundFault"); +static const int SUBSCRIPTION_CATEGORY_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SubscriptionCategoryNotFound"); static const int RESOURCE_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ResourceNotFoundFault"); -static const int SNAPSHOT_COPY_ALREADY_ENABLED_FAULT_HASH = HashingUtils::HashString("SnapshotCopyAlreadyEnabledFault"); +static const int CLUSTER_SECURITY_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ClusterSecurityGroupNotFound"); static const int UNSUPPORTED_OPTION_FAULT_HASH = HashingUtils::HashString("UnsupportedOptionFault"); -static const int S_N_S_INVALID_TOPIC_FAULT_HASH = HashingUtils::HashString("SNSInvalidTopic"); -static const int INVALID_SUBSCRIPTION_STATE_FAULT_HASH = HashingUtils::HashString("InvalidSubscriptionStateFault"); -static const int HSM_CONFIGURATION_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("HsmConfigurationNotFoundFault"); -static const int CLUSTER_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ClusterNotFound"); static const int SNAPSHOT_COPY_GRANT_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SnapshotCopyGrantNotFoundFault"); -static const int UNKNOWN_SNAPSHOT_COPY_REGION_FAULT_HASH = HashingUtils::HashString("UnknownSnapshotCopyRegionFault"); +static const int INSUFFICIENT_S3_BUCKET_POLICY_FAULT_HASH = HashingUtils::HashString("InsufficientS3BucketPolicyFault"); +static const int INVALID_ELASTIC_IP_FAULT_HASH = HashingUtils::HashString("InvalidElasticIpFault"); +static const int RESERVED_NODE_OFFERING_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ReservedNodeOfferingNotFound"); +static const int SNAPSHOT_COPY_ALREADY_ENABLED_FAULT_HASH = HashingUtils::HashString("SnapshotCopyAlreadyEnabledFault"); +static const int INVALID_CLUSTER_SECURITY_GROUP_STATE_FAULT_HASH = HashingUtils::HashString("InvalidClusterSecurityGroupState"); +static const int CLUSTER_SUBNET_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ClusterSubnetGroupNotFoundFault"); +static const int SNAPSHOT_COPY_DISABLED_FAULT_HASH = HashingUtils::HashString("SnapshotCopyDisabledFault"); static const int HSM_CONFIGURATION_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("HsmConfigurationQuotaExceededFault"); -static const int AUTHORIZATION_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("AuthorizationNotFound"); +static const int SNAPSHOT_COPY_GRANT_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("SnapshotCopyGrantAlreadyExistsFault"); static const int RESIZE_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ResizeNotFound"); -static const int EVENT_SUBSCRIPTION_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("EventSubscriptionQuotaExceeded"); -static const int INVALID_SNAPSHOT_COPY_GRANT_STATE_FAULT_HASH = HashingUtils::HashString("InvalidSnapshotCopyGrantStateFault"); -static const int INVALID_CLUSTER_STATE_FAULT_HASH = HashingUtils::HashString("InvalidClusterState"); +static const int SNAPSHOT_COPY_GRANT_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("SnapshotCopyGrantQuotaExceededFault"); +static const int HSM_CONFIGURATION_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("HsmConfigurationAlreadyExistsFault"); +static const int INVALID_V_P_C_NETWORK_STATE_FAULT_HASH = HashingUtils::HashString("InvalidVPCNetworkStateFault"); +static const int HSM_CLIENT_CERTIFICATE_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("HsmClientCertificateAlreadyExistsFault"); +static const int BUCKET_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("BucketNotFoundFault"); +static const int ACCESS_TO_SNAPSHOT_DENIED_FAULT_HASH = HashingUtils::HashString("AccessToSnapshotDenied"); +static const int TAG_LIMIT_EXCEEDED_FAULT_HASH = HashingUtils::HashString("TagLimitExceededFault"); +static const int S_N_S_TOPIC_ARN_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SNSTopicArnNotFound"); +static const int INVALID_CLUSTER_SUBNET_STATE_FAULT_HASH = HashingUtils::HashString("InvalidClusterSubnetStateFault"); static const int SUBNET_ALREADY_IN_USE_HASH = HashingUtils::HashString("SubnetAlreadyInUse"); +static const int INVALID_SNAPSHOT_COPY_GRANT_STATE_FAULT_HASH = HashingUtils::HashString("InvalidSnapshotCopyGrantStateFault"); +static const int LIMIT_EXCEEDED_FAULT_HASH = HashingUtils::HashString("LimitExceededFault"); +static const int CLUSTER_SECURITY_GROUP_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("QuotaExceeded.ClusterSecurityGroup"); +static const int INVALID_CLUSTER_PARAMETER_GROUP_STATE_FAULT_HASH = HashingUtils::HashString("InvalidClusterParameterGroupState"); static const int INVALID_CLUSTER_SNAPSHOT_STATE_FAULT_HASH = HashingUtils::HashString("InvalidClusterSnapshotState"); static const int INSUFFICIENT_CLUSTER_CAPACITY_FAULT_HASH = HashingUtils::HashString("InsufficientClusterCapacity"); -static const int BUCKET_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("BucketNotFoundFault"); -static const int INVALID_TAG_FAULT_HASH = HashingUtils::HashString("InvalidTagFault"); -static const int RESERVED_NODE_OFFERING_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ReservedNodeOfferingNotFound"); -static const int INVALID_HSM_CONFIGURATION_STATE_FAULT_HASH = HashingUtils::HashString("InvalidHsmConfigurationStateFault"); -static const int INVALID_SUBNET_HASH = HashingUtils::HashString("InvalidSubnet"); -static const int CLUSTER_SECURITY_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ClusterSecurityGroupNotFound"); -static const int INVALID_ELASTIC_IP_FAULT_HASH = HashingUtils::HashString("InvalidElasticIpFault"); -static const int AUTHORIZATION_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("AuthorizationQuotaExceeded"); -static const int UNSUPPORTED_OPERATION_FAULT_HASH = HashingUtils::HashString("UnsupportedOperation"); -static const int CLUSTER_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("ClusterQuotaExceeded"); -static const int INVALID_CLUSTER_SUBNET_GROUP_STATE_FAULT_HASH = HashingUtils::HashString("InvalidClusterSubnetGroupStateFault"); -static const int SUBSCRIPTION_SEVERITY_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SubscriptionSeverityNotFound"); -static const int HSM_CLIENT_CERTIFICATE_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("HsmClientCertificateNotFoundFault"); -static const int HSM_CLIENT_CERTIFICATE_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("HsmClientCertificateAlreadyExistsFault"); -static const int SUBSCRIPTION_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SubscriptionNotFound"); -static const int SNAPSHOT_COPY_DISABLED_FAULT_HASH = HashingUtils::HashString("SnapshotCopyDisabledFault"); -static const int INVALID_HSM_CLIENT_CERTIFICATE_STATE_FAULT_HASH = HashingUtils::HashString("InvalidHsmClientCertificateStateFault"); -static const int CLUSTER_SUBNET_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ClusterSubnetGroupNotFoundFault"); -static const int INVALID_S3_KEY_PREFIX_FAULT_HASH = HashingUtils::HashString("InvalidS3KeyPrefixFault"); static const int CLUSTER_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ClusterAlreadyExists"); -static const int SOURCE_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SourceNotFound"); -static const int COPY_TO_REGION_DISABLED_FAULT_HASH = HashingUtils::HashString("CopyToRegionDisabledFault"); -static const int INVALID_TABLE_RESTORE_ARGUMENT_FAULT_HASH = HashingUtils::HashString("InvalidTableRestoreArgument"); -static const int CLUSTER_SNAPSHOT_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ClusterSnapshotNotFound"); -static const int INVALID_S3_BUCKET_NAME_FAULT_HASH = HashingUtils::HashString("InvalidS3BucketNameFault"); -static const int AUTHORIZATION_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("AuthorizationAlreadyExists"); -static const int CLUSTER_PARAMETER_GROUP_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("ClusterParameterGroupNotFound"); -static const int SNAPSHOT_COPY_GRANT_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("SnapshotCopyGrantQuotaExceededFault"); -static const int CLUSTER_SUBNET_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("ClusterSubnetQuotaExceededFault"); -static const int TABLE_RESTORE_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("TableRestoreNotFoundFault"); -static const int LIMIT_EXCEEDED_FAULT_HASH = HashingUtils::HashString("LimitExceededFault"); -static const int CLUSTER_SECURITY_GROUP_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("ClusterSecurityGroupAlreadyExists"); -static const int NUMBER_OF_NODES_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("NumberOfNodesQuotaExceeded"); -static const int CLUSTER_SNAPSHOT_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("ClusterSnapshotQuotaExceeded"); +static const int SUBSCRIPTION_SEVERITY_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SubscriptionSeverityNotFound"); +static const int S_N_S_INVALID_TOPIC_FAULT_HASH = HashingUtils::HashString("SNSInvalidTopic"); +static const int INVALID_SUBSCRIPTION_STATE_FAULT_HASH = HashingUtils::HashString("InvalidSubscriptionStateFault"); static const int SUBSCRIPTION_EVENT_ID_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SubscriptionEventIdNotFound"); -static const int INVALID_RESTORE_FAULT_HASH = HashingUtils::HashString("InvalidRestore"); -static const int INVALID_CLUSTER_PARAMETER_GROUP_STATE_FAULT_HASH = HashingUtils::HashString("InvalidClusterParameterGroupState"); -static const int S_N_S_NO_AUTHORIZATION_FAULT_HASH = HashingUtils::HashString("SNSNoAuthorization"); -static const int INVALID_CLUSTER_SUBNET_STATE_FAULT_HASH = HashingUtils::HashString("InvalidClusterSubnetStateFault"); -static const int UNAUTHORIZED_OPERATION_HASH = HashingUtils::HashString("UnauthorizedOperation"); -static const int INVALID_V_P_C_NETWORK_STATE_FAULT_HASH = HashingUtils::HashString("InvalidVPCNetworkStateFault"); -static const int SUBSCRIPTION_CATEGORY_NOT_FOUND_FAULT_HASH = HashingUtils::HashString("SubscriptionCategoryNotFound"); -static const int ACCESS_TO_SNAPSHOT_DENIED_FAULT_HASH = HashingUtils::HashString("AccessToSnapshotDenied"); -static const int INSUFFICIENT_S3_BUCKET_POLICY_FAULT_HASH = HashingUtils::HashString("InsufficientS3BucketPolicyFault"); +static const int NUMBER_OF_NODES_PER_CLUSTER_LIMIT_EXCEEDED_FAULT_HASH = HashingUtils::HashString("NumberOfNodesPerClusterLimitExceeded"); +static const int HSM_CLIENT_CERTIFICATE_QUOTA_EXCEEDED_FAULT_HASH = HashingUtils::HashString("HsmClientCertificateQuotaExceededFault"); -namespace Aws -{ -namespace Redshift -{ -namespace RedshiftErrorMapper -{ AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); - if (hashCode == TAG_LIMIT_EXCEEDED_FAULT_HASH) - { - return AWSError(static_cast(RedshiftErrors::TAG_LIMIT_EXCEEDED_FAULT), false); - } - else if (hashCode == RESERVED_NODE_NOT_FOUND_FAULT_HASH) + if (hashCode == INVALID_RESTORE_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::RESERVED_NODE_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_RESTORE_FAULT), false); } - else if (hashCode == CLUSTER_PARAMETER_GROUP_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == INVALID_S3_KEY_PREFIX_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::CLUSTER_PARAMETER_GROUP_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_S3_KEY_PREFIX_FAULT), false); } - else if (hashCode == RESERVED_NODE_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == CLUSTER_PARAMETER_GROUP_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::RESERVED_NODE_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_PARAMETER_GROUP_NOT_FOUND_FAULT), false); } - else if (hashCode == SNAPSHOT_COPY_ALREADY_DISABLED_FAULT_HASH) + else if (hashCode == INVALID_CLUSTER_STATE_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::SNAPSHOT_COPY_ALREADY_DISABLED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_CLUSTER_STATE_FAULT), false); } - else if (hashCode == INCOMPATIBLE_ORDERABLE_OPTIONS_HASH) + else if (hashCode == UNAUTHORIZED_OPERATION_HASH) { - return AWSError(static_cast(RedshiftErrors::INCOMPATIBLE_ORDERABLE_OPTIONS), false); + return AWSError(static_cast(RedshiftErrors::UNAUTHORIZED_OPERATION), false); } - else if (hashCode == IN_PROGRESS_TABLE_RESTORE_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == UNKNOWN_SNAPSHOT_COPY_REGION_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::IN_PROGRESS_TABLE_RESTORE_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::UNKNOWN_SNAPSHOT_COPY_REGION_FAULT), false); } - else if (hashCode == CLUSTER_PARAMETER_GROUP_ALREADY_EXISTS_FAULT_HASH) + else if (hashCode == INVALID_TAG_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::CLUSTER_PARAMETER_GROUP_ALREADY_EXISTS_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_TAG_FAULT), false); } - else if (hashCode == DEPENDENT_SERVICE_REQUEST_THROTTLING_FAULT_HASH) + else if (hashCode == CLUSTER_SUBNET_GROUP_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::DEPENDENT_SERVICE_REQUEST_THROTTLING_FAULT), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_SUBNET_GROUP_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == CLUSTER_SUBNET_GROUP_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == RESERVED_NODE_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::CLUSTER_SUBNET_GROUP_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::RESERVED_NODE_NOT_FOUND_FAULT), false); } - else if (hashCode == SNAPSHOT_COPY_GRANT_ALREADY_EXISTS_FAULT_HASH) + else if (hashCode == UNSUPPORTED_OPERATION_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::SNAPSHOT_COPY_GRANT_ALREADY_EXISTS_FAULT), false); + return AWSError(static_cast(RedshiftErrors::UNSUPPORTED_OPERATION_FAULT), false); } - else if (hashCode == INVALID_CLUSTER_SECURITY_GROUP_STATE_FAULT_HASH) + else if (hashCode == S_N_S_NO_AUTHORIZATION_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_CLUSTER_SECURITY_GROUP_STATE_FAULT), false); + return AWSError(static_cast(RedshiftErrors::S_N_S_NO_AUTHORIZATION_FAULT), false); } - else if (hashCode == HSM_CLIENT_CERTIFICATE_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == CLUSTER_SNAPSHOT_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::HSM_CLIENT_CERTIFICATE_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_SNAPSHOT_NOT_FOUND_FAULT), false); } - else if (hashCode == CLUSTER_SUBNET_GROUP_ALREADY_EXISTS_FAULT_HASH) + else if (hashCode == RESERVED_NODE_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::CLUSTER_SUBNET_GROUP_ALREADY_EXISTS_FAULT), false); + return AWSError(static_cast(RedshiftErrors::RESERVED_NODE_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == RESERVED_NODE_ALREADY_EXISTS_FAULT_HASH) + else if (hashCode == INVALID_HSM_CLIENT_CERTIFICATE_STATE_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::RESERVED_NODE_ALREADY_EXISTS_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_HSM_CLIENT_CERTIFICATE_STATE_FAULT), false); } - else if (hashCode == S_N_S_TOPIC_ARN_NOT_FOUND_FAULT_HASH) + else if (hashCode == SNAPSHOT_COPY_ALREADY_DISABLED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::S_N_S_TOPIC_ARN_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::SNAPSHOT_COPY_ALREADY_DISABLED_FAULT), false); } - else if (hashCode == SUBSCRIPTION_ALREADY_EXIST_FAULT_HASH) + else if (hashCode == CLUSTER_SUBNET_GROUP_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::SUBSCRIPTION_ALREADY_EXIST_FAULT), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_SUBNET_GROUP_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == CLUSTER_SECURITY_GROUP_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == INVALID_HSM_CONFIGURATION_STATE_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::CLUSTER_SECURITY_GROUP_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_HSM_CONFIGURATION_STATE_FAULT), false); } - else if (hashCode == CLUSTER_SNAPSHOT_ALREADY_EXISTS_FAULT_HASH) + else if (hashCode == INVALID_S3_BUCKET_NAME_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::CLUSTER_SNAPSHOT_ALREADY_EXISTS_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_S3_BUCKET_NAME_FAULT), false); } - else if (hashCode == NUMBER_OF_NODES_PER_CLUSTER_LIMIT_EXCEEDED_FAULT_HASH) + else if (hashCode == CLUSTER_SUBNET_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::NUMBER_OF_NODES_PER_CLUSTER_LIMIT_EXCEEDED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_SUBNET_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == HSM_CONFIGURATION_ALREADY_EXISTS_FAULT_HASH) + else if (hashCode == CLUSTER_SNAPSHOT_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::HSM_CONFIGURATION_ALREADY_EXISTS_FAULT), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_SNAPSHOT_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == RESOURCE_NOT_FOUND_FAULT_HASH) + else if (hashCode == CLUSTER_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::RESOURCE_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_NOT_FOUND_FAULT), false); } - else if (hashCode == SNAPSHOT_COPY_ALREADY_ENABLED_FAULT_HASH) + else if (hashCode == EVENT_SUBSCRIPTION_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::SNAPSHOT_COPY_ALREADY_ENABLED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::EVENT_SUBSCRIPTION_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == UNSUPPORTED_OPTION_FAULT_HASH) + else if (hashCode == RESERVED_NODE_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::UNSUPPORTED_OPTION_FAULT), false); + return AWSError(static_cast(RedshiftErrors::RESERVED_NODE_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == S_N_S_INVALID_TOPIC_FAULT_HASH) + else if (hashCode == INCOMPATIBLE_ORDERABLE_OPTIONS_HASH) { - return AWSError(static_cast(RedshiftErrors::S_N_S_INVALID_TOPIC_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INCOMPATIBLE_ORDERABLE_OPTIONS), false); } - else if (hashCode == INVALID_SUBSCRIPTION_STATE_FAULT_HASH) + else if (hashCode == AUTHORIZATION_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_SUBSCRIPTION_STATE_FAULT), false); + return AWSError(static_cast(RedshiftErrors::AUTHORIZATION_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == HSM_CONFIGURATION_NOT_FOUND_FAULT_HASH) + else if (hashCode == SUBSCRIPTION_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::HSM_CONFIGURATION_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::SUBSCRIPTION_NOT_FOUND_FAULT), false); } - else if (hashCode == CLUSTER_NOT_FOUND_FAULT_HASH) + else if (hashCode == AUTHORIZATION_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::CLUSTER_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::AUTHORIZATION_NOT_FOUND_FAULT), false); } - else if (hashCode == SNAPSHOT_COPY_GRANT_NOT_FOUND_FAULT_HASH) + else if (hashCode == CLUSTER_PARAMETER_GROUP_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::SNAPSHOT_COPY_GRANT_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_PARAMETER_GROUP_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == UNKNOWN_SNAPSHOT_COPY_REGION_FAULT_HASH) + else if (hashCode == COPY_TO_REGION_DISABLED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::UNKNOWN_SNAPSHOT_COPY_REGION_FAULT), false); + return AWSError(static_cast(RedshiftErrors::COPY_TO_REGION_DISABLED_FAULT), false); } - else if (hashCode == HSM_CONFIGURATION_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == NUMBER_OF_NODES_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::HSM_CONFIGURATION_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::NUMBER_OF_NODES_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == AUTHORIZATION_NOT_FOUND_FAULT_HASH) + else if (hashCode == SUBSCRIPTION_ALREADY_EXIST_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::AUTHORIZATION_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::SUBSCRIPTION_ALREADY_EXIST_FAULT), false); } - else if (hashCode == RESIZE_NOT_FOUND_FAULT_HASH) + else if (hashCode == INVALID_SUBNET_HASH) { - return AWSError(static_cast(RedshiftErrors::RESIZE_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_SUBNET), false); } - else if (hashCode == EVENT_SUBSCRIPTION_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == CLUSTER_SECURITY_GROUP_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::EVENT_SUBSCRIPTION_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_SECURITY_GROUP_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == INVALID_SNAPSHOT_COPY_GRANT_STATE_FAULT_HASH) + else if (hashCode == HSM_CLIENT_CERTIFICATE_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_SNAPSHOT_COPY_GRANT_STATE_FAULT), false); + return AWSError(static_cast(RedshiftErrors::HSM_CLIENT_CERTIFICATE_NOT_FOUND_FAULT), false); } - else if (hashCode == INVALID_CLUSTER_STATE_FAULT_HASH) + else if (hashCode == AUTHORIZATION_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_CLUSTER_STATE_FAULT), false); + return AWSError(static_cast(RedshiftErrors::AUTHORIZATION_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == SUBNET_ALREADY_IN_USE_HASH) + else if (hashCode == CLUSTER_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::SUBNET_ALREADY_IN_USE), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == INVALID_CLUSTER_SNAPSHOT_STATE_FAULT_HASH) + else if (hashCode == CLUSTER_PARAMETER_GROUP_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_CLUSTER_SNAPSHOT_STATE_FAULT), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_PARAMETER_GROUP_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == INSUFFICIENT_CLUSTER_CAPACITY_FAULT_HASH) + else if (hashCode == SOURCE_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INSUFFICIENT_CLUSTER_CAPACITY_FAULT), false); + return AWSError(static_cast(RedshiftErrors::SOURCE_NOT_FOUND_FAULT), false); } - else if (hashCode == BUCKET_NOT_FOUND_FAULT_HASH) + else if (hashCode == INVALID_CLUSTER_SUBNET_GROUP_STATE_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::BUCKET_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_CLUSTER_SUBNET_GROUP_STATE_FAULT), false); } - else if (hashCode == INVALID_TAG_FAULT_HASH) + else if (hashCode == CLUSTER_SNAPSHOT_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_TAG_FAULT), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_SNAPSHOT_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == RESERVED_NODE_OFFERING_NOT_FOUND_FAULT_HASH) + else if (hashCode == HSM_CONFIGURATION_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::RESERVED_NODE_OFFERING_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::HSM_CONFIGURATION_NOT_FOUND_FAULT), false); } - else if (hashCode == INVALID_HSM_CONFIGURATION_STATE_FAULT_HASH) + else if (hashCode == SUBSCRIPTION_CATEGORY_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_HSM_CONFIGURATION_STATE_FAULT), false); + return AWSError(static_cast(RedshiftErrors::SUBSCRIPTION_CATEGORY_NOT_FOUND_FAULT), false); } - else if (hashCode == INVALID_SUBNET_HASH) + else if (hashCode == RESOURCE_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_SUBNET), false); + return AWSError(static_cast(RedshiftErrors::RESOURCE_NOT_FOUND_FAULT), false); } else if (hashCode == CLUSTER_SECURITY_GROUP_NOT_FOUND_FAULT_HASH) { return AWSError(static_cast(RedshiftErrors::CLUSTER_SECURITY_GROUP_NOT_FOUND_FAULT), false); } - else if (hashCode == INVALID_ELASTIC_IP_FAULT_HASH) - { - return AWSError(static_cast(RedshiftErrors::INVALID_ELASTIC_IP_FAULT), false); - } - else if (hashCode == AUTHORIZATION_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == UNSUPPORTED_OPTION_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::AUTHORIZATION_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::UNSUPPORTED_OPTION_FAULT), false); } - else if (hashCode == UNSUPPORTED_OPERATION_FAULT_HASH) + else if (hashCode == SNAPSHOT_COPY_GRANT_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::UNSUPPORTED_OPERATION_FAULT), false); + return AWSError(static_cast(RedshiftErrors::SNAPSHOT_COPY_GRANT_NOT_FOUND_FAULT), false); } - else if (hashCode == CLUSTER_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == INSUFFICIENT_S3_BUCKET_POLICY_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::CLUSTER_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INSUFFICIENT_S3_BUCKET_POLICY_FAULT), false); } - else if (hashCode == INVALID_CLUSTER_SUBNET_GROUP_STATE_FAULT_HASH) + else if (hashCode == INVALID_ELASTIC_IP_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_CLUSTER_SUBNET_GROUP_STATE_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_ELASTIC_IP_FAULT), false); } - else if (hashCode == SUBSCRIPTION_SEVERITY_NOT_FOUND_FAULT_HASH) + else if (hashCode == RESERVED_NODE_OFFERING_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::SUBSCRIPTION_SEVERITY_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::RESERVED_NODE_OFFERING_NOT_FOUND_FAULT), false); } - else if (hashCode == HSM_CLIENT_CERTIFICATE_NOT_FOUND_FAULT_HASH) + else if (hashCode == SNAPSHOT_COPY_ALREADY_ENABLED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::HSM_CLIENT_CERTIFICATE_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::SNAPSHOT_COPY_ALREADY_ENABLED_FAULT), false); } - else if (hashCode == HSM_CLIENT_CERTIFICATE_ALREADY_EXISTS_FAULT_HASH) + else if (hashCode == INVALID_CLUSTER_SECURITY_GROUP_STATE_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::HSM_CLIENT_CERTIFICATE_ALREADY_EXISTS_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_CLUSTER_SECURITY_GROUP_STATE_FAULT), false); } - else if (hashCode == SUBSCRIPTION_NOT_FOUND_FAULT_HASH) + else if (hashCode == CLUSTER_SUBNET_GROUP_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::SUBSCRIPTION_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_SUBNET_GROUP_NOT_FOUND_FAULT), false); } else if (hashCode == SNAPSHOT_COPY_DISABLED_FAULT_HASH) { return AWSError(static_cast(RedshiftErrors::SNAPSHOT_COPY_DISABLED_FAULT), false); } - else if (hashCode == INVALID_HSM_CLIENT_CERTIFICATE_STATE_FAULT_HASH) + else if (hashCode == HSM_CONFIGURATION_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_HSM_CLIENT_CERTIFICATE_STATE_FAULT), false); + return AWSError(static_cast(RedshiftErrors::HSM_CONFIGURATION_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == CLUSTER_SUBNET_GROUP_NOT_FOUND_FAULT_HASH) + else if (hashCode == SNAPSHOT_COPY_GRANT_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::CLUSTER_SUBNET_GROUP_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::SNAPSHOT_COPY_GRANT_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == INVALID_S3_KEY_PREFIX_FAULT_HASH) + else if (hashCode == RESIZE_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_S3_KEY_PREFIX_FAULT), false); + return AWSError(static_cast(RedshiftErrors::RESIZE_NOT_FOUND_FAULT), false); } - else if (hashCode == CLUSTER_ALREADY_EXISTS_FAULT_HASH) + else if (hashCode == SNAPSHOT_COPY_GRANT_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::CLUSTER_ALREADY_EXISTS_FAULT), false); + return AWSError(static_cast(RedshiftErrors::SNAPSHOT_COPY_GRANT_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == SOURCE_NOT_FOUND_FAULT_HASH) + else if (hashCode == HSM_CONFIGURATION_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::SOURCE_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::HSM_CONFIGURATION_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == COPY_TO_REGION_DISABLED_FAULT_HASH) + else if (hashCode == INVALID_V_P_C_NETWORK_STATE_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::COPY_TO_REGION_DISABLED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_V_P_C_NETWORK_STATE_FAULT), false); } - else if (hashCode == INVALID_TABLE_RESTORE_ARGUMENT_FAULT_HASH) + else if (hashCode == HSM_CLIENT_CERTIFICATE_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_TABLE_RESTORE_ARGUMENT_FAULT), false); + return AWSError(static_cast(RedshiftErrors::HSM_CLIENT_CERTIFICATE_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == CLUSTER_SNAPSHOT_NOT_FOUND_FAULT_HASH) + else if (hashCode == BUCKET_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::CLUSTER_SNAPSHOT_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::BUCKET_NOT_FOUND_FAULT), false); } - else if (hashCode == INVALID_S3_BUCKET_NAME_FAULT_HASH) + else if (hashCode == ACCESS_TO_SNAPSHOT_DENIED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_S3_BUCKET_NAME_FAULT), false); + return AWSError(static_cast(RedshiftErrors::ACCESS_TO_SNAPSHOT_DENIED_FAULT), false); } - else if (hashCode == AUTHORIZATION_ALREADY_EXISTS_FAULT_HASH) + else if (hashCode == TAG_LIMIT_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::AUTHORIZATION_ALREADY_EXISTS_FAULT), false); + return AWSError(static_cast(RedshiftErrors::TAG_LIMIT_EXCEEDED_FAULT), false); } - else if (hashCode == CLUSTER_PARAMETER_GROUP_NOT_FOUND_FAULT_HASH) + else if (hashCode == S_N_S_TOPIC_ARN_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::CLUSTER_PARAMETER_GROUP_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::S_N_S_TOPIC_ARN_NOT_FOUND_FAULT), false); } - else if (hashCode == SNAPSHOT_COPY_GRANT_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == INVALID_CLUSTER_SUBNET_STATE_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::SNAPSHOT_COPY_GRANT_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_CLUSTER_SUBNET_STATE_FAULT), false); } - else if (hashCode == CLUSTER_SUBNET_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == SUBNET_ALREADY_IN_USE_HASH) { - return AWSError(static_cast(RedshiftErrors::CLUSTER_SUBNET_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::SUBNET_ALREADY_IN_USE), false); } - else if (hashCode == TABLE_RESTORE_NOT_FOUND_FAULT_HASH) + else if (hashCode == INVALID_SNAPSHOT_COPY_GRANT_STATE_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::TABLE_RESTORE_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_SNAPSHOT_COPY_GRANT_STATE_FAULT), false); } else if (hashCode == LIMIT_EXCEEDED_FAULT_HASH) { return AWSError(static_cast(RedshiftErrors::LIMIT_EXCEEDED_FAULT), false); } - else if (hashCode == CLUSTER_SECURITY_GROUP_ALREADY_EXISTS_FAULT_HASH) - { - return AWSError(static_cast(RedshiftErrors::CLUSTER_SECURITY_GROUP_ALREADY_EXISTS_FAULT), false); - } - else if (hashCode == NUMBER_OF_NODES_QUOTA_EXCEEDED_FAULT_HASH) - { - return AWSError(static_cast(RedshiftErrors::NUMBER_OF_NODES_QUOTA_EXCEEDED_FAULT), false); - } - else if (hashCode == CLUSTER_SNAPSHOT_QUOTA_EXCEEDED_FAULT_HASH) + else if (hashCode == CLUSTER_SECURITY_GROUP_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::CLUSTER_SNAPSHOT_QUOTA_EXCEEDED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_SECURITY_GROUP_QUOTA_EXCEEDED_FAULT), false); } - else if (hashCode == SUBSCRIPTION_EVENT_ID_NOT_FOUND_FAULT_HASH) + else if (hashCode == INVALID_CLUSTER_PARAMETER_GROUP_STATE_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::SUBSCRIPTION_EVENT_ID_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_CLUSTER_PARAMETER_GROUP_STATE_FAULT), false); } - else if (hashCode == INVALID_RESTORE_FAULT_HASH) + else if (hashCode == INVALID_CLUSTER_SNAPSHOT_STATE_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_RESTORE_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_CLUSTER_SNAPSHOT_STATE_FAULT), false); } - else if (hashCode == INVALID_CLUSTER_PARAMETER_GROUP_STATE_FAULT_HASH) + else if (hashCode == INSUFFICIENT_CLUSTER_CAPACITY_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_CLUSTER_PARAMETER_GROUP_STATE_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INSUFFICIENT_CLUSTER_CAPACITY_FAULT), false); } - else if (hashCode == S_N_S_NO_AUTHORIZATION_FAULT_HASH) + else if (hashCode == CLUSTER_ALREADY_EXISTS_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::S_N_S_NO_AUTHORIZATION_FAULT), false); + return AWSError(static_cast(RedshiftErrors::CLUSTER_ALREADY_EXISTS_FAULT), false); } - else if (hashCode == INVALID_CLUSTER_SUBNET_STATE_FAULT_HASH) + else if (hashCode == SUBSCRIPTION_SEVERITY_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_CLUSTER_SUBNET_STATE_FAULT), false); + return AWSError(static_cast(RedshiftErrors::SUBSCRIPTION_SEVERITY_NOT_FOUND_FAULT), false); } - else if (hashCode == UNAUTHORIZED_OPERATION_HASH) + else if (hashCode == S_N_S_INVALID_TOPIC_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::UNAUTHORIZED_OPERATION), false); + return AWSError(static_cast(RedshiftErrors::S_N_S_INVALID_TOPIC_FAULT), false); } - else if (hashCode == INVALID_V_P_C_NETWORK_STATE_FAULT_HASH) + else if (hashCode == INVALID_SUBSCRIPTION_STATE_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INVALID_V_P_C_NETWORK_STATE_FAULT), false); + return AWSError(static_cast(RedshiftErrors::INVALID_SUBSCRIPTION_STATE_FAULT), false); } - else if (hashCode == SUBSCRIPTION_CATEGORY_NOT_FOUND_FAULT_HASH) + else if (hashCode == SUBSCRIPTION_EVENT_ID_NOT_FOUND_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::SUBSCRIPTION_CATEGORY_NOT_FOUND_FAULT), false); + return AWSError(static_cast(RedshiftErrors::SUBSCRIPTION_EVENT_ID_NOT_FOUND_FAULT), false); } - else if (hashCode == ACCESS_TO_SNAPSHOT_DENIED_FAULT_HASH) + else if (hashCode == NUMBER_OF_NODES_PER_CLUSTER_LIMIT_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::ACCESS_TO_SNAPSHOT_DENIED_FAULT), false); + return AWSError(static_cast(RedshiftErrors::NUMBER_OF_NODES_PER_CLUSTER_LIMIT_EXCEEDED_FAULT), false); } - else if (hashCode == INSUFFICIENT_S3_BUCKET_POLICY_FAULT_HASH) + else if (hashCode == HSM_CLIENT_CERTIFICATE_QUOTA_EXCEEDED_FAULT_HASH) { - return AWSError(static_cast(RedshiftErrors::INSUFFICIENT_S3_BUCKET_POLICY_FAULT), false); + return AWSError(static_cast(RedshiftErrors::HSM_CLIENT_CERTIFICATE_QUOTA_EXCEEDED_FAULT), false); } return AWSError(CoreErrors::UNKNOWN, false); } diff --git a/aws-cpp-sdk-redshift/source/model/AccountWithRestoreAccess.cpp b/aws-cpp-sdk-redshift/source/model/AccountWithRestoreAccess.cpp index 36ef87ad62a..594ddfe8c6f 100644 --- a/aws-cpp-sdk-redshift/source/model/AccountWithRestoreAccess.cpp +++ b/aws-cpp-sdk-redshift/source/model/AccountWithRestoreAccess.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + AccountWithRestoreAccess::AccountWithRestoreAccess() : m_accountIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void AccountWithRestoreAccess::OutputToStream(Aws::OStream& oStream, const char* oStream << location << ".AccountId=" << StringUtils::URLEncode(m_accountId.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/AvailabilityZone.cpp b/aws-cpp-sdk-redshift/source/model/AvailabilityZone.cpp index 39edd7cb87f..9feeacb0a84 100644 --- a/aws-cpp-sdk-redshift/source/model/AvailabilityZone.cpp +++ b/aws-cpp-sdk-redshift/source/model/AvailabilityZone.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + AvailabilityZone::AvailabilityZone() : m_nameHasBeenSet(false) { @@ -66,3 +72,7 @@ void AvailabilityZone::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".Name=" << StringUtils::URLEncode(m_name.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/Cluster.cpp b/aws-cpp-sdk-redshift/source/model/Cluster.cpp index 9f6dc42e041..d25b2c74346 100644 --- a/aws-cpp-sdk-redshift/source/model/Cluster.cpp +++ b/aws-cpp-sdk-redshift/source/model/Cluster.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + Cluster::Cluster() : m_clusterIdentifierHasBeenSet(false), m_nodeTypeHasBeenSet(false), @@ -704,3 +710,7 @@ void Cluster::OutputToStream(Aws::OStream& oStream, const char* location) const } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws diff --git a/aws-cpp-sdk-redshift/source/model/ClusterNode.cpp b/aws-cpp-sdk-redshift/source/model/ClusterNode.cpp index 64b2af5150a..c3aebad850c 100644 --- a/aws-cpp-sdk-redshift/source/model/ClusterNode.cpp +++ b/aws-cpp-sdk-redshift/source/model/ClusterNode.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + ClusterNode::ClusterNode() : m_nodeRoleHasBeenSet(false), m_privateIPAddressHasBeenSet(false), @@ -98,3 +104,7 @@ void ClusterNode::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".PublicIPAddress=" << StringUtils::URLEncode(m_publicIPAddress.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/ClusterParameterGroup.cpp b/aws-cpp-sdk-redshift/source/model/ClusterParameterGroup.cpp index 70c6378d665..0226c0372d6 100644 --- a/aws-cpp-sdk-redshift/source/model/ClusterParameterGroup.cpp +++ b/aws-cpp-sdk-redshift/source/model/ClusterParameterGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + ClusterParameterGroup::ClusterParameterGroup() : m_parameterGroupNameHasBeenSet(false), m_parameterGroupFamilyHasBeenSet(false), @@ -132,3 +138,7 @@ void ClusterParameterGroup::OutputToStream(Aws::OStream& oStream, const char* lo } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/ClusterParameterGroupStatus.cpp b/aws-cpp-sdk-redshift/source/model/ClusterParameterGroupStatus.cpp index a8eaf18d1ff..dd8c7b6ed41 100644 --- a/aws-cpp-sdk-redshift/source/model/ClusterParameterGroupStatus.cpp +++ b/aws-cpp-sdk-redshift/source/model/ClusterParameterGroupStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + ClusterParameterGroupStatus::ClusterParameterGroupStatus() : m_parameterGroupNameHasBeenSet(false), m_parameterApplyStatusHasBeenSet(false), @@ -116,3 +122,7 @@ void ClusterParameterGroupStatus::OutputToStream(Aws::OStream& oStream, const ch } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/ClusterParameterStatus.cpp b/aws-cpp-sdk-redshift/source/model/ClusterParameterStatus.cpp index 485e30d0565..2892ab3d8ac 100644 --- a/aws-cpp-sdk-redshift/source/model/ClusterParameterStatus.cpp +++ b/aws-cpp-sdk-redshift/source/model/ClusterParameterStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + ClusterParameterStatus::ClusterParameterStatus() : m_parameterNameHasBeenSet(false), m_parameterApplyStatusHasBeenSet(false), @@ -98,3 +104,7 @@ void ClusterParameterStatus::OutputToStream(Aws::OStream& oStream, const char* l oStream << location << ".ParameterApplyErrorDescription=" << StringUtils::URLEncode(m_parameterApplyErrorDescription.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/ClusterSecurityGroup.cpp b/aws-cpp-sdk-redshift/source/model/ClusterSecurityGroup.cpp index 7bbd764f55c..7ebf322a9ea 100644 --- a/aws-cpp-sdk-redshift/source/model/ClusterSecurityGroup.cpp +++ b/aws-cpp-sdk-redshift/source/model/ClusterSecurityGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + ClusterSecurityGroup::ClusterSecurityGroup() : m_clusterSecurityGroupNameHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -184,3 +190,7 @@ void ClusterSecurityGroup::OutputToStream(Aws::OStream& oStream, const char* loc } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/ClusterSecurityGroupMembership.cpp b/aws-cpp-sdk-redshift/source/model/ClusterSecurityGroupMembership.cpp index ed224f95595..f145edb9466 100644 --- a/aws-cpp-sdk-redshift/source/model/ClusterSecurityGroupMembership.cpp +++ b/aws-cpp-sdk-redshift/source/model/ClusterSecurityGroupMembership.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + ClusterSecurityGroupMembership::ClusterSecurityGroupMembership() : m_clusterSecurityGroupNameHasBeenSet(false), m_statusHasBeenSet(false) @@ -82,3 +88,7 @@ void ClusterSecurityGroupMembership::OutputToStream(Aws::OStream& oStream, const oStream << location << ".Status=" << StringUtils::URLEncode(m_status.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/ClusterSnapshotCopyStatus.cpp b/aws-cpp-sdk-redshift/source/model/ClusterSnapshotCopyStatus.cpp index 52d10df3f30..f4313809709 100644 --- a/aws-cpp-sdk-redshift/source/model/ClusterSnapshotCopyStatus.cpp +++ b/aws-cpp-sdk-redshift/source/model/ClusterSnapshotCopyStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + ClusterSnapshotCopyStatus::ClusterSnapshotCopyStatus() : m_destinationRegionHasBeenSet(false), m_retentionPeriod(0), @@ -100,3 +106,7 @@ void ClusterSnapshotCopyStatus::OutputToStream(Aws::OStream& oStream, const char oStream << location << ".SnapshotCopyGrantName=" << StringUtils::URLEncode(m_snapshotCopyGrantName.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/ClusterSubnetGroup.cpp b/aws-cpp-sdk-redshift/source/model/ClusterSubnetGroup.cpp index 29e7c61898b..7dad75acb54 100644 --- a/aws-cpp-sdk-redshift/source/model/ClusterSubnetGroup.cpp +++ b/aws-cpp-sdk-redshift/source/model/ClusterSubnetGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + ClusterSubnetGroup::ClusterSubnetGroup() : m_clusterSubnetGroupNameHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -182,3 +188,7 @@ void ClusterSubnetGroup::OutputToStream(Aws::OStream& oStream, const char* locat } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/ClusterVersion.cpp b/aws-cpp-sdk-redshift/source/model/ClusterVersion.cpp index 683dfaa5c73..68f45376f16 100644 --- a/aws-cpp-sdk-redshift/source/model/ClusterVersion.cpp +++ b/aws-cpp-sdk-redshift/source/model/ClusterVersion.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + ClusterVersion::ClusterVersion() : m_clusterVersionHasBeenSet(false), m_clusterParameterGroupFamilyHasBeenSet(false), @@ -98,3 +104,7 @@ void ClusterVersion::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".Description=" << StringUtils::URLEncode(m_description.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/DefaultClusterParameters.cpp b/aws-cpp-sdk-redshift/source/model/DefaultClusterParameters.cpp index 39716d468c9..d5ac75cab3f 100644 --- a/aws-cpp-sdk-redshift/source/model/DefaultClusterParameters.cpp +++ b/aws-cpp-sdk-redshift/source/model/DefaultClusterParameters.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + DefaultClusterParameters::DefaultClusterParameters() : m_parameterGroupFamilyHasBeenSet(false), m_markerHasBeenSet(false), @@ -116,3 +122,7 @@ void DefaultClusterParameters::OutputToStream(Aws::OStream& oStream, const char* } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/EC2SecurityGroup.cpp b/aws-cpp-sdk-redshift/source/model/EC2SecurityGroup.cpp index 61432c1deb9..2d99c68d2cc 100644 --- a/aws-cpp-sdk-redshift/source/model/EC2SecurityGroup.cpp +++ b/aws-cpp-sdk-redshift/source/model/EC2SecurityGroup.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + EC2SecurityGroup::EC2SecurityGroup() : m_statusHasBeenSet(false), m_eC2SecurityGroupNameHasBeenSet(false), @@ -132,3 +138,7 @@ void EC2SecurityGroup::OutputToStream(Aws::OStream& oStream, const char* locatio } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/ElasticIpStatus.cpp b/aws-cpp-sdk-redshift/source/model/ElasticIpStatus.cpp index aee860a32bf..50671a815dc 100644 --- a/aws-cpp-sdk-redshift/source/model/ElasticIpStatus.cpp +++ b/aws-cpp-sdk-redshift/source/model/ElasticIpStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + ElasticIpStatus::ElasticIpStatus() : m_elasticIpHasBeenSet(false), m_statusHasBeenSet(false) @@ -82,3 +88,7 @@ void ElasticIpStatus::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".Status=" << StringUtils::URLEncode(m_status.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/Endpoint.cpp b/aws-cpp-sdk-redshift/source/model/Endpoint.cpp index ab5d8503415..5dbbf39f92e 100644 --- a/aws-cpp-sdk-redshift/source/model/Endpoint.cpp +++ b/aws-cpp-sdk-redshift/source/model/Endpoint.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + Endpoint::Endpoint() : m_addressHasBeenSet(false), m_port(0), @@ -84,3 +90,7 @@ void Endpoint::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Port=" << m_port << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/Event.cpp b/aws-cpp-sdk-redshift/source/model/Event.cpp index 8bbb27b906c..3cf3c023636 100644 --- a/aws-cpp-sdk-redshift/source/model/Event.cpp +++ b/aws-cpp-sdk-redshift/source/model/Event.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + Event::Event() : m_sourceIdentifierHasBeenSet(false), m_sourceTypeHasBeenSet(false), @@ -176,3 +182,7 @@ void Event::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".EventId=" << StringUtils::URLEncode(m_eventId.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws diff --git a/aws-cpp-sdk-redshift/source/model/EventCategoriesMap.cpp b/aws-cpp-sdk-redshift/source/model/EventCategoriesMap.cpp index b47eb590d03..bc70c33bea5 100644 --- a/aws-cpp-sdk-redshift/source/model/EventCategoriesMap.cpp +++ b/aws-cpp-sdk-redshift/source/model/EventCategoriesMap.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + EventCategoriesMap::EventCategoriesMap() : m_sourceTypeHasBeenSet(false), m_eventsHasBeenSet(false) @@ -100,3 +106,7 @@ void EventCategoriesMap::OutputToStream(Aws::OStream& oStream, const char* locat } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/EventInfoMap.cpp b/aws-cpp-sdk-redshift/source/model/EventInfoMap.cpp index b83b7edf6f0..38835f3be9f 100644 --- a/aws-cpp-sdk-redshift/source/model/EventInfoMap.cpp +++ b/aws-cpp-sdk-redshift/source/model/EventInfoMap.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + EventInfoMap::EventInfoMap() : m_eventIdHasBeenSet(false), m_eventCategoriesHasBeenSet(false), @@ -128,3 +134,7 @@ void EventInfoMap::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".Severity=" << StringUtils::URLEncode(m_severity.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/EventSubscription.cpp b/aws-cpp-sdk-redshift/source/model/EventSubscription.cpp index 652a53b9b25..97089d077fd 100644 --- a/aws-cpp-sdk-redshift/source/model/EventSubscription.cpp +++ b/aws-cpp-sdk-redshift/source/model/EventSubscription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + EventSubscription::EventSubscription() : m_customerAwsIdHasBeenSet(false), m_custSubscriptionIdHasBeenSet(false), @@ -274,3 +280,7 @@ void EventSubscription::OutputToStream(Aws::OStream& oStream, const char* locati } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws diff --git a/aws-cpp-sdk-redshift/source/model/HsmClientCertificate.cpp b/aws-cpp-sdk-redshift/source/model/HsmClientCertificate.cpp index dc392820730..010b3316b37 100644 --- a/aws-cpp-sdk-redshift/source/model/HsmClientCertificate.cpp +++ b/aws-cpp-sdk-redshift/source/model/HsmClientCertificate.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + HsmClientCertificate::HsmClientCertificate() : m_hsmClientCertificateIdentifierHasBeenSet(false), m_hsmClientCertificatePublicKeyHasBeenSet(false), @@ -116,3 +122,7 @@ void HsmClientCertificate::OutputToStream(Aws::OStream& oStream, const char* loc } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/HsmConfiguration.cpp b/aws-cpp-sdk-redshift/source/model/HsmConfiguration.cpp index c2894f0a1e0..90f565ce83b 100644 --- a/aws-cpp-sdk-redshift/source/model/HsmConfiguration.cpp +++ b/aws-cpp-sdk-redshift/source/model/HsmConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + HsmConfiguration::HsmConfiguration() : m_hsmConfigurationIdentifierHasBeenSet(false), m_descriptionHasBeenSet(false), @@ -148,3 +154,7 @@ void HsmConfiguration::OutputToStream(Aws::OStream& oStream, const char* locatio } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/HsmStatus.cpp b/aws-cpp-sdk-redshift/source/model/HsmStatus.cpp index 667c0e0cbde..02d47e42b39 100644 --- a/aws-cpp-sdk-redshift/source/model/HsmStatus.cpp +++ b/aws-cpp-sdk-redshift/source/model/HsmStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + HsmStatus::HsmStatus() : m_hsmClientCertificateIdentifierHasBeenSet(false), m_hsmConfigurationIdentifierHasBeenSet(false), @@ -98,3 +104,7 @@ void HsmStatus::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".Status=" << StringUtils::URLEncode(m_status.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/IPRange.cpp b/aws-cpp-sdk-redshift/source/model/IPRange.cpp index 51375a6e689..59da92d7975 100644 --- a/aws-cpp-sdk-redshift/source/model/IPRange.cpp +++ b/aws-cpp-sdk-redshift/source/model/IPRange.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + IPRange::IPRange() : m_statusHasBeenSet(false), m_cIDRIPHasBeenSet(false), @@ -116,3 +122,7 @@ void IPRange::OutputToStream(Aws::OStream& oStream, const char* location) const } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/OrderableClusterOption.cpp b/aws-cpp-sdk-redshift/source/model/OrderableClusterOption.cpp index fb4a88366bc..ddb23e0a4c1 100644 --- a/aws-cpp-sdk-redshift/source/model/OrderableClusterOption.cpp +++ b/aws-cpp-sdk-redshift/source/model/OrderableClusterOption.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + OrderableClusterOption::OrderableClusterOption() : m_clusterVersionHasBeenSet(false), m_clusterTypeHasBeenSet(false), @@ -132,3 +138,7 @@ void OrderableClusterOption::OutputToStream(Aws::OStream& oStream, const char* l } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/Parameter.cpp b/aws-cpp-sdk-redshift/source/model/Parameter.cpp index b44c54cd36b..e1dfff05b67 100644 --- a/aws-cpp-sdk-redshift/source/model/Parameter.cpp +++ b/aws-cpp-sdk-redshift/source/model/Parameter.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + Parameter::Parameter() : m_parameterNameHasBeenSet(false), m_parameterValueHasBeenSet(false), @@ -196,3 +202,7 @@ void Parameter::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".MinimumEngineVersion=" << StringUtils::URLEncode(m_minimumEngineVersion.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/ParameterApplyType.cpp b/aws-cpp-sdk-redshift/source/model/ParameterApplyType.cpp index 81037acb3c4..59e73fb2b71 100644 --- a/aws-cpp-sdk-redshift/source/model/ParameterApplyType.cpp +++ b/aws-cpp-sdk-redshift/source/model/ParameterApplyType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int static__HASH = HashingUtils::HashString("static"); -static const int dynamic_HASH = HashingUtils::HashString("dynamic"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ParameterApplyTypeMapper { + static const int static__HASH = HashingUtils::HashString("static"); + static const int dynamic_HASH = HashingUtils::HashString("dynamic"); + ParameterApplyType GetParameterApplyTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-redshift/source/model/PendingModifiedValues.cpp b/aws-cpp-sdk-redshift/source/model/PendingModifiedValues.cpp index 51868833c6e..4487223269a 100644 --- a/aws-cpp-sdk-redshift/source/model/PendingModifiedValues.cpp +++ b/aws-cpp-sdk-redshift/source/model/PendingModifiedValues.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + PendingModifiedValues::PendingModifiedValues() : m_masterUserPasswordHasBeenSet(false), m_nodeTypeHasBeenSet(false), @@ -184,3 +190,7 @@ void PendingModifiedValues::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".PubliclyAccessible=" << m_publiclyAccessible << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws diff --git a/aws-cpp-sdk-redshift/source/model/RecurringCharge.cpp b/aws-cpp-sdk-redshift/source/model/RecurringCharge.cpp index 259be43c0f9..024f2f1b7f5 100644 --- a/aws-cpp-sdk-redshift/source/model/RecurringCharge.cpp +++ b/aws-cpp-sdk-redshift/source/model/RecurringCharge.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + RecurringCharge::RecurringCharge() : m_recurringChargeAmount(0.0), m_recurringChargeAmountHasBeenSet(false), @@ -84,3 +90,7 @@ void RecurringCharge::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".RecurringChargeFrequency=" << StringUtils::URLEncode(m_recurringChargeFrequency.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/ReservedNode.cpp b/aws-cpp-sdk-redshift/source/model/ReservedNode.cpp index 8d7293a1400..05956b4a9b9 100644 --- a/aws-cpp-sdk-redshift/source/model/ReservedNode.cpp +++ b/aws-cpp-sdk-redshift/source/model/ReservedNode.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + ReservedNode::ReservedNode() : m_reservedNodeIdHasBeenSet(false), m_reservedNodeOfferingIdHasBeenSet(false), @@ -268,3 +274,7 @@ void ReservedNode::OutputToStream(Aws::OStream& oStream, const char* location) c } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws diff --git a/aws-cpp-sdk-redshift/source/model/ReservedNodeOffering.cpp b/aws-cpp-sdk-redshift/source/model/ReservedNodeOffering.cpp index 79d667c8cbc..d07f9a951a0 100644 --- a/aws-cpp-sdk-redshift/source/model/ReservedNodeOffering.cpp +++ b/aws-cpp-sdk-redshift/source/model/ReservedNodeOffering.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + ReservedNodeOffering::ReservedNodeOffering() : m_reservedNodeOfferingIdHasBeenSet(false), m_nodeTypeHasBeenSet(false), @@ -202,3 +208,7 @@ void ReservedNodeOffering::OutputToStream(Aws::OStream& oStream, const char* loc } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-redshift/source/model/ResponseMetadata.cpp index 780bd5880e7..2a2fcfbffc6 100644 --- a/aws-cpp-sdk-redshift/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-redshift/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/RestoreStatus.cpp b/aws-cpp-sdk-redshift/source/model/RestoreStatus.cpp index 00bab23c26d..1972a5f9eb4 100644 --- a/aws-cpp-sdk-redshift/source/model/RestoreStatus.cpp +++ b/aws-cpp-sdk-redshift/source/model/RestoreStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + RestoreStatus::RestoreStatus() : m_statusHasBeenSet(false), m_currentRestoreRateInMegaBytesPerSecond(0.0), @@ -156,3 +162,7 @@ void RestoreStatus::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".EstimatedTimeToCompletionInSeconds=" << m_estimatedTimeToCompletionInSeconds << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/Snapshot.cpp b/aws-cpp-sdk-redshift/source/model/Snapshot.cpp index 260841eb404..4bbc4c584c0 100644 --- a/aws-cpp-sdk-redshift/source/model/Snapshot.cpp +++ b/aws-cpp-sdk-redshift/source/model/Snapshot.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + Snapshot::Snapshot() : m_snapshotIdentifierHasBeenSet(false), m_clusterIdentifierHasBeenSet(false), @@ -568,3 +574,7 @@ void Snapshot::OutputToStream(Aws::OStream& oStream, const char* location) const } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws diff --git a/aws-cpp-sdk-redshift/source/model/SnapshotCopyGrant.cpp b/aws-cpp-sdk-redshift/source/model/SnapshotCopyGrant.cpp index 638d60c4c4b..44118e26100 100644 --- a/aws-cpp-sdk-redshift/source/model/SnapshotCopyGrant.cpp +++ b/aws-cpp-sdk-redshift/source/model/SnapshotCopyGrant.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + SnapshotCopyGrant::SnapshotCopyGrant() : m_snapshotCopyGrantNameHasBeenSet(false), m_kmsKeyIdHasBeenSet(false), @@ -116,3 +122,7 @@ void SnapshotCopyGrant::OutputToStream(Aws::OStream& oStream, const char* locati } } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/SourceType.cpp b/aws-cpp-sdk-redshift/source/model/SourceType.cpp index 7dc2cd9c5f2..a001e063b21 100644 --- a/aws-cpp-sdk-redshift/source/model/SourceType.cpp +++ b/aws-cpp-sdk-redshift/source/model/SourceType.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int cluster_HASH = HashingUtils::HashString("cluster"); -static const int cluster_parameter_group_HASH = HashingUtils::HashString("cluster-parameter-group"); -static const int cluster_security_group_HASH = HashingUtils::HashString("cluster-security-group"); -static const int cluster_snapshot_HASH = HashingUtils::HashString("cluster-snapshot"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace SourceTypeMapper { + static const int cluster_HASH = HashingUtils::HashString("cluster"); + static const int cluster_parameter_group_HASH = HashingUtils::HashString("cluster-parameter-group"); + static const int cluster_security_group_HASH = HashingUtils::HashString("cluster-security-group"); + static const int cluster_snapshot_HASH = HashingUtils::HashString("cluster-snapshot"); + SourceType GetSourceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-redshift/source/model/Subnet.cpp b/aws-cpp-sdk-redshift/source/model/Subnet.cpp index 19eb8d0f72d..5d3c0c9e259 100644 --- a/aws-cpp-sdk-redshift/source/model/Subnet.cpp +++ b/aws-cpp-sdk-redshift/source/model/Subnet.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + Subnet::Subnet() : m_subnetIdentifierHasBeenSet(false), m_subnetAvailabilityZoneHasBeenSet(false), @@ -102,3 +108,7 @@ void Subnet::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".SubnetStatus=" << StringUtils::URLEncode(m_subnetStatus.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/Tag.cpp b/aws-cpp-sdk-redshift/source/model/Tag.cpp index 3a961a82a8a..790e0c42006 100644 --- a/aws-cpp-sdk-redshift/source/model/Tag.cpp +++ b/aws-cpp-sdk-redshift/source/model/Tag.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -82,3 +88,7 @@ void Tag::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".Value=" << StringUtils::URLEncode(m_value.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/TaggedResource.cpp b/aws-cpp-sdk-redshift/source/model/TaggedResource.cpp index 6c61303eebb..ab0cf4055a3 100644 --- a/aws-cpp-sdk-redshift/source/model/TaggedResource.cpp +++ b/aws-cpp-sdk-redshift/source/model/TaggedResource.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + TaggedResource::TaggedResource() : m_tagHasBeenSet(false), m_resourceNameHasBeenSet(false), @@ -102,3 +108,7 @@ void TaggedResource::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".ResourceType=" << StringUtils::URLEncode(m_resourceType.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-redshift/source/model/VpcSecurityGroupMembership.cpp b/aws-cpp-sdk-redshift/source/model/VpcSecurityGroupMembership.cpp index 22f3a60065d..a1269c584ea 100644 --- a/aws-cpp-sdk-redshift/source/model/VpcSecurityGroupMembership.cpp +++ b/aws-cpp-sdk-redshift/source/model/VpcSecurityGroupMembership.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Redshift::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Redshift +{ +namespace Model +{ + VpcSecurityGroupMembership::VpcSecurityGroupMembership() : m_vpcSecurityGroupIdHasBeenSet(false), m_statusHasBeenSet(false) @@ -82,3 +88,7 @@ void VpcSecurityGroupMembership::OutputToStream(Aws::OStream& oStream, const cha oStream << location << ".Status=" << StringUtils::URLEncode(m_status.c_str()) << "&"; } } + +} // namespace Model +} // namespace Redshift +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-route53/CMakeLists.txt b/aws-cpp-sdk-route53/CMakeLists.txt index 39b7a3ca3ac..62fa1c6509b 100644 --- a/aws-cpp-sdk-route53/CMakeLists.txt +++ b/aws-cpp-sdk-route53/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-route53) "source/model/*.cpp" ) - file(GLOB ROUTE53_SRC + file(GLOB ROUTE53_UNIFIED_HEADERS ${AWS_ROUTE53_HEADERS} ${AWS_ROUTE53_MODEL_HEADERS} + ) + + file(GLOB ROUTE53_UNITY_SRC ${AWS_ROUTE53_SOURCE} ${AWS_ROUTE53_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("ROUTE53" ROUTE53_UNITY_SRC) + endif() + + file(GLOB ROUTE53_SRC + ${ROUTE53_UNIFIED_HEADERS} + ${ROUTE53_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-route53/source/Route53Errors.cpp b/aws-cpp-sdk-route53/source/Route53Errors.cpp index 7df8188ad2e..bd3a5d30200 100644 --- a/aws-cpp-sdk-route53/source/Route53Errors.cpp +++ b/aws-cpp-sdk-route53/source/Route53Errors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::Route53; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Route53ErrorMapper +{ + static const int NO_SUCH_TRAFFIC_POLICY_INSTANCE_HASH = HashingUtils::HashString("NoSuchTrafficPolicyInstance"); static const int HEALTH_CHECK_VERSION_MISMATCH_HASH = HashingUtils::HashString("HealthCheckVersionMismatch"); static const int HEALTH_CHECK_ALREADY_EXISTS_HASH = HashingUtils::HashString("HealthCheckAlreadyExists"); @@ -61,12 +68,6 @@ static const int V_P_C_ASSOCIATION_NOT_FOUND_HASH = HashingUtils::HashString("VP static const int NO_SUCH_GEO_LOCATION_HASH = HashingUtils::HashString("NoSuchGeoLocation"); static const int PUBLIC_ZONE_V_P_C_ASSOCIATION_HASH = HashingUtils::HashString("PublicZoneVPCAssociation"); -namespace Aws -{ -namespace Route53 -{ -namespace Route53ErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-route53/source/model/AliasTarget.cpp b/aws-cpp-sdk-route53/source/model/AliasTarget.cpp index b1c4f15e642..b3194853f01 100644 --- a/aws-cpp-sdk-route53/source/model/AliasTarget.cpp +++ b/aws-cpp-sdk-route53/source/model/AliasTarget.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + AliasTarget::AliasTarget() : m_hostedZoneIdHasBeenSet(false), m_dNSNameHasBeenSet(false), @@ -93,3 +99,7 @@ void AliasTarget::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/Change.cpp b/aws-cpp-sdk-route53/source/model/Change.cpp index eac502750ff..be6091275e6 100644 --- a/aws-cpp-sdk-route53/source/model/Change.cpp +++ b/aws-cpp-sdk-route53/source/model/Change.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + Change::Change() : m_actionHasBeenSet(false), m_resourceRecordSetHasBeenSet(false) @@ -75,3 +81,7 @@ void Change::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/ChangeAction.cpp b/aws-cpp-sdk-route53/source/model/ChangeAction.cpp index dccc6d11513..7d16e7f9254 100644 --- a/aws-cpp-sdk-route53/source/model/ChangeAction.cpp +++ b/aws-cpp-sdk-route53/source/model/ChangeAction.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int CREATE_HASH = HashingUtils::HashString("CREATE"); -static const int DELETE__HASH = HashingUtils::HashString("DELETE"); -static const int UPSERT_HASH = HashingUtils::HashString("UPSERT"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ChangeActionMapper { + static const int CREATE_HASH = HashingUtils::HashString("CREATE"); + static const int DELETE__HASH = HashingUtils::HashString("DELETE"); + static const int UPSERT_HASH = HashingUtils::HashString("UPSERT"); + ChangeAction GetChangeActionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-route53/source/model/ChangeBatch.cpp b/aws-cpp-sdk-route53/source/model/ChangeBatch.cpp index e60f9f33695..9492737e96d 100644 --- a/aws-cpp-sdk-route53/source/model/ChangeBatch.cpp +++ b/aws-cpp-sdk-route53/source/model/ChangeBatch.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + ChangeBatch::ChangeBatch() : m_commentHasBeenSet(false), m_changesHasBeenSet(false) @@ -85,3 +91,7 @@ void ChangeBatch::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/ChangeBatchRecord.cpp b/aws-cpp-sdk-route53/source/model/ChangeBatchRecord.cpp index 8c3a20e899c..1a53c9c1e4d 100644 --- a/aws-cpp-sdk-route53/source/model/ChangeBatchRecord.cpp +++ b/aws-cpp-sdk-route53/source/model/ChangeBatchRecord.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + ChangeBatchRecord::ChangeBatchRecord() : m_idHasBeenSet(false), m_submittedAtHasBeenSet(false), @@ -141,3 +147,7 @@ void ChangeBatchRecord::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/ChangeInfo.cpp b/aws-cpp-sdk-route53/source/model/ChangeInfo.cpp index 15ea3becf1a..49390a387f4 100644 --- a/aws-cpp-sdk-route53/source/model/ChangeInfo.cpp +++ b/aws-cpp-sdk-route53/source/model/ChangeInfo.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + ChangeInfo::ChangeInfo() : m_idHasBeenSet(false), m_statusHasBeenSet(false), @@ -103,3 +109,7 @@ void ChangeInfo::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/ChangeStatus.cpp b/aws-cpp-sdk-route53/source/model/ChangeStatus.cpp index e815d06abe9..3ed0fdf1602 100644 --- a/aws-cpp-sdk-route53/source/model/ChangeStatus.cpp +++ b/aws-cpp-sdk-route53/source/model/ChangeStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int PENDING_HASH = HashingUtils::HashString("PENDING"); -static const int INSYNC_HASH = HashingUtils::HashString("INSYNC"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ChangeStatusMapper { + static const int PENDING_HASH = HashingUtils::HashString("PENDING"); + static const int INSYNC_HASH = HashingUtils::HashString("INSYNC"); + ChangeStatus GetChangeStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-route53/source/model/DelegationSet.cpp b/aws-cpp-sdk-route53/source/model/DelegationSet.cpp index 3ee635582aa..bab0e8578f2 100644 --- a/aws-cpp-sdk-route53/source/model/DelegationSet.cpp +++ b/aws-cpp-sdk-route53/source/model/DelegationSet.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + DelegationSet::DelegationSet() : m_idHasBeenSet(false), m_callerReferenceHasBeenSet(false), @@ -99,3 +105,7 @@ void DelegationSet::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/GeoLocation.cpp b/aws-cpp-sdk-route53/source/model/GeoLocation.cpp index b1116b8f618..e999dddc12c 100644 --- a/aws-cpp-sdk-route53/source/model/GeoLocation.cpp +++ b/aws-cpp-sdk-route53/source/model/GeoLocation.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + GeoLocation::GeoLocation() : m_continentCodeHasBeenSet(false), m_countryCodeHasBeenSet(false), @@ -89,3 +95,7 @@ void GeoLocation::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/GeoLocationDetails.cpp b/aws-cpp-sdk-route53/source/model/GeoLocationDetails.cpp index 6fb7fc7713c..12d58450a6b 100644 --- a/aws-cpp-sdk-route53/source/model/GeoLocationDetails.cpp +++ b/aws-cpp-sdk-route53/source/model/GeoLocationDetails.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + GeoLocationDetails::GeoLocationDetails() : m_continentCodeHasBeenSet(false), m_continentNameHasBeenSet(false), @@ -131,3 +137,7 @@ void GeoLocationDetails::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/HealthCheck.cpp b/aws-cpp-sdk-route53/source/model/HealthCheck.cpp index d0208ad5006..86133df47cb 100644 --- a/aws-cpp-sdk-route53/source/model/HealthCheck.cpp +++ b/aws-cpp-sdk-route53/source/model/HealthCheck.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + HealthCheck::HealthCheck() : m_idHasBeenSet(false), m_callerReferenceHasBeenSet(false), @@ -121,3 +127,7 @@ void HealthCheck::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/HealthCheckConfig.cpp b/aws-cpp-sdk-route53/source/model/HealthCheckConfig.cpp index e38316b584e..01ced6cb60c 100644 --- a/aws-cpp-sdk-route53/source/model/HealthCheckConfig.cpp +++ b/aws-cpp-sdk-route53/source/model/HealthCheckConfig.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + HealthCheckConfig::HealthCheckConfig() : m_iPAddressHasBeenSet(false), m_port(0), @@ -319,3 +325,7 @@ void HealthCheckConfig::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/HealthCheckObservation.cpp b/aws-cpp-sdk-route53/source/model/HealthCheckObservation.cpp index 2bd2603fb0e..ead1551c90e 100644 --- a/aws-cpp-sdk-route53/source/model/HealthCheckObservation.cpp +++ b/aws-cpp-sdk-route53/source/model/HealthCheckObservation.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + HealthCheckObservation::HealthCheckObservation() : m_regionHasBeenSet(false), m_iPAddressHasBeenSet(false), @@ -89,3 +95,7 @@ void HealthCheckObservation::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/HealthCheckType.cpp b/aws-cpp-sdk-route53/source/model/HealthCheckType.cpp index 296883c5834..63b5ee65fa7 100644 --- a/aws-cpp-sdk-route53/source/model/HealthCheckType.cpp +++ b/aws-cpp-sdk-route53/source/model/HealthCheckType.cpp @@ -15,17 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int HTTP_HASH = HashingUtils::HashString("HTTP"); -static const int HTTPS_HASH = HashingUtils::HashString("HTTPS"); -static const int HTTP_STR_MATCH_HASH = HashingUtils::HashString("HTTP_STR_MATCH"); -static const int HTTPS_STR_MATCH_HASH = HashingUtils::HashString("HTTPS_STR_MATCH"); -static const int TCP_HASH = HashingUtils::HashString("TCP"); -static const int CALCULATED_HASH = HashingUtils::HashString("CALCULATED"); -static const int CLOUDWATCH_METRIC_HASH = HashingUtils::HashString("CLOUDWATCH_METRIC"); namespace Aws { @@ -36,6 +28,13 @@ namespace Aws namespace HealthCheckTypeMapper { + static const int HTTP_HASH = HashingUtils::HashString("HTTP"); + static const int HTTPS_HASH = HashingUtils::HashString("HTTPS"); + static const int HTTP_STR_MATCH_HASH = HashingUtils::HashString("HTTP_STR_MATCH"); + static const int HTTPS_STR_MATCH_HASH = HashingUtils::HashString("HTTPS_STR_MATCH"); + static const int TCP_HASH = HashingUtils::HashString("TCP"); + static const int CALCULATED_HASH = HashingUtils::HashString("CALCULATED"); + HealthCheckType GetHealthCheckTypeForName(const Aws::String& name) { @@ -64,11 +63,7 @@ namespace Aws { return HealthCheckType::CALCULATED; } - else if (hashCode == CLOUDWATCH_METRIC_HASH) - { - return HealthCheckType::CLOUDWATCH_METRIC; - } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -94,10 +89,8 @@ namespace Aws return "TCP"; case HealthCheckType::CALCULATED: return "CALCULATED"; - case HealthCheckType::CLOUDWATCH_METRIC: - return "CLOUDWATCH_METRIC"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-route53/source/model/HostedZone.cpp b/aws-cpp-sdk-route53/source/model/HostedZone.cpp index 6f1501d7fbb..02abe84fed6 100644 --- a/aws-cpp-sdk-route53/source/model/HostedZone.cpp +++ b/aws-cpp-sdk-route53/source/model/HostedZone.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + HostedZone::HostedZone() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -121,3 +127,7 @@ void HostedZone::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/HostedZoneConfig.cpp b/aws-cpp-sdk-route53/source/model/HostedZoneConfig.cpp index d6c1bbbf74f..91ea439c40b 100644 --- a/aws-cpp-sdk-route53/source/model/HostedZoneConfig.cpp +++ b/aws-cpp-sdk-route53/source/model/HostedZoneConfig.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + HostedZoneConfig::HostedZoneConfig() : m_commentHasBeenSet(false), m_privateZone(false), @@ -79,3 +85,7 @@ void HostedZoneConfig::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/RRType.cpp b/aws-cpp-sdk-route53/source/model/RRType.cpp index dc42bbac22a..09488b84800 100644 --- a/aws-cpp-sdk-route53/source/model/RRType.cpp +++ b/aws-cpp-sdk-route53/source/model/RRType.cpp @@ -19,16 +19,6 @@ using namespace Aws::Utils; -static const int SOA_HASH = HashingUtils::HashString("SOA"); -static const int A_HASH = HashingUtils::HashString("A"); -static const int TXT_HASH = HashingUtils::HashString("TXT"); -static const int NS_HASH = HashingUtils::HashString("NS"); -static const int CNAME_HASH = HashingUtils::HashString("CNAME"); -static const int MX_HASH = HashingUtils::HashString("MX"); -static const int PTR_HASH = HashingUtils::HashString("PTR"); -static const int SRV_HASH = HashingUtils::HashString("SRV"); -static const int SPF_HASH = HashingUtils::HashString("SPF"); -static const int AAAA_HASH = HashingUtils::HashString("AAAA"); namespace Aws { @@ -39,6 +29,17 @@ namespace Aws namespace RRTypeMapper { + static const int SOA_HASH = HashingUtils::HashString("SOA"); + static const int A_HASH = HashingUtils::HashString("A"); + static const int TXT_HASH = HashingUtils::HashString("TXT"); + static const int NS_HASH = HashingUtils::HashString("NS"); + static const int CNAME_HASH = HashingUtils::HashString("CNAME"); + static const int MX_HASH = HashingUtils::HashString("MX"); + static const int PTR_HASH = HashingUtils::HashString("PTR"); + static const int SRV_HASH = HashingUtils::HashString("SRV"); + static const int SPF_HASH = HashingUtils::HashString("SPF"); + static const int AAAA_HASH = HashingUtils::HashString("AAAA"); + RRType GetRRTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-route53/source/model/ResourceRecord.cpp b/aws-cpp-sdk-route53/source/model/ResourceRecord.cpp index 7d27484296c..2dcc55580ba 100644 --- a/aws-cpp-sdk-route53/source/model/ResourceRecord.cpp +++ b/aws-cpp-sdk-route53/source/model/ResourceRecord.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + ResourceRecord::ResourceRecord() : m_valueHasBeenSet(false) { @@ -61,3 +67,7 @@ void ResourceRecord::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/ResourceRecordSet.cpp b/aws-cpp-sdk-route53/source/model/ResourceRecordSet.cpp index 8c3e412ee4e..4dabb992e16 100644 --- a/aws-cpp-sdk-route53/source/model/ResourceRecordSet.cpp +++ b/aws-cpp-sdk-route53/source/model/ResourceRecordSet.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + ResourceRecordSet::ResourceRecordSet() : m_nameHasBeenSet(false), m_typeHasBeenSet(false), @@ -233,3 +239,7 @@ void ResourceRecordSet::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/ResourceRecordSetFailover.cpp b/aws-cpp-sdk-route53/source/model/ResourceRecordSetFailover.cpp index 42f5ff693bb..1aee74d4c43 100644 --- a/aws-cpp-sdk-route53/source/model/ResourceRecordSetFailover.cpp +++ b/aws-cpp-sdk-route53/source/model/ResourceRecordSetFailover.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int PRIMARY_HASH = HashingUtils::HashString("PRIMARY"); -static const int SECONDARY_HASH = HashingUtils::HashString("SECONDARY"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ResourceRecordSetFailoverMapper { + static const int PRIMARY_HASH = HashingUtils::HashString("PRIMARY"); + static const int SECONDARY_HASH = HashingUtils::HashString("SECONDARY"); + ResourceRecordSetFailover GetResourceRecordSetFailoverForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-route53/source/model/ResourceRecordSetRegion.cpp b/aws-cpp-sdk-route53/source/model/ResourceRecordSetRegion.cpp index f5aab322511..f4407ebadd7 100644 --- a/aws-cpp-sdk-route53/source/model/ResourceRecordSetRegion.cpp +++ b/aws-cpp-sdk-route53/source/model/ResourceRecordSetRegion.cpp @@ -19,17 +19,6 @@ using namespace Aws::Utils; -static const int us_east_1_HASH = HashingUtils::HashString("us-east-1"); -static const int us_west_1_HASH = HashingUtils::HashString("us-west-1"); -static const int us_west_2_HASH = HashingUtils::HashString("us-west-2"); -static const int eu_west_1_HASH = HashingUtils::HashString("eu-west-1"); -static const int eu_central_1_HASH = HashingUtils::HashString("eu-central-1"); -static const int ap_southeast_1_HASH = HashingUtils::HashString("ap-southeast-1"); -static const int ap_southeast_2_HASH = HashingUtils::HashString("ap-southeast-2"); -static const int ap_northeast_1_HASH = HashingUtils::HashString("ap-northeast-1"); -static const int ap_northeast_2_HASH = HashingUtils::HashString("ap-northeast-2"); -static const int sa_east_1_HASH = HashingUtils::HashString("sa-east-1"); -static const int cn_north_1_HASH = HashingUtils::HashString("cn-north-1"); namespace Aws { @@ -40,6 +29,18 @@ namespace Aws namespace ResourceRecordSetRegionMapper { + static const int us_east_1_HASH = HashingUtils::HashString("us-east-1"); + static const int us_west_1_HASH = HashingUtils::HashString("us-west-1"); + static const int us_west_2_HASH = HashingUtils::HashString("us-west-2"); + static const int eu_west_1_HASH = HashingUtils::HashString("eu-west-1"); + static const int eu_central_1_HASH = HashingUtils::HashString("eu-central-1"); + static const int ap_southeast_1_HASH = HashingUtils::HashString("ap-southeast-1"); + static const int ap_southeast_2_HASH = HashingUtils::HashString("ap-southeast-2"); + static const int ap_northeast_1_HASH = HashingUtils::HashString("ap-northeast-1"); + static const int ap_northeast_2_HASH = HashingUtils::HashString("ap-northeast-2"); + static const int sa_east_1_HASH = HashingUtils::HashString("sa-east-1"); + static const int cn_north_1_HASH = HashingUtils::HashString("cn-north-1"); + ResourceRecordSetRegion GetResourceRecordSetRegionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-route53/source/model/ResourceTagSet.cpp b/aws-cpp-sdk-route53/source/model/ResourceTagSet.cpp index 0767150f47d..932035b3679 100644 --- a/aws-cpp-sdk-route53/source/model/ResourceTagSet.cpp +++ b/aws-cpp-sdk-route53/source/model/ResourceTagSet.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + ResourceTagSet::ResourceTagSet() : m_resourceTypeHasBeenSet(false), m_resourceIdHasBeenSet(false), @@ -99,3 +105,7 @@ void ResourceTagSet::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/StatusReport.cpp b/aws-cpp-sdk-route53/source/model/StatusReport.cpp index 3f5f2db716a..561ccd3ec05 100644 --- a/aws-cpp-sdk-route53/source/model/StatusReport.cpp +++ b/aws-cpp-sdk-route53/source/model/StatusReport.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + StatusReport::StatusReport() : m_statusHasBeenSet(false), m_checkedTimeHasBeenSet(false) @@ -75,3 +81,7 @@ void StatusReport::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/Tag.cpp b/aws-cpp-sdk-route53/source/model/Tag.cpp index 46a6888b080..382d0baa7bb 100644 --- a/aws-cpp-sdk-route53/source/model/Tag.cpp +++ b/aws-cpp-sdk-route53/source/model/Tag.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -75,3 +81,7 @@ void Tag::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/TagResourceType.cpp b/aws-cpp-sdk-route53/source/model/TagResourceType.cpp index 2260b41f955..4976c2a0af1 100644 --- a/aws-cpp-sdk-route53/source/model/TagResourceType.cpp +++ b/aws-cpp-sdk-route53/source/model/TagResourceType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int healthcheck_HASH = HashingUtils::HashString("healthcheck"); -static const int hostedzone_HASH = HashingUtils::HashString("hostedzone"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace TagResourceTypeMapper { + static const int healthcheck_HASH = HashingUtils::HashString("healthcheck"); + static const int hostedzone_HASH = HashingUtils::HashString("hostedzone"); + TagResourceType GetTagResourceTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-route53/source/model/TrafficPolicy.cpp b/aws-cpp-sdk-route53/source/model/TrafficPolicy.cpp index b2885e49c14..ef139d05531 100644 --- a/aws-cpp-sdk-route53/source/model/TrafficPolicy.cpp +++ b/aws-cpp-sdk-route53/source/model/TrafficPolicy.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + TrafficPolicy::TrafficPolicy() : m_idHasBeenSet(false), m_version(0), @@ -135,3 +141,7 @@ void TrafficPolicy::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/TrafficPolicyInstance.cpp b/aws-cpp-sdk-route53/source/model/TrafficPolicyInstance.cpp index 01704ca46c3..0965098f991 100644 --- a/aws-cpp-sdk-route53/source/model/TrafficPolicyInstance.cpp +++ b/aws-cpp-sdk-route53/source/model/TrafficPolicyInstance.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + TrafficPolicyInstance::TrafficPolicyInstance() : m_idHasBeenSet(false), m_hostedZoneIdHasBeenSet(false), @@ -181,3 +187,7 @@ void TrafficPolicyInstance::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/TrafficPolicySummary.cpp b/aws-cpp-sdk-route53/source/model/TrafficPolicySummary.cpp index e8945bb799e..44e04754b77 100644 --- a/aws-cpp-sdk-route53/source/model/TrafficPolicySummary.cpp +++ b/aws-cpp-sdk-route53/source/model/TrafficPolicySummary.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + TrafficPolicySummary::TrafficPolicySummary() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -125,3 +131,7 @@ void TrafficPolicySummary::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/VPC.cpp b/aws-cpp-sdk-route53/source/model/VPC.cpp index dc3d869e6fd..72d2f19ec8a 100644 --- a/aws-cpp-sdk-route53/source/model/VPC.cpp +++ b/aws-cpp-sdk-route53/source/model/VPC.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::Route53::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53 +{ +namespace Model +{ + VPC::VPC() : m_vPCRegionHasBeenSet(false), m_vPCIdHasBeenSet(false) @@ -75,3 +81,7 @@ void VPC::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace Route53 +} // namespace Aws diff --git a/aws-cpp-sdk-route53/source/model/VPCRegion.cpp b/aws-cpp-sdk-route53/source/model/VPCRegion.cpp index 091aeb7a256..c56dfb92b0a 100644 --- a/aws-cpp-sdk-route53/source/model/VPCRegion.cpp +++ b/aws-cpp-sdk-route53/source/model/VPCRegion.cpp @@ -19,17 +19,6 @@ using namespace Aws::Utils; -static const int us_east_1_HASH = HashingUtils::HashString("us-east-1"); -static const int us_west_1_HASH = HashingUtils::HashString("us-west-1"); -static const int us_west_2_HASH = HashingUtils::HashString("us-west-2"); -static const int eu_west_1_HASH = HashingUtils::HashString("eu-west-1"); -static const int eu_central_1_HASH = HashingUtils::HashString("eu-central-1"); -static const int ap_southeast_1_HASH = HashingUtils::HashString("ap-southeast-1"); -static const int ap_southeast_2_HASH = HashingUtils::HashString("ap-southeast-2"); -static const int ap_northeast_1_HASH = HashingUtils::HashString("ap-northeast-1"); -static const int ap_northeast_2_HASH = HashingUtils::HashString("ap-northeast-2"); -static const int sa_east_1_HASH = HashingUtils::HashString("sa-east-1"); -static const int cn_north_1_HASH = HashingUtils::HashString("cn-north-1"); namespace Aws { @@ -40,6 +29,18 @@ namespace Aws namespace VPCRegionMapper { + static const int us_east_1_HASH = HashingUtils::HashString("us-east-1"); + static const int us_west_1_HASH = HashingUtils::HashString("us-west-1"); + static const int us_west_2_HASH = HashingUtils::HashString("us-west-2"); + static const int eu_west_1_HASH = HashingUtils::HashString("eu-west-1"); + static const int eu_central_1_HASH = HashingUtils::HashString("eu-central-1"); + static const int ap_southeast_1_HASH = HashingUtils::HashString("ap-southeast-1"); + static const int ap_southeast_2_HASH = HashingUtils::HashString("ap-southeast-2"); + static const int ap_northeast_1_HASH = HashingUtils::HashString("ap-northeast-1"); + static const int ap_northeast_2_HASH = HashingUtils::HashString("ap-northeast-2"); + static const int sa_east_1_HASH = HashingUtils::HashString("sa-east-1"); + static const int cn_north_1_HASH = HashingUtils::HashString("cn-north-1"); + VPCRegion GetVPCRegionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-route53domains/CMakeLists.txt b/aws-cpp-sdk-route53domains/CMakeLists.txt index 4bb484082fd..3338d82e5d4 100644 --- a/aws-cpp-sdk-route53domains/CMakeLists.txt +++ b/aws-cpp-sdk-route53domains/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-route53domains) "source/model/*.cpp" ) - file(GLOB ROUTE53DOMAINS_SRC + file(GLOB ROUTE53DOMAINS_UNIFIED_HEADERS ${AWS_ROUTE53DOMAINS_HEADERS} ${AWS_ROUTE53DOMAINS_MODEL_HEADERS} + ) + + file(GLOB ROUTE53DOMAINS_UNITY_SRC ${AWS_ROUTE53DOMAINS_SOURCE} ${AWS_ROUTE53DOMAINS_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("ROUTE53DOMAINS" ROUTE53DOMAINS_UNITY_SRC) + endif() + + file(GLOB ROUTE53DOMAINS_SRC + ${ROUTE53DOMAINS_UNIFIED_HEADERS} + ${ROUTE53DOMAINS_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-route53domains/include/aws/route53domains/model/CheckDomainAvailabilityResult.h b/aws-cpp-sdk-route53domains/include/aws/route53domains/model/CheckDomainAvailabilityResult.h index 7cc90b0acf3..97beb6e5f8b 100644 --- a/aws-cpp-sdk-route53domains/include/aws/route53domains/model/CheckDomainAvailabilityResult.h +++ b/aws-cpp-sdk-route53domains/include/aws/route53domains/model/CheckDomainAvailabilityResult.h @@ -45,15 +45,15 @@ namespace Model /** *

Whether the domain name is available for registering.

You can * only register domains designated as AVAILABLE.

Type: - * String

Valid values:

  • AVAILABLE – The domain - * name is available.
  • AVAILABLE_RESERVED – The domain name is - * reserved under specific conditions.
  • AVAILABLE_PREORDER – - * The domain name is available and can be preordered.
    • - *
  • UNAVAILABLE – The domain name is not available.
    • - *
  • UNAVAILABLE_PREMIUM – The domain name is not available.
    • - *
  • UNAVAILABLE_RESTRICTED – The domain name is forbidden.
    • - *
  • RESERVED – The domain name has been reserved for another person - * or organization.
  • DONT_KNOW – The TLD registry didn't reply + * String

    Valid values:

    • AVAILABLE ? The domain + * name is available.
    • AVAILABLE_RESERVED ? The domain name + * is reserved under specific conditions.
    • AVAILABLE_PREORDER + * ? The domain name is available and can be preordered.
    • + * UNAVAILABLE ? The domain name is not available.
    • + * UNAVAILABLE_PREMIUM ? The domain name is not available.
    • + * UNAVAILABLE_RESTRICTED ? The domain name is forbidden.
    • + * RESERVED ? The domain name has been reserved for another person or + * organization.
    • DONT_KNOW ? The TLD registry didn't reply * with a definitive answer about whether the domain name is available. Amazon * Route 53 can return this response for a variety of reasons, for example, the * registry is performing maintenance. Try again later.
    @@ -63,15 +63,15 @@ namespace Model /** *

    Whether the domain name is available for registering.

    You can * only register domains designated as AVAILABLE.

    Type: - * String

    Valid values:

    • AVAILABLE – The domain - * name is available.
    • AVAILABLE_RESERVED – The domain name is - * reserved under specific conditions.
    • AVAILABLE_PREORDER – - * The domain name is available and can be preordered.
      • - *
    • UNAVAILABLE – The domain name is not available.
      • - *
    • UNAVAILABLE_PREMIUM – The domain name is not available.
      • - *
    • UNAVAILABLE_RESTRICTED – The domain name is forbidden.
      • - *
    • RESERVED – The domain name has been reserved for another person - * or organization.
    • DONT_KNOW – The TLD registry didn't reply + * String

      Valid values:

      • AVAILABLE ? The domain + * name is available.
      • AVAILABLE_RESERVED ? The domain name + * is reserved under specific conditions.
      • AVAILABLE_PREORDER + * ? The domain name is available and can be preordered.
      • + * UNAVAILABLE ? The domain name is not available.
      • + * UNAVAILABLE_PREMIUM ? The domain name is not available.
      • + * UNAVAILABLE_RESTRICTED ? The domain name is forbidden.
      • + * RESERVED ? The domain name has been reserved for another person or + * organization.
      • DONT_KNOW ? The TLD registry didn't reply * with a definitive answer about whether the domain name is available. Amazon * Route 53 can return this response for a variety of reasons, for example, the * registry is performing maintenance. Try again later.
      @@ -81,15 +81,15 @@ namespace Model /** *

      Whether the domain name is available for registering.

      You can * only register domains designated as AVAILABLE.

      Type: - * String

      Valid values:

      • AVAILABLE – The domain - * name is available.
      • AVAILABLE_RESERVED – The domain name is - * reserved under specific conditions.
      • AVAILABLE_PREORDER – - * The domain name is available and can be preordered.
        • - *
      • UNAVAILABLE – The domain name is not available.
        • - *
      • UNAVAILABLE_PREMIUM – The domain name is not available.
        • - *
      • UNAVAILABLE_RESTRICTED – The domain name is forbidden.
        • - *
      • RESERVED – The domain name has been reserved for another person - * or organization.
      • DONT_KNOW – The TLD registry didn't reply + * String

        Valid values:

        • AVAILABLE ? The domain + * name is available.
        • AVAILABLE_RESERVED ? The domain name + * is reserved under specific conditions.
        • AVAILABLE_PREORDER + * ? The domain name is available and can be preordered.
        • + * UNAVAILABLE ? The domain name is not available.
        • + * UNAVAILABLE_PREMIUM ? The domain name is not available.
        • + * UNAVAILABLE_RESTRICTED ? The domain name is forbidden.
        • + * RESERVED ? The domain name has been reserved for another person or + * organization.
        • DONT_KNOW ? The TLD registry didn't reply * with a definitive answer about whether the domain name is available. Amazon * Route 53 can return this response for a variety of reasons, for example, the * registry is performing maintenance. Try again later.
        @@ -99,15 +99,15 @@ namespace Model /** *

        Whether the domain name is available for registering.

        You can * only register domains designated as AVAILABLE.

        Type: - * String

        Valid values:

        • AVAILABLE – The domain - * name is available.
        • AVAILABLE_RESERVED – The domain name is - * reserved under specific conditions.
        • AVAILABLE_PREORDER – - * The domain name is available and can be preordered.
          • - *
        • UNAVAILABLE – The domain name is not available.
          • - *
        • UNAVAILABLE_PREMIUM – The domain name is not available.
          • - *
        • UNAVAILABLE_RESTRICTED – The domain name is forbidden.
          • - *
        • RESERVED – The domain name has been reserved for another person - * or organization.
        • DONT_KNOW – The TLD registry didn't reply + * String

          Valid values:

          • AVAILABLE ? The domain + * name is available.
          • AVAILABLE_RESERVED ? The domain name + * is reserved under specific conditions.
          • AVAILABLE_PREORDER + * ? The domain name is available and can be preordered.
          • + * UNAVAILABLE ? The domain name is not available.
          • + * UNAVAILABLE_PREMIUM ? The domain name is not available.
          • + * UNAVAILABLE_RESTRICTED ? The domain name is forbidden.
          • + * RESERVED ? The domain name has been reserved for another person or + * organization.
          • DONT_KNOW ? The TLD registry didn't reply * with a definitive answer about whether the domain name is available. Amazon * Route 53 can return this response for a variety of reasons, for example, the * registry is performing maintenance. Try again later.
          @@ -117,15 +117,15 @@ namespace Model /** *

          Whether the domain name is available for registering.

          You can * only register domains designated as AVAILABLE.

          Type: - * String

          Valid values:

          • AVAILABLE – The domain - * name is available.
          • AVAILABLE_RESERVED – The domain name is - * reserved under specific conditions.
          • AVAILABLE_PREORDER – - * The domain name is available and can be preordered.
            • - *
          • UNAVAILABLE – The domain name is not available.
            • - *
          • UNAVAILABLE_PREMIUM – The domain name is not available.
            • - *
          • UNAVAILABLE_RESTRICTED – The domain name is forbidden.
            • - *
          • RESERVED – The domain name has been reserved for another person - * or organization.
          • DONT_KNOW – The TLD registry didn't reply + * String

            Valid values:

            • AVAILABLE ? The domain + * name is available.
            • AVAILABLE_RESERVED ? The domain name + * is reserved under specific conditions.
            • AVAILABLE_PREORDER + * ? The domain name is available and can be preordered.
            • + * UNAVAILABLE ? The domain name is not available.
            • + * UNAVAILABLE_PREMIUM ? The domain name is not available.
            • + * UNAVAILABLE_RESTRICTED ? The domain name is forbidden.
            • + * RESERVED ? The domain name has been reserved for another person or + * organization.
            • DONT_KNOW ? The TLD registry didn't reply * with a definitive answer about whether the domain name is available. Amazon * Route 53 can return this response for a variety of reasons, for example, the * registry is performing maintenance. Try again later.
            diff --git a/aws-cpp-sdk-route53domains/source/Route53DomainsErrors.cpp b/aws-cpp-sdk-route53domains/source/Route53DomainsErrors.cpp index 0ac4cb6fdd0..5a0b0f790dc 100644 --- a/aws-cpp-sdk-route53domains/source/Route53DomainsErrors.cpp +++ b/aws-cpp-sdk-route53domains/source/Route53DomainsErrors.cpp @@ -20,13 +20,6 @@ using namespace Aws::Client; using namespace Aws::Route53Domains; using namespace Aws::Utils; -static const int DOMAIN_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("DomainLimitExceeded"); -static const int OPERATION_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("OperationLimitExceeded"); -static const int INVALID_INPUT_HASH = HashingUtils::HashString("InvalidInput"); -static const int DUPLICATE_REQUEST_HASH = HashingUtils::HashString("DuplicateRequest"); -static const int T_L_D_RULES_VIOLATION_HASH = HashingUtils::HashString("TLDRulesViolation"); -static const int UNSUPPORTED_T_L_D_HASH = HashingUtils::HashString("UnsupportedTLD"); - namespace Aws { namespace Route53Domains @@ -34,34 +27,42 @@ namespace Route53Domains namespace Route53DomainsErrorMapper { +static const int INVALID_INPUT_HASH = HashingUtils::HashString("InvalidInput"); +static const int OPERATION_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("OperationLimitExceeded"); +static const int DUPLICATE_REQUEST_HASH = HashingUtils::HashString("DuplicateRequest"); +static const int DOMAIN_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("DomainLimitExceeded"); +static const int UNSUPPORTED_T_L_D_HASH = HashingUtils::HashString("UnsupportedTLD"); +static const int T_L_D_RULES_VIOLATION_HASH = HashingUtils::HashString("TLDRulesViolation"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); - if (hashCode == DOMAIN_LIMIT_EXCEEDED_HASH) + if (hashCode == INVALID_INPUT_HASH) { - return AWSError(static_cast(Route53DomainsErrors::DOMAIN_LIMIT_EXCEEDED), false); + return AWSError(static_cast(Route53DomainsErrors::INVALID_INPUT), false); } else if (hashCode == OPERATION_LIMIT_EXCEEDED_HASH) { return AWSError(static_cast(Route53DomainsErrors::OPERATION_LIMIT_EXCEEDED), false); } - else if (hashCode == INVALID_INPUT_HASH) - { - return AWSError(static_cast(Route53DomainsErrors::INVALID_INPUT), false); - } else if (hashCode == DUPLICATE_REQUEST_HASH) { return AWSError(static_cast(Route53DomainsErrors::DUPLICATE_REQUEST), false); } - else if (hashCode == T_L_D_RULES_VIOLATION_HASH) + else if (hashCode == DOMAIN_LIMIT_EXCEEDED_HASH) { - return AWSError(static_cast(Route53DomainsErrors::T_L_D_RULES_VIOLATION), false); + return AWSError(static_cast(Route53DomainsErrors::DOMAIN_LIMIT_EXCEEDED), false); } else if (hashCode == UNSUPPORTED_T_L_D_HASH) { return AWSError(static_cast(Route53DomainsErrors::UNSUPPORTED_T_L_D), false); } + else if (hashCode == T_L_D_RULES_VIOLATION_HASH) + { + return AWSError(static_cast(Route53DomainsErrors::T_L_D_RULES_VIOLATION), false); + } return AWSError(CoreErrors::UNKNOWN, false); } diff --git a/aws-cpp-sdk-route53domains/source/model/ContactDetail.cpp b/aws-cpp-sdk-route53domains/source/model/ContactDetail.cpp index 4c05ecbeff2..01c1b02bf16 100644 --- a/aws-cpp-sdk-route53domains/source/model/ContactDetail.cpp +++ b/aws-cpp-sdk-route53domains/source/model/ContactDetail.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Route53Domains::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53Domains +{ +namespace Model +{ + ContactDetail::ContactDetail() : m_firstNameHasBeenSet(false), m_lastNameHasBeenSet(false), @@ -256,4 +262,8 @@ JsonValue ContactDetail::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Route53Domains +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-route53domains/source/model/ContactType.cpp b/aws-cpp-sdk-route53domains/source/model/ContactType.cpp index 31a84a9337a..e63618a72ac 100644 --- a/aws-cpp-sdk-route53domains/source/model/ContactType.cpp +++ b/aws-cpp-sdk-route53domains/source/model/ContactType.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int PERSON_HASH = HashingUtils::HashString("PERSON"); -static const int COMPANY_HASH = HashingUtils::HashString("COMPANY"); -static const int ASSOCIATION_HASH = HashingUtils::HashString("ASSOCIATION"); -static const int PUBLIC_BODY_HASH = HashingUtils::HashString("PUBLIC_BODY"); -static const int RESELLER_HASH = HashingUtils::HashString("RESELLER"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace ContactTypeMapper { + static const int PERSON_HASH = HashingUtils::HashString("PERSON"); + static const int COMPANY_HASH = HashingUtils::HashString("COMPANY"); + static const int ASSOCIATION_HASH = HashingUtils::HashString("ASSOCIATION"); + static const int PUBLIC_BODY_HASH = HashingUtils::HashString("PUBLIC_BODY"); + static const int RESELLER_HASH = HashingUtils::HashString("RESELLER"); + ContactType GetContactTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-route53domains/source/model/CountryCode.cpp b/aws-cpp-sdk-route53domains/source/model/CountryCode.cpp index e18121d7c48..de1ddf0589d 100644 --- a/aws-cpp-sdk-route53domains/source/model/CountryCode.cpp +++ b/aws-cpp-sdk-route53domains/source/model/CountryCode.cpp @@ -19,235 +19,6 @@ using namespace Aws::Utils; -static const int AD_HASH = HashingUtils::HashString("AD"); -static const int AE_HASH = HashingUtils::HashString("AE"); -static const int AF_HASH = HashingUtils::HashString("AF"); -static const int AG_HASH = HashingUtils::HashString("AG"); -static const int AI_HASH = HashingUtils::HashString("AI"); -static const int AL_HASH = HashingUtils::HashString("AL"); -static const int AM_HASH = HashingUtils::HashString("AM"); -static const int AN_HASH = HashingUtils::HashString("AN"); -static const int AO_HASH = HashingUtils::HashString("AO"); -static const int AQ_HASH = HashingUtils::HashString("AQ"); -static const int AR_HASH = HashingUtils::HashString("AR"); -static const int AS_HASH = HashingUtils::HashString("AS"); -static const int AT_HASH = HashingUtils::HashString("AT"); -static const int AU_HASH = HashingUtils::HashString("AU"); -static const int AW_HASH = HashingUtils::HashString("AW"); -static const int AZ_HASH = HashingUtils::HashString("AZ"); -static const int BA_HASH = HashingUtils::HashString("BA"); -static const int BB_HASH = HashingUtils::HashString("BB"); -static const int BD_HASH = HashingUtils::HashString("BD"); -static const int BE_HASH = HashingUtils::HashString("BE"); -static const int BF_HASH = HashingUtils::HashString("BF"); -static const int BG_HASH = HashingUtils::HashString("BG"); -static const int BH_HASH = HashingUtils::HashString("BH"); -static const int BI_HASH = HashingUtils::HashString("BI"); -static const int BJ_HASH = HashingUtils::HashString("BJ"); -static const int BL_HASH = HashingUtils::HashString("BL"); -static const int BM_HASH = HashingUtils::HashString("BM"); -static const int BN_HASH = HashingUtils::HashString("BN"); -static const int BO_HASH = HashingUtils::HashString("BO"); -static const int BR_HASH = HashingUtils::HashString("BR"); -static const int BS_HASH = HashingUtils::HashString("BS"); -static const int BT_HASH = HashingUtils::HashString("BT"); -static const int BW_HASH = HashingUtils::HashString("BW"); -static const int BY_HASH = HashingUtils::HashString("BY"); -static const int BZ_HASH = HashingUtils::HashString("BZ"); -static const int CA_HASH = HashingUtils::HashString("CA"); -static const int CC_HASH = HashingUtils::HashString("CC"); -static const int CD_HASH = HashingUtils::HashString("CD"); -static const int CF_HASH = HashingUtils::HashString("CF"); -static const int CG_HASH = HashingUtils::HashString("CG"); -static const int CH_HASH = HashingUtils::HashString("CH"); -static const int CI_HASH = HashingUtils::HashString("CI"); -static const int CK_HASH = HashingUtils::HashString("CK"); -static const int CL_HASH = HashingUtils::HashString("CL"); -static const int CM_HASH = HashingUtils::HashString("CM"); -static const int CN_HASH = HashingUtils::HashString("CN"); -static const int CO_HASH = HashingUtils::HashString("CO"); -static const int CR_HASH = HashingUtils::HashString("CR"); -static const int CU_HASH = HashingUtils::HashString("CU"); -static const int CV_HASH = HashingUtils::HashString("CV"); -static const int CX_HASH = HashingUtils::HashString("CX"); -static const int CY_HASH = HashingUtils::HashString("CY"); -static const int CZ_HASH = HashingUtils::HashString("CZ"); -static const int DE_HASH = HashingUtils::HashString("DE"); -static const int DJ_HASH = HashingUtils::HashString("DJ"); -static const int DK_HASH = HashingUtils::HashString("DK"); -static const int DM_HASH = HashingUtils::HashString("DM"); -static const int DO_HASH = HashingUtils::HashString("DO"); -static const int DZ_HASH = HashingUtils::HashString("DZ"); -static const int EC_HASH = HashingUtils::HashString("EC"); -static const int EE_HASH = HashingUtils::HashString("EE"); -static const int EG_HASH = HashingUtils::HashString("EG"); -static const int ER_HASH = HashingUtils::HashString("ER"); -static const int ES_HASH = HashingUtils::HashString("ES"); -static const int ET_HASH = HashingUtils::HashString("ET"); -static const int FI_HASH = HashingUtils::HashString("FI"); -static const int FJ_HASH = HashingUtils::HashString("FJ"); -static const int FK_HASH = HashingUtils::HashString("FK"); -static const int FM_HASH = HashingUtils::HashString("FM"); -static const int FO_HASH = HashingUtils::HashString("FO"); -static const int FR_HASH = HashingUtils::HashString("FR"); -static const int GA_HASH = HashingUtils::HashString("GA"); -static const int GB_HASH = HashingUtils::HashString("GB"); -static const int GD_HASH = HashingUtils::HashString("GD"); -static const int GE_HASH = HashingUtils::HashString("GE"); -static const int GH_HASH = HashingUtils::HashString("GH"); -static const int GI_HASH = HashingUtils::HashString("GI"); -static const int GL_HASH = HashingUtils::HashString("GL"); -static const int GM_HASH = HashingUtils::HashString("GM"); -static const int GN_HASH = HashingUtils::HashString("GN"); -static const int GQ_HASH = HashingUtils::HashString("GQ"); -static const int GR_HASH = HashingUtils::HashString("GR"); -static const int GT_HASH = HashingUtils::HashString("GT"); -static const int GU_HASH = HashingUtils::HashString("GU"); -static const int GW_HASH = HashingUtils::HashString("GW"); -static const int GY_HASH = HashingUtils::HashString("GY"); -static const int HK_HASH = HashingUtils::HashString("HK"); -static const int HN_HASH = HashingUtils::HashString("HN"); -static const int HR_HASH = HashingUtils::HashString("HR"); -static const int HT_HASH = HashingUtils::HashString("HT"); -static const int HU_HASH = HashingUtils::HashString("HU"); -static const int ID_HASH = HashingUtils::HashString("ID"); -static const int IE_HASH = HashingUtils::HashString("IE"); -static const int IL_HASH = HashingUtils::HashString("IL"); -static const int IM_HASH = HashingUtils::HashString("IM"); -static const int IN_HASH = HashingUtils::HashString("IN"); -static const int IQ_HASH = HashingUtils::HashString("IQ"); -static const int IR_HASH = HashingUtils::HashString("IR"); -static const int IS_HASH = HashingUtils::HashString("IS"); -static const int IT_HASH = HashingUtils::HashString("IT"); -static const int JM_HASH = HashingUtils::HashString("JM"); -static const int JO_HASH = HashingUtils::HashString("JO"); -static const int JP_HASH = HashingUtils::HashString("JP"); -static const int KE_HASH = HashingUtils::HashString("KE"); -static const int KG_HASH = HashingUtils::HashString("KG"); -static const int KH_HASH = HashingUtils::HashString("KH"); -static const int KI_HASH = HashingUtils::HashString("KI"); -static const int KM_HASH = HashingUtils::HashString("KM"); -static const int KN_HASH = HashingUtils::HashString("KN"); -static const int KP_HASH = HashingUtils::HashString("KP"); -static const int KR_HASH = HashingUtils::HashString("KR"); -static const int KW_HASH = HashingUtils::HashString("KW"); -static const int KY_HASH = HashingUtils::HashString("KY"); -static const int KZ_HASH = HashingUtils::HashString("KZ"); -static const int LA_HASH = HashingUtils::HashString("LA"); -static const int LB_HASH = HashingUtils::HashString("LB"); -static const int LC_HASH = HashingUtils::HashString("LC"); -static const int LI_HASH = HashingUtils::HashString("LI"); -static const int LK_HASH = HashingUtils::HashString("LK"); -static const int LR_HASH = HashingUtils::HashString("LR"); -static const int LS_HASH = HashingUtils::HashString("LS"); -static const int LT_HASH = HashingUtils::HashString("LT"); -static const int LU_HASH = HashingUtils::HashString("LU"); -static const int LV_HASH = HashingUtils::HashString("LV"); -static const int LY_HASH = HashingUtils::HashString("LY"); -static const int MA_HASH = HashingUtils::HashString("MA"); -static const int MC_HASH = HashingUtils::HashString("MC"); -static const int MD_HASH = HashingUtils::HashString("MD"); -static const int ME_HASH = HashingUtils::HashString("ME"); -static const int MF_HASH = HashingUtils::HashString("MF"); -static const int MG_HASH = HashingUtils::HashString("MG"); -static const int MH_HASH = HashingUtils::HashString("MH"); -static const int MK_HASH = HashingUtils::HashString("MK"); -static const int ML_HASH = HashingUtils::HashString("ML"); -static const int MM_HASH = HashingUtils::HashString("MM"); -static const int MN_HASH = HashingUtils::HashString("MN"); -static const int MO_HASH = HashingUtils::HashString("MO"); -static const int MP_HASH = HashingUtils::HashString("MP"); -static const int MR_HASH = HashingUtils::HashString("MR"); -static const int MS_HASH = HashingUtils::HashString("MS"); -static const int MT_HASH = HashingUtils::HashString("MT"); -static const int MU_HASH = HashingUtils::HashString("MU"); -static const int MV_HASH = HashingUtils::HashString("MV"); -static const int MW_HASH = HashingUtils::HashString("MW"); -static const int MX_HASH = HashingUtils::HashString("MX"); -static const int MY_HASH = HashingUtils::HashString("MY"); -static const int MZ_HASH = HashingUtils::HashString("MZ"); -static const int NA_HASH = HashingUtils::HashString("NA"); -static const int NC_HASH = HashingUtils::HashString("NC"); -static const int NE_HASH = HashingUtils::HashString("NE"); -static const int NG_HASH = HashingUtils::HashString("NG"); -static const int NI_HASH = HashingUtils::HashString("NI"); -static const int NL_HASH = HashingUtils::HashString("NL"); -static const int NO_HASH = HashingUtils::HashString("NO"); -static const int NP_HASH = HashingUtils::HashString("NP"); -static const int NR_HASH = HashingUtils::HashString("NR"); -static const int NU_HASH = HashingUtils::HashString("NU"); -static const int NZ_HASH = HashingUtils::HashString("NZ"); -static const int OM_HASH = HashingUtils::HashString("OM"); -static const int PA_HASH = HashingUtils::HashString("PA"); -static const int PE_HASH = HashingUtils::HashString("PE"); -static const int PF_HASH = HashingUtils::HashString("PF"); -static const int PG_HASH = HashingUtils::HashString("PG"); -static const int PH_HASH = HashingUtils::HashString("PH"); -static const int PK_HASH = HashingUtils::HashString("PK"); -static const int PL_HASH = HashingUtils::HashString("PL"); -static const int PM_HASH = HashingUtils::HashString("PM"); -static const int PN_HASH = HashingUtils::HashString("PN"); -static const int PR_HASH = HashingUtils::HashString("PR"); -static const int PT_HASH = HashingUtils::HashString("PT"); -static const int PW_HASH = HashingUtils::HashString("PW"); -static const int PY_HASH = HashingUtils::HashString("PY"); -static const int QA_HASH = HashingUtils::HashString("QA"); -static const int RO_HASH = HashingUtils::HashString("RO"); -static const int RS_HASH = HashingUtils::HashString("RS"); -static const int RU_HASH = HashingUtils::HashString("RU"); -static const int RW_HASH = HashingUtils::HashString("RW"); -static const int SA_HASH = HashingUtils::HashString("SA"); -static const int SB_HASH = HashingUtils::HashString("SB"); -static const int SC_HASH = HashingUtils::HashString("SC"); -static const int SD_HASH = HashingUtils::HashString("SD"); -static const int SE_HASH = HashingUtils::HashString("SE"); -static const int SG_HASH = HashingUtils::HashString("SG"); -static const int SH_HASH = HashingUtils::HashString("SH"); -static const int SI_HASH = HashingUtils::HashString("SI"); -static const int SK_HASH = HashingUtils::HashString("SK"); -static const int SL_HASH = HashingUtils::HashString("SL"); -static const int SM_HASH = HashingUtils::HashString("SM"); -static const int SN_HASH = HashingUtils::HashString("SN"); -static const int SO_HASH = HashingUtils::HashString("SO"); -static const int SR_HASH = HashingUtils::HashString("SR"); -static const int ST_HASH = HashingUtils::HashString("ST"); -static const int SV_HASH = HashingUtils::HashString("SV"); -static const int SY_HASH = HashingUtils::HashString("SY"); -static const int SZ_HASH = HashingUtils::HashString("SZ"); -static const int TC_HASH = HashingUtils::HashString("TC"); -static const int TD_HASH = HashingUtils::HashString("TD"); -static const int TG_HASH = HashingUtils::HashString("TG"); -static const int TH_HASH = HashingUtils::HashString("TH"); -static const int TJ_HASH = HashingUtils::HashString("TJ"); -static const int TK_HASH = HashingUtils::HashString("TK"); -static const int TL_HASH = HashingUtils::HashString("TL"); -static const int TM_HASH = HashingUtils::HashString("TM"); -static const int TN_HASH = HashingUtils::HashString("TN"); -static const int TO_HASH = HashingUtils::HashString("TO"); -static const int TR_HASH = HashingUtils::HashString("TR"); -static const int TT_HASH = HashingUtils::HashString("TT"); -static const int TV_HASH = HashingUtils::HashString("TV"); -static const int TW_HASH = HashingUtils::HashString("TW"); -static const int TZ_HASH = HashingUtils::HashString("TZ"); -static const int UA_HASH = HashingUtils::HashString("UA"); -static const int UG_HASH = HashingUtils::HashString("UG"); -static const int US_HASH = HashingUtils::HashString("US"); -static const int UY_HASH = HashingUtils::HashString("UY"); -static const int UZ_HASH = HashingUtils::HashString("UZ"); -static const int VA_HASH = HashingUtils::HashString("VA"); -static const int VC_HASH = HashingUtils::HashString("VC"); -static const int VE_HASH = HashingUtils::HashString("VE"); -static const int VG_HASH = HashingUtils::HashString("VG"); -static const int VI_HASH = HashingUtils::HashString("VI"); -static const int VN_HASH = HashingUtils::HashString("VN"); -static const int VU_HASH = HashingUtils::HashString("VU"); -static const int WF_HASH = HashingUtils::HashString("WF"); -static const int WS_HASH = HashingUtils::HashString("WS"); -static const int YE_HASH = HashingUtils::HashString("YE"); -static const int YT_HASH = HashingUtils::HashString("YT"); -static const int ZA_HASH = HashingUtils::HashString("ZA"); -static const int ZM_HASH = HashingUtils::HashString("ZM"); -static const int ZW_HASH = HashingUtils::HashString("ZW"); namespace Aws { @@ -258,6 +29,236 @@ namespace Aws namespace CountryCodeMapper { + static const int AD_HASH = HashingUtils::HashString("AD"); + static const int AE_HASH = HashingUtils::HashString("AE"); + static const int AF_HASH = HashingUtils::HashString("AF"); + static const int AG_HASH = HashingUtils::HashString("AG"); + static const int AI_HASH = HashingUtils::HashString("AI"); + static const int AL_HASH = HashingUtils::HashString("AL"); + static const int AM_HASH = HashingUtils::HashString("AM"); + static const int AN_HASH = HashingUtils::HashString("AN"); + static const int AO_HASH = HashingUtils::HashString("AO"); + static const int AQ_HASH = HashingUtils::HashString("AQ"); + static const int AR_HASH = HashingUtils::HashString("AR"); + static const int AS_HASH = HashingUtils::HashString("AS"); + static const int AT_HASH = HashingUtils::HashString("AT"); + static const int AU_HASH = HashingUtils::HashString("AU"); + static const int AW_HASH = HashingUtils::HashString("AW"); + static const int AZ_HASH = HashingUtils::HashString("AZ"); + static const int BA_HASH = HashingUtils::HashString("BA"); + static const int BB_HASH = HashingUtils::HashString("BB"); + static const int BD_HASH = HashingUtils::HashString("BD"); + static const int BE_HASH = HashingUtils::HashString("BE"); + static const int BF_HASH = HashingUtils::HashString("BF"); + static const int BG_HASH = HashingUtils::HashString("BG"); + static const int BH_HASH = HashingUtils::HashString("BH"); + static const int BI_HASH = HashingUtils::HashString("BI"); + static const int BJ_HASH = HashingUtils::HashString("BJ"); + static const int BL_HASH = HashingUtils::HashString("BL"); + static const int BM_HASH = HashingUtils::HashString("BM"); + static const int BN_HASH = HashingUtils::HashString("BN"); + static const int BO_HASH = HashingUtils::HashString("BO"); + static const int BR_HASH = HashingUtils::HashString("BR"); + static const int BS_HASH = HashingUtils::HashString("BS"); + static const int BT_HASH = HashingUtils::HashString("BT"); + static const int BW_HASH = HashingUtils::HashString("BW"); + static const int BY_HASH = HashingUtils::HashString("BY"); + static const int BZ_HASH = HashingUtils::HashString("BZ"); + static const int CA_HASH = HashingUtils::HashString("CA"); + static const int CC_HASH = HashingUtils::HashString("CC"); + static const int CD_HASH = HashingUtils::HashString("CD"); + static const int CF_HASH = HashingUtils::HashString("CF"); + static const int CG_HASH = HashingUtils::HashString("CG"); + static const int CH_HASH = HashingUtils::HashString("CH"); + static const int CI_HASH = HashingUtils::HashString("CI"); + static const int CK_HASH = HashingUtils::HashString("CK"); + static const int CL_HASH = HashingUtils::HashString("CL"); + static const int CM_HASH = HashingUtils::HashString("CM"); + static const int CN_HASH = HashingUtils::HashString("CN"); + static const int CO_HASH = HashingUtils::HashString("CO"); + static const int CR_HASH = HashingUtils::HashString("CR"); + static const int CU_HASH = HashingUtils::HashString("CU"); + static const int CV_HASH = HashingUtils::HashString("CV"); + static const int CX_HASH = HashingUtils::HashString("CX"); + static const int CY_HASH = HashingUtils::HashString("CY"); + static const int CZ_HASH = HashingUtils::HashString("CZ"); + static const int DE_HASH = HashingUtils::HashString("DE"); + static const int DJ_HASH = HashingUtils::HashString("DJ"); + static const int DK_HASH = HashingUtils::HashString("DK"); + static const int DM_HASH = HashingUtils::HashString("DM"); + static const int DO_HASH = HashingUtils::HashString("DO"); + static const int DZ_HASH = HashingUtils::HashString("DZ"); + static const int EC_HASH = HashingUtils::HashString("EC"); + static const int EE_HASH = HashingUtils::HashString("EE"); + static const int EG_HASH = HashingUtils::HashString("EG"); + static const int ER_HASH = HashingUtils::HashString("ER"); + static const int ES_HASH = HashingUtils::HashString("ES"); + static const int ET_HASH = HashingUtils::HashString("ET"); + static const int FI_HASH = HashingUtils::HashString("FI"); + static const int FJ_HASH = HashingUtils::HashString("FJ"); + static const int FK_HASH = HashingUtils::HashString("FK"); + static const int FM_HASH = HashingUtils::HashString("FM"); + static const int FO_HASH = HashingUtils::HashString("FO"); + static const int FR_HASH = HashingUtils::HashString("FR"); + static const int GA_HASH = HashingUtils::HashString("GA"); + static const int GB_HASH = HashingUtils::HashString("GB"); + static const int GD_HASH = HashingUtils::HashString("GD"); + static const int GE_HASH = HashingUtils::HashString("GE"); + static const int GH_HASH = HashingUtils::HashString("GH"); + static const int GI_HASH = HashingUtils::HashString("GI"); + static const int GL_HASH = HashingUtils::HashString("GL"); + static const int GM_HASH = HashingUtils::HashString("GM"); + static const int GN_HASH = HashingUtils::HashString("GN"); + static const int GQ_HASH = HashingUtils::HashString("GQ"); + static const int GR_HASH = HashingUtils::HashString("GR"); + static const int GT_HASH = HashingUtils::HashString("GT"); + static const int GU_HASH = HashingUtils::HashString("GU"); + static const int GW_HASH = HashingUtils::HashString("GW"); + static const int GY_HASH = HashingUtils::HashString("GY"); + static const int HK_HASH = HashingUtils::HashString("HK"); + static const int HN_HASH = HashingUtils::HashString("HN"); + static const int HR_HASH = HashingUtils::HashString("HR"); + static const int HT_HASH = HashingUtils::HashString("HT"); + static const int HU_HASH = HashingUtils::HashString("HU"); + static const int ID_HASH = HashingUtils::HashString("ID"); + static const int IE_HASH = HashingUtils::HashString("IE"); + static const int IL_HASH = HashingUtils::HashString("IL"); + static const int IM_HASH = HashingUtils::HashString("IM"); + static const int IN_HASH = HashingUtils::HashString("IN"); + static const int IQ_HASH = HashingUtils::HashString("IQ"); + static const int IR_HASH = HashingUtils::HashString("IR"); + static const int IS_HASH = HashingUtils::HashString("IS"); + static const int IT_HASH = HashingUtils::HashString("IT"); + static const int JM_HASH = HashingUtils::HashString("JM"); + static const int JO_HASH = HashingUtils::HashString("JO"); + static const int JP_HASH = HashingUtils::HashString("JP"); + static const int KE_HASH = HashingUtils::HashString("KE"); + static const int KG_HASH = HashingUtils::HashString("KG"); + static const int KH_HASH = HashingUtils::HashString("KH"); + static const int KI_HASH = HashingUtils::HashString("KI"); + static const int KM_HASH = HashingUtils::HashString("KM"); + static const int KN_HASH = HashingUtils::HashString("KN"); + static const int KP_HASH = HashingUtils::HashString("KP"); + static const int KR_HASH = HashingUtils::HashString("KR"); + static const int KW_HASH = HashingUtils::HashString("KW"); + static const int KY_HASH = HashingUtils::HashString("KY"); + static const int KZ_HASH = HashingUtils::HashString("KZ"); + static const int LA_HASH = HashingUtils::HashString("LA"); + static const int LB_HASH = HashingUtils::HashString("LB"); + static const int LC_HASH = HashingUtils::HashString("LC"); + static const int LI_HASH = HashingUtils::HashString("LI"); + static const int LK_HASH = HashingUtils::HashString("LK"); + static const int LR_HASH = HashingUtils::HashString("LR"); + static const int LS_HASH = HashingUtils::HashString("LS"); + static const int LT_HASH = HashingUtils::HashString("LT"); + static const int LU_HASH = HashingUtils::HashString("LU"); + static const int LV_HASH = HashingUtils::HashString("LV"); + static const int LY_HASH = HashingUtils::HashString("LY"); + static const int MA_HASH = HashingUtils::HashString("MA"); + static const int MC_HASH = HashingUtils::HashString("MC"); + static const int MD_HASH = HashingUtils::HashString("MD"); + static const int ME_HASH = HashingUtils::HashString("ME"); + static const int MF_HASH = HashingUtils::HashString("MF"); + static const int MG_HASH = HashingUtils::HashString("MG"); + static const int MH_HASH = HashingUtils::HashString("MH"); + static const int MK_HASH = HashingUtils::HashString("MK"); + static const int ML_HASH = HashingUtils::HashString("ML"); + static const int MM_HASH = HashingUtils::HashString("MM"); + static const int MN_HASH = HashingUtils::HashString("MN"); + static const int MO_HASH = HashingUtils::HashString("MO"); + static const int MP_HASH = HashingUtils::HashString("MP"); + static const int MR_HASH = HashingUtils::HashString("MR"); + static const int MS_HASH = HashingUtils::HashString("MS"); + static const int MT_HASH = HashingUtils::HashString("MT"); + static const int MU_HASH = HashingUtils::HashString("MU"); + static const int MV_HASH = HashingUtils::HashString("MV"); + static const int MW_HASH = HashingUtils::HashString("MW"); + static const int MX_HASH = HashingUtils::HashString("MX"); + static const int MY_HASH = HashingUtils::HashString("MY"); + static const int MZ_HASH = HashingUtils::HashString("MZ"); + static const int NA_HASH = HashingUtils::HashString("NA"); + static const int NC_HASH = HashingUtils::HashString("NC"); + static const int NE_HASH = HashingUtils::HashString("NE"); + static const int NG_HASH = HashingUtils::HashString("NG"); + static const int NI_HASH = HashingUtils::HashString("NI"); + static const int NL_HASH = HashingUtils::HashString("NL"); + static const int NO_HASH = HashingUtils::HashString("NO"); + static const int NP_HASH = HashingUtils::HashString("NP"); + static const int NR_HASH = HashingUtils::HashString("NR"); + static const int NU_HASH = HashingUtils::HashString("NU"); + static const int NZ_HASH = HashingUtils::HashString("NZ"); + static const int OM_HASH = HashingUtils::HashString("OM"); + static const int PA_HASH = HashingUtils::HashString("PA"); + static const int PE_HASH = HashingUtils::HashString("PE"); + static const int PF_HASH = HashingUtils::HashString("PF"); + static const int PG_HASH = HashingUtils::HashString("PG"); + static const int PH_HASH = HashingUtils::HashString("PH"); + static const int PK_HASH = HashingUtils::HashString("PK"); + static const int PL_HASH = HashingUtils::HashString("PL"); + static const int PM_HASH = HashingUtils::HashString("PM"); + static const int PN_HASH = HashingUtils::HashString("PN"); + static const int PR_HASH = HashingUtils::HashString("PR"); + static const int PT_HASH = HashingUtils::HashString("PT"); + static const int PW_HASH = HashingUtils::HashString("PW"); + static const int PY_HASH = HashingUtils::HashString("PY"); + static const int QA_HASH = HashingUtils::HashString("QA"); + static const int RO_HASH = HashingUtils::HashString("RO"); + static const int RS_HASH = HashingUtils::HashString("RS"); + static const int RU_HASH = HashingUtils::HashString("RU"); + static const int RW_HASH = HashingUtils::HashString("RW"); + static const int SA_HASH = HashingUtils::HashString("SA"); + static const int SB_HASH = HashingUtils::HashString("SB"); + static const int SC_HASH = HashingUtils::HashString("SC"); + static const int SD_HASH = HashingUtils::HashString("SD"); + static const int SE_HASH = HashingUtils::HashString("SE"); + static const int SG_HASH = HashingUtils::HashString("SG"); + static const int SH_HASH = HashingUtils::HashString("SH"); + static const int SI_HASH = HashingUtils::HashString("SI"); + static const int SK_HASH = HashingUtils::HashString("SK"); + static const int SL_HASH = HashingUtils::HashString("SL"); + static const int SM_HASH = HashingUtils::HashString("SM"); + static const int SN_HASH = HashingUtils::HashString("SN"); + static const int SO_HASH = HashingUtils::HashString("SO"); + static const int SR_HASH = HashingUtils::HashString("SR"); + static const int ST_HASH = HashingUtils::HashString("ST"); + static const int SV_HASH = HashingUtils::HashString("SV"); + static const int SY_HASH = HashingUtils::HashString("SY"); + static const int SZ_HASH = HashingUtils::HashString("SZ"); + static const int TC_HASH = HashingUtils::HashString("TC"); + static const int TD_HASH = HashingUtils::HashString("TD"); + static const int TG_HASH = HashingUtils::HashString("TG"); + static const int TH_HASH = HashingUtils::HashString("TH"); + static const int TJ_HASH = HashingUtils::HashString("TJ"); + static const int TK_HASH = HashingUtils::HashString("TK"); + static const int TL_HASH = HashingUtils::HashString("TL"); + static const int TM_HASH = HashingUtils::HashString("TM"); + static const int TN_HASH = HashingUtils::HashString("TN"); + static const int TO_HASH = HashingUtils::HashString("TO"); + static const int TR_HASH = HashingUtils::HashString("TR"); + static const int TT_HASH = HashingUtils::HashString("TT"); + static const int TV_HASH = HashingUtils::HashString("TV"); + static const int TW_HASH = HashingUtils::HashString("TW"); + static const int TZ_HASH = HashingUtils::HashString("TZ"); + static const int UA_HASH = HashingUtils::HashString("UA"); + static const int UG_HASH = HashingUtils::HashString("UG"); + static const int US_HASH = HashingUtils::HashString("US"); + static const int UY_HASH = HashingUtils::HashString("UY"); + static const int UZ_HASH = HashingUtils::HashString("UZ"); + static const int VA_HASH = HashingUtils::HashString("VA"); + static const int VC_HASH = HashingUtils::HashString("VC"); + static const int VE_HASH = HashingUtils::HashString("VE"); + static const int VG_HASH = HashingUtils::HashString("VG"); + static const int VI_HASH = HashingUtils::HashString("VI"); + static const int VN_HASH = HashingUtils::HashString("VN"); + static const int VU_HASH = HashingUtils::HashString("VU"); + static const int WF_HASH = HashingUtils::HashString("WF"); + static const int WS_HASH = HashingUtils::HashString("WS"); + static const int YE_HASH = HashingUtils::HashString("YE"); + static const int YT_HASH = HashingUtils::HashString("YT"); + static const int ZA_HASH = HashingUtils::HashString("ZA"); + static const int ZM_HASH = HashingUtils::HashString("ZM"); + static const int ZW_HASH = HashingUtils::HashString("ZW"); + /* The if-else chains in this file are converted into a jump table by the compiler, which allows constant time lookup. The chain has been broken into helper functions diff --git a/aws-cpp-sdk-route53domains/source/model/DomainAvailability.cpp b/aws-cpp-sdk-route53domains/source/model/DomainAvailability.cpp index 046b33eac15..d3c7c737fce 100644 --- a/aws-cpp-sdk-route53domains/source/model/DomainAvailability.cpp +++ b/aws-cpp-sdk-route53domains/source/model/DomainAvailability.cpp @@ -19,14 +19,6 @@ using namespace Aws::Utils; -static const int AVAILABLE_HASH = HashingUtils::HashString("AVAILABLE"); -static const int AVAILABLE_RESERVED_HASH = HashingUtils::HashString("AVAILABLE_RESERVED"); -static const int AVAILABLE_PREORDER_HASH = HashingUtils::HashString("AVAILABLE_PREORDER"); -static const int UNAVAILABLE_HASH = HashingUtils::HashString("UNAVAILABLE"); -static const int UNAVAILABLE_PREMIUM_HASH = HashingUtils::HashString("UNAVAILABLE_PREMIUM"); -static const int UNAVAILABLE_RESTRICTED_HASH = HashingUtils::HashString("UNAVAILABLE_RESTRICTED"); -static const int RESERVED_HASH = HashingUtils::HashString("RESERVED"); -static const int DONT_KNOW_HASH = HashingUtils::HashString("DONT_KNOW"); namespace Aws { @@ -37,6 +29,15 @@ namespace Aws namespace DomainAvailabilityMapper { + static const int AVAILABLE_HASH = HashingUtils::HashString("AVAILABLE"); + static const int AVAILABLE_RESERVED_HASH = HashingUtils::HashString("AVAILABLE_RESERVED"); + static const int AVAILABLE_PREORDER_HASH = HashingUtils::HashString("AVAILABLE_PREORDER"); + static const int UNAVAILABLE_HASH = HashingUtils::HashString("UNAVAILABLE"); + static const int UNAVAILABLE_PREMIUM_HASH = HashingUtils::HashString("UNAVAILABLE_PREMIUM"); + static const int UNAVAILABLE_RESTRICTED_HASH = HashingUtils::HashString("UNAVAILABLE_RESTRICTED"); + static const int RESERVED_HASH = HashingUtils::HashString("RESERVED"); + static const int DONT_KNOW_HASH = HashingUtils::HashString("DONT_KNOW"); + DomainAvailability GetDomainAvailabilityForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-route53domains/source/model/DomainSummary.cpp b/aws-cpp-sdk-route53domains/source/model/DomainSummary.cpp index ad971ea41d5..59b7abe777f 100644 --- a/aws-cpp-sdk-route53domains/source/model/DomainSummary.cpp +++ b/aws-cpp-sdk-route53domains/source/model/DomainSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Route53Domains::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53Domains +{ +namespace Model +{ + DomainSummary::DomainSummary() : m_domainNameHasBeenSet(false), m_autoRenew(false), @@ -103,4 +109,8 @@ JsonValue DomainSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Route53Domains +} // namespace Aws diff --git a/aws-cpp-sdk-route53domains/source/model/ExtraParam.cpp b/aws-cpp-sdk-route53domains/source/model/ExtraParam.cpp index fe5935035df..d18ad514c73 100644 --- a/aws-cpp-sdk-route53domains/source/model/ExtraParam.cpp +++ b/aws-cpp-sdk-route53domains/source/model/ExtraParam.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Route53Domains::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53Domains +{ +namespace Model +{ + ExtraParam::ExtraParam() : m_nameHasBeenSet(false), m_valueHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue ExtraParam::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Route53Domains +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-route53domains/source/model/ExtraParamName.cpp b/aws-cpp-sdk-route53domains/source/model/ExtraParamName.cpp index 86966b55a22..96e4f43e4a0 100644 --- a/aws-cpp-sdk-route53domains/source/model/ExtraParamName.cpp +++ b/aws-cpp-sdk-route53domains/source/model/ExtraParamName.cpp @@ -15,31 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int DUNS_NUMBER_HASH = HashingUtils::HashString("DUNS_NUMBER"); -static const int BRAND_NUMBER_HASH = HashingUtils::HashString("BRAND_NUMBER"); -static const int BIRTH_DEPARTMENT_HASH = HashingUtils::HashString("BIRTH_DEPARTMENT"); -static const int BIRTH_DATE_IN_YYYY_MM_DD_HASH = HashingUtils::HashString("BIRTH_DATE_IN_YYYY_MM_DD"); -static const int BIRTH_COUNTRY_HASH = HashingUtils::HashString("BIRTH_COUNTRY"); -static const int BIRTH_CITY_HASH = HashingUtils::HashString("BIRTH_CITY"); -static const int DOCUMENT_NUMBER_HASH = HashingUtils::HashString("DOCUMENT_NUMBER"); -static const int AU_ID_NUMBER_HASH = HashingUtils::HashString("AU_ID_NUMBER"); -static const int AU_ID_TYPE_HASH = HashingUtils::HashString("AU_ID_TYPE"); -static const int CA_LEGAL_TYPE_HASH = HashingUtils::HashString("CA_LEGAL_TYPE"); -static const int CA_BUSINESS_ENTITY_TYPE_HASH = HashingUtils::HashString("CA_BUSINESS_ENTITY_TYPE"); -static const int ES_IDENTIFICATION_HASH = HashingUtils::HashString("ES_IDENTIFICATION"); -static const int ES_IDENTIFICATION_TYPE_HASH = HashingUtils::HashString("ES_IDENTIFICATION_TYPE"); -static const int ES_LEGAL_FORM_HASH = HashingUtils::HashString("ES_LEGAL_FORM"); -static const int FI_BUSINESS_NUMBER_HASH = HashingUtils::HashString("FI_BUSINESS_NUMBER"); -static const int FI_ID_NUMBER_HASH = HashingUtils::HashString("FI_ID_NUMBER"); -static const int IT_PIN_HASH = HashingUtils::HashString("IT_PIN"); -static const int RU_PASSPORT_DATA_HASH = HashingUtils::HashString("RU_PASSPORT_DATA"); -static const int SE_ID_NUMBER_HASH = HashingUtils::HashString("SE_ID_NUMBER"); -static const int SG_ID_NUMBER_HASH = HashingUtils::HashString("SG_ID_NUMBER"); -static const int VAT_NUMBER_HASH = HashingUtils::HashString("VAT_NUMBER"); namespace Aws { @@ -50,6 +28,27 @@ namespace Aws namespace ExtraParamNameMapper { + static const int DUNS_NUMBER_HASH = HashingUtils::HashString("DUNS_NUMBER"); + static const int BRAND_NUMBER_HASH = HashingUtils::HashString("BRAND_NUMBER"); + static const int BIRTH_DEPARTMENT_HASH = HashingUtils::HashString("BIRTH_DEPARTMENT"); + static const int BIRTH_DATE_IN_YYYY_MM_DD_HASH = HashingUtils::HashString("BIRTH_DATE_IN_YYYY_MM_DD"); + static const int BIRTH_COUNTRY_HASH = HashingUtils::HashString("BIRTH_COUNTRY"); + static const int BIRTH_CITY_HASH = HashingUtils::HashString("BIRTH_CITY"); + static const int DOCUMENT_NUMBER_HASH = HashingUtils::HashString("DOCUMENT_NUMBER"); + static const int AU_ID_NUMBER_HASH = HashingUtils::HashString("AU_ID_NUMBER"); + static const int AU_ID_TYPE_HASH = HashingUtils::HashString("AU_ID_TYPE"); + static const int CA_LEGAL_TYPE_HASH = HashingUtils::HashString("CA_LEGAL_TYPE"); + static const int ES_IDENTIFICATION_HASH = HashingUtils::HashString("ES_IDENTIFICATION"); + static const int ES_IDENTIFICATION_TYPE_HASH = HashingUtils::HashString("ES_IDENTIFICATION_TYPE"); + static const int ES_LEGAL_FORM_HASH = HashingUtils::HashString("ES_LEGAL_FORM"); + static const int FI_BUSINESS_NUMBER_HASH = HashingUtils::HashString("FI_BUSINESS_NUMBER"); + static const int FI_ID_NUMBER_HASH = HashingUtils::HashString("FI_ID_NUMBER"); + static const int IT_PIN_HASH = HashingUtils::HashString("IT_PIN"); + static const int RU_PASSPORT_DATA_HASH = HashingUtils::HashString("RU_PASSPORT_DATA"); + static const int SE_ID_NUMBER_HASH = HashingUtils::HashString("SE_ID_NUMBER"); + static const int SG_ID_NUMBER_HASH = HashingUtils::HashString("SG_ID_NUMBER"); + static const int VAT_NUMBER_HASH = HashingUtils::HashString("VAT_NUMBER"); + ExtraParamName GetExtraParamNameForName(const Aws::String& name) { @@ -94,10 +93,6 @@ namespace Aws { return ExtraParamName::CA_LEGAL_TYPE; } - else if (hashCode == CA_BUSINESS_ENTITY_TYPE_HASH) - { - return ExtraParamName::CA_BUSINESS_ENTITY_TYPE; - } else if (hashCode == ES_IDENTIFICATION_HASH) { return ExtraParamName::ES_IDENTIFICATION; @@ -138,7 +133,7 @@ namespace Aws { return ExtraParamName::VAT_NUMBER; } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -172,8 +167,6 @@ namespace Aws return "AU_ID_TYPE"; case ExtraParamName::CA_LEGAL_TYPE: return "CA_LEGAL_TYPE"; - case ExtraParamName::CA_BUSINESS_ENTITY_TYPE: - return "CA_BUSINESS_ENTITY_TYPE"; case ExtraParamName::ES_IDENTIFICATION: return "ES_IDENTIFICATION"; case ExtraParamName::ES_IDENTIFICATION_TYPE: @@ -195,7 +188,7 @@ namespace Aws case ExtraParamName::VAT_NUMBER: return "VAT_NUMBER"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-route53domains/source/model/Nameserver.cpp b/aws-cpp-sdk-route53domains/source/model/Nameserver.cpp index a6829619c19..453e0fbac2a 100644 --- a/aws-cpp-sdk-route53domains/source/model/Nameserver.cpp +++ b/aws-cpp-sdk-route53domains/source/model/Nameserver.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Route53Domains::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53Domains +{ +namespace Model +{ + Nameserver::Nameserver() : m_nameHasBeenSet(false), m_glueIpsHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue Nameserver::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Route53Domains +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-route53domains/source/model/OperationStatus.cpp b/aws-cpp-sdk-route53domains/source/model/OperationStatus.cpp index 6463d2913e3..e22fc7adbda 100644 --- a/aws-cpp-sdk-route53domains/source/model/OperationStatus.cpp +++ b/aws-cpp-sdk-route53domains/source/model/OperationStatus.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int SUBMITTED_HASH = HashingUtils::HashString("SUBMITTED"); -static const int IN_PROGRESS_HASH = HashingUtils::HashString("IN_PROGRESS"); -static const int ERROR__HASH = HashingUtils::HashString("ERROR"); -static const int SUCCESSFUL_HASH = HashingUtils::HashString("SUCCESSFUL"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace OperationStatusMapper { + static const int SUBMITTED_HASH = HashingUtils::HashString("SUBMITTED"); + static const int IN_PROGRESS_HASH = HashingUtils::HashString("IN_PROGRESS"); + static const int ERROR__HASH = HashingUtils::HashString("ERROR"); + static const int SUCCESSFUL_HASH = HashingUtils::HashString("SUCCESSFUL"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + OperationStatus GetOperationStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-route53domains/source/model/OperationSummary.cpp b/aws-cpp-sdk-route53domains/source/model/OperationSummary.cpp index b546a535cac..32dfc3d032f 100644 --- a/aws-cpp-sdk-route53domains/source/model/OperationSummary.cpp +++ b/aws-cpp-sdk-route53domains/source/model/OperationSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Route53Domains::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53Domains +{ +namespace Model +{ + OperationSummary::OperationSummary() : m_operationIdHasBeenSet(false), m_statusHasBeenSet(false), @@ -97,4 +103,8 @@ JsonValue OperationSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Route53Domains +} // namespace Aws diff --git a/aws-cpp-sdk-route53domains/source/model/OperationType.cpp b/aws-cpp-sdk-route53domains/source/model/OperationType.cpp index 4e7dabad6b5..5c3c32b780d 100644 --- a/aws-cpp-sdk-route53domains/source/model/OperationType.cpp +++ b/aws-cpp-sdk-route53domains/source/model/OperationType.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int REGISTER_DOMAIN_HASH = HashingUtils::HashString("REGISTER_DOMAIN"); -static const int DELETE_DOMAIN_HASH = HashingUtils::HashString("DELETE_DOMAIN"); -static const int TRANSFER_IN_DOMAIN_HASH = HashingUtils::HashString("TRANSFER_IN_DOMAIN"); -static const int UPDATE_DOMAIN_CONTACT_HASH = HashingUtils::HashString("UPDATE_DOMAIN_CONTACT"); -static const int UPDATE_NAMESERVER_HASH = HashingUtils::HashString("UPDATE_NAMESERVER"); -static const int CHANGE_PRIVACY_PROTECTION_HASH = HashingUtils::HashString("CHANGE_PRIVACY_PROTECTION"); -static const int DOMAIN_LOCK_HASH = HashingUtils::HashString("DOMAIN_LOCK"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace OperationTypeMapper { + static const int REGISTER_DOMAIN_HASH = HashingUtils::HashString("REGISTER_DOMAIN"); + static const int DELETE_DOMAIN_HASH = HashingUtils::HashString("DELETE_DOMAIN"); + static const int TRANSFER_IN_DOMAIN_HASH = HashingUtils::HashString("TRANSFER_IN_DOMAIN"); + static const int UPDATE_DOMAIN_CONTACT_HASH = HashingUtils::HashString("UPDATE_DOMAIN_CONTACT"); + static const int UPDATE_NAMESERVER_HASH = HashingUtils::HashString("UPDATE_NAMESERVER"); + static const int CHANGE_PRIVACY_PROTECTION_HASH = HashingUtils::HashString("CHANGE_PRIVACY_PROTECTION"); + static const int DOMAIN_LOCK_HASH = HashingUtils::HashString("DOMAIN_LOCK"); + OperationType GetOperationTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-route53domains/source/model/Tag.cpp b/aws-cpp-sdk-route53domains/source/model/Tag.cpp index cafb5dac920..ccbd9cec36c 100644 --- a/aws-cpp-sdk-route53domains/source/model/Tag.cpp +++ b/aws-cpp-sdk-route53domains/source/model/Tag.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Route53Domains::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Route53Domains +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Tag::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Route53Domains +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp b/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp index 73c9eab9334..d4910d2bf1a 100644 --- a/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp +++ b/aws-cpp-sdk-s3-integration-tests/BucketAndObjectOperationTest.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -62,16 +63,16 @@ namespace static const char* CREATE_BUCKET_TEST_NAME = "awsnativesdkcreatebuckettestbucket"; static const char* LOCATION_BUCKET_TEST_NAME = "loc"; static const char* PUT_OBJECTS_BUCKET_NAME = "awsnativesdkputobjectstestbucket"; - static const char* PUT_WEIRD_CHARSETS_OBJECTS_BUCKET_NAME = "awsnativesdkcharsetstestbucket"; + static const char* PUT_WEIRD_CHARSETS_OBJECTS_BUCKET_NAME = "awsnativesdkcharsetstestbucket"; static const char* PUT_OBJECTS_PRESIGNED_URLS_BUCKET_NAME = "awsnativesdkpresignedtestbucket"; static const char* PUT_MULTIPART_BUCKET_NAME = "awsnativesdkputobjectmultipartbucket"; static const char* ERRORS_TESTING_BUCKET = "awsnativesdkerrorsbucket"; static const char* INTERRUPT_TESTING_BUCKET = "awsnativesdkinterruptbucket"; static const char* TEST_OBJ_KEY = "TestObjectKey"; - //windows won't let you hard code unicode strings in a source file and assign them to a char*. Every other compiler does and I need to test this. - //to get around this, this string is url encoded version of "TestUnicode中国Key". At test time, we'll convert it to the unicode string - static const char* URLENCODED_UNICODE_KEY = "TestUnicode%E4%B8%AD%E5%9B%BDKey"; - static const char* URIESCAPE_KEY = "Escape+Me"; + //windows won't let you hard code unicode strings in a source file and assign them to a char*. Every other compiler does and I need to test this. + //to get around this, this string is url encoded version of "TestUnicode中国Key". At test time, we'll convert it to the unicode string + static const char* URLENCODED_UNICODE_KEY = "TestUnicode%E4%B8%AD%E5%9B%BDKey"; + static const char* URIESCAPE_KEY = "Escape+Me"; static const int TIMEOUT_MAX = 10; @@ -134,14 +135,26 @@ namespace static std::shared_ptr Create5MbStreamForUploadPart(const char* partTag) { - std::shared_ptr streamPtr = Aws::MakeShared(ALLOCATION_TAG); - unsigned fiveMbSize = 5 * 1024 * 1024; - for (unsigned i = 0; i < fiveMbSize; i += 30) + uint32_t fiveMbSize = 5 * 1024 * 1024; + + Aws::StringStream patternStream; + patternStream << "Multi-Part upload Test Part " << partTag << ":" << std::endl; + Aws::String pattern = patternStream.str(); + + Aws::String scratchString; + scratchString.reserve(fiveMbSize); + + // 5MB is a hard minimum for multi part uploads; make sure the final string is at least that long + uint32_t patternCopyCount = static_cast< uint32_t >( fiveMbSize / pattern.size() + 1 ); + for(uint32_t i = 0; i < patternCopyCount; ++i) { - *streamPtr << "Multi-Part upload Test Part " << partTag << ":" << std::endl; + scratchString.append( pattern ); } + std::shared_ptr streamPtr = Aws::MakeShared(ALLOCATION_TAG, scratchString); + streamPtr->seekg(0); + streamPtr->seekp(0, std::ios_base::end); return streamPtr; } @@ -513,99 +526,99 @@ namespace ASSERT_FALSE(headObjectOutcome.IsSuccess()); } - TEST_F(BucketAndObjectOperationTest, TestKeysWithCrazyCharacterSets) - { - Aws::String fullBucketName = CalculateBucketName(PUT_WEIRD_CHARSETS_OBJECTS_BUCKET_NAME); + TEST_F(BucketAndObjectOperationTest, TestKeysWithCrazyCharacterSets) + { + Aws::String fullBucketName = CalculateBucketName(PUT_WEIRD_CHARSETS_OBJECTS_BUCKET_NAME); - CreateBucketRequest createBucketRequest; - createBucketRequest.SetBucket(fullBucketName); - createBucketRequest.SetACL(BucketCannedACL::private_); + CreateBucketRequest createBucketRequest; + createBucketRequest.SetBucket(fullBucketName); + createBucketRequest.SetACL(BucketCannedACL::private_); - CreateBucketOutcome createBucketOutcome = Client->CreateBucket(createBucketRequest); - ASSERT_TRUE(createBucketOutcome.IsSuccess()); - const CreateBucketResult& createBucketResult = createBucketOutcome.GetResult(); - ASSERT_TRUE(!createBucketResult.GetLocation().empty()); + CreateBucketOutcome createBucketOutcome = Client->CreateBucket(createBucketRequest); + ASSERT_TRUE(createBucketOutcome.IsSuccess()); + const CreateBucketResult& createBucketResult = createBucketOutcome.GetResult(); + ASSERT_TRUE(!createBucketResult.GetLocation().empty()); - WaitForBucketToPropagate(fullBucketName); + WaitForBucketToPropagate(fullBucketName); - //test unicode - { - //we already have verification that this is a legit unicode string via the StringUtils test. - Aws::String unicodekey = StringUtils::URLDecode(URLENCODED_UNICODE_KEY); - PutObjectRequest putObjectRequest; - putObjectRequest.SetBucket(fullBucketName); + //test unicode + { + //we already have verification that this is a legit unicode string via the StringUtils test. + Aws::String unicodekey = StringUtils::URLDecode(URLENCODED_UNICODE_KEY); + PutObjectRequest putObjectRequest; + putObjectRequest.SetBucket(fullBucketName); - std::shared_ptr objectStream = Aws::MakeShared("TestKeysWithCrazyCharacterSets"); - *objectStream << "Test Object"; - objectStream->flush(); - putObjectRequest.SetBody(objectStream); - putObjectRequest.SetKey(unicodekey); + std::shared_ptr objectStream = Aws::MakeShared("TestKeysWithCrazyCharacterSets"); + *objectStream << "Test Object"; + objectStream->flush(); + putObjectRequest.SetBody(objectStream); + putObjectRequest.SetKey(unicodekey); - PutObjectOutcome putObjectOutcome = Client->PutObject(putObjectRequest); - ASSERT_TRUE(putObjectOutcome.IsSuccess()); + PutObjectOutcome putObjectOutcome = Client->PutObject(putObjectRequest); + ASSERT_TRUE(putObjectOutcome.IsSuccess()); - WaitForObjectToPropagate(fullBucketName, unicodekey.c_str()); + WaitForObjectToPropagate(fullBucketName, unicodekey.c_str()); - ListObjectsRequest listObjectsRequest; - listObjectsRequest.SetBucket(fullBucketName); + ListObjectsRequest listObjectsRequest; + listObjectsRequest.SetBucket(fullBucketName); - ListObjectsOutcome listObjectsOutcome = Client->ListObjects(listObjectsRequest); - ASSERT_TRUE(listObjectsOutcome.IsSuccess()); - ASSERT_TRUE(WaitForObjectToPropagate(fullBucketName, unicodekey.c_str())); + ListObjectsOutcome listObjectsOutcome = Client->ListObjects(listObjectsRequest); + ASSERT_TRUE(listObjectsOutcome.IsSuccess()); + ASSERT_TRUE(WaitForObjectToPropagate(fullBucketName, unicodekey.c_str())); - HeadObjectRequest headObjectRequest; - headObjectRequest.SetBucket(fullBucketName); - headObjectRequest.SetKey(unicodekey); + HeadObjectRequest headObjectRequest; + headObjectRequest.SetBucket(fullBucketName); + headObjectRequest.SetKey(unicodekey); - HeadObjectOutcome headObjectOutcome = Client->HeadObject(headObjectRequest); - ASSERT_TRUE(headObjectOutcome.IsSuccess()); + HeadObjectOutcome headObjectOutcome = Client->HeadObject(headObjectRequest); + ASSERT_TRUE(headObjectOutcome.IsSuccess()); - DeleteObjectRequest deleteObjectRequest; - deleteObjectRequest.SetBucket(fullBucketName); - deleteObjectRequest.SetKey(unicodekey); - DeleteObjectOutcome deleteObjectOutcome = Client->DeleteObject(deleteObjectRequest); - ASSERT_TRUE(deleteObjectOutcome.IsSuccess()); - } + DeleteObjectRequest deleteObjectRequest; + deleteObjectRequest.SetBucket(fullBucketName); + deleteObjectRequest.SetKey(unicodekey); + DeleteObjectOutcome deleteObjectOutcome = Client->DeleteObject(deleteObjectRequest); + ASSERT_TRUE(deleteObjectOutcome.IsSuccess()); + } - //test uri encoding edge case. - { - PutObjectRequest putObjectRequest; - putObjectRequest.SetBucket(fullBucketName); + //test uri encoding edge case. + { + PutObjectRequest putObjectRequest; + putObjectRequest.SetBucket(fullBucketName); - std::shared_ptr objectStream = Aws::MakeShared("TestKeysWithCrazyCharacterSets"); - *objectStream << "Test Object"; - objectStream->flush(); - putObjectRequest.SetBody(objectStream); - putObjectRequest.SetKey(URIESCAPE_KEY); + std::shared_ptr objectStream = Aws::MakeShared("TestKeysWithCrazyCharacterSets"); + *objectStream << "Test Object"; + objectStream->flush(); + putObjectRequest.SetBody(objectStream); + putObjectRequest.SetKey(URIESCAPE_KEY); - PutObjectOutcome putObjectOutcome = Client->PutObject(putObjectRequest); - ASSERT_TRUE(putObjectOutcome.IsSuccess()); + PutObjectOutcome putObjectOutcome = Client->PutObject(putObjectRequest); + ASSERT_TRUE(putObjectOutcome.IsSuccess()); - WaitForObjectToPropagate(fullBucketName, URIESCAPE_KEY); + WaitForObjectToPropagate(fullBucketName, URIESCAPE_KEY); - ListObjectsRequest listObjectsRequest; - listObjectsRequest.SetBucket(fullBucketName); + ListObjectsRequest listObjectsRequest; + listObjectsRequest.SetBucket(fullBucketName); - ListObjectsOutcome listObjectsOutcome = Client->ListObjects(listObjectsRequest); - ASSERT_TRUE(listObjectsOutcome.IsSuccess()); - ASSERT_TRUE(WaitForObjectToPropagate(fullBucketName, URIESCAPE_KEY)); + ListObjectsOutcome listObjectsOutcome = Client->ListObjects(listObjectsRequest); + ASSERT_TRUE(listObjectsOutcome.IsSuccess()); + ASSERT_TRUE(WaitForObjectToPropagate(fullBucketName, URIESCAPE_KEY)); - HeadObjectRequest headObjectRequest; - headObjectRequest.SetBucket(fullBucketName); - headObjectRequest.SetKey(URIESCAPE_KEY); + HeadObjectRequest headObjectRequest; + headObjectRequest.SetBucket(fullBucketName); + headObjectRequest.SetKey(URIESCAPE_KEY); - HeadObjectOutcome headObjectOutcome = Client->HeadObject(headObjectRequest); - ASSERT_TRUE(headObjectOutcome.IsSuccess()); + HeadObjectOutcome headObjectOutcome = Client->HeadObject(headObjectRequest); + ASSERT_TRUE(headObjectOutcome.IsSuccess()); - DeleteObjectRequest deleteObjectRequest; - deleteObjectRequest.SetBucket(fullBucketName); - deleteObjectRequest.SetKey(URIESCAPE_KEY); - DeleteObjectOutcome deleteObjectOutcome = Client->DeleteObject(deleteObjectRequest); - ASSERT_TRUE(deleteObjectOutcome.IsSuccess()); - } + DeleteObjectRequest deleteObjectRequest; + deleteObjectRequest.SetBucket(fullBucketName); + deleteObjectRequest.SetKey(URIESCAPE_KEY); + DeleteObjectOutcome deleteObjectOutcome = Client->DeleteObject(deleteObjectRequest); + ASSERT_TRUE(deleteObjectOutcome.IsSuccess()); + } - WaitForBucketToEmpty(fullBucketName); - } + WaitForBucketToEmpty(fullBucketName); + } TEST_F(BucketAndObjectOperationTest, TestObjectOperationsWithPresignedUrls) { @@ -634,7 +647,7 @@ namespace putRequest->SetContentLength(intConverter.str()); putRequest->SetContentType("text/plain"); std::shared_ptr putResponse = m_HttpClient->MakeRequest(*putRequest); - std::cout << putResponse->GetResponseBody().rdbuf(); + ASSERT_EQ(HttpResponseCode::OK, putResponse->GetResponseCode()); WaitForObjectToPropagate(fullBucketName, TEST_OBJ_KEY); @@ -758,15 +771,18 @@ namespace // repeat the get, but channel it directly to a file; tests the ability to override the output stream #ifndef __ANDROID__ - static const char* DOWNLOADED_FILENAME = "DownloadTestFile"; + Aws::String TestFileName = "DownloadTestFile"; +#else + Aws::String TestFileName = Aws::Platform::GetCacheDirectory() + Aws::String("DownloadTestFile"); +#endif - std::remove(DOWNLOADED_FILENAME); + std::remove(TestFileName.c_str()); GetObjectRequest getObjectRequest2; getObjectRequest2.SetBucket(fullBucketName); getObjectRequest2.SetKey(multipartKeyName); getObjectRequest2.SetResponseStreamFactory( - [](){ + [=](){ // NOTE: If using an FStream in order to download a file from S3 to a physical file, then we need to specify // the filemode "std::ios_base::out | std::ios_base::in | std::ios_base::trunc" -- // If the file transfer fails, then the error stream from the httpRequest is written to the file instead of the @@ -777,7 +793,7 @@ namespace // The 'truncate' is required to ensure that if the file download IS successful, then it can be written to the // FStream (if ::trunc is not specified, then the FStream.write fails for some unknown reason) - return Aws::New(ALLOCATION_TAG, DOWNLOADED_FILENAME, std::ios_base::out | std::ios_base::in | std::ios_base::trunc); + return Aws::New(ALLOCATION_TAG, TestFileName.c_str(), std::ios_base::out | std::ios_base::in | std::ios_base::trunc); } ); @@ -792,8 +808,8 @@ namespace getObjectRequest3.SetBucket("FAIL"); getObjectRequest3.SetKey("FAIL"); getObjectRequest3.SetResponseStreamFactory( - [](){ - return Aws::New(ALLOCATION_TAG, DOWNLOADED_FILENAME, std::ios_base::out | std::ios_base::in | std::ios_base::trunc); + [=](){ + return Aws::New(ALLOCATION_TAG, TestFileName.c_str(), std::ios_base::out | std::ios_base::in | std::ios_base::trunc); } ); @@ -801,7 +817,7 @@ namespace // Enclose scope just to make sure the download file is properly closed before we reread it GetObjectOutcome getObjectOutcome3 = Client->GetObject(getObjectRequest3); - std::remove(DOWNLOADED_FILENAME); + std::remove(TestFileName.c_str()); ASSERT_FALSE(getObjectOutcome3.IsSuccess()); } @@ -813,8 +829,8 @@ namespace getObjectRequest4.SetBucket("FAIL"); getObjectRequest4.SetKey("FAIL"); getObjectRequest4.SetResponseStreamFactory( - [](){ - return Aws::New(ALLOCATION_TAG, DOWNLOADED_FILENAME, std::ios_base::out); + [=](){ + return Aws::New(ALLOCATION_TAG, TestFileName.c_str(), std::ios_base::out); } ); @@ -822,12 +838,11 @@ namespace // Enclose scope just to make sure the download file is properly closed before we reread it GetObjectOutcome getObjectOutcome4 = Client->GetObject(getObjectRequest4); - std::remove(DOWNLOADED_FILENAME); + std::remove(TestFileName.c_str()); ASSERT_FALSE(getObjectOutcome4.IsSuccess()); } - { // Enclose scope just to make sure the download file is properly closed before we reread it GetObjectOutcome getObjectOutcome2 = Client->GetObject(getObjectRequest2); @@ -835,7 +850,7 @@ namespace } Aws::String fileContents; - Aws::IFStream downloadedFile(DOWNLOADED_FILENAME); + Aws::IFStream downloadedFile(TestFileName.c_str()); ASSERT_TRUE(downloadedFile.good()); if (downloadedFile.good()) @@ -846,12 +861,10 @@ namespace fileContents.assign((std::istreambuf_iterator(downloadedFile)), std::istreambuf_iterator()); } - std::remove(DOWNLOADED_FILENAME); + std::remove(TestFileName.c_str()); ASSERT_EQ(expectedStreamValue.str(), fileContents); -#endif // __ANDROID__ - // Remove the file DeleteObjectRequest deleteObjectRequest; deleteObjectRequest.SetBucket(fullBucketName); @@ -861,6 +874,7 @@ namespace ASSERT_TRUE(deleteObjectOutcome.IsSuccess()); } + TEST_F(BucketAndObjectOperationTest, TestThatErrorsParse) { Aws::String fullBucketName = CalculateBucketName(ERRORS_TESTING_BUCKET); diff --git a/aws-cpp-sdk-s3/CMakeLists.txt b/aws-cpp-sdk-s3/CMakeLists.txt index d3952b53e5c..b37d38504b2 100644 --- a/aws-cpp-sdk-s3/CMakeLists.txt +++ b/aws-cpp-sdk-s3/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-s3) "source/model/*.cpp" ) - file(GLOB S3_SRC + file(GLOB S3_UNIFIED_HEADERS ${AWS_S3_HEADERS} ${AWS_S3_MODEL_HEADERS} + ) + + file(GLOB S3_UNITY_SRC ${AWS_S3_SOURCE} ${AWS_S3_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("S3" S3_UNITY_SRC) + endif() + + file(GLOB S3_SRC + ${S3_UNIFIED_HEADERS} + ${S3_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-s3/include/aws/s3/model/CopyObjectRequest.h b/aws-cpp-sdk-s3/include/aws/s3/model/CopyObjectRequest.h index 424912c97b9..2a7e9dc4178 100644 --- a/aws-cpp-sdk-s3/include/aws/s3/model/CopyObjectRequest.h +++ b/aws-cpp-sdk-s3/include/aws/s3/model/CopyObjectRequest.h @@ -858,7 +858,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline const Aws::String& GetSSECustomerKey() const{ return m_sSECustomerKey; } @@ -867,7 +867,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(const Aws::String& value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey = value; } @@ -876,7 +876,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(Aws::String&& value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey = value; } @@ -885,7 +885,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(const char* value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey.assign(value); } @@ -894,7 +894,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline CopyObjectRequest& WithSSECustomerKey(const Aws::String& value) { SetSSECustomerKey(value); return *this;} @@ -903,7 +903,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline CopyObjectRequest& WithSSECustomerKey(Aws::String&& value) { SetSSECustomerKey(value); return *this;} @@ -912,7 +912,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline CopyObjectRequest& WithSSECustomerKey(const char* value) { SetSSECustomerKey(value); return *this;} diff --git a/aws-cpp-sdk-s3/include/aws/s3/model/CreateMultipartUploadRequest.h b/aws-cpp-sdk-s3/include/aws/s3/model/CreateMultipartUploadRequest.h index 9913c2b664e..1912b72d485 100644 --- a/aws-cpp-sdk-s3/include/aws/s3/model/CreateMultipartUploadRequest.h +++ b/aws-cpp-sdk-s3/include/aws/s3/model/CreateMultipartUploadRequest.h @@ -665,7 +665,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline const Aws::String& GetSSECustomerKey() const{ return m_sSECustomerKey; } @@ -674,7 +674,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(const Aws::String& value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey = value; } @@ -683,7 +683,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(Aws::String&& value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey = value; } @@ -692,7 +692,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(const char* value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey.assign(value); } @@ -701,7 +701,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline CreateMultipartUploadRequest& WithSSECustomerKey(const Aws::String& value) { SetSSECustomerKey(value); return *this;} @@ -710,7 +710,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline CreateMultipartUploadRequest& WithSSECustomerKey(Aws::String&& value) { SetSSECustomerKey(value); return *this;} @@ -719,7 +719,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline CreateMultipartUploadRequest& WithSSECustomerKey(const char* value) { SetSSECustomerKey(value); return *this;} diff --git a/aws-cpp-sdk-s3/include/aws/s3/model/GetObjectRequest.h b/aws-cpp-sdk-s3/include/aws/s3/model/GetObjectRequest.h index 6e983957da4..80c3293be90 100644 --- a/aws-cpp-sdk-s3/include/aws/s3/model/GetObjectRequest.h +++ b/aws-cpp-sdk-s3/include/aws/s3/model/GetObjectRequest.h @@ -552,7 +552,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline const Aws::String& GetSSECustomerKey() const{ return m_sSECustomerKey; } @@ -561,7 +561,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(const Aws::String& value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey = value; } @@ -570,7 +570,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(Aws::String&& value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey = value; } @@ -579,7 +579,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(const char* value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey.assign(value); } @@ -588,7 +588,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline GetObjectRequest& WithSSECustomerKey(const Aws::String& value) { SetSSECustomerKey(value); return *this;} @@ -597,7 +597,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline GetObjectRequest& WithSSECustomerKey(Aws::String&& value) { SetSSECustomerKey(value); return *this;} @@ -606,7 +606,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline GetObjectRequest& WithSSECustomerKey(const char* value) { SetSSECustomerKey(value); return *this;} diff --git a/aws-cpp-sdk-s3/include/aws/s3/model/HeadObjectRequest.h b/aws-cpp-sdk-s3/include/aws/s3/model/HeadObjectRequest.h index 98f5b6a4366..b3467fc1d24 100644 --- a/aws-cpp-sdk-s3/include/aws/s3/model/HeadObjectRequest.h +++ b/aws-cpp-sdk-s3/include/aws/s3/model/HeadObjectRequest.h @@ -352,7 +352,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline const Aws::String& GetSSECustomerKey() const{ return m_sSECustomerKey; } @@ -361,7 +361,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(const Aws::String& value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey = value; } @@ -370,7 +370,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(Aws::String&& value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey = value; } @@ -379,7 +379,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(const char* value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey.assign(value); } @@ -388,7 +388,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline HeadObjectRequest& WithSSECustomerKey(const Aws::String& value) { SetSSECustomerKey(value); return *this;} @@ -397,7 +397,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline HeadObjectRequest& WithSSECustomerKey(Aws::String&& value) { SetSSECustomerKey(value); return *this;} @@ -406,7 +406,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline HeadObjectRequest& WithSSECustomerKey(const char* value) { SetSSECustomerKey(value); return *this;} diff --git a/aws-cpp-sdk-s3/include/aws/s3/model/PutObjectRequest.h b/aws-cpp-sdk-s3/include/aws/s3/model/PutObjectRequest.h index 66947fb0e0f..057f4175b2a 100644 --- a/aws-cpp-sdk-s3/include/aws/s3/model/PutObjectRequest.h +++ b/aws-cpp-sdk-s3/include/aws/s3/model/PutObjectRequest.h @@ -710,7 +710,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline const Aws::String& GetSSECustomerKey() const{ return m_sSECustomerKey; } @@ -719,7 +719,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(const Aws::String& value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey = value; } @@ -728,7 +728,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(Aws::String&& value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey = value; } @@ -737,7 +737,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline void SetSSECustomerKey(const char* value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey.assign(value); } @@ -746,7 +746,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline PutObjectRequest& WithSSECustomerKey(const Aws::String& value) { SetSSECustomerKey(value); return *this;} @@ -755,7 +755,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline PutObjectRequest& WithSSECustomerKey(Aws::String&& value) { SetSSECustomerKey(value); return *this;} @@ -764,7 +764,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. + * x-amz-server-side?-encryption?-customer-algorithm header. */ inline PutObjectRequest& WithSSECustomerKey(const char* value) { SetSSECustomerKey(value); return *this;} diff --git a/aws-cpp-sdk-s3/include/aws/s3/model/UploadPartCopyRequest.h b/aws-cpp-sdk-s3/include/aws/s3/model/UploadPartCopyRequest.h index 093e4bafe6f..c73406cc422 100644 --- a/aws-cpp-sdk-s3/include/aws/s3/model/UploadPartCopyRequest.h +++ b/aws-cpp-sdk-s3/include/aws/s3/model/UploadPartCopyRequest.h @@ -402,7 +402,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. This must be the same + * x-amz-server-side?-encryption?-customer-algorithm header. This must be the same * encryption key specified in the initiate multipart upload request. */ inline const Aws::String& GetSSECustomerKey() const{ return m_sSECustomerKey; } @@ -412,7 +412,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. This must be the same + * x-amz-server-side?-encryption?-customer-algorithm header. This must be the same * encryption key specified in the initiate multipart upload request. */ inline void SetSSECustomerKey(const Aws::String& value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey = value; } @@ -422,7 +422,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. This must be the same + * x-amz-server-side?-encryption?-customer-algorithm header. This must be the same * encryption key specified in the initiate multipart upload request. */ inline void SetSSECustomerKey(Aws::String&& value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey = value; } @@ -432,7 +432,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. This must be the same + * x-amz-server-side?-encryption?-customer-algorithm header. This must be the same * encryption key specified in the initiate multipart upload request. */ inline void SetSSECustomerKey(const char* value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey.assign(value); } @@ -442,7 +442,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. This must be the same + * x-amz-server-side?-encryption?-customer-algorithm header. This must be the same * encryption key specified in the initiate multipart upload request. */ inline UploadPartCopyRequest& WithSSECustomerKey(const Aws::String& value) { SetSSECustomerKey(value); return *this;} @@ -452,7 +452,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. This must be the same + * x-amz-server-side?-encryption?-customer-algorithm header. This must be the same * encryption key specified in the initiate multipart upload request. */ inline UploadPartCopyRequest& WithSSECustomerKey(Aws::String&& value) { SetSSECustomerKey(value); return *this;} @@ -462,7 +462,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. This must be the same + * x-amz-server-side?-encryption?-customer-algorithm header. This must be the same * encryption key specified in the initiate multipart upload request. */ inline UploadPartCopyRequest& WithSSECustomerKey(const char* value) { SetSSECustomerKey(value); return *this;} diff --git a/aws-cpp-sdk-s3/include/aws/s3/model/UploadPartRequest.h b/aws-cpp-sdk-s3/include/aws/s3/model/UploadPartRequest.h index d6a6584013d..823a28ac00a 100644 --- a/aws-cpp-sdk-s3/include/aws/s3/model/UploadPartRequest.h +++ b/aws-cpp-sdk-s3/include/aws/s3/model/UploadPartRequest.h @@ -256,7 +256,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. This must be the same + * x-amz-server-side?-encryption?-customer-algorithm header. This must be the same * encryption key specified in the initiate multipart upload request. */ inline const Aws::String& GetSSECustomerKey() const{ return m_sSECustomerKey; } @@ -266,7 +266,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. This must be the same + * x-amz-server-side?-encryption?-customer-algorithm header. This must be the same * encryption key specified in the initiate multipart upload request. */ inline void SetSSECustomerKey(const Aws::String& value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey = value; } @@ -276,7 +276,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. This must be the same + * x-amz-server-side?-encryption?-customer-algorithm header. This must be the same * encryption key specified in the initiate multipart upload request. */ inline void SetSSECustomerKey(Aws::String&& value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey = value; } @@ -286,7 +286,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. This must be the same + * x-amz-server-side?-encryption?-customer-algorithm header. This must be the same * encryption key specified in the initiate multipart upload request. */ inline void SetSSECustomerKey(const char* value) { m_sSECustomerKeyHasBeenSet = true; m_sSECustomerKey.assign(value); } @@ -296,7 +296,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. This must be the same + * x-amz-server-side?-encryption?-customer-algorithm header. This must be the same * encryption key specified in the initiate multipart upload request. */ inline UploadPartRequest& WithSSECustomerKey(const Aws::String& value) { SetSSECustomerKey(value); return *this;} @@ -306,7 +306,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. This must be the same + * x-amz-server-side?-encryption?-customer-algorithm header. This must be the same * encryption key specified in the initiate multipart upload request. */ inline UploadPartRequest& WithSSECustomerKey(Aws::String&& value) { SetSSECustomerKey(value); return *this;} @@ -316,7 +316,7 @@ namespace Model * encrypting data. This value is used to store the object and then it is * discarded; Amazon does not store the encryption key. The key must be appropriate * for use with the algorithm specified in the - * x-amz-server-side​-encryption​-customer-algorithm header. This must be the same + * x-amz-server-side?-encryption?-customer-algorithm header. This must be the same * encryption key specified in the initiate multipart upload request. */ inline UploadPartRequest& WithSSECustomerKey(const char* value) { SetSSECustomerKey(value); return *this;} diff --git a/aws-cpp-sdk-s3/source/S3Errors.cpp b/aws-cpp-sdk-s3/source/S3Errors.cpp index f8d7c999d83..6a2484dc8b0 100644 --- a/aws-cpp-sdk-s3/source/S3Errors.cpp +++ b/aws-cpp-sdk-s3/source/S3Errors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::S3; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace S3ErrorMapper +{ + static const int NO_SUCH_KEY_HASH = HashingUtils::HashString("NoSuchKey"); static const int BUCKET_ALREADY_OWNED_BY_YOU_HASH = HashingUtils::HashString("BucketAlreadyOwnedByYou"); static const int OBJECT_ALREADY_IN_ACTIVE_TIER_HASH = HashingUtils::HashString("ObjectAlreadyInActiveTierError"); @@ -28,12 +35,6 @@ static const int NO_SUCH_UPLOAD_HASH = HashingUtils::HashString("NoSuchUpload"); static const int OBJECT_NOT_IN_ACTIVE_TIER_HASH = HashingUtils::HashString("ObjectNotInActiveTierError"); static const int NO_SUCH_BUCKET_HASH = HashingUtils::HashString("NoSuchBucket"); -namespace Aws -{ -namespace S3 -{ -namespace S3ErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-s3/source/model/AccessControlPolicy.cpp b/aws-cpp-sdk-s3/source/model/AccessControlPolicy.cpp index a056f4d5a70..b0a9c684d06 100644 --- a/aws-cpp-sdk-s3/source/model/AccessControlPolicy.cpp +++ b/aws-cpp-sdk-s3/source/model/AccessControlPolicy.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + AccessControlPolicy::AccessControlPolicy() : m_grantsHasBeenSet(false), m_ownerHasBeenSet(false) @@ -85,3 +91,7 @@ void AccessControlPolicy::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/Bucket.cpp b/aws-cpp-sdk-s3/source/model/Bucket.cpp index c2c8106f3fe..c496afeea76 100644 --- a/aws-cpp-sdk-s3/source/model/Bucket.cpp +++ b/aws-cpp-sdk-s3/source/model/Bucket.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Bucket::Bucket() : m_nameHasBeenSet(false), m_creationDateHasBeenSet(false) @@ -75,3 +81,7 @@ void Bucket::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/BucketCannedACL.cpp b/aws-cpp-sdk-s3/source/model/BucketCannedACL.cpp index 58faa1b7bd8..106e443d412 100644 --- a/aws-cpp-sdk-s3/source/model/BucketCannedACL.cpp +++ b/aws-cpp-sdk-s3/source/model/BucketCannedACL.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int private__HASH = HashingUtils::HashString("private"); -static const int public_read_HASH = HashingUtils::HashString("public-read"); -static const int public_read_write_HASH = HashingUtils::HashString("public-read-write"); -static const int authenticated_read_HASH = HashingUtils::HashString("authenticated-read"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace BucketCannedACLMapper { + static const int private__HASH = HashingUtils::HashString("private"); + static const int public_read_HASH = HashingUtils::HashString("public-read"); + static const int public_read_write_HASH = HashingUtils::HashString("public-read-write"); + static const int authenticated_read_HASH = HashingUtils::HashString("authenticated-read"); + BucketCannedACL GetBucketCannedACLForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/BucketLifecycleConfiguration.cpp b/aws-cpp-sdk-s3/source/model/BucketLifecycleConfiguration.cpp index 6376987762c..63741cb1ff8 100644 --- a/aws-cpp-sdk-s3/source/model/BucketLifecycleConfiguration.cpp +++ b/aws-cpp-sdk-s3/source/model/BucketLifecycleConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + BucketLifecycleConfiguration::BucketLifecycleConfiguration() : m_rulesHasBeenSet(false) { @@ -70,3 +76,7 @@ void BucketLifecycleConfiguration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/BucketLocationConstraint.cpp b/aws-cpp-sdk-s3/source/model/BucketLocationConstraint.cpp index d2e0c44da38..86282c09552 100644 --- a/aws-cpp-sdk-s3/source/model/BucketLocationConstraint.cpp +++ b/aws-cpp-sdk-s3/source/model/BucketLocationConstraint.cpp @@ -19,16 +19,6 @@ using namespace Aws::Utils; -static const int EU_HASH = HashingUtils::HashString("EU"); -static const int eu_west_1_HASH = HashingUtils::HashString("eu-west-1"); -static const int us_west_1_HASH = HashingUtils::HashString("us-west-1"); -static const int us_west_2_HASH = HashingUtils::HashString("us-west-2"); -static const int ap_southeast_1_HASH = HashingUtils::HashString("ap-southeast-1"); -static const int ap_southeast_2_HASH = HashingUtils::HashString("ap-southeast-2"); -static const int ap_northeast_1_HASH = HashingUtils::HashString("ap-northeast-1"); -static const int sa_east_1_HASH = HashingUtils::HashString("sa-east-1"); -static const int cn_north_1_HASH = HashingUtils::HashString("cn-north-1"); -static const int eu_central_1_HASH = HashingUtils::HashString("eu-central-1"); namespace Aws { @@ -39,6 +29,17 @@ namespace Aws namespace BucketLocationConstraintMapper { + static const int EU_HASH = HashingUtils::HashString("EU"); + static const int eu_west_1_HASH = HashingUtils::HashString("eu-west-1"); + static const int us_west_1_HASH = HashingUtils::HashString("us-west-1"); + static const int us_west_2_HASH = HashingUtils::HashString("us-west-2"); + static const int ap_southeast_1_HASH = HashingUtils::HashString("ap-southeast-1"); + static const int ap_southeast_2_HASH = HashingUtils::HashString("ap-southeast-2"); + static const int ap_northeast_1_HASH = HashingUtils::HashString("ap-northeast-1"); + static const int sa_east_1_HASH = HashingUtils::HashString("sa-east-1"); + static const int cn_north_1_HASH = HashingUtils::HashString("cn-north-1"); + static const int eu_central_1_HASH = HashingUtils::HashString("eu-central-1"); + BucketLocationConstraint GetBucketLocationConstraintForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/BucketLoggingStatus.cpp b/aws-cpp-sdk-s3/source/model/BucketLoggingStatus.cpp index 5bc6f29dc96..aa895b870e6 100644 --- a/aws-cpp-sdk-s3/source/model/BucketLoggingStatus.cpp +++ b/aws-cpp-sdk-s3/source/model/BucketLoggingStatus.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + BucketLoggingStatus::BucketLoggingStatus() : m_loggingEnabledHasBeenSet(false) { @@ -61,3 +67,7 @@ void BucketLoggingStatus::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/BucketLogsPermission.cpp b/aws-cpp-sdk-s3/source/model/BucketLogsPermission.cpp index a0493fccec0..d3efc73c89f 100644 --- a/aws-cpp-sdk-s3/source/model/BucketLogsPermission.cpp +++ b/aws-cpp-sdk-s3/source/model/BucketLogsPermission.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int FULL_CONTROL_HASH = HashingUtils::HashString("FULL_CONTROL"); -static const int READ_HASH = HashingUtils::HashString("READ"); -static const int WRITE_HASH = HashingUtils::HashString("WRITE"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace BucketLogsPermissionMapper { + static const int FULL_CONTROL_HASH = HashingUtils::HashString("FULL_CONTROL"); + static const int READ_HASH = HashingUtils::HashString("READ"); + static const int WRITE_HASH = HashingUtils::HashString("WRITE"); + BucketLogsPermission GetBucketLogsPermissionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/BucketVersioningStatus.cpp b/aws-cpp-sdk-s3/source/model/BucketVersioningStatus.cpp index 4a8e00237ea..d2491013e28 100644 --- a/aws-cpp-sdk-s3/source/model/BucketVersioningStatus.cpp +++ b/aws-cpp-sdk-s3/source/model/BucketVersioningStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Enabled_HASH = HashingUtils::HashString("Enabled"); -static const int Suspended_HASH = HashingUtils::HashString("Suspended"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace BucketVersioningStatusMapper { + static const int Enabled_HASH = HashingUtils::HashString("Enabled"); + static const int Suspended_HASH = HashingUtils::HashString("Suspended"); + BucketVersioningStatus GetBucketVersioningStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/CORSConfiguration.cpp b/aws-cpp-sdk-s3/source/model/CORSConfiguration.cpp index e06c2e309c5..9aa905d7848 100644 --- a/aws-cpp-sdk-s3/source/model/CORSConfiguration.cpp +++ b/aws-cpp-sdk-s3/source/model/CORSConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + CORSConfiguration::CORSConfiguration() : m_cORSRulesHasBeenSet(false) { @@ -70,3 +76,7 @@ void CORSConfiguration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/CORSRule.cpp b/aws-cpp-sdk-s3/source/model/CORSRule.cpp index 1119eafe71f..7c7624e9232 100644 --- a/aws-cpp-sdk-s3/source/model/CORSRule.cpp +++ b/aws-cpp-sdk-s3/source/model/CORSRule.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + CORSRule::CORSRule() : m_allowedHeadersHasBeenSet(false), m_allowedMethodsHasBeenSet(false), @@ -157,3 +163,7 @@ void CORSRule::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/CloudFunctionConfiguration.cpp b/aws-cpp-sdk-s3/source/model/CloudFunctionConfiguration.cpp index adee31096fb..fbb1ac77acc 100644 --- a/aws-cpp-sdk-s3/source/model/CloudFunctionConfiguration.cpp +++ b/aws-cpp-sdk-s3/source/model/CloudFunctionConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + CloudFunctionConfiguration::CloudFunctionConfiguration() : m_idHasBeenSet(false), m_eventsHasBeenSet(false), @@ -112,3 +118,7 @@ void CloudFunctionConfiguration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/CommonPrefix.cpp b/aws-cpp-sdk-s3/source/model/CommonPrefix.cpp index 3d6699b6a98..03fdc4b476f 100644 --- a/aws-cpp-sdk-s3/source/model/CommonPrefix.cpp +++ b/aws-cpp-sdk-s3/source/model/CommonPrefix.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + CommonPrefix::CommonPrefix() : m_prefixHasBeenSet(false) { @@ -61,3 +67,7 @@ void CommonPrefix::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/CompletedMultipartUpload.cpp b/aws-cpp-sdk-s3/source/model/CompletedMultipartUpload.cpp index 1c0e3d74a9c..1a25ef0ff16 100644 --- a/aws-cpp-sdk-s3/source/model/CompletedMultipartUpload.cpp +++ b/aws-cpp-sdk-s3/source/model/CompletedMultipartUpload.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + CompletedMultipartUpload::CompletedMultipartUpload() : m_partsHasBeenSet(false) { @@ -70,3 +76,7 @@ void CompletedMultipartUpload::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/CompletedPart.cpp b/aws-cpp-sdk-s3/source/model/CompletedPart.cpp index 7eddba8454a..14e510b9267 100644 --- a/aws-cpp-sdk-s3/source/model/CompletedPart.cpp +++ b/aws-cpp-sdk-s3/source/model/CompletedPart.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + CompletedPart::CompletedPart() : m_eTagHasBeenSet(false), m_partNumber(0), @@ -79,3 +85,7 @@ void CompletedPart::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/Condition.cpp b/aws-cpp-sdk-s3/source/model/Condition.cpp index 52a7df98284..c26d26a88d6 100644 --- a/aws-cpp-sdk-s3/source/model/Condition.cpp +++ b/aws-cpp-sdk-s3/source/model/Condition.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Condition::Condition() : m_httpErrorCodeReturnedEqualsHasBeenSet(false), m_keyPrefixEqualsHasBeenSet(false) @@ -75,3 +81,7 @@ void Condition::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/CopyPartResult.cpp b/aws-cpp-sdk-s3/source/model/CopyPartResult.cpp index 50d661c88fb..433feb76d69 100644 --- a/aws-cpp-sdk-s3/source/model/CopyPartResult.cpp +++ b/aws-cpp-sdk-s3/source/model/CopyPartResult.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + CopyPartResult::CopyPartResult() : m_eTagHasBeenSet(false), m_lastModifiedHasBeenSet(false) @@ -75,3 +81,7 @@ void CopyPartResult::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/CreateBucketConfiguration.cpp b/aws-cpp-sdk-s3/source/model/CreateBucketConfiguration.cpp index 760226d07db..2817a197384 100644 --- a/aws-cpp-sdk-s3/source/model/CreateBucketConfiguration.cpp +++ b/aws-cpp-sdk-s3/source/model/CreateBucketConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + CreateBucketConfiguration::CreateBucketConfiguration() : m_locationConstraintHasBeenSet(false) { @@ -61,3 +67,7 @@ void CreateBucketConfiguration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/Delete.cpp b/aws-cpp-sdk-s3/source/model/Delete.cpp index 9ccfc7cf367..a8fe502eaff 100644 --- a/aws-cpp-sdk-s3/source/model/Delete.cpp +++ b/aws-cpp-sdk-s3/source/model/Delete.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Delete::Delete() : m_objectsHasBeenSet(false), m_quiet(false), @@ -88,3 +94,7 @@ void Delete::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/DeleteMarkerEntry.cpp b/aws-cpp-sdk-s3/source/model/DeleteMarkerEntry.cpp index ad67da47995..106955c79cf 100644 --- a/aws-cpp-sdk-s3/source/model/DeleteMarkerEntry.cpp +++ b/aws-cpp-sdk-s3/source/model/DeleteMarkerEntry.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + DeleteMarkerEntry::DeleteMarkerEntry() : m_ownerHasBeenSet(false), m_keyHasBeenSet(false), @@ -121,3 +127,7 @@ void DeleteMarkerEntry::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/DeletedObject.cpp b/aws-cpp-sdk-s3/source/model/DeletedObject.cpp index 83206812e10..5bb4cba5850 100644 --- a/aws-cpp-sdk-s3/source/model/DeletedObject.cpp +++ b/aws-cpp-sdk-s3/source/model/DeletedObject.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + DeletedObject::DeletedObject() : m_keyHasBeenSet(false), m_versionIdHasBeenSet(false), @@ -107,3 +113,7 @@ void DeletedObject::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/Destination.cpp b/aws-cpp-sdk-s3/source/model/Destination.cpp index f60089458e9..c7433b8bbed 100644 --- a/aws-cpp-sdk-s3/source/model/Destination.cpp +++ b/aws-cpp-sdk-s3/source/model/Destination.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Destination::Destination() : m_bucketHasBeenSet(false), m_storageClassHasBeenSet(false) @@ -75,3 +81,7 @@ void Destination::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/EncodingType.cpp b/aws-cpp-sdk-s3/source/model/EncodingType.cpp index 48443050d71..2586cc7c883 100644 --- a/aws-cpp-sdk-s3/source/model/EncodingType.cpp +++ b/aws-cpp-sdk-s3/source/model/EncodingType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int url_HASH = HashingUtils::HashString("url"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace EncodingTypeMapper { + static const int url_HASH = HashingUtils::HashString("url"); + EncodingType GetEncodingTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/Error.cpp b/aws-cpp-sdk-s3/source/model/Error.cpp index e281fb62185..776811dd03f 100644 --- a/aws-cpp-sdk-s3/source/model/Error.cpp +++ b/aws-cpp-sdk-s3/source/model/Error.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Error::Error() : m_keyHasBeenSet(false), m_versionIdHasBeenSet(false), @@ -103,3 +109,7 @@ void Error::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/ErrorDocument.cpp b/aws-cpp-sdk-s3/source/model/ErrorDocument.cpp index e8cde023f6e..05c4fdabec0 100644 --- a/aws-cpp-sdk-s3/source/model/ErrorDocument.cpp +++ b/aws-cpp-sdk-s3/source/model/ErrorDocument.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + ErrorDocument::ErrorDocument() : m_keyHasBeenSet(false) { @@ -61,3 +67,7 @@ void ErrorDocument::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/Event.cpp b/aws-cpp-sdk-s3/source/model/Event.cpp index 52fd76f227d..d61a3a31bab 100644 --- a/aws-cpp-sdk-s3/source/model/Event.cpp +++ b/aws-cpp-sdk-s3/source/model/Event.cpp @@ -19,15 +19,6 @@ using namespace Aws::Utils; -static const int s3_ReducedRedundancyLostObject_HASH = HashingUtils::HashString("s3:ReducedRedundancyLostObject"); -static const int s3_ObjectCreated_HASH = HashingUtils::HashString("s3:ObjectCreated:*"); -static const int s3_ObjectCreated_Put_HASH = HashingUtils::HashString("s3:ObjectCreated:Put"); -static const int s3_ObjectCreated_Post_HASH = HashingUtils::HashString("s3:ObjectCreated:Post"); -static const int s3_ObjectCreated_Copy_HASH = HashingUtils::HashString("s3:ObjectCreated:Copy"); -static const int s3_ObjectCreated_CompleteMultipartUpload_HASH = HashingUtils::HashString("s3:ObjectCreated:CompleteMultipartUpload"); -static const int s3_ObjectRemoved_HASH = HashingUtils::HashString("s3:ObjectRemoved:*"); -static const int s3_ObjectRemoved_Delete_HASH = HashingUtils::HashString("s3:ObjectRemoved:Delete"); -static const int s3_ObjectRemoved_DeleteMarkerCreated_HASH = HashingUtils::HashString("s3:ObjectRemoved:DeleteMarkerCreated"); namespace Aws { @@ -38,6 +29,16 @@ namespace Aws namespace EventMapper { + static const int s3_ReducedRedundancyLostObject_HASH = HashingUtils::HashString("s3:ReducedRedundancyLostObject"); + static const int s3_ObjectCreated_HASH = HashingUtils::HashString("s3:ObjectCreated:*"); + static const int s3_ObjectCreated_Put_HASH = HashingUtils::HashString("s3:ObjectCreated:Put"); + static const int s3_ObjectCreated_Post_HASH = HashingUtils::HashString("s3:ObjectCreated:Post"); + static const int s3_ObjectCreated_Copy_HASH = HashingUtils::HashString("s3:ObjectCreated:Copy"); + static const int s3_ObjectCreated_CompleteMultipartUpload_HASH = HashingUtils::HashString("s3:ObjectCreated:CompleteMultipartUpload"); + static const int s3_ObjectRemoved_HASH = HashingUtils::HashString("s3:ObjectRemoved:*"); + static const int s3_ObjectRemoved_Delete_HASH = HashingUtils::HashString("s3:ObjectRemoved:Delete"); + static const int s3_ObjectRemoved_DeleteMarkerCreated_HASH = HashingUtils::HashString("s3:ObjectRemoved:DeleteMarkerCreated"); + Event GetEventForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/ExpirationStatus.cpp b/aws-cpp-sdk-s3/source/model/ExpirationStatus.cpp index f45fbae6b12..be5938065dd 100644 --- a/aws-cpp-sdk-s3/source/model/ExpirationStatus.cpp +++ b/aws-cpp-sdk-s3/source/model/ExpirationStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Enabled_HASH = HashingUtils::HashString("Enabled"); -static const int Disabled_HASH = HashingUtils::HashString("Disabled"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ExpirationStatusMapper { + static const int Enabled_HASH = HashingUtils::HashString("Enabled"); + static const int Disabled_HASH = HashingUtils::HashString("Disabled"); + ExpirationStatus GetExpirationStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/FilterRule.cpp b/aws-cpp-sdk-s3/source/model/FilterRule.cpp index 2db88b78a10..d57b936a188 100644 --- a/aws-cpp-sdk-s3/source/model/FilterRule.cpp +++ b/aws-cpp-sdk-s3/source/model/FilterRule.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + FilterRule::FilterRule() : m_nameHasBeenSet(false), m_valueHasBeenSet(false) @@ -75,3 +81,7 @@ void FilterRule::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/FilterRuleName.cpp b/aws-cpp-sdk-s3/source/model/FilterRuleName.cpp index 9e5e963ef8a..1674576d664 100644 --- a/aws-cpp-sdk-s3/source/model/FilterRuleName.cpp +++ b/aws-cpp-sdk-s3/source/model/FilterRuleName.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int prefix_HASH = HashingUtils::HashString("prefix"); -static const int suffix_HASH = HashingUtils::HashString("suffix"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace FilterRuleNameMapper { + static const int prefix_HASH = HashingUtils::HashString("prefix"); + static const int suffix_HASH = HashingUtils::HashString("suffix"); + FilterRuleName GetFilterRuleNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/Grant.cpp b/aws-cpp-sdk-s3/source/model/Grant.cpp index d4040e94ea4..5b77caf5198 100644 --- a/aws-cpp-sdk-s3/source/model/Grant.cpp +++ b/aws-cpp-sdk-s3/source/model/Grant.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Grant::Grant() : m_granteeHasBeenSet(false), m_permissionHasBeenSet(false) @@ -75,3 +81,7 @@ void Grant::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/Grantee.cpp b/aws-cpp-sdk-s3/source/model/Grantee.cpp index da924e525e9..db2e7a52f77 100644 --- a/aws-cpp-sdk-s3/source/model/Grantee.cpp +++ b/aws-cpp-sdk-s3/source/model/Grantee.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Grantee::Grantee() : m_displayNameHasBeenSet(false), m_emailAddressHasBeenSet(false), @@ -117,3 +123,7 @@ void Grantee::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/IndexDocument.cpp b/aws-cpp-sdk-s3/source/model/IndexDocument.cpp index 46069290a0e..845e5a719c7 100644 --- a/aws-cpp-sdk-s3/source/model/IndexDocument.cpp +++ b/aws-cpp-sdk-s3/source/model/IndexDocument.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + IndexDocument::IndexDocument() : m_suffixHasBeenSet(false) { @@ -61,3 +67,7 @@ void IndexDocument::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/Initiator.cpp b/aws-cpp-sdk-s3/source/model/Initiator.cpp index 723cf7113d5..ffd178f4f0f 100644 --- a/aws-cpp-sdk-s3/source/model/Initiator.cpp +++ b/aws-cpp-sdk-s3/source/model/Initiator.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Initiator::Initiator() : m_iDHasBeenSet(false), m_displayNameHasBeenSet(false) @@ -75,3 +81,7 @@ void Initiator::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/LambdaFunctionConfiguration.cpp b/aws-cpp-sdk-s3/source/model/LambdaFunctionConfiguration.cpp index ed2be162b0b..d120b2964b1 100644 --- a/aws-cpp-sdk-s3/source/model/LambdaFunctionConfiguration.cpp +++ b/aws-cpp-sdk-s3/source/model/LambdaFunctionConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + LambdaFunctionConfiguration::LambdaFunctionConfiguration() : m_idHasBeenSet(false), m_lambdaFunctionArnHasBeenSet(false), @@ -112,3 +118,7 @@ void LambdaFunctionConfiguration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/LifecycleConfiguration.cpp b/aws-cpp-sdk-s3/source/model/LifecycleConfiguration.cpp index 187b47c07e1..a1b347e8b12 100644 --- a/aws-cpp-sdk-s3/source/model/LifecycleConfiguration.cpp +++ b/aws-cpp-sdk-s3/source/model/LifecycleConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + LifecycleConfiguration::LifecycleConfiguration() : m_rulesHasBeenSet(false) { @@ -70,3 +76,7 @@ void LifecycleConfiguration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/LifecycleExpiration.cpp b/aws-cpp-sdk-s3/source/model/LifecycleExpiration.cpp index d4aa0054e72..de20b152b6e 100644 --- a/aws-cpp-sdk-s3/source/model/LifecycleExpiration.cpp +++ b/aws-cpp-sdk-s3/source/model/LifecycleExpiration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + LifecycleExpiration::LifecycleExpiration() : m_dateHasBeenSet(false), m_days(0), @@ -97,3 +103,7 @@ void LifecycleExpiration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/LifecycleRule.cpp b/aws-cpp-sdk-s3/source/model/LifecycleRule.cpp index 3287a324cac..445cb622acb 100644 --- a/aws-cpp-sdk-s3/source/model/LifecycleRule.cpp +++ b/aws-cpp-sdk-s3/source/model/LifecycleRule.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + LifecycleRule::LifecycleRule() : m_expirationHasBeenSet(false), m_iDHasBeenSet(false), @@ -177,3 +183,7 @@ void LifecycleRule::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/LoggingEnabled.cpp b/aws-cpp-sdk-s3/source/model/LoggingEnabled.cpp index bde230d80ff..966798695f2 100644 --- a/aws-cpp-sdk-s3/source/model/LoggingEnabled.cpp +++ b/aws-cpp-sdk-s3/source/model/LoggingEnabled.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + LoggingEnabled::LoggingEnabled() : m_targetBucketHasBeenSet(false), m_targetGrantsHasBeenSet(false), @@ -99,3 +105,7 @@ void LoggingEnabled::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/MFADelete.cpp b/aws-cpp-sdk-s3/source/model/MFADelete.cpp index e0e301f1b4f..47f8a094a37 100644 --- a/aws-cpp-sdk-s3/source/model/MFADelete.cpp +++ b/aws-cpp-sdk-s3/source/model/MFADelete.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Enabled_HASH = HashingUtils::HashString("Enabled"); -static const int Disabled_HASH = HashingUtils::HashString("Disabled"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace MFADeleteMapper { + static const int Enabled_HASH = HashingUtils::HashString("Enabled"); + static const int Disabled_HASH = HashingUtils::HashString("Disabled"); + MFADelete GetMFADeleteForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/MFADeleteStatus.cpp b/aws-cpp-sdk-s3/source/model/MFADeleteStatus.cpp index 18675a0fd01..fd0489dc358 100644 --- a/aws-cpp-sdk-s3/source/model/MFADeleteStatus.cpp +++ b/aws-cpp-sdk-s3/source/model/MFADeleteStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Enabled_HASH = HashingUtils::HashString("Enabled"); -static const int Disabled_HASH = HashingUtils::HashString("Disabled"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace MFADeleteStatusMapper { + static const int Enabled_HASH = HashingUtils::HashString("Enabled"); + static const int Disabled_HASH = HashingUtils::HashString("Disabled"); + MFADeleteStatus GetMFADeleteStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/MetadataDirective.cpp b/aws-cpp-sdk-s3/source/model/MetadataDirective.cpp index c760f333dcb..937abc56216 100644 --- a/aws-cpp-sdk-s3/source/model/MetadataDirective.cpp +++ b/aws-cpp-sdk-s3/source/model/MetadataDirective.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int COPY_HASH = HashingUtils::HashString("COPY"); -static const int REPLACE_HASH = HashingUtils::HashString("REPLACE"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace MetadataDirectiveMapper { + static const int COPY_HASH = HashingUtils::HashString("COPY"); + static const int REPLACE_HASH = HashingUtils::HashString("REPLACE"); + MetadataDirective GetMetadataDirectiveForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/MultipartUpload.cpp b/aws-cpp-sdk-s3/source/model/MultipartUpload.cpp index 397527ea3c8..535f5ae09f4 100644 --- a/aws-cpp-sdk-s3/source/model/MultipartUpload.cpp +++ b/aws-cpp-sdk-s3/source/model/MultipartUpload.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + MultipartUpload::MultipartUpload() : m_uploadIdHasBeenSet(false), m_keyHasBeenSet(false), @@ -131,3 +137,7 @@ void MultipartUpload::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/NoncurrentVersionExpiration.cpp b/aws-cpp-sdk-s3/source/model/NoncurrentVersionExpiration.cpp index 97916cbf3c1..c3d836a1a93 100644 --- a/aws-cpp-sdk-s3/source/model/NoncurrentVersionExpiration.cpp +++ b/aws-cpp-sdk-s3/source/model/NoncurrentVersionExpiration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + NoncurrentVersionExpiration::NoncurrentVersionExpiration() : m_noncurrentDays(0), m_noncurrentDaysHasBeenSet(false) @@ -65,3 +71,7 @@ void NoncurrentVersionExpiration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/NoncurrentVersionTransition.cpp b/aws-cpp-sdk-s3/source/model/NoncurrentVersionTransition.cpp index 6bd9b977fdd..adf04e1fbc5 100644 --- a/aws-cpp-sdk-s3/source/model/NoncurrentVersionTransition.cpp +++ b/aws-cpp-sdk-s3/source/model/NoncurrentVersionTransition.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + NoncurrentVersionTransition::NoncurrentVersionTransition() : m_noncurrentDays(0), m_noncurrentDaysHasBeenSet(false), @@ -79,3 +85,7 @@ void NoncurrentVersionTransition::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/NotificationConfiguration.cpp b/aws-cpp-sdk-s3/source/model/NotificationConfiguration.cpp index 1864241340c..8b788939871 100644 --- a/aws-cpp-sdk-s3/source/model/NotificationConfiguration.cpp +++ b/aws-cpp-sdk-s3/source/model/NotificationConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + NotificationConfiguration::NotificationConfiguration() : m_topicConfigurationsHasBeenSet(false), m_queueConfigurationsHasBeenSet(false), @@ -116,3 +122,7 @@ void NotificationConfiguration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/NotificationConfigurationDeprecated.cpp b/aws-cpp-sdk-s3/source/model/NotificationConfigurationDeprecated.cpp index 05c244ba87b..1bb40b33a52 100644 --- a/aws-cpp-sdk-s3/source/model/NotificationConfigurationDeprecated.cpp +++ b/aws-cpp-sdk-s3/source/model/NotificationConfigurationDeprecated.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + NotificationConfigurationDeprecated::NotificationConfigurationDeprecated() : m_topicConfigurationHasBeenSet(false), m_queueConfigurationHasBeenSet(false), @@ -89,3 +95,7 @@ void NotificationConfigurationDeprecated::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/NotificationConfigurationFilter.cpp b/aws-cpp-sdk-s3/source/model/NotificationConfigurationFilter.cpp index 746020144db..92af931a82b 100644 --- a/aws-cpp-sdk-s3/source/model/NotificationConfigurationFilter.cpp +++ b/aws-cpp-sdk-s3/source/model/NotificationConfigurationFilter.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + NotificationConfigurationFilter::NotificationConfigurationFilter() : m_keyHasBeenSet(false) { @@ -61,3 +67,7 @@ void NotificationConfigurationFilter::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/Object.cpp b/aws-cpp-sdk-s3/source/model/Object.cpp index 83de590361f..115a5619972 100644 --- a/aws-cpp-sdk-s3/source/model/Object.cpp +++ b/aws-cpp-sdk-s3/source/model/Object.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Object::Object() : m_keyHasBeenSet(false), m_lastModifiedHasBeenSet(false), @@ -135,3 +141,7 @@ void Object::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/ObjectCannedACL.cpp b/aws-cpp-sdk-s3/source/model/ObjectCannedACL.cpp index 16589664b4d..47568e98383 100644 --- a/aws-cpp-sdk-s3/source/model/ObjectCannedACL.cpp +++ b/aws-cpp-sdk-s3/source/model/ObjectCannedACL.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int private__HASH = HashingUtils::HashString("private"); -static const int public_read_HASH = HashingUtils::HashString("public-read"); -static const int public_read_write_HASH = HashingUtils::HashString("public-read-write"); -static const int authenticated_read_HASH = HashingUtils::HashString("authenticated-read"); -static const int aws_exec_read_HASH = HashingUtils::HashString("aws-exec-read"); -static const int bucket_owner_read_HASH = HashingUtils::HashString("bucket-owner-read"); -static const int bucket_owner_full_control_HASH = HashingUtils::HashString("bucket-owner-full-control"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace ObjectCannedACLMapper { + static const int private__HASH = HashingUtils::HashString("private"); + static const int public_read_HASH = HashingUtils::HashString("public-read"); + static const int public_read_write_HASH = HashingUtils::HashString("public-read-write"); + static const int authenticated_read_HASH = HashingUtils::HashString("authenticated-read"); + static const int aws_exec_read_HASH = HashingUtils::HashString("aws-exec-read"); + static const int bucket_owner_read_HASH = HashingUtils::HashString("bucket-owner-read"); + static const int bucket_owner_full_control_HASH = HashingUtils::HashString("bucket-owner-full-control"); + ObjectCannedACL GetObjectCannedACLForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/ObjectIdentifier.cpp b/aws-cpp-sdk-s3/source/model/ObjectIdentifier.cpp index 08b1e755aca..287611a5185 100644 --- a/aws-cpp-sdk-s3/source/model/ObjectIdentifier.cpp +++ b/aws-cpp-sdk-s3/source/model/ObjectIdentifier.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + ObjectIdentifier::ObjectIdentifier() : m_keyHasBeenSet(false), m_versionIdHasBeenSet(false) @@ -75,3 +81,7 @@ void ObjectIdentifier::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/ObjectStorageClass.cpp b/aws-cpp-sdk-s3/source/model/ObjectStorageClass.cpp index 56415d97534..c73663a7b4e 100644 --- a/aws-cpp-sdk-s3/source/model/ObjectStorageClass.cpp +++ b/aws-cpp-sdk-s3/source/model/ObjectStorageClass.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int STANDARD_HASH = HashingUtils::HashString("STANDARD"); -static const int REDUCED_REDUNDANCY_HASH = HashingUtils::HashString("REDUCED_REDUNDANCY"); -static const int GLACIER_HASH = HashingUtils::HashString("GLACIER"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ObjectStorageClassMapper { + static const int STANDARD_HASH = HashingUtils::HashString("STANDARD"); + static const int REDUCED_REDUNDANCY_HASH = HashingUtils::HashString("REDUCED_REDUNDANCY"); + static const int GLACIER_HASH = HashingUtils::HashString("GLACIER"); + ObjectStorageClass GetObjectStorageClassForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/ObjectVersion.cpp b/aws-cpp-sdk-s3/source/model/ObjectVersion.cpp index e406e056336..bf41e889a16 100644 --- a/aws-cpp-sdk-s3/source/model/ObjectVersion.cpp +++ b/aws-cpp-sdk-s3/source/model/ObjectVersion.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + ObjectVersion::ObjectVersion() : m_eTagHasBeenSet(false), m_size(0), @@ -167,3 +173,7 @@ void ObjectVersion::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/ObjectVersionStorageClass.cpp b/aws-cpp-sdk-s3/source/model/ObjectVersionStorageClass.cpp index fbe62cbd76f..97790d3eeb2 100644 --- a/aws-cpp-sdk-s3/source/model/ObjectVersionStorageClass.cpp +++ b/aws-cpp-sdk-s3/source/model/ObjectVersionStorageClass.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int STANDARD_HASH = HashingUtils::HashString("STANDARD"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace ObjectVersionStorageClassMapper { + static const int STANDARD_HASH = HashingUtils::HashString("STANDARD"); + ObjectVersionStorageClass GetObjectVersionStorageClassForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/Owner.cpp b/aws-cpp-sdk-s3/source/model/Owner.cpp index caa0eca5d22..8dcbc16e962 100644 --- a/aws-cpp-sdk-s3/source/model/Owner.cpp +++ b/aws-cpp-sdk-s3/source/model/Owner.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Owner::Owner() : m_displayNameHasBeenSet(false), m_iDHasBeenSet(false) @@ -75,3 +81,7 @@ void Owner::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/Part.cpp b/aws-cpp-sdk-s3/source/model/Part.cpp index 8de6baa06f0..7d875bcdd2f 100644 --- a/aws-cpp-sdk-s3/source/model/Part.cpp +++ b/aws-cpp-sdk-s3/source/model/Part.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Part::Part() : m_partNumber(0), m_partNumberHasBeenSet(false), @@ -111,3 +117,7 @@ void Part::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/Payer.cpp b/aws-cpp-sdk-s3/source/model/Payer.cpp index 673bc6a5d45..5ee3b873066 100644 --- a/aws-cpp-sdk-s3/source/model/Payer.cpp +++ b/aws-cpp-sdk-s3/source/model/Payer.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Requester_HASH = HashingUtils::HashString("Requester"); -static const int BucketOwner_HASH = HashingUtils::HashString("BucketOwner"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace PayerMapper { + static const int Requester_HASH = HashingUtils::HashString("Requester"); + static const int BucketOwner_HASH = HashingUtils::HashString("BucketOwner"); + Payer GetPayerForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/Permission.cpp b/aws-cpp-sdk-s3/source/model/Permission.cpp index 62bc74aeb3b..3aa445f3723 100644 --- a/aws-cpp-sdk-s3/source/model/Permission.cpp +++ b/aws-cpp-sdk-s3/source/model/Permission.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int FULL_CONTROL_HASH = HashingUtils::HashString("FULL_CONTROL"); -static const int WRITE_HASH = HashingUtils::HashString("WRITE"); -static const int WRITE_ACP_HASH = HashingUtils::HashString("WRITE_ACP"); -static const int READ_HASH = HashingUtils::HashString("READ"); -static const int READ_ACP_HASH = HashingUtils::HashString("READ_ACP"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace PermissionMapper { + static const int FULL_CONTROL_HASH = HashingUtils::HashString("FULL_CONTROL"); + static const int WRITE_HASH = HashingUtils::HashString("WRITE"); + static const int WRITE_ACP_HASH = HashingUtils::HashString("WRITE_ACP"); + static const int READ_HASH = HashingUtils::HashString("READ"); + static const int READ_ACP_HASH = HashingUtils::HashString("READ_ACP"); + Permission GetPermissionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/Protocol.cpp b/aws-cpp-sdk-s3/source/model/Protocol.cpp index d8d6c4883ed..f881f05b4bf 100644 --- a/aws-cpp-sdk-s3/source/model/Protocol.cpp +++ b/aws-cpp-sdk-s3/source/model/Protocol.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int http_HASH = HashingUtils::HashString("http"); -static const int https_HASH = HashingUtils::HashString("https"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ProtocolMapper { + static const int http_HASH = HashingUtils::HashString("http"); + static const int https_HASH = HashingUtils::HashString("https"); + Protocol GetProtocolForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/QueueConfiguration.cpp b/aws-cpp-sdk-s3/source/model/QueueConfiguration.cpp index bfb64e005e4..e19d4a7ec22 100644 --- a/aws-cpp-sdk-s3/source/model/QueueConfiguration.cpp +++ b/aws-cpp-sdk-s3/source/model/QueueConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + QueueConfiguration::QueueConfiguration() : m_idHasBeenSet(false), m_queueArnHasBeenSet(false), @@ -112,3 +118,7 @@ void QueueConfiguration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/QueueConfigurationDeprecated.cpp b/aws-cpp-sdk-s3/source/model/QueueConfigurationDeprecated.cpp index 30d64d07657..7a534a6b263 100644 --- a/aws-cpp-sdk-s3/source/model/QueueConfigurationDeprecated.cpp +++ b/aws-cpp-sdk-s3/source/model/QueueConfigurationDeprecated.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + QueueConfigurationDeprecated::QueueConfigurationDeprecated() : m_idHasBeenSet(false), m_eventsHasBeenSet(false), @@ -98,3 +104,7 @@ void QueueConfigurationDeprecated::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/Redirect.cpp b/aws-cpp-sdk-s3/source/model/Redirect.cpp index b10556e0473..af8592cfcaa 100644 --- a/aws-cpp-sdk-s3/source/model/Redirect.cpp +++ b/aws-cpp-sdk-s3/source/model/Redirect.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Redirect::Redirect() : m_hostNameHasBeenSet(false), m_httpRedirectCodeHasBeenSet(false), @@ -117,3 +123,7 @@ void Redirect::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/RedirectAllRequestsTo.cpp b/aws-cpp-sdk-s3/source/model/RedirectAllRequestsTo.cpp index c006b7f3551..06e34147a6e 100644 --- a/aws-cpp-sdk-s3/source/model/RedirectAllRequestsTo.cpp +++ b/aws-cpp-sdk-s3/source/model/RedirectAllRequestsTo.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + RedirectAllRequestsTo::RedirectAllRequestsTo() : m_hostNameHasBeenSet(false), m_protocolHasBeenSet(false) @@ -75,3 +81,7 @@ void RedirectAllRequestsTo::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/ReplicationConfiguration.cpp b/aws-cpp-sdk-s3/source/model/ReplicationConfiguration.cpp index 4eea92d8432..823fd957ed1 100644 --- a/aws-cpp-sdk-s3/source/model/ReplicationConfiguration.cpp +++ b/aws-cpp-sdk-s3/source/model/ReplicationConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + ReplicationConfiguration::ReplicationConfiguration() : m_roleHasBeenSet(false), m_rulesHasBeenSet(false) @@ -84,3 +90,7 @@ void ReplicationConfiguration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/ReplicationRule.cpp b/aws-cpp-sdk-s3/source/model/ReplicationRule.cpp index 039bec6b393..092920d4b1e 100644 --- a/aws-cpp-sdk-s3/source/model/ReplicationRule.cpp +++ b/aws-cpp-sdk-s3/source/model/ReplicationRule.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + ReplicationRule::ReplicationRule() : m_iDHasBeenSet(false), m_prefixHasBeenSet(false), @@ -103,3 +109,7 @@ void ReplicationRule::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/ReplicationRuleStatus.cpp b/aws-cpp-sdk-s3/source/model/ReplicationRuleStatus.cpp index 44530ab2034..dcdb31fd2f4 100644 --- a/aws-cpp-sdk-s3/source/model/ReplicationRuleStatus.cpp +++ b/aws-cpp-sdk-s3/source/model/ReplicationRuleStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Enabled_HASH = HashingUtils::HashString("Enabled"); -static const int Disabled_HASH = HashingUtils::HashString("Disabled"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ReplicationRuleStatusMapper { + static const int Enabled_HASH = HashingUtils::HashString("Enabled"); + static const int Disabled_HASH = HashingUtils::HashString("Disabled"); + ReplicationRuleStatus GetReplicationRuleStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/ReplicationStatus.cpp b/aws-cpp-sdk-s3/source/model/ReplicationStatus.cpp index b05a159da5c..ee211702874 100644 --- a/aws-cpp-sdk-s3/source/model/ReplicationStatus.cpp +++ b/aws-cpp-sdk-s3/source/model/ReplicationStatus.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int COMPLETE_HASH = HashingUtils::HashString("COMPLETE"); -static const int PENDING_HASH = HashingUtils::HashString("PENDING"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); -static const int REPLICA_HASH = HashingUtils::HashString("REPLICA"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace ReplicationStatusMapper { + static const int COMPLETE_HASH = HashingUtils::HashString("COMPLETE"); + static const int PENDING_HASH = HashingUtils::HashString("PENDING"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + static const int REPLICA_HASH = HashingUtils::HashString("REPLICA"); + ReplicationStatus GetReplicationStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/RequestCharged.cpp b/aws-cpp-sdk-s3/source/model/RequestCharged.cpp index ee73eac055b..0e63635f708 100644 --- a/aws-cpp-sdk-s3/source/model/RequestCharged.cpp +++ b/aws-cpp-sdk-s3/source/model/RequestCharged.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int requester_HASH = HashingUtils::HashString("requester"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace RequestChargedMapper { + static const int requester_HASH = HashingUtils::HashString("requester"); + RequestCharged GetRequestChargedForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/RequestPayer.cpp b/aws-cpp-sdk-s3/source/model/RequestPayer.cpp index bde242e7693..99d97bd6b9d 100644 --- a/aws-cpp-sdk-s3/source/model/RequestPayer.cpp +++ b/aws-cpp-sdk-s3/source/model/RequestPayer.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int requester_HASH = HashingUtils::HashString("requester"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace RequestPayerMapper { + static const int requester_HASH = HashingUtils::HashString("requester"); + RequestPayer GetRequestPayerForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/RequestPaymentConfiguration.cpp b/aws-cpp-sdk-s3/source/model/RequestPaymentConfiguration.cpp index d2c87a731bb..b097680e95d 100644 --- a/aws-cpp-sdk-s3/source/model/RequestPaymentConfiguration.cpp +++ b/aws-cpp-sdk-s3/source/model/RequestPaymentConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + RequestPaymentConfiguration::RequestPaymentConfiguration() : m_payerHasBeenSet(false) { @@ -61,3 +67,7 @@ void RequestPaymentConfiguration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/RestoreRequest.cpp b/aws-cpp-sdk-s3/source/model/RestoreRequest.cpp index 54f527ed94d..671d2f5d6f8 100644 --- a/aws-cpp-sdk-s3/source/model/RestoreRequest.cpp +++ b/aws-cpp-sdk-s3/source/model/RestoreRequest.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + RestoreRequest::RestoreRequest() : m_days(0), m_daysHasBeenSet(false) @@ -65,3 +71,7 @@ void RestoreRequest::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/RoutingRule.cpp b/aws-cpp-sdk-s3/source/model/RoutingRule.cpp index d54447d058b..7b711b7fb9d 100644 --- a/aws-cpp-sdk-s3/source/model/RoutingRule.cpp +++ b/aws-cpp-sdk-s3/source/model/RoutingRule.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + RoutingRule::RoutingRule() : m_conditionHasBeenSet(false), m_redirectHasBeenSet(false) @@ -75,3 +81,7 @@ void RoutingRule::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/Rule.cpp b/aws-cpp-sdk-s3/source/model/Rule.cpp index b7431bf8dde..88cd476051e 100644 --- a/aws-cpp-sdk-s3/source/model/Rule.cpp +++ b/aws-cpp-sdk-s3/source/model/Rule.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Rule::Rule() : m_expirationHasBeenSet(false), m_iDHasBeenSet(false), @@ -159,3 +165,7 @@ void Rule::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/S3KeyFilter.cpp b/aws-cpp-sdk-s3/source/model/S3KeyFilter.cpp index 1ed90f78455..f92c3a1ee8a 100644 --- a/aws-cpp-sdk-s3/source/model/S3KeyFilter.cpp +++ b/aws-cpp-sdk-s3/source/model/S3KeyFilter.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + S3KeyFilter::S3KeyFilter() : m_filterRulesHasBeenSet(false) { @@ -70,3 +76,7 @@ void S3KeyFilter::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/ServerSideEncryption.cpp b/aws-cpp-sdk-s3/source/model/ServerSideEncryption.cpp index 69c44b73b9b..299b7e55eb7 100644 --- a/aws-cpp-sdk-s3/source/model/ServerSideEncryption.cpp +++ b/aws-cpp-sdk-s3/source/model/ServerSideEncryption.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int AES256_HASH = HashingUtils::HashString("AES256"); -static const int aws_kms_HASH = HashingUtils::HashString("aws:kms"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ServerSideEncryptionMapper { + static const int AES256_HASH = HashingUtils::HashString("AES256"); + static const int aws_kms_HASH = HashingUtils::HashString("aws:kms"); + ServerSideEncryption GetServerSideEncryptionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/StorageClass.cpp b/aws-cpp-sdk-s3/source/model/StorageClass.cpp index 31bc7183b10..92a967b7f38 100644 --- a/aws-cpp-sdk-s3/source/model/StorageClass.cpp +++ b/aws-cpp-sdk-s3/source/model/StorageClass.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int STANDARD_HASH = HashingUtils::HashString("STANDARD"); -static const int REDUCED_REDUNDANCY_HASH = HashingUtils::HashString("REDUCED_REDUNDANCY"); -static const int STANDARD_IA_HASH = HashingUtils::HashString("STANDARD_IA"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace StorageClassMapper { + static const int STANDARD_HASH = HashingUtils::HashString("STANDARD"); + static const int REDUCED_REDUNDANCY_HASH = HashingUtils::HashString("REDUCED_REDUNDANCY"); + static const int STANDARD_IA_HASH = HashingUtils::HashString("STANDARD_IA"); + StorageClass GetStorageClassForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/Tag.cpp b/aws-cpp-sdk-s3/source/model/Tag.cpp index 5f2554afb58..52c7782e86f 100644 --- a/aws-cpp-sdk-s3/source/model/Tag.cpp +++ b/aws-cpp-sdk-s3/source/model/Tag.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -75,3 +81,7 @@ void Tag::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/Tagging.cpp b/aws-cpp-sdk-s3/source/model/Tagging.cpp index 3076bd520ea..3e00123c79a 100644 --- a/aws-cpp-sdk-s3/source/model/Tagging.cpp +++ b/aws-cpp-sdk-s3/source/model/Tagging.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Tagging::Tagging() : m_tagSetHasBeenSet(false) { @@ -71,3 +77,7 @@ void Tagging::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/TargetGrant.cpp b/aws-cpp-sdk-s3/source/model/TargetGrant.cpp index 8970a2ab9a8..7e5058cc615 100644 --- a/aws-cpp-sdk-s3/source/model/TargetGrant.cpp +++ b/aws-cpp-sdk-s3/source/model/TargetGrant.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + TargetGrant::TargetGrant() : m_granteeHasBeenSet(false), m_permissionHasBeenSet(false) @@ -75,3 +81,7 @@ void TargetGrant::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/TopicConfiguration.cpp b/aws-cpp-sdk-s3/source/model/TopicConfiguration.cpp index 8b467496892..cd47d1e7db5 100644 --- a/aws-cpp-sdk-s3/source/model/TopicConfiguration.cpp +++ b/aws-cpp-sdk-s3/source/model/TopicConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + TopicConfiguration::TopicConfiguration() : m_idHasBeenSet(false), m_topicArnHasBeenSet(false), @@ -112,3 +118,7 @@ void TopicConfiguration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/TopicConfigurationDeprecated.cpp b/aws-cpp-sdk-s3/source/model/TopicConfigurationDeprecated.cpp index a0f4c008676..f65233953b8 100644 --- a/aws-cpp-sdk-s3/source/model/TopicConfigurationDeprecated.cpp +++ b/aws-cpp-sdk-s3/source/model/TopicConfigurationDeprecated.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + TopicConfigurationDeprecated::TopicConfigurationDeprecated() : m_idHasBeenSet(false), m_eventsHasBeenSet(false), @@ -98,3 +104,7 @@ void TopicConfigurationDeprecated::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/Transition.cpp b/aws-cpp-sdk-s3/source/model/Transition.cpp index 5b0d1a0dc47..ac4fd02640f 100644 --- a/aws-cpp-sdk-s3/source/model/Transition.cpp +++ b/aws-cpp-sdk-s3/source/model/Transition.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + Transition::Transition() : m_dateHasBeenSet(false), m_days(0), @@ -93,3 +99,7 @@ void Transition::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/TransitionStorageClass.cpp b/aws-cpp-sdk-s3/source/model/TransitionStorageClass.cpp index ee9ad60695f..1ac703d5f94 100644 --- a/aws-cpp-sdk-s3/source/model/TransitionStorageClass.cpp +++ b/aws-cpp-sdk-s3/source/model/TransitionStorageClass.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int GLACIER_HASH = HashingUtils::HashString("GLACIER"); -static const int STANDARD_IA_HASH = HashingUtils::HashString("STANDARD_IA"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace TransitionStorageClassMapper { + static const int GLACIER_HASH = HashingUtils::HashString("GLACIER"); + static const int STANDARD_IA_HASH = HashingUtils::HashString("STANDARD_IA"); + TransitionStorageClass GetTransitionStorageClassForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/Type.cpp b/aws-cpp-sdk-s3/source/model/Type.cpp index 63d60b70560..bb770dda6c2 100644 --- a/aws-cpp-sdk-s3/source/model/Type.cpp +++ b/aws-cpp-sdk-s3/source/model/Type.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int CanonicalUser_HASH = HashingUtils::HashString("CanonicalUser"); -static const int AmazonCustomerByEmail_HASH = HashingUtils::HashString("AmazonCustomerByEmail"); -static const int Group_HASH = HashingUtils::HashString("Group"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace TypeMapper { + static const int CanonicalUser_HASH = HashingUtils::HashString("CanonicalUser"); + static const int AmazonCustomerByEmail_HASH = HashingUtils::HashString("AmazonCustomerByEmail"); + static const int Group_HASH = HashingUtils::HashString("Group"); + Type GetTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-s3/source/model/VersioningConfiguration.cpp b/aws-cpp-sdk-s3/source/model/VersioningConfiguration.cpp index 3bd42b78108..ab5671ee81b 100644 --- a/aws-cpp-sdk-s3/source/model/VersioningConfiguration.cpp +++ b/aws-cpp-sdk-s3/source/model/VersioningConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + VersioningConfiguration::VersioningConfiguration() : m_mFADeleteHasBeenSet(false), m_statusHasBeenSet(false) @@ -75,3 +81,7 @@ void VersioningConfiguration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-s3/source/model/WebsiteConfiguration.cpp b/aws-cpp-sdk-s3/source/model/WebsiteConfiguration.cpp index 7d005556c26..1c1c18340ef 100644 --- a/aws-cpp-sdk-s3/source/model/WebsiteConfiguration.cpp +++ b/aws-cpp-sdk-s3/source/model/WebsiteConfiguration.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::S3::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace S3 +{ +namespace Model +{ + WebsiteConfiguration::WebsiteConfiguration() : m_errorDocumentHasBeenSet(false), m_indexDocumentHasBeenSet(false), @@ -113,3 +119,7 @@ void WebsiteConfiguration::AddToNode(XmlNode& parentNode) const } } + +} // namespace Model +} // namespace S3 +} // namespace Aws diff --git a/aws-cpp-sdk-sdb/CMakeLists.txt b/aws-cpp-sdk-sdb/CMakeLists.txt index cf70113ba03..a6e0d50c8e2 100644 --- a/aws-cpp-sdk-sdb/CMakeLists.txt +++ b/aws-cpp-sdk-sdb/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-sdb) "source/model/*.cpp" ) - file(GLOB SDB_SRC + file(GLOB SDB_UNIFIED_HEADERS ${AWS_SDB_HEADERS} ${AWS_SDB_MODEL_HEADERS} + ) + + file(GLOB SDB_UNITY_SRC ${AWS_SDB_SOURCE} ${AWS_SDB_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("SDB" SDB_UNITY_SRC) + endif() + + file(GLOB SDB_SRC + ${SDB_UNIFIED_HEADERS} + ${SDB_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-sdb/source/SimpleDBErrors.cpp b/aws-cpp-sdk-sdb/source/SimpleDBErrors.cpp index a008d510012..137d3fec432 100644 --- a/aws-cpp-sdk-sdb/source/SimpleDBErrors.cpp +++ b/aws-cpp-sdk-sdb/source/SimpleDBErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::SimpleDB; using namespace Aws::Utils; +namespace Aws +{ +namespace SimpleDB +{ +namespace SimpleDBErrorMapper +{ + static const int REQUEST_TIMEOUT_HASH = HashingUtils::HashString("RequestTimeout"); static const int NO_SUCH_DOMAIN_HASH = HashingUtils::HashString("NoSuchDomain"); static const int NUMBER_DOMAIN_ATTRIBUTES_EXCEEDED_HASH = HashingUtils::HashString("NumberDomainAttributesExceeded"); @@ -36,12 +43,6 @@ static const int NUMBER_DOMAINS_EXCEEDED_HASH = HashingUtils::HashString("Number static const int INVALID_QUERY_EXPRESSION_HASH = HashingUtils::HashString("InvalidQueryExpression"); static const int TOO_MANY_REQUESTED_ATTRIBUTES_HASH = HashingUtils::HashString("TooManyRequestedAttributes"); -namespace Aws -{ -namespace SimpleDB -{ -namespace SimpleDBErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-sdb/source/model/Attribute.cpp b/aws-cpp-sdk-sdb/source/model/Attribute.cpp index b50f9cdea9b..ae1ff44eb5e 100644 --- a/aws-cpp-sdk-sdb/source/model/Attribute.cpp +++ b/aws-cpp-sdk-sdb/source/model/Attribute.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SimpleDB::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SimpleDB +{ +namespace Model +{ + Attribute::Attribute() : m_nameHasBeenSet(false), m_alternateNameEncodingHasBeenSet(false), @@ -114,3 +120,7 @@ void Attribute::OutputToStream(Aws::OStream& oStream, const char* location) cons oStream << location << ".AlternateValueEncoding=" << StringUtils::URLEncode(m_alternateValueEncoding.c_str()) << "&"; } } + +} // namespace Model +} // namespace SimpleDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sdb/source/model/DeletableItem.cpp b/aws-cpp-sdk-sdb/source/model/DeletableItem.cpp index f86c2b3c6eb..fef364d75af 100644 --- a/aws-cpp-sdk-sdb/source/model/DeletableItem.cpp +++ b/aws-cpp-sdk-sdb/source/model/DeletableItem.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SimpleDB::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SimpleDB +{ +namespace Model +{ + DeletableItem::DeletableItem() : m_nameHasBeenSet(false), m_attributesHasBeenSet(false) @@ -100,3 +106,7 @@ void DeletableItem::OutputToStream(Aws::OStream& oStream, const char* location) } } } + +} // namespace Model +} // namespace SimpleDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sdb/source/model/Item.cpp b/aws-cpp-sdk-sdb/source/model/Item.cpp index 40f59ef9f39..dad20cd2535 100644 --- a/aws-cpp-sdk-sdb/source/model/Item.cpp +++ b/aws-cpp-sdk-sdb/source/model/Item.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SimpleDB::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SimpleDB +{ +namespace Model +{ + Item::Item() : m_nameHasBeenSet(false), m_alternateNameEncodingHasBeenSet(false), @@ -116,3 +122,7 @@ void Item::OutputToStream(Aws::OStream& oStream, const char* location) const } } } + +} // namespace Model +} // namespace SimpleDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sdb/source/model/ReplaceableAttribute.cpp b/aws-cpp-sdk-sdb/source/model/ReplaceableAttribute.cpp index b79f858bcbd..c48c2ee0294 100644 --- a/aws-cpp-sdk-sdb/source/model/ReplaceableAttribute.cpp +++ b/aws-cpp-sdk-sdb/source/model/ReplaceableAttribute.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SimpleDB::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SimpleDB +{ +namespace Model +{ + ReplaceableAttribute::ReplaceableAttribute() : m_nameHasBeenSet(false), m_valueHasBeenSet(false), @@ -100,3 +106,7 @@ void ReplaceableAttribute::OutputToStream(Aws::OStream& oStream, const char* loc oStream << location << ".Replace=" << m_replace << "&"; } } + +} // namespace Model +} // namespace SimpleDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sdb/source/model/ReplaceableItem.cpp b/aws-cpp-sdk-sdb/source/model/ReplaceableItem.cpp index 0f556ca7679..4d91cff5916 100644 --- a/aws-cpp-sdk-sdb/source/model/ReplaceableItem.cpp +++ b/aws-cpp-sdk-sdb/source/model/ReplaceableItem.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SimpleDB::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SimpleDB +{ +namespace Model +{ + ReplaceableItem::ReplaceableItem() : m_nameHasBeenSet(false), m_attributesHasBeenSet(false) @@ -100,3 +106,7 @@ void ReplaceableItem::OutputToStream(Aws::OStream& oStream, const char* location } } } + +} // namespace Model +} // namespace SimpleDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sdb/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-sdb/source/model/ResponseMetadata.cpp index 0b0e60952ca..0ee8bcb3678 100644 --- a/aws-cpp-sdk-sdb/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-sdb/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SimpleDB::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SimpleDB +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace SimpleDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sdb/source/model/UpdateCondition.cpp b/aws-cpp-sdk-sdb/source/model/UpdateCondition.cpp index 3a1843634b3..9221390d696 100644 --- a/aws-cpp-sdk-sdb/source/model/UpdateCondition.cpp +++ b/aws-cpp-sdk-sdb/source/model/UpdateCondition.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SimpleDB::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SimpleDB +{ +namespace Model +{ + UpdateCondition::UpdateCondition() : m_nameHasBeenSet(false), m_valueHasBeenSet(false), @@ -100,3 +106,7 @@ void UpdateCondition::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".Exists=" << m_exists << "&"; } } + +} // namespace Model +} // namespace SimpleDB +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sns/CMakeLists.txt b/aws-cpp-sdk-sns/CMakeLists.txt index e33d7fb8157..9e107024bbe 100644 --- a/aws-cpp-sdk-sns/CMakeLists.txt +++ b/aws-cpp-sdk-sns/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-sns) "source/model/*.cpp" ) - file(GLOB SNS_SRC + file(GLOB SNS_UNIFIED_HEADERS ${AWS_SNS_HEADERS} ${AWS_SNS_MODEL_HEADERS} + ) + + file(GLOB SNS_UNITY_SRC ${AWS_SNS_SOURCE} ${AWS_SNS_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("SNS" SNS_UNITY_SRC) + endif() + + file(GLOB SNS_SRC + ${SNS_UNIFIED_HEADERS} + ${SNS_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-sns/source/SNSErrors.cpp b/aws-cpp-sdk-sns/source/SNSErrors.cpp index be2e118f3ed..bde03f31edc 100644 --- a/aws-cpp-sdk-sns/source/SNSErrors.cpp +++ b/aws-cpp-sdk-sns/source/SNSErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::SNS; using namespace Aws::Utils; +namespace Aws +{ +namespace SNS +{ +namespace SNSErrorMapper +{ + static const int INVALID_PARAMETER_HASH = HashingUtils::HashString("InvalidParameter"); static const int TOPIC_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("TopicLimitExceeded"); static const int PLATFORM_APPLICATION_DISABLED_HASH = HashingUtils::HashString("PlatformApplicationDisabled"); @@ -29,12 +36,6 @@ static const int AUTHORIZATION_ERROR_HASH = HashingUtils::HashString("Authorizat static const int ENDPOINT_DISABLED_HASH = HashingUtils::HashString("EndpointDisabled"); static const int NOT_FOUND_HASH = HashingUtils::HashString("NotFound"); -namespace Aws -{ -namespace SNS -{ -namespace SNSErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-sns/source/model/MessageAttributeValue.cpp b/aws-cpp-sdk-sns/source/model/MessageAttributeValue.cpp index 35501fd4bda..e2115ddbb99 100644 --- a/aws-cpp-sdk-sns/source/model/MessageAttributeValue.cpp +++ b/aws-cpp-sdk-sns/source/model/MessageAttributeValue.cpp @@ -20,10 +20,16 @@ #include -using namespace Aws::SNS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SNS +{ +namespace Model +{ + MessageAttributeValue::MessageAttributeValue() : m_dataTypeHasBeenSet(false), m_stringValueHasBeenSet(false), @@ -99,3 +105,7 @@ void MessageAttributeValue::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".BinaryValue=" << StringUtils::URLEncode(HashingUtils::Base64Encode(m_binaryValue).c_str()) << "&"; } } + +} // namespace Model +} // namespace SNS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sns/source/model/PlatformApplication.cpp b/aws-cpp-sdk-sns/source/model/PlatformApplication.cpp index caa7801d94e..dc0a8ea21f5 100644 --- a/aws-cpp-sdk-sns/source/model/PlatformApplication.cpp +++ b/aws-cpp-sdk-sns/source/model/PlatformApplication.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SNS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SNS +{ +namespace Model +{ + PlatformApplication::PlatformApplication() : m_platformApplicationArnHasBeenSet(false), m_attributesHasBeenSet(false) @@ -90,3 +96,7 @@ void PlatformApplication::OutputToStream(Aws::OStream& oStream, const char* loca { } } + +} // namespace Model +} // namespace SNS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sns/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-sns/source/model/ResponseMetadata.cpp index 4ffdde76c06..1da862acf30 100644 --- a/aws-cpp-sdk-sns/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-sns/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SNS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SNS +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace SNS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sns/source/model/Subscription.cpp b/aws-cpp-sdk-sns/source/model/Subscription.cpp index 96c3c53d80b..276d34b0fac 100644 --- a/aws-cpp-sdk-sns/source/model/Subscription.cpp +++ b/aws-cpp-sdk-sns/source/model/Subscription.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SNS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SNS +{ +namespace Model +{ + Subscription::Subscription() : m_subscriptionArnHasBeenSet(false), m_ownerHasBeenSet(false), @@ -130,3 +136,7 @@ void Subscription::OutputToStream(Aws::OStream& oStream, const char* location) c oStream << location << ".TopicArn=" << StringUtils::URLEncode(m_topicArn.c_str()) << "&"; } } + +} // namespace Model +} // namespace SNS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sns/source/model/Topic.cpp b/aws-cpp-sdk-sns/source/model/Topic.cpp index 09e394ddfc8..21722e4cd36 100644 --- a/aws-cpp-sdk-sns/source/model/Topic.cpp +++ b/aws-cpp-sdk-sns/source/model/Topic.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SNS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SNS +{ +namespace Model +{ + Topic::Topic() : m_topicArnHasBeenSet(false) { @@ -66,3 +72,7 @@ void Topic::OutputToStream(Aws::OStream& oStream, const char* location) const oStream << location << ".TopicArn=" << StringUtils::URLEncode(m_topicArn.c_str()) << "&"; } } + +} // namespace Model +} // namespace SNS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sqs/CMakeLists.txt b/aws-cpp-sdk-sqs/CMakeLists.txt index b1e330f4ec8..3240305359a 100644 --- a/aws-cpp-sdk-sqs/CMakeLists.txt +++ b/aws-cpp-sdk-sqs/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-sqs) "source/model/*.cpp" ) - file(GLOB SQS_SRC + file(GLOB SQS_UNIFIED_HEADERS ${AWS_SQS_HEADERS} ${AWS_SQS_MODEL_HEADERS} + ) + + file(GLOB SQS_UNITY_SRC ${AWS_SQS_SOURCE} ${AWS_SQS_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("SQS" SQS_UNITY_SRC) + endif() + + file(GLOB SQS_SRC + ${SQS_UNIFIED_HEADERS} + ${SQS_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-sqs/source/SQSErrors.cpp b/aws-cpp-sdk-sqs/source/SQSErrors.cpp index f93a547d951..5d64eda30c2 100644 --- a/aws-cpp-sdk-sqs/source/SQSErrors.cpp +++ b/aws-cpp-sdk-sqs/source/SQSErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::SQS; using namespace Aws::Utils; +namespace Aws +{ +namespace SQS +{ +namespace SQSErrorMapper +{ + static const int OVER_LIMIT_HASH = HashingUtils::HashString("OverLimit"); static const int RECEIPT_HANDLE_IS_INVALID_HASH = HashingUtils::HashString("ReceiptHandleIsInvalid"); static const int INVALID_BATCH_ENTRY_ID_HASH = HashingUtils::HashString("AWS.SimpleQueueService.InvalidBatchEntryId"); @@ -37,12 +44,6 @@ static const int PURGE_QUEUE_IN_PROGRESS_HASH = HashingUtils::HashString("AWS.Si static const int MESSAGE_NOT_INFLIGHT_HASH = HashingUtils::HashString("AWS.SimpleQueueService.MessageNotInflight"); static const int QUEUE_DOES_NOT_EXIST_HASH = HashingUtils::HashString("AWS.SimpleQueueService.NonExistentQueue"); -namespace Aws -{ -namespace SQS -{ -namespace SQSErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-sqs/source/model/BatchResultErrorEntry.cpp b/aws-cpp-sdk-sqs/source/model/BatchResultErrorEntry.cpp index 21a510830ee..4987768060b 100644 --- a/aws-cpp-sdk-sqs/source/model/BatchResultErrorEntry.cpp +++ b/aws-cpp-sdk-sqs/source/model/BatchResultErrorEntry.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SQS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SQS +{ +namespace Model +{ + BatchResultErrorEntry::BatchResultErrorEntry() : m_idHasBeenSet(false), m_senderFault(false), @@ -116,3 +122,7 @@ void BatchResultErrorEntry::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".Message=" << StringUtils::URLEncode(m_message.c_str()) << "&"; } } + +} // namespace Model +} // namespace SQS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sqs/source/model/ChangeMessageVisibilityBatchRequestEntry.cpp b/aws-cpp-sdk-sqs/source/model/ChangeMessageVisibilityBatchRequestEntry.cpp index 3193950aaf4..495e214a941 100644 --- a/aws-cpp-sdk-sqs/source/model/ChangeMessageVisibilityBatchRequestEntry.cpp +++ b/aws-cpp-sdk-sqs/source/model/ChangeMessageVisibilityBatchRequestEntry.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SQS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SQS +{ +namespace Model +{ + ChangeMessageVisibilityBatchRequestEntry::ChangeMessageVisibilityBatchRequestEntry() : m_idHasBeenSet(false), m_receiptHandleHasBeenSet(false), @@ -100,3 +106,7 @@ void ChangeMessageVisibilityBatchRequestEntry::OutputToStream(Aws::OStream& oStr oStream << location << ".VisibilityTimeout=" << m_visibilityTimeout << "&"; } } + +} // namespace Model +} // namespace SQS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sqs/source/model/ChangeMessageVisibilityBatchResultEntry.cpp b/aws-cpp-sdk-sqs/source/model/ChangeMessageVisibilityBatchResultEntry.cpp index 79c0b59be2b..3dc5451242d 100644 --- a/aws-cpp-sdk-sqs/source/model/ChangeMessageVisibilityBatchResultEntry.cpp +++ b/aws-cpp-sdk-sqs/source/model/ChangeMessageVisibilityBatchResultEntry.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SQS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SQS +{ +namespace Model +{ + ChangeMessageVisibilityBatchResultEntry::ChangeMessageVisibilityBatchResultEntry() : m_idHasBeenSet(false) { @@ -66,3 +72,7 @@ void ChangeMessageVisibilityBatchResultEntry::OutputToStream(Aws::OStream& oStre oStream << location << ".Id=" << StringUtils::URLEncode(m_id.c_str()) << "&"; } } + +} // namespace Model +} // namespace SQS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sqs/source/model/DeleteMessageBatchRequestEntry.cpp b/aws-cpp-sdk-sqs/source/model/DeleteMessageBatchRequestEntry.cpp index 612f8ff6b61..398772880a4 100644 --- a/aws-cpp-sdk-sqs/source/model/DeleteMessageBatchRequestEntry.cpp +++ b/aws-cpp-sdk-sqs/source/model/DeleteMessageBatchRequestEntry.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SQS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SQS +{ +namespace Model +{ + DeleteMessageBatchRequestEntry::DeleteMessageBatchRequestEntry() : m_idHasBeenSet(false), m_receiptHandleHasBeenSet(false) @@ -82,3 +88,7 @@ void DeleteMessageBatchRequestEntry::OutputToStream(Aws::OStream& oStream, const oStream << location << ".ReceiptHandle=" << StringUtils::URLEncode(m_receiptHandle.c_str()) << "&"; } } + +} // namespace Model +} // namespace SQS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sqs/source/model/DeleteMessageBatchResultEntry.cpp b/aws-cpp-sdk-sqs/source/model/DeleteMessageBatchResultEntry.cpp index 27e8d32c105..65ec7392572 100644 --- a/aws-cpp-sdk-sqs/source/model/DeleteMessageBatchResultEntry.cpp +++ b/aws-cpp-sdk-sqs/source/model/DeleteMessageBatchResultEntry.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SQS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SQS +{ +namespace Model +{ + DeleteMessageBatchResultEntry::DeleteMessageBatchResultEntry() : m_idHasBeenSet(false) { @@ -66,3 +72,7 @@ void DeleteMessageBatchResultEntry::OutputToStream(Aws::OStream& oStream, const oStream << location << ".Id=" << StringUtils::URLEncode(m_id.c_str()) << "&"; } } + +} // namespace Model +} // namespace SQS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sqs/source/model/Message.cpp b/aws-cpp-sdk-sqs/source/model/Message.cpp index 6ad2db4f272..8ed7daf7b7a 100644 --- a/aws-cpp-sdk-sqs/source/model/Message.cpp +++ b/aws-cpp-sdk-sqs/source/model/Message.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SQS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SQS +{ +namespace Model +{ + Message::Message() : m_messageIdHasBeenSet(false), m_receiptHandleHasBeenSet(false), @@ -176,3 +182,7 @@ void Message::OutputToStream(Aws::OStream& oStream, const char* location) const { } } + +} // namespace Model +} // namespace SQS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sqs/source/model/MessageAttributeValue.cpp b/aws-cpp-sdk-sqs/source/model/MessageAttributeValue.cpp index 5c8092aa6fc..3470cb8fd1e 100644 --- a/aws-cpp-sdk-sqs/source/model/MessageAttributeValue.cpp +++ b/aws-cpp-sdk-sqs/source/model/MessageAttributeValue.cpp @@ -20,10 +20,16 @@ #include -using namespace Aws::SQS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SQS +{ +namespace Model +{ + MessageAttributeValue::MessageAttributeValue() : m_stringValueHasBeenSet(false), m_binaryValueHasBeenSet(false), @@ -158,3 +164,7 @@ void MessageAttributeValue::OutputToStream(Aws::OStream& oStream, const char* lo oStream << location << ".DataType=" << StringUtils::URLEncode(m_dataType.c_str()) << "&"; } } + +} // namespace Model +} // namespace SQS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sqs/source/model/QueueAttributeName.cpp b/aws-cpp-sdk-sqs/source/model/QueueAttributeName.cpp index 66796af76f9..53d7639b320 100644 --- a/aws-cpp-sdk-sqs/source/model/QueueAttributeName.cpp +++ b/aws-cpp-sdk-sqs/source/model/QueueAttributeName.cpp @@ -19,19 +19,6 @@ using namespace Aws::Utils; -static const int Policy_HASH = HashingUtils::HashString("Policy"); -static const int VisibilityTimeout_HASH = HashingUtils::HashString("VisibilityTimeout"); -static const int MaximumMessageSize_HASH = HashingUtils::HashString("MaximumMessageSize"); -static const int MessageRetentionPeriod_HASH = HashingUtils::HashString("MessageRetentionPeriod"); -static const int ApproximateNumberOfMessages_HASH = HashingUtils::HashString("ApproximateNumberOfMessages"); -static const int ApproximateNumberOfMessagesNotVisible_HASH = HashingUtils::HashString("ApproximateNumberOfMessagesNotVisible"); -static const int CreatedTimestamp_HASH = HashingUtils::HashString("CreatedTimestamp"); -static const int LastModifiedTimestamp_HASH = HashingUtils::HashString("LastModifiedTimestamp"); -static const int QueueArn_HASH = HashingUtils::HashString("QueueArn"); -static const int ApproximateNumberOfMessagesDelayed_HASH = HashingUtils::HashString("ApproximateNumberOfMessagesDelayed"); -static const int DelaySeconds_HASH = HashingUtils::HashString("DelaySeconds"); -static const int ReceiveMessageWaitTimeSeconds_HASH = HashingUtils::HashString("ReceiveMessageWaitTimeSeconds"); -static const int RedrivePolicy_HASH = HashingUtils::HashString("RedrivePolicy"); namespace Aws { @@ -42,6 +29,20 @@ namespace Aws namespace QueueAttributeNameMapper { + static const int Policy_HASH = HashingUtils::HashString("Policy"); + static const int VisibilityTimeout_HASH = HashingUtils::HashString("VisibilityTimeout"); + static const int MaximumMessageSize_HASH = HashingUtils::HashString("MaximumMessageSize"); + static const int MessageRetentionPeriod_HASH = HashingUtils::HashString("MessageRetentionPeriod"); + static const int ApproximateNumberOfMessages_HASH = HashingUtils::HashString("ApproximateNumberOfMessages"); + static const int ApproximateNumberOfMessagesNotVisible_HASH = HashingUtils::HashString("ApproximateNumberOfMessagesNotVisible"); + static const int CreatedTimestamp_HASH = HashingUtils::HashString("CreatedTimestamp"); + static const int LastModifiedTimestamp_HASH = HashingUtils::HashString("LastModifiedTimestamp"); + static const int QueueArn_HASH = HashingUtils::HashString("QueueArn"); + static const int ApproximateNumberOfMessagesDelayed_HASH = HashingUtils::HashString("ApproximateNumberOfMessagesDelayed"); + static const int DelaySeconds_HASH = HashingUtils::HashString("DelaySeconds"); + static const int ReceiveMessageWaitTimeSeconds_HASH = HashingUtils::HashString("ReceiveMessageWaitTimeSeconds"); + static const int RedrivePolicy_HASH = HashingUtils::HashString("RedrivePolicy"); + QueueAttributeName GetQueueAttributeNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-sqs/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-sqs/source/model/ResponseMetadata.cpp index f6578ff8075..9265d0bbcfd 100644 --- a/aws-cpp-sdk-sqs/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-sqs/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SQS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SQS +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace SQS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sqs/source/model/SendMessageBatchRequestEntry.cpp b/aws-cpp-sdk-sqs/source/model/SendMessageBatchRequestEntry.cpp index f5125ce2a09..7c718e1466f 100644 --- a/aws-cpp-sdk-sqs/source/model/SendMessageBatchRequestEntry.cpp +++ b/aws-cpp-sdk-sqs/source/model/SendMessageBatchRequestEntry.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SQS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SQS +{ +namespace Model +{ + SendMessageBatchRequestEntry::SendMessageBatchRequestEntry() : m_idHasBeenSet(false), m_messageBodyHasBeenSet(false), @@ -123,3 +129,7 @@ void SendMessageBatchRequestEntry::OutputToStream(Aws::OStream& oStream, const c { } } + +} // namespace Model +} // namespace SQS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sqs/source/model/SendMessageBatchResultEntry.cpp b/aws-cpp-sdk-sqs/source/model/SendMessageBatchResultEntry.cpp index 765ad37dfcf..7f6ff5c784d 100644 --- a/aws-cpp-sdk-sqs/source/model/SendMessageBatchResultEntry.cpp +++ b/aws-cpp-sdk-sqs/source/model/SendMessageBatchResultEntry.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::SQS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace SQS +{ +namespace Model +{ + SendMessageBatchResultEntry::SendMessageBatchResultEntry() : m_idHasBeenSet(false), m_messageIdHasBeenSet(false), @@ -114,3 +120,7 @@ void SendMessageBatchResultEntry::OutputToStream(Aws::OStream& oStream, const ch oStream << location << ".MD5OfMessageAttributes=" << StringUtils::URLEncode(m_mD5OfMessageAttributes.c_str()) << "&"; } } + +} // namespace Model +} // namespace SQS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ssm/CMakeLists.txt b/aws-cpp-sdk-ssm/CMakeLists.txt index b7ce8c47e48..bfcf6e7be98 100644 --- a/aws-cpp-sdk-ssm/CMakeLists.txt +++ b/aws-cpp-sdk-ssm/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-ssm) "source/model/*.cpp" ) - file(GLOB SSM_SRC + file(GLOB SSM_UNIFIED_HEADERS ${AWS_SSM_HEADERS} ${AWS_SSM_MODEL_HEADERS} + ) + + file(GLOB SSM_UNITY_SRC ${AWS_SSM_SOURCE} ${AWS_SSM_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("SSM" SSM_UNITY_SRC) + endif() + + file(GLOB SSM_SRC + ${SSM_UNIFIED_HEADERS} + ${SSM_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-ssm/include/aws/ssm/model/DocumentParameter.h b/aws-cpp-sdk-ssm/include/aws/ssm/model/DocumentParameter.h index 9bc10df88c4..6a82ae0db9f 100644 --- a/aws-cpp-sdk-ssm/include/aws/ssm/model/DocumentParameter.h +++ b/aws-cpp-sdk-ssm/include/aws/ssm/model/DocumentParameter.h @@ -75,27 +75,27 @@ namespace Model inline DocumentParameter& WithName(const char* value) { SetName(value); return *this;} /** - *

            The type of parameter. The type can be either “String” or “StringList”.

            + *

            The type of parameter. The type can be either ?String? or ?StringList?.

            */ inline const DocumentParameterType& GetType() const{ return m_type; } /** - *

            The type of parameter. The type can be either “String” or “StringList”.

            + *

            The type of parameter. The type can be either ?String? or ?StringList?.

            */ inline void SetType(const DocumentParameterType& value) { m_typeHasBeenSet = true; m_type = value; } /** - *

            The type of parameter. The type can be either “String” or “StringList”.

            + *

            The type of parameter. The type can be either ?String? or ?StringList?.

            */ inline void SetType(DocumentParameterType&& value) { m_typeHasBeenSet = true; m_type = value; } /** - *

            The type of parameter. The type can be either “String” or “StringList”.

            + *

            The type of parameter. The type can be either ?String? or ?StringList?.

            */ inline DocumentParameter& WithType(const DocumentParameterType& value) { SetType(value); return *this;} /** - *

            The type of parameter. The type can be either “String” or “StringList”.

            + *

            The type of parameter. The type can be either ?String? or ?StringList?.

            */ inline DocumentParameter& WithType(DocumentParameterType&& value) { SetType(value); return *this;} diff --git a/aws-cpp-sdk-ssm/source/SSMErrors.cpp b/aws-cpp-sdk-ssm/source/SSMErrors.cpp index c7d4697605e..eac5765e077 100644 --- a/aws-cpp-sdk-ssm/source/SSMErrors.cpp +++ b/aws-cpp-sdk-ssm/source/SSMErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::SSM; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace SSMErrorMapper +{ + static const int DOCUMENT_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("DocumentLimitExceeded"); static const int DUPLICATE_INSTANCE_ID_HASH = HashingUtils::HashString("DuplicateInstanceId"); static const int INVALID_INSTANCE_ID_HASH = HashingUtils::HashString("InvalidInstanceId"); @@ -41,12 +48,6 @@ static const int INVALID_DOCUMENT_CONTENT_HASH = HashingUtils::HashString("Inval static const int ASSOCIATED_INSTANCES_HASH = HashingUtils::HashString("AssociatedInstances"); static const int INVALID_INSTANCE_INFORMATION_FILTER_VALUE_HASH = HashingUtils::HashString("InvalidInstanceInformationFilterValue"); -namespace Aws -{ -namespace SSM -{ -namespace SSMErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-ssm/source/model/Association.cpp b/aws-cpp-sdk-ssm/source/model/Association.cpp index 9d61b511965..0fb32ad8b11 100644 --- a/aws-cpp-sdk-ssm/source/model/Association.cpp +++ b/aws-cpp-sdk-ssm/source/model/Association.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + Association::Association() : m_nameHasBeenSet(false), m_instanceIdHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Association::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ssm/source/model/AssociationDescription.cpp b/aws-cpp-sdk-ssm/source/model/AssociationDescription.cpp index 4036f5fac07..fa7eff1ed15 100644 --- a/aws-cpp-sdk-ssm/source/model/AssociationDescription.cpp +++ b/aws-cpp-sdk-ssm/source/model/AssociationDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + AssociationDescription::AssociationDescription() : m_nameHasBeenSet(false), m_instanceIdHasBeenSet(false), @@ -133,4 +139,8 @@ JsonValue AssociationDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws diff --git a/aws-cpp-sdk-ssm/source/model/AssociationFilter.cpp b/aws-cpp-sdk-ssm/source/model/AssociationFilter.cpp index 31e932c6e09..d705e66b774 100644 --- a/aws-cpp-sdk-ssm/source/model/AssociationFilter.cpp +++ b/aws-cpp-sdk-ssm/source/model/AssociationFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + AssociationFilter::AssociationFilter() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue AssociationFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ssm/source/model/AssociationFilterKey.cpp b/aws-cpp-sdk-ssm/source/model/AssociationFilterKey.cpp index 7e8d70beebd..29743a548db 100644 --- a/aws-cpp-sdk-ssm/source/model/AssociationFilterKey.cpp +++ b/aws-cpp-sdk-ssm/source/model/AssociationFilterKey.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int InstanceId_HASH = HashingUtils::HashString("InstanceId"); -static const int Name_HASH = HashingUtils::HashString("Name"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace AssociationFilterKeyMapper { + static const int InstanceId_HASH = HashingUtils::HashString("InstanceId"); + static const int Name_HASH = HashingUtils::HashString("Name"); + AssociationFilterKey GetAssociationFilterKeyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ssm/source/model/AssociationStatus.cpp b/aws-cpp-sdk-ssm/source/model/AssociationStatus.cpp index 558a5ba8380..bce0f547c56 100644 --- a/aws-cpp-sdk-ssm/source/model/AssociationStatus.cpp +++ b/aws-cpp-sdk-ssm/source/model/AssociationStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + AssociationStatus::AssociationStatus() : m_dateHasBeenSet(false), m_nameHasBeenSet(false), @@ -98,4 +104,8 @@ JsonValue AssociationStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws diff --git a/aws-cpp-sdk-ssm/source/model/AssociationStatusName.cpp b/aws-cpp-sdk-ssm/source/model/AssociationStatusName.cpp index b85acab90b9..a79c7d2cfc2 100644 --- a/aws-cpp-sdk-ssm/source/model/AssociationStatusName.cpp +++ b/aws-cpp-sdk-ssm/source/model/AssociationStatusName.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int Pending_HASH = HashingUtils::HashString("Pending"); -static const int Success_HASH = HashingUtils::HashString("Success"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace AssociationStatusNameMapper { + static const int Pending_HASH = HashingUtils::HashString("Pending"); + static const int Success_HASH = HashingUtils::HashString("Success"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + AssociationStatusName GetAssociationStatusNameForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ssm/source/model/Command.cpp b/aws-cpp-sdk-ssm/source/model/Command.cpp index cfb940c1884..33bfb9b1358 100644 --- a/aws-cpp-sdk-ssm/source/model/Command.cpp +++ b/aws-cpp-sdk-ssm/source/model/Command.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + Command::Command() : m_commandIdHasBeenSet(false), m_documentNameHasBeenSet(false), @@ -214,4 +220,8 @@ JsonValue Command::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws diff --git a/aws-cpp-sdk-ssm/source/model/CommandFilter.cpp b/aws-cpp-sdk-ssm/source/model/CommandFilter.cpp index 674bca570f2..a9f14753b49 100644 --- a/aws-cpp-sdk-ssm/source/model/CommandFilter.cpp +++ b/aws-cpp-sdk-ssm/source/model/CommandFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + CommandFilter::CommandFilter() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue CommandFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ssm/source/model/CommandFilterKey.cpp b/aws-cpp-sdk-ssm/source/model/CommandFilterKey.cpp index a7acad966f9..859e846e69c 100644 --- a/aws-cpp-sdk-ssm/source/model/CommandFilterKey.cpp +++ b/aws-cpp-sdk-ssm/source/model/CommandFilterKey.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int InvokedAfter_HASH = HashingUtils::HashString("InvokedAfter"); -static const int InvokedBefore_HASH = HashingUtils::HashString("InvokedBefore"); -static const int Status_HASH = HashingUtils::HashString("Status"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace CommandFilterKeyMapper { + static const int InvokedAfter_HASH = HashingUtils::HashString("InvokedAfter"); + static const int InvokedBefore_HASH = HashingUtils::HashString("InvokedBefore"); + static const int Status_HASH = HashingUtils::HashString("Status"); + CommandFilterKey GetCommandFilterKeyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ssm/source/model/CommandInvocation.cpp b/aws-cpp-sdk-ssm/source/model/CommandInvocation.cpp index db8c54d27be..1f6d2961c9e 100644 --- a/aws-cpp-sdk-ssm/source/model/CommandInvocation.cpp +++ b/aws-cpp-sdk-ssm/source/model/CommandInvocation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + CommandInvocation::CommandInvocation() : m_commandIdHasBeenSet(false), m_instanceIdHasBeenSet(false), @@ -166,4 +172,8 @@ JsonValue CommandInvocation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws diff --git a/aws-cpp-sdk-ssm/source/model/CommandInvocationStatus.cpp b/aws-cpp-sdk-ssm/source/model/CommandInvocationStatus.cpp index 7f8b7ab734e..c514ec7354d 100644 --- a/aws-cpp-sdk-ssm/source/model/CommandInvocationStatus.cpp +++ b/aws-cpp-sdk-ssm/source/model/CommandInvocationStatus.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int Pending_HASH = HashingUtils::HashString("Pending"); -static const int InProgress_HASH = HashingUtils::HashString("InProgress"); -static const int Cancelling_HASH = HashingUtils::HashString("Cancelling"); -static const int Success_HASH = HashingUtils::HashString("Success"); -static const int TimedOut_HASH = HashingUtils::HashString("TimedOut"); -static const int Cancelled_HASH = HashingUtils::HashString("Cancelled"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace CommandInvocationStatusMapper { + static const int Pending_HASH = HashingUtils::HashString("Pending"); + static const int InProgress_HASH = HashingUtils::HashString("InProgress"); + static const int Cancelling_HASH = HashingUtils::HashString("Cancelling"); + static const int Success_HASH = HashingUtils::HashString("Success"); + static const int TimedOut_HASH = HashingUtils::HashString("TimedOut"); + static const int Cancelled_HASH = HashingUtils::HashString("Cancelled"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + CommandInvocationStatus GetCommandInvocationStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ssm/source/model/CommandPlugin.cpp b/aws-cpp-sdk-ssm/source/model/CommandPlugin.cpp index d2dea8303b3..887278b6c26 100644 --- a/aws-cpp-sdk-ssm/source/model/CommandPlugin.cpp +++ b/aws-cpp-sdk-ssm/source/model/CommandPlugin.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + CommandPlugin::CommandPlugin() : m_nameHasBeenSet(false), m_statusHasBeenSet(false), @@ -159,4 +165,8 @@ JsonValue CommandPlugin::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws diff --git a/aws-cpp-sdk-ssm/source/model/CommandPluginStatus.cpp b/aws-cpp-sdk-ssm/source/model/CommandPluginStatus.cpp index a11fa66f12f..d2c41c6c09f 100644 --- a/aws-cpp-sdk-ssm/source/model/CommandPluginStatus.cpp +++ b/aws-cpp-sdk-ssm/source/model/CommandPluginStatus.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int Pending_HASH = HashingUtils::HashString("Pending"); -static const int InProgress_HASH = HashingUtils::HashString("InProgress"); -static const int Success_HASH = HashingUtils::HashString("Success"); -static const int TimedOut_HASH = HashingUtils::HashString("TimedOut"); -static const int Cancelled_HASH = HashingUtils::HashString("Cancelled"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace CommandPluginStatusMapper { + static const int Pending_HASH = HashingUtils::HashString("Pending"); + static const int InProgress_HASH = HashingUtils::HashString("InProgress"); + static const int Success_HASH = HashingUtils::HashString("Success"); + static const int TimedOut_HASH = HashingUtils::HashString("TimedOut"); + static const int Cancelled_HASH = HashingUtils::HashString("Cancelled"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + CommandPluginStatus GetCommandPluginStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ssm/source/model/CommandStatus.cpp b/aws-cpp-sdk-ssm/source/model/CommandStatus.cpp index 0c7a1472593..433b61809b6 100644 --- a/aws-cpp-sdk-ssm/source/model/CommandStatus.cpp +++ b/aws-cpp-sdk-ssm/source/model/CommandStatus.cpp @@ -19,13 +19,6 @@ using namespace Aws::Utils; -static const int Pending_HASH = HashingUtils::HashString("Pending"); -static const int InProgress_HASH = HashingUtils::HashString("InProgress"); -static const int Cancelling_HASH = HashingUtils::HashString("Cancelling"); -static const int Success_HASH = HashingUtils::HashString("Success"); -static const int TimedOut_HASH = HashingUtils::HashString("TimedOut"); -static const int Cancelled_HASH = HashingUtils::HashString("Cancelled"); -static const int Failed_HASH = HashingUtils::HashString("Failed"); namespace Aws { @@ -36,6 +29,14 @@ namespace Aws namespace CommandStatusMapper { + static const int Pending_HASH = HashingUtils::HashString("Pending"); + static const int InProgress_HASH = HashingUtils::HashString("InProgress"); + static const int Cancelling_HASH = HashingUtils::HashString("Cancelling"); + static const int Success_HASH = HashingUtils::HashString("Success"); + static const int TimedOut_HASH = HashingUtils::HashString("TimedOut"); + static const int Cancelled_HASH = HashingUtils::HashString("Cancelled"); + static const int Failed_HASH = HashingUtils::HashString("Failed"); + CommandStatus GetCommandStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ssm/source/model/CreateAssociationBatchRequestEntry.cpp b/aws-cpp-sdk-ssm/source/model/CreateAssociationBatchRequestEntry.cpp index 381be664596..acf31c7ab3e 100644 --- a/aws-cpp-sdk-ssm/source/model/CreateAssociationBatchRequestEntry.cpp +++ b/aws-cpp-sdk-ssm/source/model/CreateAssociationBatchRequestEntry.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + CreateAssociationBatchRequestEntry::CreateAssociationBatchRequestEntry() : m_nameHasBeenSet(false), m_instanceIdHasBeenSet(false), @@ -104,4 +110,8 @@ JsonValue CreateAssociationBatchRequestEntry::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ssm/source/model/DocumentDescription.cpp b/aws-cpp-sdk-ssm/source/model/DocumentDescription.cpp index cf4c8911289..bfb5b437bbe 100644 --- a/aws-cpp-sdk-ssm/source/model/DocumentDescription.cpp +++ b/aws-cpp-sdk-ssm/source/model/DocumentDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + DocumentDescription::DocumentDescription() : m_sha1HasBeenSet(false), m_nameHasBeenSet(false), @@ -159,4 +165,8 @@ JsonValue DocumentDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws diff --git a/aws-cpp-sdk-ssm/source/model/DocumentFilter.cpp b/aws-cpp-sdk-ssm/source/model/DocumentFilter.cpp index 21a20523be9..b658478a847 100644 --- a/aws-cpp-sdk-ssm/source/model/DocumentFilter.cpp +++ b/aws-cpp-sdk-ssm/source/model/DocumentFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + DocumentFilter::DocumentFilter() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue DocumentFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ssm/source/model/DocumentFilterKey.cpp b/aws-cpp-sdk-ssm/source/model/DocumentFilterKey.cpp index 724d3a3f942..d0ebea155c5 100644 --- a/aws-cpp-sdk-ssm/source/model/DocumentFilterKey.cpp +++ b/aws-cpp-sdk-ssm/source/model/DocumentFilterKey.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int Name_HASH = HashingUtils::HashString("Name"); -static const int Owner_HASH = HashingUtils::HashString("Owner"); -static const int PlatformTypes_HASH = HashingUtils::HashString("PlatformTypes"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace DocumentFilterKeyMapper { + static const int Name_HASH = HashingUtils::HashString("Name"); + static const int Owner_HASH = HashingUtils::HashString("Owner"); + static const int PlatformTypes_HASH = HashingUtils::HashString("PlatformTypes"); + DocumentFilterKey GetDocumentFilterKeyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ssm/source/model/DocumentIdentifier.cpp b/aws-cpp-sdk-ssm/source/model/DocumentIdentifier.cpp index 20ea6e6e3e1..b66e1fd480f 100644 --- a/aws-cpp-sdk-ssm/source/model/DocumentIdentifier.cpp +++ b/aws-cpp-sdk-ssm/source/model/DocumentIdentifier.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + DocumentIdentifier::DocumentIdentifier() : m_nameHasBeenSet(false), m_platformTypesHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue DocumentIdentifier::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ssm/source/model/DocumentParameter.cpp b/aws-cpp-sdk-ssm/source/model/DocumentParameter.cpp index 72fd3935967..4b48a22b6c6 100644 --- a/aws-cpp-sdk-ssm/source/model/DocumentParameter.cpp +++ b/aws-cpp-sdk-ssm/source/model/DocumentParameter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + DocumentParameter::DocumentParameter() : m_nameHasBeenSet(false), m_typeHasBeenSet(false), @@ -99,4 +105,8 @@ JsonValue DocumentParameter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ssm/source/model/DocumentParameterType.cpp b/aws-cpp-sdk-ssm/source/model/DocumentParameterType.cpp index 9adec83db4d..cfe53f296f0 100644 --- a/aws-cpp-sdk-ssm/source/model/DocumentParameterType.cpp +++ b/aws-cpp-sdk-ssm/source/model/DocumentParameterType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int String_HASH = HashingUtils::HashString("String"); -static const int StringList_HASH = HashingUtils::HashString("StringList"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace DocumentParameterTypeMapper { + static const int String_HASH = HashingUtils::HashString("String"); + static const int StringList_HASH = HashingUtils::HashString("StringList"); + DocumentParameterType GetDocumentParameterTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ssm/source/model/DocumentStatus.cpp b/aws-cpp-sdk-ssm/source/model/DocumentStatus.cpp index 990abb25674..4d3e8f09a88 100644 --- a/aws-cpp-sdk-ssm/source/model/DocumentStatus.cpp +++ b/aws-cpp-sdk-ssm/source/model/DocumentStatus.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int Creating_HASH = HashingUtils::HashString("Creating"); -static const int Active_HASH = HashingUtils::HashString("Active"); -static const int Deleting_HASH = HashingUtils::HashString("Deleting"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace DocumentStatusMapper { + static const int Creating_HASH = HashingUtils::HashString("Creating"); + static const int Active_HASH = HashingUtils::HashString("Active"); + static const int Deleting_HASH = HashingUtils::HashString("Deleting"); + DocumentStatus GetDocumentStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ssm/source/model/FailedCreateAssociation.cpp b/aws-cpp-sdk-ssm/source/model/FailedCreateAssociation.cpp index d5a3ecf9907..b1987becde2 100644 --- a/aws-cpp-sdk-ssm/source/model/FailedCreateAssociation.cpp +++ b/aws-cpp-sdk-ssm/source/model/FailedCreateAssociation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + FailedCreateAssociation::FailedCreateAssociation() : m_entryHasBeenSet(false), m_messageHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue FailedCreateAssociation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ssm/source/model/Fault.cpp b/aws-cpp-sdk-ssm/source/model/Fault.cpp index 7ccf0f7bb31..f91c5e7d040 100644 --- a/aws-cpp-sdk-ssm/source/model/Fault.cpp +++ b/aws-cpp-sdk-ssm/source/model/Fault.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int Client_HASH = HashingUtils::HashString("Client"); -static const int Server_HASH = HashingUtils::HashString("Server"); -static const int Unknown_HASH = HashingUtils::HashString("Unknown"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace FaultMapper { + static const int Client_HASH = HashingUtils::HashString("Client"); + static const int Server_HASH = HashingUtils::HashString("Server"); + static const int Unknown_HASH = HashingUtils::HashString("Unknown"); + Fault GetFaultForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ssm/source/model/InstanceInformation.cpp b/aws-cpp-sdk-ssm/source/model/InstanceInformation.cpp index a8aaaa9ecab..45e9692c5be 100644 --- a/aws-cpp-sdk-ssm/source/model/InstanceInformation.cpp +++ b/aws-cpp-sdk-ssm/source/model/InstanceInformation.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + InstanceInformation::InstanceInformation() : m_instanceIdHasBeenSet(false), m_pingStatusHasBeenSet(false), @@ -159,4 +165,8 @@ JsonValue InstanceInformation::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws diff --git a/aws-cpp-sdk-ssm/source/model/InstanceInformationFilter.cpp b/aws-cpp-sdk-ssm/source/model/InstanceInformationFilter.cpp index 9403beb567b..3f2235aa07f 100644 --- a/aws-cpp-sdk-ssm/source/model/InstanceInformationFilter.cpp +++ b/aws-cpp-sdk-ssm/source/model/InstanceInformationFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SSM::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SSM +{ +namespace Model +{ + InstanceInformationFilter::InstanceInformationFilter() : m_keyHasBeenSet(false), m_valueSetHasBeenSet(false) @@ -77,4 +83,8 @@ JsonValue InstanceInformationFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SSM +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-ssm/source/model/InstanceInformationFilterKey.cpp b/aws-cpp-sdk-ssm/source/model/InstanceInformationFilterKey.cpp index 4e217804ae9..9be01a1839b 100644 --- a/aws-cpp-sdk-ssm/source/model/InstanceInformationFilterKey.cpp +++ b/aws-cpp-sdk-ssm/source/model/InstanceInformationFilterKey.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int InstanceIds_HASH = HashingUtils::HashString("InstanceIds"); -static const int AgentVersion_HASH = HashingUtils::HashString("AgentVersion"); -static const int PingStatus_HASH = HashingUtils::HashString("PingStatus"); -static const int PlatformTypes_HASH = HashingUtils::HashString("PlatformTypes"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace InstanceInformationFilterKeyMapper { + static const int InstanceIds_HASH = HashingUtils::HashString("InstanceIds"); + static const int AgentVersion_HASH = HashingUtils::HashString("AgentVersion"); + static const int PingStatus_HASH = HashingUtils::HashString("PingStatus"); + static const int PlatformTypes_HASH = HashingUtils::HashString("PlatformTypes"); + InstanceInformationFilterKey GetInstanceInformationFilterKeyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ssm/source/model/PingStatus.cpp b/aws-cpp-sdk-ssm/source/model/PingStatus.cpp index 74b9a361940..6e2d05db491 100644 --- a/aws-cpp-sdk-ssm/source/model/PingStatus.cpp +++ b/aws-cpp-sdk-ssm/source/model/PingStatus.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int Online_HASH = HashingUtils::HashString("Online"); -static const int ConnectionLost_HASH = HashingUtils::HashString("ConnectionLost"); -static const int Inactive_HASH = HashingUtils::HashString("Inactive"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace PingStatusMapper { + static const int Online_HASH = HashingUtils::HashString("Online"); + static const int ConnectionLost_HASH = HashingUtils::HashString("ConnectionLost"); + static const int Inactive_HASH = HashingUtils::HashString("Inactive"); + PingStatus GetPingStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-ssm/source/model/PlatformType.cpp b/aws-cpp-sdk-ssm/source/model/PlatformType.cpp index 1c8428cb26e..07083563a11 100644 --- a/aws-cpp-sdk-ssm/source/model/PlatformType.cpp +++ b/aws-cpp-sdk-ssm/source/model/PlatformType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int Windows_HASH = HashingUtils::HashString("Windows"); -static const int Linux_HASH = HashingUtils::HashString("Linux"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace PlatformTypeMapper { + static const int Windows_HASH = HashingUtils::HashString("Windows"); + static const int Linux_HASH = HashingUtils::HashString("Linux"); + PlatformType GetPlatformTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-storagegateway/CMakeLists.txt b/aws-cpp-sdk-storagegateway/CMakeLists.txt index 54d7c91c430..f619310ec30 100644 --- a/aws-cpp-sdk-storagegateway/CMakeLists.txt +++ b/aws-cpp-sdk-storagegateway/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-storagegateway) "source/model/*.cpp" ) - file(GLOB STORAGEGATEWAY_SRC + file(GLOB STORAGEGATEWAY_UNIFIED_HEADERS ${AWS_STORAGEGATEWAY_HEADERS} ${AWS_STORAGEGATEWAY_MODEL_HEADERS} + ) + + file(GLOB STORAGEGATEWAY_UNITY_SRC ${AWS_STORAGEGATEWAY_SOURCE} ${AWS_STORAGEGATEWAY_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("STORAGEGATEWAY" STORAGEGATEWAY_UNITY_SRC) + endif() + + file(GLOB STORAGEGATEWAY_SRC + ${STORAGEGATEWAY_UNIFIED_HEADERS} + ${STORAGEGATEWAY_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-storagegateway/include/aws/storagegateway/StorageGatewayClient.h b/aws-cpp-sdk-storagegateway/include/aws/storagegateway/StorageGatewayClient.h index b27b30af37f..5c30041893b 100644 --- a/aws-cpp-sdk-storagegateway/include/aws/storagegateway/StorageGatewayClient.h +++ b/aws-cpp-sdk-storagegateway/include/aws/storagegateway/StorageGatewayClient.h @@ -994,8 +994,8 @@ namespace Model * gateway, your next step is to remove it from your environment.

            *

            You no longer pay software charges after the gateway is deleted; however, * your existing Amazon EBS snapshots persist and you will continue to be billed - * for these snapshots. You can choose to remove all remaining Amazon EBS snapshots - * by canceling your Amazon EC2 subscription.  If you prefer not to cancel your + * for these snapshots.?You can choose to remove all remaining Amazon EBS snapshots + * by canceling your Amazon EC2 subscription.? If you prefer not to cancel your * Amazon EC2 subscription, you can delete your snapshots using the Amazon EC2 * console. For more information, see the AWS Storage Gateway Detail @@ -1013,8 +1013,8 @@ namespace Model * gateway, your next step is to remove it from your environment.

            *

            You no longer pay software charges after the gateway is deleted; however, * your existing Amazon EBS snapshots persist and you will continue to be billed - * for these snapshots. You can choose to remove all remaining Amazon EBS snapshots - * by canceling your Amazon EC2 subscription.  If you prefer not to cancel your + * for these snapshots.?You can choose to remove all remaining Amazon EBS snapshots + * by canceling your Amazon EC2 subscription.? If you prefer not to cancel your * Amazon EC2 subscription, you can delete your snapshots using the Amazon EC2 * console. For more information, see the AWS Storage Gateway Detail @@ -1034,8 +1034,8 @@ namespace Model * gateway, your next step is to remove it from your environment.

            *

            You no longer pay software charges after the gateway is deleted; however, * your existing Amazon EBS snapshots persist and you will continue to be billed - * for these snapshots. You can choose to remove all remaining Amazon EBS snapshots - * by canceling your Amazon EC2 subscription.  If you prefer not to cancel your + * for these snapshots.?You can choose to remove all remaining Amazon EBS snapshots + * by canceling your Amazon EC2 subscription.? If you prefer not to cancel your * Amazon EC2 subscription, you can delete your snapshots using the Amazon EC2 * console. For more information, see the AWS Storage Gateway Detail diff --git a/aws-cpp-sdk-storagegateway/source/StorageGatewayErrors.cpp b/aws-cpp-sdk-storagegateway/source/StorageGatewayErrors.cpp index 8810033f859..728cbaa4c28 100644 --- a/aws-cpp-sdk-storagegateway/source/StorageGatewayErrors.cpp +++ b/aws-cpp-sdk-storagegateway/source/StorageGatewayErrors.cpp @@ -20,8 +20,6 @@ using namespace Aws::Client; using namespace Aws::StorageGateway; using namespace Aws::Utils; -static const int INVALID_GATEWAY_REQUEST_HASH = HashingUtils::HashString("InvalidGatewayRequestException"); - namespace Aws { namespace StorageGateway @@ -29,6 +27,9 @@ namespace StorageGateway namespace StorageGatewayErrorMapper { +static const int INVALID_GATEWAY_REQUEST_HASH = HashingUtils::HashString("InvalidGatewayRequestException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-storagegateway/source/model/CachediSCSIVolume.cpp b/aws-cpp-sdk-storagegateway/source/model/CachediSCSIVolume.cpp index 00122451e5c..3a0be97e047 100644 --- a/aws-cpp-sdk-storagegateway/source/model/CachediSCSIVolume.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/CachediSCSIVolume.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + CachediSCSIVolume::CachediSCSIVolume() : m_volumeARNHasBeenSet(false), m_volumeIdHasBeenSet(false), @@ -164,4 +170,8 @@ JsonValue CachediSCSIVolume::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-storagegateway/source/model/ChapInfo.cpp b/aws-cpp-sdk-storagegateway/source/model/ChapInfo.cpp index fe756bfb591..7afb0f06c2f 100644 --- a/aws-cpp-sdk-storagegateway/source/model/ChapInfo.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/ChapInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + ChapInfo::ChapInfo() : m_targetARNHasBeenSet(false), m_secretToAuthenticateInitiatorHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue ChapInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-storagegateway/source/model/DeviceiSCSIAttributes.cpp b/aws-cpp-sdk-storagegateway/source/model/DeviceiSCSIAttributes.cpp index 79f39100fc3..79d5eb863fc 100644 --- a/aws-cpp-sdk-storagegateway/source/model/DeviceiSCSIAttributes.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/DeviceiSCSIAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + DeviceiSCSIAttributes::DeviceiSCSIAttributes() : m_targetARNHasBeenSet(false), m_networkInterfaceIdHasBeenSet(false), @@ -104,4 +110,8 @@ JsonValue DeviceiSCSIAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-storagegateway/source/model/Disk.cpp b/aws-cpp-sdk-storagegateway/source/model/Disk.cpp index 5d7faddac2e..5fb0788e11d 100644 --- a/aws-cpp-sdk-storagegateway/source/model/Disk.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/Disk.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + Disk::Disk() : m_diskIdHasBeenSet(false), m_diskPathHasBeenSet(false), @@ -147,4 +153,8 @@ JsonValue Disk::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-storagegateway/source/model/ErrorCode.cpp b/aws-cpp-sdk-storagegateway/source/model/ErrorCode.cpp index 9854e11a788..6307f8d502a 100644 --- a/aws-cpp-sdk-storagegateway/source/model/ErrorCode.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/ErrorCode.cpp @@ -19,67 +19,6 @@ using namespace Aws::Utils; -static const int ActivationKeyExpired_HASH = HashingUtils::HashString("ActivationKeyExpired"); -static const int ActivationKeyInvalid_HASH = HashingUtils::HashString("ActivationKeyInvalid"); -static const int ActivationKeyNotFound_HASH = HashingUtils::HashString("ActivationKeyNotFound"); -static const int GatewayInternalError_HASH = HashingUtils::HashString("GatewayInternalError"); -static const int GatewayNotConnected_HASH = HashingUtils::HashString("GatewayNotConnected"); -static const int GatewayNotFound_HASH = HashingUtils::HashString("GatewayNotFound"); -static const int GatewayProxyNetworkConnectionBusy_HASH = HashingUtils::HashString("GatewayProxyNetworkConnectionBusy"); -static const int AuthenticationFailure_HASH = HashingUtils::HashString("AuthenticationFailure"); -static const int BandwidthThrottleScheduleNotFound_HASH = HashingUtils::HashString("BandwidthThrottleScheduleNotFound"); -static const int Blocked_HASH = HashingUtils::HashString("Blocked"); -static const int CannotExportSnapshot_HASH = HashingUtils::HashString("CannotExportSnapshot"); -static const int ChapCredentialNotFound_HASH = HashingUtils::HashString("ChapCredentialNotFound"); -static const int DiskAlreadyAllocated_HASH = HashingUtils::HashString("DiskAlreadyAllocated"); -static const int DiskDoesNotExist_HASH = HashingUtils::HashString("DiskDoesNotExist"); -static const int DiskSizeGreaterThanVolumeMaxSize_HASH = HashingUtils::HashString("DiskSizeGreaterThanVolumeMaxSize"); -static const int DiskSizeLessThanVolumeSize_HASH = HashingUtils::HashString("DiskSizeLessThanVolumeSize"); -static const int DiskSizeNotGigAligned_HASH = HashingUtils::HashString("DiskSizeNotGigAligned"); -static const int DuplicateCertificateInfo_HASH = HashingUtils::HashString("DuplicateCertificateInfo"); -static const int DuplicateSchedule_HASH = HashingUtils::HashString("DuplicateSchedule"); -static const int EndpointNotFound_HASH = HashingUtils::HashString("EndpointNotFound"); -static const int IAMNotSupported_HASH = HashingUtils::HashString("IAMNotSupported"); -static const int InitiatorInvalid_HASH = HashingUtils::HashString("InitiatorInvalid"); -static const int InitiatorNotFound_HASH = HashingUtils::HashString("InitiatorNotFound"); -static const int InternalError_HASH = HashingUtils::HashString("InternalError"); -static const int InvalidGateway_HASH = HashingUtils::HashString("InvalidGateway"); -static const int InvalidEndpoint_HASH = HashingUtils::HashString("InvalidEndpoint"); -static const int InvalidParameters_HASH = HashingUtils::HashString("InvalidParameters"); -static const int InvalidSchedule_HASH = HashingUtils::HashString("InvalidSchedule"); -static const int LocalStorageLimitExceeded_HASH = HashingUtils::HashString("LocalStorageLimitExceeded"); -static const int LunAlreadyAllocated_HASH = HashingUtils::HashString("LunAlreadyAllocated "); -static const int LunInvalid_HASH = HashingUtils::HashString("LunInvalid"); -static const int MaximumContentLengthExceeded_HASH = HashingUtils::HashString("MaximumContentLengthExceeded"); -static const int MaximumTapeCartridgeCountExceeded_HASH = HashingUtils::HashString("MaximumTapeCartridgeCountExceeded"); -static const int MaximumVolumeCountExceeded_HASH = HashingUtils::HashString("MaximumVolumeCountExceeded"); -static const int NetworkConfigurationChanged_HASH = HashingUtils::HashString("NetworkConfigurationChanged"); -static const int NoDisksAvailable_HASH = HashingUtils::HashString("NoDisksAvailable"); -static const int NotImplemented_HASH = HashingUtils::HashString("NotImplemented"); -static const int NotSupported_HASH = HashingUtils::HashString("NotSupported"); -static const int OperationAborted_HASH = HashingUtils::HashString("OperationAborted"); -static const int OutdatedGateway_HASH = HashingUtils::HashString("OutdatedGateway"); -static const int ParametersNotImplemented_HASH = HashingUtils::HashString("ParametersNotImplemented"); -static const int RegionInvalid_HASH = HashingUtils::HashString("RegionInvalid"); -static const int RequestTimeout_HASH = HashingUtils::HashString("RequestTimeout"); -static const int ServiceUnavailable_HASH = HashingUtils::HashString("ServiceUnavailable"); -static const int SnapshotDeleted_HASH = HashingUtils::HashString("SnapshotDeleted"); -static const int SnapshotIdInvalid_HASH = HashingUtils::HashString("SnapshotIdInvalid"); -static const int SnapshotInProgress_HASH = HashingUtils::HashString("SnapshotInProgress"); -static const int SnapshotNotFound_HASH = HashingUtils::HashString("SnapshotNotFound"); -static const int SnapshotScheduleNotFound_HASH = HashingUtils::HashString("SnapshotScheduleNotFound"); -static const int StagingAreaFull_HASH = HashingUtils::HashString("StagingAreaFull"); -static const int StorageFailure_HASH = HashingUtils::HashString("StorageFailure"); -static const int TapeCartridgeNotFound_HASH = HashingUtils::HashString("TapeCartridgeNotFound"); -static const int TargetAlreadyExists_HASH = HashingUtils::HashString("TargetAlreadyExists"); -static const int TargetInvalid_HASH = HashingUtils::HashString("TargetInvalid"); -static const int TargetNotFound_HASH = HashingUtils::HashString("TargetNotFound"); -static const int UnauthorizedOperation_HASH = HashingUtils::HashString("UnauthorizedOperation"); -static const int VolumeAlreadyExists_HASH = HashingUtils::HashString("VolumeAlreadyExists"); -static const int VolumeIdInvalid_HASH = HashingUtils::HashString("VolumeIdInvalid"); -static const int VolumeInUse_HASH = HashingUtils::HashString("VolumeInUse"); -static const int VolumeNotFound_HASH = HashingUtils::HashString("VolumeNotFound"); -static const int VolumeNotReady_HASH = HashingUtils::HashString("VolumeNotReady"); namespace Aws { @@ -90,6 +29,68 @@ namespace Aws namespace ErrorCodeMapper { + static const int ActivationKeyExpired_HASH = HashingUtils::HashString("ActivationKeyExpired"); + static const int ActivationKeyInvalid_HASH = HashingUtils::HashString("ActivationKeyInvalid"); + static const int ActivationKeyNotFound_HASH = HashingUtils::HashString("ActivationKeyNotFound"); + static const int GatewayInternalError_HASH = HashingUtils::HashString("GatewayInternalError"); + static const int GatewayNotConnected_HASH = HashingUtils::HashString("GatewayNotConnected"); + static const int GatewayNotFound_HASH = HashingUtils::HashString("GatewayNotFound"); + static const int GatewayProxyNetworkConnectionBusy_HASH = HashingUtils::HashString("GatewayProxyNetworkConnectionBusy"); + static const int AuthenticationFailure_HASH = HashingUtils::HashString("AuthenticationFailure"); + static const int BandwidthThrottleScheduleNotFound_HASH = HashingUtils::HashString("BandwidthThrottleScheduleNotFound"); + static const int Blocked_HASH = HashingUtils::HashString("Blocked"); + static const int CannotExportSnapshot_HASH = HashingUtils::HashString("CannotExportSnapshot"); + static const int ChapCredentialNotFound_HASH = HashingUtils::HashString("ChapCredentialNotFound"); + static const int DiskAlreadyAllocated_HASH = HashingUtils::HashString("DiskAlreadyAllocated"); + static const int DiskDoesNotExist_HASH = HashingUtils::HashString("DiskDoesNotExist"); + static const int DiskSizeGreaterThanVolumeMaxSize_HASH = HashingUtils::HashString("DiskSizeGreaterThanVolumeMaxSize"); + static const int DiskSizeLessThanVolumeSize_HASH = HashingUtils::HashString("DiskSizeLessThanVolumeSize"); + static const int DiskSizeNotGigAligned_HASH = HashingUtils::HashString("DiskSizeNotGigAligned"); + static const int DuplicateCertificateInfo_HASH = HashingUtils::HashString("DuplicateCertificateInfo"); + static const int DuplicateSchedule_HASH = HashingUtils::HashString("DuplicateSchedule"); + static const int EndpointNotFound_HASH = HashingUtils::HashString("EndpointNotFound"); + static const int IAMNotSupported_HASH = HashingUtils::HashString("IAMNotSupported"); + static const int InitiatorInvalid_HASH = HashingUtils::HashString("InitiatorInvalid"); + static const int InitiatorNotFound_HASH = HashingUtils::HashString("InitiatorNotFound"); + static const int InternalError_HASH = HashingUtils::HashString("InternalError"); + static const int InvalidGateway_HASH = HashingUtils::HashString("InvalidGateway"); + static const int InvalidEndpoint_HASH = HashingUtils::HashString("InvalidEndpoint"); + static const int InvalidParameters_HASH = HashingUtils::HashString("InvalidParameters"); + static const int InvalidSchedule_HASH = HashingUtils::HashString("InvalidSchedule"); + static const int LocalStorageLimitExceeded_HASH = HashingUtils::HashString("LocalStorageLimitExceeded"); + static const int LunAlreadyAllocated_HASH = HashingUtils::HashString("LunAlreadyAllocated "); + static const int LunInvalid_HASH = HashingUtils::HashString("LunInvalid"); + static const int MaximumContentLengthExceeded_HASH = HashingUtils::HashString("MaximumContentLengthExceeded"); + static const int MaximumTapeCartridgeCountExceeded_HASH = HashingUtils::HashString("MaximumTapeCartridgeCountExceeded"); + static const int MaximumVolumeCountExceeded_HASH = HashingUtils::HashString("MaximumVolumeCountExceeded"); + static const int NetworkConfigurationChanged_HASH = HashingUtils::HashString("NetworkConfigurationChanged"); + static const int NoDisksAvailable_HASH = HashingUtils::HashString("NoDisksAvailable"); + static const int NotImplemented_HASH = HashingUtils::HashString("NotImplemented"); + static const int NotSupported_HASH = HashingUtils::HashString("NotSupported"); + static const int OperationAborted_HASH = HashingUtils::HashString("OperationAborted"); + static const int OutdatedGateway_HASH = HashingUtils::HashString("OutdatedGateway"); + static const int ParametersNotImplemented_HASH = HashingUtils::HashString("ParametersNotImplemented"); + static const int RegionInvalid_HASH = HashingUtils::HashString("RegionInvalid"); + static const int RequestTimeout_HASH = HashingUtils::HashString("RequestTimeout"); + static const int ServiceUnavailable_HASH = HashingUtils::HashString("ServiceUnavailable"); + static const int SnapshotDeleted_HASH = HashingUtils::HashString("SnapshotDeleted"); + static const int SnapshotIdInvalid_HASH = HashingUtils::HashString("SnapshotIdInvalid"); + static const int SnapshotInProgress_HASH = HashingUtils::HashString("SnapshotInProgress"); + static const int SnapshotNotFound_HASH = HashingUtils::HashString("SnapshotNotFound"); + static const int SnapshotScheduleNotFound_HASH = HashingUtils::HashString("SnapshotScheduleNotFound"); + static const int StagingAreaFull_HASH = HashingUtils::HashString("StagingAreaFull"); + static const int StorageFailure_HASH = HashingUtils::HashString("StorageFailure"); + static const int TapeCartridgeNotFound_HASH = HashingUtils::HashString("TapeCartridgeNotFound"); + static const int TargetAlreadyExists_HASH = HashingUtils::HashString("TargetAlreadyExists"); + static const int TargetInvalid_HASH = HashingUtils::HashString("TargetInvalid"); + static const int TargetNotFound_HASH = HashingUtils::HashString("TargetNotFound"); + static const int UnauthorizedOperation_HASH = HashingUtils::HashString("UnauthorizedOperation"); + static const int VolumeAlreadyExists_HASH = HashingUtils::HashString("VolumeAlreadyExists"); + static const int VolumeIdInvalid_HASH = HashingUtils::HashString("VolumeIdInvalid"); + static const int VolumeInUse_HASH = HashingUtils::HashString("VolumeInUse"); + static const int VolumeNotFound_HASH = HashingUtils::HashString("VolumeNotFound"); + static const int VolumeNotReady_HASH = HashingUtils::HashString("VolumeNotReady"); + ErrorCode GetErrorCodeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-storagegateway/source/model/GatewayInfo.cpp b/aws-cpp-sdk-storagegateway/source/model/GatewayInfo.cpp index 15310fe263c..28354862fab 100644 --- a/aws-cpp-sdk-storagegateway/source/model/GatewayInfo.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/GatewayInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + GatewayInfo::GatewayInfo() : m_gatewayARNHasBeenSet(false), m_gatewayTypeHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue GatewayInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-storagegateway/source/model/NetworkInterface.cpp b/aws-cpp-sdk-storagegateway/source/model/NetworkInterface.cpp index 59250bb7b8e..382d188fe3a 100644 --- a/aws-cpp-sdk-storagegateway/source/model/NetworkInterface.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/NetworkInterface.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + NetworkInterface::NetworkInterface() : m_ipv4AddressHasBeenSet(false), m_macAddressHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue NetworkInterface::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-storagegateway/source/model/StorageGatewayError.cpp b/aws-cpp-sdk-storagegateway/source/model/StorageGatewayError.cpp index d38801ad8e8..27a9d94dd0b 100644 --- a/aws-cpp-sdk-storagegateway/source/model/StorageGatewayError.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/StorageGatewayError.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + StorageGatewayError::StorageGatewayError() : m_errorCodeHasBeenSet(false), m_errorDetailsHasBeenSet(false) @@ -77,4 +83,8 @@ JsonValue StorageGatewayError::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-storagegateway/source/model/StorediSCSIVolume.cpp b/aws-cpp-sdk-storagegateway/source/model/StorediSCSIVolume.cpp index ddbff55c973..fd875f19f02 100644 --- a/aws-cpp-sdk-storagegateway/source/model/StorediSCSIVolume.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/StorediSCSIVolume.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + StorediSCSIVolume::StorediSCSIVolume() : m_volumeARNHasBeenSet(false), m_volumeIdHasBeenSet(false), @@ -196,4 +202,8 @@ JsonValue StorediSCSIVolume::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-storagegateway/source/model/Tag.cpp b/aws-cpp-sdk-storagegateway/source/model/Tag.cpp index eb2e3bbe547..56a1d783751 100644 --- a/aws-cpp-sdk-storagegateway/source/model/Tag.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/Tag.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + Tag::Tag() : m_keyHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Tag::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-storagegateway/source/model/Tape.cpp b/aws-cpp-sdk-storagegateway/source/model/Tape.cpp index 4119e6994fa..72f433ef5a5 100644 --- a/aws-cpp-sdk-storagegateway/source/model/Tape.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/Tape.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + Tape::Tape() : m_tapeARNHasBeenSet(false), m_tapeBarcodeHasBeenSet(false), @@ -134,4 +140,8 @@ JsonValue Tape::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-storagegateway/source/model/TapeArchive.cpp b/aws-cpp-sdk-storagegateway/source/model/TapeArchive.cpp index 27222aa8ca9..da6f9661633 100644 --- a/aws-cpp-sdk-storagegateway/source/model/TapeArchive.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/TapeArchive.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + TapeArchive::TapeArchive() : m_tapeARNHasBeenSet(false), m_tapeBarcodeHasBeenSet(false), @@ -131,4 +137,8 @@ JsonValue TapeArchive::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws diff --git a/aws-cpp-sdk-storagegateway/source/model/TapeRecoveryPointInfo.cpp b/aws-cpp-sdk-storagegateway/source/model/TapeRecoveryPointInfo.cpp index 5ed5bf0445a..707adc56601 100644 --- a/aws-cpp-sdk-storagegateway/source/model/TapeRecoveryPointInfo.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/TapeRecoveryPointInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + TapeRecoveryPointInfo::TapeRecoveryPointInfo() : m_tapeARNHasBeenSet(false), m_tapeRecoveryPointTimeHasBeenSet(false), @@ -101,4 +107,8 @@ JsonValue TapeRecoveryPointInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws diff --git a/aws-cpp-sdk-storagegateway/source/model/VTLDevice.cpp b/aws-cpp-sdk-storagegateway/source/model/VTLDevice.cpp index 61e45b64aa5..bee25629512 100644 --- a/aws-cpp-sdk-storagegateway/source/model/VTLDevice.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/VTLDevice.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + VTLDevice::VTLDevice() : m_vTLDeviceARNHasBeenSet(false), m_vTLDeviceTypeHasBeenSet(false), @@ -115,4 +121,8 @@ JsonValue VTLDevice::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-storagegateway/source/model/VolumeInfo.cpp b/aws-cpp-sdk-storagegateway/source/model/VolumeInfo.cpp index 2d228c3effb..b7975c66d96 100644 --- a/aws-cpp-sdk-storagegateway/source/model/VolumeInfo.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/VolumeInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + VolumeInfo::VolumeInfo() : m_volumeARNHasBeenSet(false), m_volumeTypeHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue VolumeInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-storagegateway/source/model/VolumeRecoveryPointInfo.cpp b/aws-cpp-sdk-storagegateway/source/model/VolumeRecoveryPointInfo.cpp index ad3cf416658..ec9959aba6f 100644 --- a/aws-cpp-sdk-storagegateway/source/model/VolumeRecoveryPointInfo.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/VolumeRecoveryPointInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + VolumeRecoveryPointInfo::VolumeRecoveryPointInfo() : m_volumeARNHasBeenSet(false), m_volumeSizeInBytes(0), @@ -104,4 +110,8 @@ JsonValue VolumeRecoveryPointInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-storagegateway/source/model/VolumeiSCSIAttributes.cpp b/aws-cpp-sdk-storagegateway/source/model/VolumeiSCSIAttributes.cpp index 1209e930081..f4421f16ffa 100644 --- a/aws-cpp-sdk-storagegateway/source/model/VolumeiSCSIAttributes.cpp +++ b/aws-cpp-sdk-storagegateway/source/model/VolumeiSCSIAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::StorageGateway::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace StorageGateway +{ +namespace Model +{ + VolumeiSCSIAttributes::VolumeiSCSIAttributes() : m_targetARNHasBeenSet(false), m_networkInterfaceIdHasBeenSet(false), @@ -121,4 +127,8 @@ JsonValue VolumeiSCSIAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace StorageGateway +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sts/CMakeLists.txt b/aws-cpp-sdk-sts/CMakeLists.txt index 9f00258ecf8..98f44083802 100644 --- a/aws-cpp-sdk-sts/CMakeLists.txt +++ b/aws-cpp-sdk-sts/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-sts) "source/model/*.cpp" ) - file(GLOB STS_SRC + file(GLOB STS_UNIFIED_HEADERS ${AWS_STS_HEADERS} ${AWS_STS_MODEL_HEADERS} + ) + + file(GLOB STS_UNITY_SRC ${AWS_STS_SOURCE} ${AWS_STS_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("STS" STS_UNITY_SRC) + endif() + + file(GLOB STS_SRC + ${STS_UNIFIED_HEADERS} + ${STS_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-sts/include/aws/sts/STSClient.h b/aws-cpp-sdk-sts/include/aws/sts/STSClient.h index 905263a519f..0e767acea63 100644 --- a/aws-cpp-sdk-sts/include/aws/sts/STSClient.h +++ b/aws-cpp-sdk-sts/include/aws/sts/STSClient.h @@ -1081,7 +1081,7 @@ namespace Model * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_getfederationtoken.html">Permissions * for GetFederationToken. For information about using * GetFederationToken to create temporary security credentials, see GetFederationToken—Federation + * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_getfederationtoken">GetFederationToken?Federation * Through a Custom Identity Broker.

            */ virtual Model::GetFederationTokenOutcome GetFederationToken(const Model::GetFederationTokenRequest& request) const; @@ -1153,7 +1153,7 @@ namespace Model * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_getfederationtoken.html">Permissions * for GetFederationToken. For information about using * GetFederationToken to create temporary security credentials, see GetFederationToken—Federation + * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_getfederationtoken">GetFederationToken?Federation * Through a Custom Identity Broker.

            * * returns a future to the operation so that it can be executed in parallel to other requests. @@ -1227,7 +1227,7 @@ namespace Model * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_getfederationtoken.html">Permissions * for GetFederationToken. For information about using * GetFederationToken to create temporary security credentials, see GetFederationToken—Federation + * href="http://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#api_getfederationtoken">GetFederationToken?Federation * Through a Custom Identity Broker.

            * * Queues the request into a thread executor and triggers associated callback when operation has finished. diff --git a/aws-cpp-sdk-sts/source/STSErrors.cpp b/aws-cpp-sdk-sts/source/STSErrors.cpp index e668ee4b71a..69bc5654f77 100644 --- a/aws-cpp-sdk-sts/source/STSErrors.cpp +++ b/aws-cpp-sdk-sts/source/STSErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::STS; using namespace Aws::Utils; +namespace Aws +{ +namespace STS +{ +namespace STSErrorMapper +{ + static const int I_D_P_COMMUNICATION_ERROR_HASH = HashingUtils::HashString("IDPCommunicationError"); static const int EXPIRED_TOKEN_HASH = HashingUtils::HashString("ExpiredTokenException"); static const int MALFORMED_POLICY_DOCUMENT_HASH = HashingUtils::HashString("MalformedPolicyDocument"); @@ -29,12 +36,6 @@ static const int INVALID_IDENTITY_TOKEN_HASH = HashingUtils::HashString("Invalid static const int REGION_DISABLED_HASH = HashingUtils::HashString("RegionDisabledException"); static const int INVALID_AUTHORIZATION_MESSAGE_HASH = HashingUtils::HashString("InvalidAuthorizationMessageException"); -namespace Aws -{ -namespace STS -{ -namespace STSErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-sts/source/model/AssumedRoleUser.cpp b/aws-cpp-sdk-sts/source/model/AssumedRoleUser.cpp index 2ee17d92b8c..057a4745ffd 100644 --- a/aws-cpp-sdk-sts/source/model/AssumedRoleUser.cpp +++ b/aws-cpp-sdk-sts/source/model/AssumedRoleUser.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::STS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace STS +{ +namespace Model +{ + AssumedRoleUser::AssumedRoleUser() : m_assumedRoleIdHasBeenSet(false), m_arnHasBeenSet(false) @@ -82,3 +88,7 @@ void AssumedRoleUser::OutputToStream(Aws::OStream& oStream, const char* location oStream << location << ".Arn=" << StringUtils::URLEncode(m_arn.c_str()) << "&"; } } + +} // namespace Model +} // namespace STS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sts/source/model/Credentials.cpp b/aws-cpp-sdk-sts/source/model/Credentials.cpp index 9f1ae9b353a..720ada17413 100644 --- a/aws-cpp-sdk-sts/source/model/Credentials.cpp +++ b/aws-cpp-sdk-sts/source/model/Credentials.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::STS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace STS +{ +namespace Model +{ + Credentials::Credentials() : m_accessKeyIdHasBeenSet(false), m_secretAccessKeyHasBeenSet(false), @@ -114,3 +120,7 @@ void Credentials::OutputToStream(Aws::OStream& oStream, const char* location) co oStream << location << ".Expiration=" << StringUtils::URLEncode(m_expiration.ToGmtString(DateFormat::ISO_8601).c_str()) << "&"; } } + +} // namespace Model +} // namespace STS +} // namespace Aws diff --git a/aws-cpp-sdk-sts/source/model/FederatedUser.cpp b/aws-cpp-sdk-sts/source/model/FederatedUser.cpp index da1c5599f67..98f6ada408d 100644 --- a/aws-cpp-sdk-sts/source/model/FederatedUser.cpp +++ b/aws-cpp-sdk-sts/source/model/FederatedUser.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::STS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace STS +{ +namespace Model +{ + FederatedUser::FederatedUser() : m_federatedUserIdHasBeenSet(false), m_arnHasBeenSet(false) @@ -82,3 +88,7 @@ void FederatedUser::OutputToStream(Aws::OStream& oStream, const char* location) oStream << location << ".Arn=" << StringUtils::URLEncode(m_arn.c_str()) << "&"; } } + +} // namespace Model +} // namespace STS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-sts/source/model/ResponseMetadata.cpp b/aws-cpp-sdk-sts/source/model/ResponseMetadata.cpp index 3cedc79e67a..9121ea01c6d 100644 --- a/aws-cpp-sdk-sts/source/model/ResponseMetadata.cpp +++ b/aws-cpp-sdk-sts/source/model/ResponseMetadata.cpp @@ -19,10 +19,16 @@ #include -using namespace Aws::STS::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace STS +{ +namespace Model +{ + ResponseMetadata::ResponseMetadata() : m_requestIdHasBeenSet(false) { @@ -66,3 +72,7 @@ void ResponseMetadata::OutputToStream(Aws::OStream& oStream, const char* locatio oStream << location << ".RequestId=" << StringUtils::URLEncode(m_requestId.c_str()) << "&"; } } + +} // namespace Model +} // namespace STS +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/CMakeLists.txt b/aws-cpp-sdk-support/CMakeLists.txt index 3bcc5b94aec..8d44d753992 100644 --- a/aws-cpp-sdk-support/CMakeLists.txt +++ b/aws-cpp-sdk-support/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-support) "source/model/*.cpp" ) - file(GLOB SUPPORT_SRC + file(GLOB SUPPORT_UNIFIED_HEADERS ${AWS_SUPPORT_HEADERS} ${AWS_SUPPORT_MODEL_HEADERS} + ) + + file(GLOB SUPPORT_UNITY_SRC ${AWS_SUPPORT_SOURCE} ${AWS_SUPPORT_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("SUPPORT" SUPPORT_UNITY_SRC) + endif() + + file(GLOB SUPPORT_SRC + ${SUPPORT_UNIFIED_HEADERS} + ${SUPPORT_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-support/source/SupportErrors.cpp b/aws-cpp-sdk-support/source/SupportErrors.cpp index 27613a1416f..aedd025a91e 100644 --- a/aws-cpp-sdk-support/source/SupportErrors.cpp +++ b/aws-cpp-sdk-support/source/SupportErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::Support; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace SupportErrorMapper +{ + static const int DESCRIBE_ATTACHMENT_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("DescribeAttachmentLimitExceeded"); static const int ATTACHMENT_ID_NOT_FOUND_HASH = HashingUtils::HashString("AttachmentIdNotFound"); static const int ATTACHMENT_SET_SIZE_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("AttachmentSetSizeLimitExceeded"); @@ -29,12 +36,6 @@ static const int ATTACHMENT_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("Atta static const int ATTACHMENT_SET_ID_NOT_FOUND_HASH = HashingUtils::HashString("AttachmentSetIdNotFound"); static const int ATTACHMENT_SET_EXPIRED_HASH = HashingUtils::HashString("AttachmentSetExpired"); -namespace Aws -{ -namespace Support -{ -namespace SupportErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-support/source/model/Attachment.cpp b/aws-cpp-sdk-support/source/model/Attachment.cpp index c0d9b30d0aa..86fa4b03db1 100644 --- a/aws-cpp-sdk-support/source/model/Attachment.cpp +++ b/aws-cpp-sdk-support/source/model/Attachment.cpp @@ -18,10 +18,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + Attachment::Attachment() : m_fileNameHasBeenSet(false), m_dataHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue Attachment::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws diff --git a/aws-cpp-sdk-support/source/model/AttachmentDetails.cpp b/aws-cpp-sdk-support/source/model/AttachmentDetails.cpp index 52f90c54cf6..97be75454f4 100644 --- a/aws-cpp-sdk-support/source/model/AttachmentDetails.cpp +++ b/aws-cpp-sdk-support/source/model/AttachmentDetails.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + AttachmentDetails::AttachmentDetails() : m_attachmentIdHasBeenSet(false), m_fileNameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue AttachmentDetails::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/source/model/CaseDetails.cpp b/aws-cpp-sdk-support/source/model/CaseDetails.cpp index 49e6bc14665..840d58e1c76 100644 --- a/aws-cpp-sdk-support/source/model/CaseDetails.cpp +++ b/aws-cpp-sdk-support/source/model/CaseDetails.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + CaseDetails::CaseDetails() : m_caseIdHasBeenSet(false), m_displayIdHasBeenSet(false), @@ -228,4 +234,8 @@ JsonValue CaseDetails::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/source/model/Category.cpp b/aws-cpp-sdk-support/source/model/Category.cpp index e429b885cc8..5bff01e67de 100644 --- a/aws-cpp-sdk-support/source/model/Category.cpp +++ b/aws-cpp-sdk-support/source/model/Category.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + Category::Category() : m_codeHasBeenSet(false), m_nameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue Category::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/source/model/Communication.cpp b/aws-cpp-sdk-support/source/model/Communication.cpp index 6d90f8275fc..5254d43c654 100644 --- a/aws-cpp-sdk-support/source/model/Communication.cpp +++ b/aws-cpp-sdk-support/source/model/Communication.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + Communication::Communication() : m_caseIdHasBeenSet(false), m_bodyHasBeenSet(false), @@ -123,4 +129,8 @@ JsonValue Communication::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/source/model/RecentCaseCommunications.cpp b/aws-cpp-sdk-support/source/model/RecentCaseCommunications.cpp index 8729832c448..150ec23d8e5 100644 --- a/aws-cpp-sdk-support/source/model/RecentCaseCommunications.cpp +++ b/aws-cpp-sdk-support/source/model/RecentCaseCommunications.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + RecentCaseCommunications::RecentCaseCommunications() : m_communicationsHasBeenSet(false), m_nextTokenHasBeenSet(false) @@ -78,4 +84,8 @@ JsonValue RecentCaseCommunications::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/source/model/Service.cpp b/aws-cpp-sdk-support/source/model/Service.cpp index 133b86d1fea..a703bc16e49 100644 --- a/aws-cpp-sdk-support/source/model/Service.cpp +++ b/aws-cpp-sdk-support/source/model/Service.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + Service::Service() : m_codeHasBeenSet(false), m_nameHasBeenSet(false), @@ -93,4 +99,8 @@ JsonValue Service::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/source/model/SeverityLevel.cpp b/aws-cpp-sdk-support/source/model/SeverityLevel.cpp index 9c050268499..9718717bdb1 100644 --- a/aws-cpp-sdk-support/source/model/SeverityLevel.cpp +++ b/aws-cpp-sdk-support/source/model/SeverityLevel.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + SeverityLevel::SeverityLevel() : m_codeHasBeenSet(false), m_nameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue SeverityLevel::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/source/model/TrustedAdvisorCategorySpecificSummary.cpp b/aws-cpp-sdk-support/source/model/TrustedAdvisorCategorySpecificSummary.cpp index 177627d02d6..d8c69dfee30 100644 --- a/aws-cpp-sdk-support/source/model/TrustedAdvisorCategorySpecificSummary.cpp +++ b/aws-cpp-sdk-support/source/model/TrustedAdvisorCategorySpecificSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + TrustedAdvisorCategorySpecificSummary::TrustedAdvisorCategorySpecificSummary() : m_costOptimizingHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue TrustedAdvisorCategorySpecificSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckDescription.cpp b/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckDescription.cpp index ebcc792180e..8b2dacdba96 100644 --- a/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckDescription.cpp +++ b/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckDescription.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + TrustedAdvisorCheckDescription::TrustedAdvisorCheckDescription() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -123,4 +129,8 @@ JsonValue TrustedAdvisorCheckDescription::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckRefreshStatus.cpp b/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckRefreshStatus.cpp index e5b3cda05c5..eec5c611b38 100644 --- a/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckRefreshStatus.cpp +++ b/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckRefreshStatus.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + TrustedAdvisorCheckRefreshStatus::TrustedAdvisorCheckRefreshStatus() : m_checkIdHasBeenSet(false), m_statusHasBeenSet(false), @@ -87,4 +93,8 @@ JsonValue TrustedAdvisorCheckRefreshStatus::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckResult.cpp b/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckResult.cpp index 790197dfff2..2c845cc7e53 100644 --- a/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckResult.cpp +++ b/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckResult.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + TrustedAdvisorCheckResult::TrustedAdvisorCheckResult() : m_checkIdHasBeenSet(false), m_timestampHasBeenSet(false), @@ -138,4 +144,8 @@ JsonValue TrustedAdvisorCheckResult::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckSummary.cpp b/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckSummary.cpp index ebc78c9da65..8920a1323b6 100644 --- a/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckSummary.cpp +++ b/aws-cpp-sdk-support/source/model/TrustedAdvisorCheckSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + TrustedAdvisorCheckSummary::TrustedAdvisorCheckSummary() : m_checkIdHasBeenSet(false), m_timestampHasBeenSet(false), @@ -132,4 +138,8 @@ JsonValue TrustedAdvisorCheckSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/source/model/TrustedAdvisorCostOptimizingSummary.cpp b/aws-cpp-sdk-support/source/model/TrustedAdvisorCostOptimizingSummary.cpp index f411b171d35..3009e9b1082 100644 --- a/aws-cpp-sdk-support/source/model/TrustedAdvisorCostOptimizingSummary.cpp +++ b/aws-cpp-sdk-support/source/model/TrustedAdvisorCostOptimizingSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + TrustedAdvisorCostOptimizingSummary::TrustedAdvisorCostOptimizingSummary() : m_estimatedMonthlySavings(0.0), m_estimatedMonthlySavingsHasBeenSet(false), @@ -74,4 +80,8 @@ JsonValue TrustedAdvisorCostOptimizingSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/source/model/TrustedAdvisorResourceDetail.cpp b/aws-cpp-sdk-support/source/model/TrustedAdvisorResourceDetail.cpp index ee7278bc41a..0014170df6a 100644 --- a/aws-cpp-sdk-support/source/model/TrustedAdvisorResourceDetail.cpp +++ b/aws-cpp-sdk-support/source/model/TrustedAdvisorResourceDetail.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + TrustedAdvisorResourceDetail::TrustedAdvisorResourceDetail() : m_statusHasBeenSet(false), m_regionHasBeenSet(false), @@ -125,4 +131,8 @@ JsonValue TrustedAdvisorResourceDetail::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-support/source/model/TrustedAdvisorResourcesSummary.cpp b/aws-cpp-sdk-support/source/model/TrustedAdvisorResourcesSummary.cpp index 95227dce8e8..12bc89b28f1 100644 --- a/aws-cpp-sdk-support/source/model/TrustedAdvisorResourcesSummary.cpp +++ b/aws-cpp-sdk-support/source/model/TrustedAdvisorResourcesSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::Support::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace Support +{ +namespace Model +{ + TrustedAdvisorResourcesSummary::TrustedAdvisorResourcesSummary() : m_resourcesProcessed(0), m_resourcesProcessedHasBeenSet(false), @@ -108,4 +114,8 @@ JsonValue TrustedAdvisorResourcesSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace Support +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/CMakeLists.txt b/aws-cpp-sdk-swf/CMakeLists.txt index 8325f16e101..512075f8f6c 100644 --- a/aws-cpp-sdk-swf/CMakeLists.txt +++ b/aws-cpp-sdk-swf/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-swf) "source/model/*.cpp" ) - file(GLOB SWF_SRC + file(GLOB SWF_UNIFIED_HEADERS ${AWS_SWF_HEADERS} ${AWS_SWF_MODEL_HEADERS} + ) + + file(GLOB SWF_UNITY_SRC ${AWS_SWF_SOURCE} ${AWS_SWF_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("SWF" SWF_UNITY_SRC) + endif() + + file(GLOB SWF_SRC + ${SWF_UNIFIED_HEADERS} + ${SWF_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-swf/source/SWFErrors.cpp b/aws-cpp-sdk-swf/source/SWFErrors.cpp index 79e4d050bf7..478506b8eeb 100644 --- a/aws-cpp-sdk-swf/source/SWFErrors.cpp +++ b/aws-cpp-sdk-swf/source/SWFErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::SWF; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace SWFErrorMapper +{ + static const int DOMAIN_DEPRECATED_FAULT_HASH = HashingUtils::HashString("DomainDeprecatedFault"); static const int UNKNOWN_RESOURCE_FAULT_HASH = HashingUtils::HashString("UnknownResourceFault"); static const int DEFAULT_UNDEFINED_FAULT_HASH = HashingUtils::HashString("DefaultUndefinedFault"); @@ -30,12 +37,6 @@ static const int DOMAIN_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("Do static const int TYPE_DEPRECATED_FAULT_HASH = HashingUtils::HashString("TypeDeprecatedFault"); static const int TYPE_ALREADY_EXISTS_FAULT_HASH = HashingUtils::HashString("TypeAlreadyExistsFault"); -namespace Aws -{ -namespace SWF -{ -namespace SWFErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-swf/source/model/ActivityTaskCancelRequestedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ActivityTaskCancelRequestedEventAttributes.cpp index b804572acbc..196a26e8c8e 100644 --- a/aws-cpp-sdk-swf/source/model/ActivityTaskCancelRequestedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ActivityTaskCancelRequestedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ActivityTaskCancelRequestedEventAttributes::ActivityTaskCancelRequestedEventAttributes() : m_decisionTaskCompletedEventId(0), m_decisionTaskCompletedEventIdHasBeenSet(false), @@ -72,4 +78,8 @@ JsonValue ActivityTaskCancelRequestedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ActivityTaskCanceledEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ActivityTaskCanceledEventAttributes.cpp index 710f24c9a68..5456d2d3ef5 100644 --- a/aws-cpp-sdk-swf/source/model/ActivityTaskCanceledEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ActivityTaskCanceledEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ActivityTaskCanceledEventAttributes::ActivityTaskCanceledEventAttributes() : m_detailsHasBeenSet(false), m_scheduledEventId(0), @@ -106,4 +112,8 @@ JsonValue ActivityTaskCanceledEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ActivityTaskCompletedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ActivityTaskCompletedEventAttributes.cpp index cda9e9e54f8..28b5670a674 100644 --- a/aws-cpp-sdk-swf/source/model/ActivityTaskCompletedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ActivityTaskCompletedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ActivityTaskCompletedEventAttributes::ActivityTaskCompletedEventAttributes() : m_resultHasBeenSet(false), m_scheduledEventId(0), @@ -89,4 +95,8 @@ JsonValue ActivityTaskCompletedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ActivityTaskFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ActivityTaskFailedEventAttributes.cpp index 7965384f3c7..c838210c2a0 100644 --- a/aws-cpp-sdk-swf/source/model/ActivityTaskFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ActivityTaskFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ActivityTaskFailedEventAttributes::ActivityTaskFailedEventAttributes() : m_reasonHasBeenSet(false), m_detailsHasBeenSet(false), @@ -104,4 +110,8 @@ JsonValue ActivityTaskFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ActivityTaskScheduledEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ActivityTaskScheduledEventAttributes.cpp index 2c95feaf9d6..618e4482dc7 100644 --- a/aws-cpp-sdk-swf/source/model/ActivityTaskScheduledEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ActivityTaskScheduledEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ActivityTaskScheduledEventAttributes::ActivityTaskScheduledEventAttributes() : m_activityTypeHasBeenSet(false), m_activityIdHasBeenSet(false), @@ -207,4 +213,8 @@ JsonValue ActivityTaskScheduledEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ActivityTaskStartedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ActivityTaskStartedEventAttributes.cpp index 014fab57d77..a0042cdeffc 100644 --- a/aws-cpp-sdk-swf/source/model/ActivityTaskStartedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ActivityTaskStartedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ActivityTaskStartedEventAttributes::ActivityTaskStartedEventAttributes() : m_identityHasBeenSet(false), m_scheduledEventId(0), @@ -72,4 +78,8 @@ JsonValue ActivityTaskStartedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ActivityTaskTimedOutEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ActivityTaskTimedOutEventAttributes.cpp index 7f02c19b52e..9fc4875f439 100644 --- a/aws-cpp-sdk-swf/source/model/ActivityTaskTimedOutEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ActivityTaskTimedOutEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ActivityTaskTimedOutEventAttributes::ActivityTaskTimedOutEventAttributes() : m_timeoutTypeHasBeenSet(false), m_scheduledEventId(0), @@ -103,4 +109,8 @@ JsonValue ActivityTaskTimedOutEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ActivityTaskTimeoutType.cpp b/aws-cpp-sdk-swf/source/model/ActivityTaskTimeoutType.cpp index 41df112911a..0d13151066e 100644 --- a/aws-cpp-sdk-swf/source/model/ActivityTaskTimeoutType.cpp +++ b/aws-cpp-sdk-swf/source/model/ActivityTaskTimeoutType.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int START_TO_CLOSE_HASH = HashingUtils::HashString("START_TO_CLOSE"); -static const int SCHEDULE_TO_START_HASH = HashingUtils::HashString("SCHEDULE_TO_START"); -static const int SCHEDULE_TO_CLOSE_HASH = HashingUtils::HashString("SCHEDULE_TO_CLOSE"); -static const int HEARTBEAT_HASH = HashingUtils::HashString("HEARTBEAT"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace ActivityTaskTimeoutTypeMapper { + static const int START_TO_CLOSE_HASH = HashingUtils::HashString("START_TO_CLOSE"); + static const int SCHEDULE_TO_START_HASH = HashingUtils::HashString("SCHEDULE_TO_START"); + static const int SCHEDULE_TO_CLOSE_HASH = HashingUtils::HashString("SCHEDULE_TO_CLOSE"); + static const int HEARTBEAT_HASH = HashingUtils::HashString("HEARTBEAT"); + ActivityTaskTimeoutType GetActivityTaskTimeoutTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/ActivityType.cpp b/aws-cpp-sdk-swf/source/model/ActivityType.cpp index e0817e1023d..c6ff906eef1 100644 --- a/aws-cpp-sdk-swf/source/model/ActivityType.cpp +++ b/aws-cpp-sdk-swf/source/model/ActivityType.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ActivityType::ActivityType() : m_nameHasBeenSet(false), m_versionHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue ActivityType::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ActivityTypeConfiguration.cpp b/aws-cpp-sdk-swf/source/model/ActivityTypeConfiguration.cpp index 5f218cc70b4..12e1d647337 100644 --- a/aws-cpp-sdk-swf/source/model/ActivityTypeConfiguration.cpp +++ b/aws-cpp-sdk-swf/source/model/ActivityTypeConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ActivityTypeConfiguration::ActivityTypeConfiguration() : m_defaultTaskStartToCloseTimeoutHasBeenSet(false), m_defaultTaskHeartbeatTimeoutHasBeenSet(false), @@ -130,4 +136,8 @@ JsonValue ActivityTypeConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ActivityTypeInfo.cpp b/aws-cpp-sdk-swf/source/model/ActivityTypeInfo.cpp index 6bb6d0e5d3e..d1d15746f0c 100644 --- a/aws-cpp-sdk-swf/source/model/ActivityTypeInfo.cpp +++ b/aws-cpp-sdk-swf/source/model/ActivityTypeInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ActivityTypeInfo::ActivityTypeInfo() : m_activityTypeHasBeenSet(false), m_statusHasBeenSet(false), @@ -112,4 +118,8 @@ JsonValue ActivityTypeInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws diff --git a/aws-cpp-sdk-swf/source/model/CancelTimerDecisionAttributes.cpp b/aws-cpp-sdk-swf/source/model/CancelTimerDecisionAttributes.cpp index 60438f8a78e..8ecceb289dd 100644 --- a/aws-cpp-sdk-swf/source/model/CancelTimerDecisionAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/CancelTimerDecisionAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + CancelTimerDecisionAttributes::CancelTimerDecisionAttributes() : m_timerIdHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue CancelTimerDecisionAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/CancelTimerFailedCause.cpp b/aws-cpp-sdk-swf/source/model/CancelTimerFailedCause.cpp index fbfe032b44b..6d91b559660 100644 --- a/aws-cpp-sdk-swf/source/model/CancelTimerFailedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/CancelTimerFailedCause.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int TIMER_ID_UNKNOWN_HASH = HashingUtils::HashString("TIMER_ID_UNKNOWN"); -static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace CancelTimerFailedCauseMapper { + static const int TIMER_ID_UNKNOWN_HASH = HashingUtils::HashString("TIMER_ID_UNKNOWN"); + static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); + CancelTimerFailedCause GetCancelTimerFailedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/CancelTimerFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/CancelTimerFailedEventAttributes.cpp index 4e85b00ebe4..edbefc211c0 100644 --- a/aws-cpp-sdk-swf/source/model/CancelTimerFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/CancelTimerFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + CancelTimerFailedEventAttributes::CancelTimerFailedEventAttributes() : m_timerIdHasBeenSet(false), m_causeHasBeenSet(false), @@ -86,4 +92,8 @@ JsonValue CancelTimerFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/CancelWorkflowExecutionDecisionAttributes.cpp b/aws-cpp-sdk-swf/source/model/CancelWorkflowExecutionDecisionAttributes.cpp index 1d66e9e9fea..254c9ae8da1 100644 --- a/aws-cpp-sdk-swf/source/model/CancelWorkflowExecutionDecisionAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/CancelWorkflowExecutionDecisionAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + CancelWorkflowExecutionDecisionAttributes::CancelWorkflowExecutionDecisionAttributes() : m_detailsHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue CancelWorkflowExecutionDecisionAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/CancelWorkflowExecutionFailedCause.cpp b/aws-cpp-sdk-swf/source/model/CancelWorkflowExecutionFailedCause.cpp index 4681d7133d4..85fcd50d3bd 100644 --- a/aws-cpp-sdk-swf/source/model/CancelWorkflowExecutionFailedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/CancelWorkflowExecutionFailedCause.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int UNHANDLED_DECISION_HASH = HashingUtils::HashString("UNHANDLED_DECISION"); -static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace CancelWorkflowExecutionFailedCauseMapper { + static const int UNHANDLED_DECISION_HASH = HashingUtils::HashString("UNHANDLED_DECISION"); + static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); + CancelWorkflowExecutionFailedCause GetCancelWorkflowExecutionFailedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/CancelWorkflowExecutionFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/CancelWorkflowExecutionFailedEventAttributes.cpp index 59dd31ad3cd..f43a0a74363 100644 --- a/aws-cpp-sdk-swf/source/model/CancelWorkflowExecutionFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/CancelWorkflowExecutionFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + CancelWorkflowExecutionFailedEventAttributes::CancelWorkflowExecutionFailedEventAttributes() : m_causeHasBeenSet(false), m_decisionTaskCompletedEventId(0), @@ -71,4 +77,8 @@ JsonValue CancelWorkflowExecutionFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ChildPolicy.cpp b/aws-cpp-sdk-swf/source/model/ChildPolicy.cpp index e62bffb5a2d..66f25a07908 100644 --- a/aws-cpp-sdk-swf/source/model/ChildPolicy.cpp +++ b/aws-cpp-sdk-swf/source/model/ChildPolicy.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int TERMINATE_HASH = HashingUtils::HashString("TERMINATE"); -static const int REQUEST_CANCEL_HASH = HashingUtils::HashString("REQUEST_CANCEL"); -static const int ABANDON_HASH = HashingUtils::HashString("ABANDON"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ChildPolicyMapper { + static const int TERMINATE_HASH = HashingUtils::HashString("TERMINATE"); + static const int REQUEST_CANCEL_HASH = HashingUtils::HashString("REQUEST_CANCEL"); + static const int ABANDON_HASH = HashingUtils::HashString("ABANDON"); + ChildPolicy GetChildPolicyForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionCanceledEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionCanceledEventAttributes.cpp index eb24dccfe9a..1662316bb01 100644 --- a/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionCanceledEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionCanceledEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ChildWorkflowExecutionCanceledEventAttributes::ChildWorkflowExecutionCanceledEventAttributes() : m_workflowExecutionHasBeenSet(false), m_workflowTypeHasBeenSet(false), @@ -119,4 +125,8 @@ JsonValue ChildWorkflowExecutionCanceledEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionCompletedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionCompletedEventAttributes.cpp index e9ed70baad2..3e5994c0222 100644 --- a/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionCompletedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionCompletedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ChildWorkflowExecutionCompletedEventAttributes::ChildWorkflowExecutionCompletedEventAttributes() : m_workflowExecutionHasBeenSet(false), m_workflowTypeHasBeenSet(false), @@ -119,4 +125,8 @@ JsonValue ChildWorkflowExecutionCompletedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionFailedEventAttributes.cpp index aae5432cc6d..f77fea99a0d 100644 --- a/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ChildWorkflowExecutionFailedEventAttributes::ChildWorkflowExecutionFailedEventAttributes() : m_workflowExecutionHasBeenSet(false), m_workflowTypeHasBeenSet(false), @@ -134,4 +140,8 @@ JsonValue ChildWorkflowExecutionFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionStartedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionStartedEventAttributes.cpp index 4e7882ff821..7bff76dee19 100644 --- a/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionStartedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionStartedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ChildWorkflowExecutionStartedEventAttributes::ChildWorkflowExecutionStartedEventAttributes() : m_workflowExecutionHasBeenSet(false), m_workflowTypeHasBeenSet(false), @@ -87,4 +93,8 @@ JsonValue ChildWorkflowExecutionStartedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionTerminatedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionTerminatedEventAttributes.cpp index f3df351a5d5..a7a25edd750 100644 --- a/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionTerminatedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionTerminatedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ChildWorkflowExecutionTerminatedEventAttributes::ChildWorkflowExecutionTerminatedEventAttributes() : m_workflowExecutionHasBeenSet(false), m_workflowTypeHasBeenSet(false), @@ -104,4 +110,8 @@ JsonValue ChildWorkflowExecutionTerminatedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionTimedOutEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionTimedOutEventAttributes.cpp index 0b06d908a33..a0dc6b81548 100644 --- a/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionTimedOutEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ChildWorkflowExecutionTimedOutEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ChildWorkflowExecutionTimedOutEventAttributes::ChildWorkflowExecutionTimedOutEventAttributes() : m_workflowExecutionHasBeenSet(false), m_workflowTypeHasBeenSet(false), @@ -118,4 +124,8 @@ JsonValue ChildWorkflowExecutionTimedOutEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/CloseStatus.cpp b/aws-cpp-sdk-swf/source/model/CloseStatus.cpp index 4d31480e637..251111a07e3 100644 --- a/aws-cpp-sdk-swf/source/model/CloseStatus.cpp +++ b/aws-cpp-sdk-swf/source/model/CloseStatus.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); -static const int FAILED_HASH = HashingUtils::HashString("FAILED"); -static const int CANCELED_HASH = HashingUtils::HashString("CANCELED"); -static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); -static const int CONTINUED_AS_NEW_HASH = HashingUtils::HashString("CONTINUED_AS_NEW"); -static const int TIMED_OUT_HASH = HashingUtils::HashString("TIMED_OUT"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace CloseStatusMapper { + static const int COMPLETED_HASH = HashingUtils::HashString("COMPLETED"); + static const int FAILED_HASH = HashingUtils::HashString("FAILED"); + static const int CANCELED_HASH = HashingUtils::HashString("CANCELED"); + static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); + static const int CONTINUED_AS_NEW_HASH = HashingUtils::HashString("CONTINUED_AS_NEW"); + static const int TIMED_OUT_HASH = HashingUtils::HashString("TIMED_OUT"); + CloseStatus GetCloseStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/CloseStatusFilter.cpp b/aws-cpp-sdk-swf/source/model/CloseStatusFilter.cpp index f4670c3726b..6960c69288e 100644 --- a/aws-cpp-sdk-swf/source/model/CloseStatusFilter.cpp +++ b/aws-cpp-sdk-swf/source/model/CloseStatusFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + CloseStatusFilter::CloseStatusFilter() : m_statusHasBeenSet(false) { @@ -54,4 +60,8 @@ JsonValue CloseStatusFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/CompleteWorkflowExecutionDecisionAttributes.cpp b/aws-cpp-sdk-swf/source/model/CompleteWorkflowExecutionDecisionAttributes.cpp index 1f192bb1953..92cdf6a0348 100644 --- a/aws-cpp-sdk-swf/source/model/CompleteWorkflowExecutionDecisionAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/CompleteWorkflowExecutionDecisionAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + CompleteWorkflowExecutionDecisionAttributes::CompleteWorkflowExecutionDecisionAttributes() : m_resultHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue CompleteWorkflowExecutionDecisionAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/CompleteWorkflowExecutionFailedCause.cpp b/aws-cpp-sdk-swf/source/model/CompleteWorkflowExecutionFailedCause.cpp index 2256b264ed9..f6c2e2328b2 100644 --- a/aws-cpp-sdk-swf/source/model/CompleteWorkflowExecutionFailedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/CompleteWorkflowExecutionFailedCause.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int UNHANDLED_DECISION_HASH = HashingUtils::HashString("UNHANDLED_DECISION"); -static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace CompleteWorkflowExecutionFailedCauseMapper { + static const int UNHANDLED_DECISION_HASH = HashingUtils::HashString("UNHANDLED_DECISION"); + static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); + CompleteWorkflowExecutionFailedCause GetCompleteWorkflowExecutionFailedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/CompleteWorkflowExecutionFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/CompleteWorkflowExecutionFailedEventAttributes.cpp index 81a5531444b..61be8d47c55 100644 --- a/aws-cpp-sdk-swf/source/model/CompleteWorkflowExecutionFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/CompleteWorkflowExecutionFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + CompleteWorkflowExecutionFailedEventAttributes::CompleteWorkflowExecutionFailedEventAttributes() : m_causeHasBeenSet(false), m_decisionTaskCompletedEventId(0), @@ -71,4 +77,8 @@ JsonValue CompleteWorkflowExecutionFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ContinueAsNewWorkflowExecutionDecisionAttributes.cpp b/aws-cpp-sdk-swf/source/model/ContinueAsNewWorkflowExecutionDecisionAttributes.cpp index 17d5041ab76..bcd750dcb71 100644 --- a/aws-cpp-sdk-swf/source/model/ContinueAsNewWorkflowExecutionDecisionAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ContinueAsNewWorkflowExecutionDecisionAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ContinueAsNewWorkflowExecutionDecisionAttributes::ContinueAsNewWorkflowExecutionDecisionAttributes() : m_inputHasBeenSet(false), m_executionStartToCloseTimeoutHasBeenSet(false), @@ -182,4 +188,8 @@ JsonValue ContinueAsNewWorkflowExecutionDecisionAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ContinueAsNewWorkflowExecutionFailedCause.cpp b/aws-cpp-sdk-swf/source/model/ContinueAsNewWorkflowExecutionFailedCause.cpp index e794705f6cd..a194a5572c6 100644 --- a/aws-cpp-sdk-swf/source/model/ContinueAsNewWorkflowExecutionFailedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/ContinueAsNewWorkflowExecutionFailedCause.cpp @@ -19,15 +19,6 @@ using namespace Aws::Utils; -static const int UNHANDLED_DECISION_HASH = HashingUtils::HashString("UNHANDLED_DECISION"); -static const int WORKFLOW_TYPE_DEPRECATED_HASH = HashingUtils::HashString("WORKFLOW_TYPE_DEPRECATED"); -static const int WORKFLOW_TYPE_DOES_NOT_EXIST_HASH = HashingUtils::HashString("WORKFLOW_TYPE_DOES_NOT_EXIST"); -static const int DEFAULT_EXECUTION_START_TO_CLOSE_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_EXECUTION_START_TO_CLOSE_TIMEOUT_UNDEFINED"); -static const int DEFAULT_TASK_START_TO_CLOSE_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_TASK_START_TO_CLOSE_TIMEOUT_UNDEFINED"); -static const int DEFAULT_TASK_LIST_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_TASK_LIST_UNDEFINED"); -static const int DEFAULT_CHILD_POLICY_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_CHILD_POLICY_UNDEFINED"); -static const int CONTINUE_AS_NEW_WORKFLOW_EXECUTION_RATE_EXCEEDED_HASH = HashingUtils::HashString("CONTINUE_AS_NEW_WORKFLOW_EXECUTION_RATE_EXCEEDED"); -static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); namespace Aws { @@ -38,6 +29,16 @@ namespace Aws namespace ContinueAsNewWorkflowExecutionFailedCauseMapper { + static const int UNHANDLED_DECISION_HASH = HashingUtils::HashString("UNHANDLED_DECISION"); + static const int WORKFLOW_TYPE_DEPRECATED_HASH = HashingUtils::HashString("WORKFLOW_TYPE_DEPRECATED"); + static const int WORKFLOW_TYPE_DOES_NOT_EXIST_HASH = HashingUtils::HashString("WORKFLOW_TYPE_DOES_NOT_EXIST"); + static const int DEFAULT_EXECUTION_START_TO_CLOSE_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_EXECUTION_START_TO_CLOSE_TIMEOUT_UNDEFINED"); + static const int DEFAULT_TASK_START_TO_CLOSE_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_TASK_START_TO_CLOSE_TIMEOUT_UNDEFINED"); + static const int DEFAULT_TASK_LIST_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_TASK_LIST_UNDEFINED"); + static const int DEFAULT_CHILD_POLICY_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_CHILD_POLICY_UNDEFINED"); + static const int CONTINUE_AS_NEW_WORKFLOW_EXECUTION_RATE_EXCEEDED_HASH = HashingUtils::HashString("CONTINUE_AS_NEW_WORKFLOW_EXECUTION_RATE_EXCEEDED"); + static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); + ContinueAsNewWorkflowExecutionFailedCause GetContinueAsNewWorkflowExecutionFailedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/ContinueAsNewWorkflowExecutionFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ContinueAsNewWorkflowExecutionFailedEventAttributes.cpp index c536998ab83..09b8c73ab88 100644 --- a/aws-cpp-sdk-swf/source/model/ContinueAsNewWorkflowExecutionFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ContinueAsNewWorkflowExecutionFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ContinueAsNewWorkflowExecutionFailedEventAttributes::ContinueAsNewWorkflowExecutionFailedEventAttributes() : m_causeHasBeenSet(false), m_decisionTaskCompletedEventId(0), @@ -71,4 +77,8 @@ JsonValue ContinueAsNewWorkflowExecutionFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/Decision.cpp b/aws-cpp-sdk-swf/source/model/Decision.cpp index d44cc4691bf..1709e32dc94 100644 --- a/aws-cpp-sdk-swf/source/model/Decision.cpp +++ b/aws-cpp-sdk-swf/source/model/Decision.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + Decision::Decision() : m_decisionTypeHasBeenSet(false), m_scheduleActivityTaskDecisionAttributesHasBeenSet(false), @@ -249,4 +255,8 @@ JsonValue Decision::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/DecisionTaskCompletedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/DecisionTaskCompletedEventAttributes.cpp index 421df4cec53..e148d164605 100644 --- a/aws-cpp-sdk-swf/source/model/DecisionTaskCompletedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/DecisionTaskCompletedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + DecisionTaskCompletedEventAttributes::DecisionTaskCompletedEventAttributes() : m_executionContextHasBeenSet(false), m_scheduledEventId(0), @@ -89,4 +95,8 @@ JsonValue DecisionTaskCompletedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/DecisionTaskScheduledEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/DecisionTaskScheduledEventAttributes.cpp index 9876e379d8e..82218d26197 100644 --- a/aws-cpp-sdk-swf/source/model/DecisionTaskScheduledEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/DecisionTaskScheduledEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + DecisionTaskScheduledEventAttributes::DecisionTaskScheduledEventAttributes() : m_taskListHasBeenSet(false), m_taskPriorityHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue DecisionTaskScheduledEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/DecisionTaskStartedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/DecisionTaskStartedEventAttributes.cpp index 9523e6e2c79..dad0a47571d 100644 --- a/aws-cpp-sdk-swf/source/model/DecisionTaskStartedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/DecisionTaskStartedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + DecisionTaskStartedEventAttributes::DecisionTaskStartedEventAttributes() : m_identityHasBeenSet(false), m_scheduledEventId(0), @@ -72,4 +78,8 @@ JsonValue DecisionTaskStartedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/DecisionTaskTimedOutEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/DecisionTaskTimedOutEventAttributes.cpp index ac02d3c3e51..9d7ff50c7bd 100644 --- a/aws-cpp-sdk-swf/source/model/DecisionTaskTimedOutEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/DecisionTaskTimedOutEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + DecisionTaskTimedOutEventAttributes::DecisionTaskTimedOutEventAttributes() : m_timeoutTypeHasBeenSet(false), m_scheduledEventId(0), @@ -88,4 +94,8 @@ JsonValue DecisionTaskTimedOutEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/DecisionTaskTimeoutType.cpp b/aws-cpp-sdk-swf/source/model/DecisionTaskTimeoutType.cpp index 6d6b0eb7a89..83e31b33452 100644 --- a/aws-cpp-sdk-swf/source/model/DecisionTaskTimeoutType.cpp +++ b/aws-cpp-sdk-swf/source/model/DecisionTaskTimeoutType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int START_TO_CLOSE_HASH = HashingUtils::HashString("START_TO_CLOSE"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace DecisionTaskTimeoutTypeMapper { + static const int START_TO_CLOSE_HASH = HashingUtils::HashString("START_TO_CLOSE"); + DecisionTaskTimeoutType GetDecisionTaskTimeoutTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/DecisionType.cpp b/aws-cpp-sdk-swf/source/model/DecisionType.cpp index 61bae8697e8..00c32e2329e 100644 --- a/aws-cpp-sdk-swf/source/model/DecisionType.cpp +++ b/aws-cpp-sdk-swf/source/model/DecisionType.cpp @@ -19,19 +19,6 @@ using namespace Aws::Utils; -static const int ScheduleActivityTask_HASH = HashingUtils::HashString("ScheduleActivityTask"); -static const int RequestCancelActivityTask_HASH = HashingUtils::HashString("RequestCancelActivityTask"); -static const int CompleteWorkflowExecution_HASH = HashingUtils::HashString("CompleteWorkflowExecution"); -static const int FailWorkflowExecution_HASH = HashingUtils::HashString("FailWorkflowExecution"); -static const int CancelWorkflowExecution_HASH = HashingUtils::HashString("CancelWorkflowExecution"); -static const int ContinueAsNewWorkflowExecution_HASH = HashingUtils::HashString("ContinueAsNewWorkflowExecution"); -static const int RecordMarker_HASH = HashingUtils::HashString("RecordMarker"); -static const int StartTimer_HASH = HashingUtils::HashString("StartTimer"); -static const int CancelTimer_HASH = HashingUtils::HashString("CancelTimer"); -static const int SignalExternalWorkflowExecution_HASH = HashingUtils::HashString("SignalExternalWorkflowExecution"); -static const int RequestCancelExternalWorkflowExecution_HASH = HashingUtils::HashString("RequestCancelExternalWorkflowExecution"); -static const int StartChildWorkflowExecution_HASH = HashingUtils::HashString("StartChildWorkflowExecution"); -static const int ScheduleLambdaFunction_HASH = HashingUtils::HashString("ScheduleLambdaFunction"); namespace Aws { @@ -42,6 +29,20 @@ namespace Aws namespace DecisionTypeMapper { + static const int ScheduleActivityTask_HASH = HashingUtils::HashString("ScheduleActivityTask"); + static const int RequestCancelActivityTask_HASH = HashingUtils::HashString("RequestCancelActivityTask"); + static const int CompleteWorkflowExecution_HASH = HashingUtils::HashString("CompleteWorkflowExecution"); + static const int FailWorkflowExecution_HASH = HashingUtils::HashString("FailWorkflowExecution"); + static const int CancelWorkflowExecution_HASH = HashingUtils::HashString("CancelWorkflowExecution"); + static const int ContinueAsNewWorkflowExecution_HASH = HashingUtils::HashString("ContinueAsNewWorkflowExecution"); + static const int RecordMarker_HASH = HashingUtils::HashString("RecordMarker"); + static const int StartTimer_HASH = HashingUtils::HashString("StartTimer"); + static const int CancelTimer_HASH = HashingUtils::HashString("CancelTimer"); + static const int SignalExternalWorkflowExecution_HASH = HashingUtils::HashString("SignalExternalWorkflowExecution"); + static const int RequestCancelExternalWorkflowExecution_HASH = HashingUtils::HashString("RequestCancelExternalWorkflowExecution"); + static const int StartChildWorkflowExecution_HASH = HashingUtils::HashString("StartChildWorkflowExecution"); + static const int ScheduleLambdaFunction_HASH = HashingUtils::HashString("ScheduleLambdaFunction"); + DecisionType GetDecisionTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/DomainConfiguration.cpp b/aws-cpp-sdk-swf/source/model/DomainConfiguration.cpp index bad420476c9..d782d3d7127 100644 --- a/aws-cpp-sdk-swf/source/model/DomainConfiguration.cpp +++ b/aws-cpp-sdk-swf/source/model/DomainConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + DomainConfiguration::DomainConfiguration() : m_workflowExecutionRetentionPeriodInDaysHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue DomainConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/DomainInfo.cpp b/aws-cpp-sdk-swf/source/model/DomainInfo.cpp index 1b90c39f42e..2f4f0393171 100644 --- a/aws-cpp-sdk-swf/source/model/DomainInfo.cpp +++ b/aws-cpp-sdk-swf/source/model/DomainInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + DomainInfo::DomainInfo() : m_nameHasBeenSet(false), m_statusHasBeenSet(false), @@ -84,4 +90,8 @@ JsonValue DomainInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/EventType.cpp b/aws-cpp-sdk-swf/source/model/EventType.cpp index da4ab2a2700..d2ed67aef7c 100644 --- a/aws-cpp-sdk-swf/source/model/EventType.cpp +++ b/aws-cpp-sdk-swf/source/model/EventType.cpp @@ -19,60 +19,6 @@ using namespace Aws::Utils; -static const int WorkflowExecutionStarted_HASH = HashingUtils::HashString("WorkflowExecutionStarted"); -static const int WorkflowExecutionCancelRequested_HASH = HashingUtils::HashString("WorkflowExecutionCancelRequested"); -static const int WorkflowExecutionCompleted_HASH = HashingUtils::HashString("WorkflowExecutionCompleted"); -static const int CompleteWorkflowExecutionFailed_HASH = HashingUtils::HashString("CompleteWorkflowExecutionFailed"); -static const int WorkflowExecutionFailed_HASH = HashingUtils::HashString("WorkflowExecutionFailed"); -static const int FailWorkflowExecutionFailed_HASH = HashingUtils::HashString("FailWorkflowExecutionFailed"); -static const int WorkflowExecutionTimedOut_HASH = HashingUtils::HashString("WorkflowExecutionTimedOut"); -static const int WorkflowExecutionCanceled_HASH = HashingUtils::HashString("WorkflowExecutionCanceled"); -static const int CancelWorkflowExecutionFailed_HASH = HashingUtils::HashString("CancelWorkflowExecutionFailed"); -static const int WorkflowExecutionContinuedAsNew_HASH = HashingUtils::HashString("WorkflowExecutionContinuedAsNew"); -static const int ContinueAsNewWorkflowExecutionFailed_HASH = HashingUtils::HashString("ContinueAsNewWorkflowExecutionFailed"); -static const int WorkflowExecutionTerminated_HASH = HashingUtils::HashString("WorkflowExecutionTerminated"); -static const int DecisionTaskScheduled_HASH = HashingUtils::HashString("DecisionTaskScheduled"); -static const int DecisionTaskStarted_HASH = HashingUtils::HashString("DecisionTaskStarted"); -static const int DecisionTaskCompleted_HASH = HashingUtils::HashString("DecisionTaskCompleted"); -static const int DecisionTaskTimedOut_HASH = HashingUtils::HashString("DecisionTaskTimedOut"); -static const int ActivityTaskScheduled_HASH = HashingUtils::HashString("ActivityTaskScheduled"); -static const int ScheduleActivityTaskFailed_HASH = HashingUtils::HashString("ScheduleActivityTaskFailed"); -static const int ActivityTaskStarted_HASH = HashingUtils::HashString("ActivityTaskStarted"); -static const int ActivityTaskCompleted_HASH = HashingUtils::HashString("ActivityTaskCompleted"); -static const int ActivityTaskFailed_HASH = HashingUtils::HashString("ActivityTaskFailed"); -static const int ActivityTaskTimedOut_HASH = HashingUtils::HashString("ActivityTaskTimedOut"); -static const int ActivityTaskCanceled_HASH = HashingUtils::HashString("ActivityTaskCanceled"); -static const int ActivityTaskCancelRequested_HASH = HashingUtils::HashString("ActivityTaskCancelRequested"); -static const int RequestCancelActivityTaskFailed_HASH = HashingUtils::HashString("RequestCancelActivityTaskFailed"); -static const int WorkflowExecutionSignaled_HASH = HashingUtils::HashString("WorkflowExecutionSignaled"); -static const int MarkerRecorded_HASH = HashingUtils::HashString("MarkerRecorded"); -static const int RecordMarkerFailed_HASH = HashingUtils::HashString("RecordMarkerFailed"); -static const int TimerStarted_HASH = HashingUtils::HashString("TimerStarted"); -static const int StartTimerFailed_HASH = HashingUtils::HashString("StartTimerFailed"); -static const int TimerFired_HASH = HashingUtils::HashString("TimerFired"); -static const int TimerCanceled_HASH = HashingUtils::HashString("TimerCanceled"); -static const int CancelTimerFailed_HASH = HashingUtils::HashString("CancelTimerFailed"); -static const int StartChildWorkflowExecutionInitiated_HASH = HashingUtils::HashString("StartChildWorkflowExecutionInitiated"); -static const int StartChildWorkflowExecutionFailed_HASH = HashingUtils::HashString("StartChildWorkflowExecutionFailed"); -static const int ChildWorkflowExecutionStarted_HASH = HashingUtils::HashString("ChildWorkflowExecutionStarted"); -static const int ChildWorkflowExecutionCompleted_HASH = HashingUtils::HashString("ChildWorkflowExecutionCompleted"); -static const int ChildWorkflowExecutionFailed_HASH = HashingUtils::HashString("ChildWorkflowExecutionFailed"); -static const int ChildWorkflowExecutionTimedOut_HASH = HashingUtils::HashString("ChildWorkflowExecutionTimedOut"); -static const int ChildWorkflowExecutionCanceled_HASH = HashingUtils::HashString("ChildWorkflowExecutionCanceled"); -static const int ChildWorkflowExecutionTerminated_HASH = HashingUtils::HashString("ChildWorkflowExecutionTerminated"); -static const int SignalExternalWorkflowExecutionInitiated_HASH = HashingUtils::HashString("SignalExternalWorkflowExecutionInitiated"); -static const int SignalExternalWorkflowExecutionFailed_HASH = HashingUtils::HashString("SignalExternalWorkflowExecutionFailed"); -static const int ExternalWorkflowExecutionSignaled_HASH = HashingUtils::HashString("ExternalWorkflowExecutionSignaled"); -static const int RequestCancelExternalWorkflowExecutionInitiated_HASH = HashingUtils::HashString("RequestCancelExternalWorkflowExecutionInitiated"); -static const int RequestCancelExternalWorkflowExecutionFailed_HASH = HashingUtils::HashString("RequestCancelExternalWorkflowExecutionFailed"); -static const int ExternalWorkflowExecutionCancelRequested_HASH = HashingUtils::HashString("ExternalWorkflowExecutionCancelRequested"); -static const int LambdaFunctionScheduled_HASH = HashingUtils::HashString("LambdaFunctionScheduled"); -static const int LambdaFunctionStarted_HASH = HashingUtils::HashString("LambdaFunctionStarted"); -static const int LambdaFunctionCompleted_HASH = HashingUtils::HashString("LambdaFunctionCompleted"); -static const int LambdaFunctionFailed_HASH = HashingUtils::HashString("LambdaFunctionFailed"); -static const int LambdaFunctionTimedOut_HASH = HashingUtils::HashString("LambdaFunctionTimedOut"); -static const int ScheduleLambdaFunctionFailed_HASH = HashingUtils::HashString("ScheduleLambdaFunctionFailed"); -static const int StartLambdaFunctionFailed_HASH = HashingUtils::HashString("StartLambdaFunctionFailed"); namespace Aws { @@ -83,6 +29,61 @@ namespace Aws namespace EventTypeMapper { + static const int WorkflowExecutionStarted_HASH = HashingUtils::HashString("WorkflowExecutionStarted"); + static const int WorkflowExecutionCancelRequested_HASH = HashingUtils::HashString("WorkflowExecutionCancelRequested"); + static const int WorkflowExecutionCompleted_HASH = HashingUtils::HashString("WorkflowExecutionCompleted"); + static const int CompleteWorkflowExecutionFailed_HASH = HashingUtils::HashString("CompleteWorkflowExecutionFailed"); + static const int WorkflowExecutionFailed_HASH = HashingUtils::HashString("WorkflowExecutionFailed"); + static const int FailWorkflowExecutionFailed_HASH = HashingUtils::HashString("FailWorkflowExecutionFailed"); + static const int WorkflowExecutionTimedOut_HASH = HashingUtils::HashString("WorkflowExecutionTimedOut"); + static const int WorkflowExecutionCanceled_HASH = HashingUtils::HashString("WorkflowExecutionCanceled"); + static const int CancelWorkflowExecutionFailed_HASH = HashingUtils::HashString("CancelWorkflowExecutionFailed"); + static const int WorkflowExecutionContinuedAsNew_HASH = HashingUtils::HashString("WorkflowExecutionContinuedAsNew"); + static const int ContinueAsNewWorkflowExecutionFailed_HASH = HashingUtils::HashString("ContinueAsNewWorkflowExecutionFailed"); + static const int WorkflowExecutionTerminated_HASH = HashingUtils::HashString("WorkflowExecutionTerminated"); + static const int DecisionTaskScheduled_HASH = HashingUtils::HashString("DecisionTaskScheduled"); + static const int DecisionTaskStarted_HASH = HashingUtils::HashString("DecisionTaskStarted"); + static const int DecisionTaskCompleted_HASH = HashingUtils::HashString("DecisionTaskCompleted"); + static const int DecisionTaskTimedOut_HASH = HashingUtils::HashString("DecisionTaskTimedOut"); + static const int ActivityTaskScheduled_HASH = HashingUtils::HashString("ActivityTaskScheduled"); + static const int ScheduleActivityTaskFailed_HASH = HashingUtils::HashString("ScheduleActivityTaskFailed"); + static const int ActivityTaskStarted_HASH = HashingUtils::HashString("ActivityTaskStarted"); + static const int ActivityTaskCompleted_HASH = HashingUtils::HashString("ActivityTaskCompleted"); + static const int ActivityTaskFailed_HASH = HashingUtils::HashString("ActivityTaskFailed"); + static const int ActivityTaskTimedOut_HASH = HashingUtils::HashString("ActivityTaskTimedOut"); + static const int ActivityTaskCanceled_HASH = HashingUtils::HashString("ActivityTaskCanceled"); + static const int ActivityTaskCancelRequested_HASH = HashingUtils::HashString("ActivityTaskCancelRequested"); + static const int RequestCancelActivityTaskFailed_HASH = HashingUtils::HashString("RequestCancelActivityTaskFailed"); + static const int WorkflowExecutionSignaled_HASH = HashingUtils::HashString("WorkflowExecutionSignaled"); + static const int MarkerRecorded_HASH = HashingUtils::HashString("MarkerRecorded"); + static const int RecordMarkerFailed_HASH = HashingUtils::HashString("RecordMarkerFailed"); + static const int TimerStarted_HASH = HashingUtils::HashString("TimerStarted"); + static const int StartTimerFailed_HASH = HashingUtils::HashString("StartTimerFailed"); + static const int TimerFired_HASH = HashingUtils::HashString("TimerFired"); + static const int TimerCanceled_HASH = HashingUtils::HashString("TimerCanceled"); + static const int CancelTimerFailed_HASH = HashingUtils::HashString("CancelTimerFailed"); + static const int StartChildWorkflowExecutionInitiated_HASH = HashingUtils::HashString("StartChildWorkflowExecutionInitiated"); + static const int StartChildWorkflowExecutionFailed_HASH = HashingUtils::HashString("StartChildWorkflowExecutionFailed"); + static const int ChildWorkflowExecutionStarted_HASH = HashingUtils::HashString("ChildWorkflowExecutionStarted"); + static const int ChildWorkflowExecutionCompleted_HASH = HashingUtils::HashString("ChildWorkflowExecutionCompleted"); + static const int ChildWorkflowExecutionFailed_HASH = HashingUtils::HashString("ChildWorkflowExecutionFailed"); + static const int ChildWorkflowExecutionTimedOut_HASH = HashingUtils::HashString("ChildWorkflowExecutionTimedOut"); + static const int ChildWorkflowExecutionCanceled_HASH = HashingUtils::HashString("ChildWorkflowExecutionCanceled"); + static const int ChildWorkflowExecutionTerminated_HASH = HashingUtils::HashString("ChildWorkflowExecutionTerminated"); + static const int SignalExternalWorkflowExecutionInitiated_HASH = HashingUtils::HashString("SignalExternalWorkflowExecutionInitiated"); + static const int SignalExternalWorkflowExecutionFailed_HASH = HashingUtils::HashString("SignalExternalWorkflowExecutionFailed"); + static const int ExternalWorkflowExecutionSignaled_HASH = HashingUtils::HashString("ExternalWorkflowExecutionSignaled"); + static const int RequestCancelExternalWorkflowExecutionInitiated_HASH = HashingUtils::HashString("RequestCancelExternalWorkflowExecutionInitiated"); + static const int RequestCancelExternalWorkflowExecutionFailed_HASH = HashingUtils::HashString("RequestCancelExternalWorkflowExecutionFailed"); + static const int ExternalWorkflowExecutionCancelRequested_HASH = HashingUtils::HashString("ExternalWorkflowExecutionCancelRequested"); + static const int LambdaFunctionScheduled_HASH = HashingUtils::HashString("LambdaFunctionScheduled"); + static const int LambdaFunctionStarted_HASH = HashingUtils::HashString("LambdaFunctionStarted"); + static const int LambdaFunctionCompleted_HASH = HashingUtils::HashString("LambdaFunctionCompleted"); + static const int LambdaFunctionFailed_HASH = HashingUtils::HashString("LambdaFunctionFailed"); + static const int LambdaFunctionTimedOut_HASH = HashingUtils::HashString("LambdaFunctionTimedOut"); + static const int ScheduleLambdaFunctionFailed_HASH = HashingUtils::HashString("ScheduleLambdaFunctionFailed"); + static const int StartLambdaFunctionFailed_HASH = HashingUtils::HashString("StartLambdaFunctionFailed"); + EventType GetEventTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/ExecutionStatus.cpp b/aws-cpp-sdk-swf/source/model/ExecutionStatus.cpp index 3de3e186671..794d2416a5e 100644 --- a/aws-cpp-sdk-swf/source/model/ExecutionStatus.cpp +++ b/aws-cpp-sdk-swf/source/model/ExecutionStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int OPEN_HASH = HashingUtils::HashString("OPEN"); -static const int CLOSED_HASH = HashingUtils::HashString("CLOSED"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ExecutionStatusMapper { + static const int OPEN_HASH = HashingUtils::HashString("OPEN"); + static const int CLOSED_HASH = HashingUtils::HashString("CLOSED"); + ExecutionStatus GetExecutionStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/ExecutionTimeFilter.cpp b/aws-cpp-sdk-swf/source/model/ExecutionTimeFilter.cpp index 3b35b1776d5..a7bdc944311 100644 --- a/aws-cpp-sdk-swf/source/model/ExecutionTimeFilter.cpp +++ b/aws-cpp-sdk-swf/source/model/ExecutionTimeFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ExecutionTimeFilter::ExecutionTimeFilter() : m_oldestDateHasBeenSet(false), m_latestDateHasBeenSet(false) @@ -68,4 +74,8 @@ JsonValue ExecutionTimeFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws diff --git a/aws-cpp-sdk-swf/source/model/ExternalWorkflowExecutionCancelRequestedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ExternalWorkflowExecutionCancelRequestedEventAttributes.cpp index 69b269a0972..09682047e56 100644 --- a/aws-cpp-sdk-swf/source/model/ExternalWorkflowExecutionCancelRequestedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ExternalWorkflowExecutionCancelRequestedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ExternalWorkflowExecutionCancelRequestedEventAttributes::ExternalWorkflowExecutionCancelRequestedEventAttributes() : m_workflowExecutionHasBeenSet(false), m_initiatedEventId(0), @@ -72,4 +78,8 @@ JsonValue ExternalWorkflowExecutionCancelRequestedEventAttributes::Jsonize() con } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ExternalWorkflowExecutionSignaledEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ExternalWorkflowExecutionSignaledEventAttributes.cpp index 7fe0e911404..6b8674a6107 100644 --- a/aws-cpp-sdk-swf/source/model/ExternalWorkflowExecutionSignaledEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ExternalWorkflowExecutionSignaledEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ExternalWorkflowExecutionSignaledEventAttributes::ExternalWorkflowExecutionSignaledEventAttributes() : m_workflowExecutionHasBeenSet(false), m_initiatedEventId(0), @@ -72,4 +78,8 @@ JsonValue ExternalWorkflowExecutionSignaledEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/FailWorkflowExecutionDecisionAttributes.cpp b/aws-cpp-sdk-swf/source/model/FailWorkflowExecutionDecisionAttributes.cpp index a4badcf4f41..1a34938b13d 100644 --- a/aws-cpp-sdk-swf/source/model/FailWorkflowExecutionDecisionAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/FailWorkflowExecutionDecisionAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + FailWorkflowExecutionDecisionAttributes::FailWorkflowExecutionDecisionAttributes() : m_reasonHasBeenSet(false), m_detailsHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue FailWorkflowExecutionDecisionAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/FailWorkflowExecutionFailedCause.cpp b/aws-cpp-sdk-swf/source/model/FailWorkflowExecutionFailedCause.cpp index 75162d0d9fd..0a3b48cbdb7 100644 --- a/aws-cpp-sdk-swf/source/model/FailWorkflowExecutionFailedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/FailWorkflowExecutionFailedCause.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int UNHANDLED_DECISION_HASH = HashingUtils::HashString("UNHANDLED_DECISION"); -static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace FailWorkflowExecutionFailedCauseMapper { + static const int UNHANDLED_DECISION_HASH = HashingUtils::HashString("UNHANDLED_DECISION"); + static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); + FailWorkflowExecutionFailedCause GetFailWorkflowExecutionFailedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/FailWorkflowExecutionFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/FailWorkflowExecutionFailedEventAttributes.cpp index 9ea4c7438b3..dd3282ed7db 100644 --- a/aws-cpp-sdk-swf/source/model/FailWorkflowExecutionFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/FailWorkflowExecutionFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + FailWorkflowExecutionFailedEventAttributes::FailWorkflowExecutionFailedEventAttributes() : m_causeHasBeenSet(false), m_decisionTaskCompletedEventId(0), @@ -71,4 +77,8 @@ JsonValue FailWorkflowExecutionFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/HistoryEvent.cpp b/aws-cpp-sdk-swf/source/model/HistoryEvent.cpp index 96b2add8a0e..0299613514e 100644 --- a/aws-cpp-sdk-swf/source/model/HistoryEvent.cpp +++ b/aws-cpp-sdk-swf/source/model/HistoryEvent.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + HistoryEvent::HistoryEvent() : m_eventTimestampHasBeenSet(false), m_eventTypeHasBeenSet(false), @@ -895,4 +901,8 @@ JsonValue HistoryEvent::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws diff --git a/aws-cpp-sdk-swf/source/model/LambdaFunctionCompletedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/LambdaFunctionCompletedEventAttributes.cpp index e91494d5a04..112fa0db0c9 100644 --- a/aws-cpp-sdk-swf/source/model/LambdaFunctionCompletedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/LambdaFunctionCompletedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + LambdaFunctionCompletedEventAttributes::LambdaFunctionCompletedEventAttributes() : m_scheduledEventId(0), m_scheduledEventIdHasBeenSet(false), @@ -89,4 +95,8 @@ JsonValue LambdaFunctionCompletedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/LambdaFunctionFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/LambdaFunctionFailedEventAttributes.cpp index 7b9d235d845..7026c02ddc8 100644 --- a/aws-cpp-sdk-swf/source/model/LambdaFunctionFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/LambdaFunctionFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + LambdaFunctionFailedEventAttributes::LambdaFunctionFailedEventAttributes() : m_scheduledEventId(0), m_scheduledEventIdHasBeenSet(false), @@ -104,4 +110,8 @@ JsonValue LambdaFunctionFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/LambdaFunctionScheduledEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/LambdaFunctionScheduledEventAttributes.cpp index 63a5603748d..60f6350d5fb 100644 --- a/aws-cpp-sdk-swf/source/model/LambdaFunctionScheduledEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/LambdaFunctionScheduledEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + LambdaFunctionScheduledEventAttributes::LambdaFunctionScheduledEventAttributes() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -117,4 +123,8 @@ JsonValue LambdaFunctionScheduledEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/LambdaFunctionStartedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/LambdaFunctionStartedEventAttributes.cpp index 1efc2edd38d..30ce85c3119 100644 --- a/aws-cpp-sdk-swf/source/model/LambdaFunctionStartedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/LambdaFunctionStartedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + LambdaFunctionStartedEventAttributes::LambdaFunctionStartedEventAttributes() : m_scheduledEventId(0), m_scheduledEventIdHasBeenSet(false) @@ -57,4 +63,8 @@ JsonValue LambdaFunctionStartedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/LambdaFunctionTimedOutEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/LambdaFunctionTimedOutEventAttributes.cpp index a31d8f89f44..a52caaa709f 100644 --- a/aws-cpp-sdk-swf/source/model/LambdaFunctionTimedOutEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/LambdaFunctionTimedOutEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + LambdaFunctionTimedOutEventAttributes::LambdaFunctionTimedOutEventAttributes() : m_scheduledEventId(0), m_scheduledEventIdHasBeenSet(false), @@ -88,4 +94,8 @@ JsonValue LambdaFunctionTimedOutEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/LambdaFunctionTimeoutType.cpp b/aws-cpp-sdk-swf/source/model/LambdaFunctionTimeoutType.cpp index cc23287d4f3..28793a04f46 100644 --- a/aws-cpp-sdk-swf/source/model/LambdaFunctionTimeoutType.cpp +++ b/aws-cpp-sdk-swf/source/model/LambdaFunctionTimeoutType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int START_TO_CLOSE_HASH = HashingUtils::HashString("START_TO_CLOSE"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace LambdaFunctionTimeoutTypeMapper { + static const int START_TO_CLOSE_HASH = HashingUtils::HashString("START_TO_CLOSE"); + LambdaFunctionTimeoutType GetLambdaFunctionTimeoutTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/MarkerRecordedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/MarkerRecordedEventAttributes.cpp index f67a4a73f65..2c62eebffd7 100644 --- a/aws-cpp-sdk-swf/source/model/MarkerRecordedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/MarkerRecordedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + MarkerRecordedEventAttributes::MarkerRecordedEventAttributes() : m_markerNameHasBeenSet(false), m_detailsHasBeenSet(false), @@ -87,4 +93,8 @@ JsonValue MarkerRecordedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/RecordMarkerDecisionAttributes.cpp b/aws-cpp-sdk-swf/source/model/RecordMarkerDecisionAttributes.cpp index 577e7c82cb3..71f1d683c91 100644 --- a/aws-cpp-sdk-swf/source/model/RecordMarkerDecisionAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/RecordMarkerDecisionAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + RecordMarkerDecisionAttributes::RecordMarkerDecisionAttributes() : m_markerNameHasBeenSet(false), m_detailsHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue RecordMarkerDecisionAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/RecordMarkerFailedCause.cpp b/aws-cpp-sdk-swf/source/model/RecordMarkerFailedCause.cpp index 2747d6a26a8..c2a9ddc4ad4 100644 --- a/aws-cpp-sdk-swf/source/model/RecordMarkerFailedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/RecordMarkerFailedCause.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace RecordMarkerFailedCauseMapper { + static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); + RecordMarkerFailedCause GetRecordMarkerFailedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/RecordMarkerFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/RecordMarkerFailedEventAttributes.cpp index a7777716232..ae7ae02de61 100644 --- a/aws-cpp-sdk-swf/source/model/RecordMarkerFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/RecordMarkerFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + RecordMarkerFailedEventAttributes::RecordMarkerFailedEventAttributes() : m_markerNameHasBeenSet(false), m_causeHasBeenSet(false), @@ -86,4 +92,8 @@ JsonValue RecordMarkerFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/RegistrationStatus.cpp b/aws-cpp-sdk-swf/source/model/RegistrationStatus.cpp index 19122352ea6..e24bc7d2e64 100644 --- a/aws-cpp-sdk-swf/source/model/RegistrationStatus.cpp +++ b/aws-cpp-sdk-swf/source/model/RegistrationStatus.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int REGISTERED_HASH = HashingUtils::HashString("REGISTERED"); -static const int DEPRECATED_HASH = HashingUtils::HashString("DEPRECATED"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace RegistrationStatusMapper { + static const int REGISTERED_HASH = HashingUtils::HashString("REGISTERED"); + static const int DEPRECATED_HASH = HashingUtils::HashString("DEPRECATED"); + RegistrationStatus GetRegistrationStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/RequestCancelActivityTaskDecisionAttributes.cpp b/aws-cpp-sdk-swf/source/model/RequestCancelActivityTaskDecisionAttributes.cpp index b976aa44713..2d23652b78b 100644 --- a/aws-cpp-sdk-swf/source/model/RequestCancelActivityTaskDecisionAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/RequestCancelActivityTaskDecisionAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + RequestCancelActivityTaskDecisionAttributes::RequestCancelActivityTaskDecisionAttributes() : m_activityIdHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue RequestCancelActivityTaskDecisionAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/RequestCancelActivityTaskFailedCause.cpp b/aws-cpp-sdk-swf/source/model/RequestCancelActivityTaskFailedCause.cpp index f75535edfb5..33c48050436 100644 --- a/aws-cpp-sdk-swf/source/model/RequestCancelActivityTaskFailedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/RequestCancelActivityTaskFailedCause.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int ACTIVITY_ID_UNKNOWN_HASH = HashingUtils::HashString("ACTIVITY_ID_UNKNOWN"); -static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace RequestCancelActivityTaskFailedCauseMapper { + static const int ACTIVITY_ID_UNKNOWN_HASH = HashingUtils::HashString("ACTIVITY_ID_UNKNOWN"); + static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); + RequestCancelActivityTaskFailedCause GetRequestCancelActivityTaskFailedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/RequestCancelActivityTaskFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/RequestCancelActivityTaskFailedEventAttributes.cpp index d169b8da87c..438dc05f677 100644 --- a/aws-cpp-sdk-swf/source/model/RequestCancelActivityTaskFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/RequestCancelActivityTaskFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + RequestCancelActivityTaskFailedEventAttributes::RequestCancelActivityTaskFailedEventAttributes() : m_activityIdHasBeenSet(false), m_causeHasBeenSet(false), @@ -86,4 +92,8 @@ JsonValue RequestCancelActivityTaskFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionDecisionAttributes.cpp b/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionDecisionAttributes.cpp index d1ca1ee05e9..2765c99a5b7 100644 --- a/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionDecisionAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionDecisionAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + RequestCancelExternalWorkflowExecutionDecisionAttributes::RequestCancelExternalWorkflowExecutionDecisionAttributes() : m_workflowIdHasBeenSet(false), m_runIdHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue RequestCancelExternalWorkflowExecutionDecisionAttributes::Jsonize() co } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionFailedCause.cpp b/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionFailedCause.cpp index fcab71707e5..0afaa1100bc 100644 --- a/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionFailedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionFailedCause.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int UNKNOWN_EXTERNAL_WORKFLOW_EXECUTION_HASH = HashingUtils::HashString("UNKNOWN_EXTERNAL_WORKFLOW_EXECUTION"); -static const int REQUEST_CANCEL_EXTERNAL_WORKFLOW_EXECUTION_RATE_EXCEEDED_HASH = HashingUtils::HashString("REQUEST_CANCEL_EXTERNAL_WORKFLOW_EXECUTION_RATE_EXCEEDED"); -static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace RequestCancelExternalWorkflowExecutionFailedCauseMapper { + static const int UNKNOWN_EXTERNAL_WORKFLOW_EXECUTION_HASH = HashingUtils::HashString("UNKNOWN_EXTERNAL_WORKFLOW_EXECUTION"); + static const int REQUEST_CANCEL_EXTERNAL_WORKFLOW_EXECUTION_RATE_EXCEEDED_HASH = HashingUtils::HashString("REQUEST_CANCEL_EXTERNAL_WORKFLOW_EXECUTION_RATE_EXCEEDED"); + static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); + RequestCancelExternalWorkflowExecutionFailedCause GetRequestCancelExternalWorkflowExecutionFailedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionFailedEventAttributes.cpp index c5a08841994..30fe95ce830 100644 --- a/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + RequestCancelExternalWorkflowExecutionFailedEventAttributes::RequestCancelExternalWorkflowExecutionFailedEventAttributes() : m_workflowIdHasBeenSet(false), m_runIdHasBeenSet(false), @@ -133,4 +139,8 @@ JsonValue RequestCancelExternalWorkflowExecutionFailedEventAttributes::Jsonize() } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionInitiatedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionInitiatedEventAttributes.cpp index e8e70261a93..a9d910d2a01 100644 --- a/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionInitiatedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/RequestCancelExternalWorkflowExecutionInitiatedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + RequestCancelExternalWorkflowExecutionInitiatedEventAttributes::RequestCancelExternalWorkflowExecutionInitiatedEventAttributes() : m_workflowIdHasBeenSet(false), m_runIdHasBeenSet(false), @@ -102,4 +108,8 @@ JsonValue RequestCancelExternalWorkflowExecutionInitiatedEventAttributes::Jsoniz } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ScheduleActivityTaskDecisionAttributes.cpp b/aws-cpp-sdk-swf/source/model/ScheduleActivityTaskDecisionAttributes.cpp index 08195980366..ecd425546ad 100644 --- a/aws-cpp-sdk-swf/source/model/ScheduleActivityTaskDecisionAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ScheduleActivityTaskDecisionAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ScheduleActivityTaskDecisionAttributes::ScheduleActivityTaskDecisionAttributes() : m_activityTypeHasBeenSet(false), m_activityIdHasBeenSet(false), @@ -190,4 +196,8 @@ JsonValue ScheduleActivityTaskDecisionAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ScheduleActivityTaskFailedCause.cpp b/aws-cpp-sdk-swf/source/model/ScheduleActivityTaskFailedCause.cpp index e8808667c06..5eff32751b4 100644 --- a/aws-cpp-sdk-swf/source/model/ScheduleActivityTaskFailedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/ScheduleActivityTaskFailedCause.cpp @@ -19,17 +19,6 @@ using namespace Aws::Utils; -static const int ACTIVITY_TYPE_DEPRECATED_HASH = HashingUtils::HashString("ACTIVITY_TYPE_DEPRECATED"); -static const int ACTIVITY_TYPE_DOES_NOT_EXIST_HASH = HashingUtils::HashString("ACTIVITY_TYPE_DOES_NOT_EXIST"); -static const int ACTIVITY_ID_ALREADY_IN_USE_HASH = HashingUtils::HashString("ACTIVITY_ID_ALREADY_IN_USE"); -static const int OPEN_ACTIVITIES_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("OPEN_ACTIVITIES_LIMIT_EXCEEDED"); -static const int ACTIVITY_CREATION_RATE_EXCEEDED_HASH = HashingUtils::HashString("ACTIVITY_CREATION_RATE_EXCEEDED"); -static const int DEFAULT_SCHEDULE_TO_CLOSE_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_SCHEDULE_TO_CLOSE_TIMEOUT_UNDEFINED"); -static const int DEFAULT_TASK_LIST_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_TASK_LIST_UNDEFINED"); -static const int DEFAULT_SCHEDULE_TO_START_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_SCHEDULE_TO_START_TIMEOUT_UNDEFINED"); -static const int DEFAULT_START_TO_CLOSE_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_START_TO_CLOSE_TIMEOUT_UNDEFINED"); -static const int DEFAULT_HEARTBEAT_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_HEARTBEAT_TIMEOUT_UNDEFINED"); -static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); namespace Aws { @@ -40,6 +29,18 @@ namespace Aws namespace ScheduleActivityTaskFailedCauseMapper { + static const int ACTIVITY_TYPE_DEPRECATED_HASH = HashingUtils::HashString("ACTIVITY_TYPE_DEPRECATED"); + static const int ACTIVITY_TYPE_DOES_NOT_EXIST_HASH = HashingUtils::HashString("ACTIVITY_TYPE_DOES_NOT_EXIST"); + static const int ACTIVITY_ID_ALREADY_IN_USE_HASH = HashingUtils::HashString("ACTIVITY_ID_ALREADY_IN_USE"); + static const int OPEN_ACTIVITIES_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("OPEN_ACTIVITIES_LIMIT_EXCEEDED"); + static const int ACTIVITY_CREATION_RATE_EXCEEDED_HASH = HashingUtils::HashString("ACTIVITY_CREATION_RATE_EXCEEDED"); + static const int DEFAULT_SCHEDULE_TO_CLOSE_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_SCHEDULE_TO_CLOSE_TIMEOUT_UNDEFINED"); + static const int DEFAULT_TASK_LIST_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_TASK_LIST_UNDEFINED"); + static const int DEFAULT_SCHEDULE_TO_START_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_SCHEDULE_TO_START_TIMEOUT_UNDEFINED"); + static const int DEFAULT_START_TO_CLOSE_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_START_TO_CLOSE_TIMEOUT_UNDEFINED"); + static const int DEFAULT_HEARTBEAT_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_HEARTBEAT_TIMEOUT_UNDEFINED"); + static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); + ScheduleActivityTaskFailedCause GetScheduleActivityTaskFailedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/ScheduleActivityTaskFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ScheduleActivityTaskFailedEventAttributes.cpp index 725403033c1..7f0ae19130a 100644 --- a/aws-cpp-sdk-swf/source/model/ScheduleActivityTaskFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ScheduleActivityTaskFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ScheduleActivityTaskFailedEventAttributes::ScheduleActivityTaskFailedEventAttributes() : m_activityTypeHasBeenSet(false), m_activityIdHasBeenSet(false), @@ -101,4 +107,8 @@ JsonValue ScheduleActivityTaskFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ScheduleLambdaFunctionDecisionAttributes.cpp b/aws-cpp-sdk-swf/source/model/ScheduleLambdaFunctionDecisionAttributes.cpp index 9930f48db15..7e1e403d504 100644 --- a/aws-cpp-sdk-swf/source/model/ScheduleLambdaFunctionDecisionAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ScheduleLambdaFunctionDecisionAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ScheduleLambdaFunctionDecisionAttributes::ScheduleLambdaFunctionDecisionAttributes() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue ScheduleLambdaFunctionDecisionAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/ScheduleLambdaFunctionFailedCause.cpp b/aws-cpp-sdk-swf/source/model/ScheduleLambdaFunctionFailedCause.cpp index 2025096807a..3dfdddb3cf3 100644 --- a/aws-cpp-sdk-swf/source/model/ScheduleLambdaFunctionFailedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/ScheduleLambdaFunctionFailedCause.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int ID_ALREADY_IN_USE_HASH = HashingUtils::HashString("ID_ALREADY_IN_USE"); -static const int OPEN_LAMBDA_FUNCTIONS_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("OPEN_LAMBDA_FUNCTIONS_LIMIT_EXCEEDED"); -static const int LAMBDA_FUNCTION_CREATION_RATE_EXCEEDED_HASH = HashingUtils::HashString("LAMBDA_FUNCTION_CREATION_RATE_EXCEEDED"); -static const int LAMBDA_SERVICE_NOT_AVAILABLE_IN_REGION_HASH = HashingUtils::HashString("LAMBDA_SERVICE_NOT_AVAILABLE_IN_REGION"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace ScheduleLambdaFunctionFailedCauseMapper { + static const int ID_ALREADY_IN_USE_HASH = HashingUtils::HashString("ID_ALREADY_IN_USE"); + static const int OPEN_LAMBDA_FUNCTIONS_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("OPEN_LAMBDA_FUNCTIONS_LIMIT_EXCEEDED"); + static const int LAMBDA_FUNCTION_CREATION_RATE_EXCEEDED_HASH = HashingUtils::HashString("LAMBDA_FUNCTION_CREATION_RATE_EXCEEDED"); + static const int LAMBDA_SERVICE_NOT_AVAILABLE_IN_REGION_HASH = HashingUtils::HashString("LAMBDA_SERVICE_NOT_AVAILABLE_IN_REGION"); + ScheduleLambdaFunctionFailedCause GetScheduleLambdaFunctionFailedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/ScheduleLambdaFunctionFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/ScheduleLambdaFunctionFailedEventAttributes.cpp index 33bc53a36cc..2235737ed0f 100644 --- a/aws-cpp-sdk-swf/source/model/ScheduleLambdaFunctionFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/ScheduleLambdaFunctionFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + ScheduleLambdaFunctionFailedEventAttributes::ScheduleLambdaFunctionFailedEventAttributes() : m_idHasBeenSet(false), m_nameHasBeenSet(false), @@ -101,4 +107,8 @@ JsonValue ScheduleLambdaFunctionFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionDecisionAttributes.cpp b/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionDecisionAttributes.cpp index 1bcfcd0137f..4337f4ad786 100644 --- a/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionDecisionAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionDecisionAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + SignalExternalWorkflowExecutionDecisionAttributes::SignalExternalWorkflowExecutionDecisionAttributes() : m_workflowIdHasBeenSet(false), m_runIdHasBeenSet(false), @@ -115,4 +121,8 @@ JsonValue SignalExternalWorkflowExecutionDecisionAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionFailedCause.cpp b/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionFailedCause.cpp index aef1f00009b..358afaac8fa 100644 --- a/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionFailedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionFailedCause.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int UNKNOWN_EXTERNAL_WORKFLOW_EXECUTION_HASH = HashingUtils::HashString("UNKNOWN_EXTERNAL_WORKFLOW_EXECUTION"); -static const int SIGNAL_EXTERNAL_WORKFLOW_EXECUTION_RATE_EXCEEDED_HASH = HashingUtils::HashString("SIGNAL_EXTERNAL_WORKFLOW_EXECUTION_RATE_EXCEEDED"); -static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace SignalExternalWorkflowExecutionFailedCauseMapper { + static const int UNKNOWN_EXTERNAL_WORKFLOW_EXECUTION_HASH = HashingUtils::HashString("UNKNOWN_EXTERNAL_WORKFLOW_EXECUTION"); + static const int SIGNAL_EXTERNAL_WORKFLOW_EXECUTION_RATE_EXCEEDED_HASH = HashingUtils::HashString("SIGNAL_EXTERNAL_WORKFLOW_EXECUTION_RATE_EXCEEDED"); + static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); + SignalExternalWorkflowExecutionFailedCause GetSignalExternalWorkflowExecutionFailedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionFailedEventAttributes.cpp index 5b582995aa5..b5a6ad65c14 100644 --- a/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + SignalExternalWorkflowExecutionFailedEventAttributes::SignalExternalWorkflowExecutionFailedEventAttributes() : m_workflowIdHasBeenSet(false), m_runIdHasBeenSet(false), @@ -133,4 +139,8 @@ JsonValue SignalExternalWorkflowExecutionFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionInitiatedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionInitiatedEventAttributes.cpp index de3ae5184b5..f989486c98d 100644 --- a/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionInitiatedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/SignalExternalWorkflowExecutionInitiatedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + SignalExternalWorkflowExecutionInitiatedEventAttributes::SignalExternalWorkflowExecutionInitiatedEventAttributes() : m_workflowIdHasBeenSet(false), m_runIdHasBeenSet(false), @@ -132,4 +138,8 @@ JsonValue SignalExternalWorkflowExecutionInitiatedEventAttributes::Jsonize() con } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionDecisionAttributes.cpp b/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionDecisionAttributes.cpp index b160e172ded..5bf52a7af60 100644 --- a/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionDecisionAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionDecisionAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + StartChildWorkflowExecutionDecisionAttributes::StartChildWorkflowExecutionDecisionAttributes() : m_workflowTypeHasBeenSet(false), m_workflowIdHasBeenSet(false), @@ -212,4 +218,8 @@ JsonValue StartChildWorkflowExecutionDecisionAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionFailedCause.cpp b/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionFailedCause.cpp index 07913aa8dc1..a205b031135 100644 --- a/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionFailedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionFailedCause.cpp @@ -19,17 +19,6 @@ using namespace Aws::Utils; -static const int WORKFLOW_TYPE_DOES_NOT_EXIST_HASH = HashingUtils::HashString("WORKFLOW_TYPE_DOES_NOT_EXIST"); -static const int WORKFLOW_TYPE_DEPRECATED_HASH = HashingUtils::HashString("WORKFLOW_TYPE_DEPRECATED"); -static const int OPEN_CHILDREN_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("OPEN_CHILDREN_LIMIT_EXCEEDED"); -static const int OPEN_WORKFLOWS_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("OPEN_WORKFLOWS_LIMIT_EXCEEDED"); -static const int CHILD_CREATION_RATE_EXCEEDED_HASH = HashingUtils::HashString("CHILD_CREATION_RATE_EXCEEDED"); -static const int WORKFLOW_ALREADY_RUNNING_HASH = HashingUtils::HashString("WORKFLOW_ALREADY_RUNNING"); -static const int DEFAULT_EXECUTION_START_TO_CLOSE_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_EXECUTION_START_TO_CLOSE_TIMEOUT_UNDEFINED"); -static const int DEFAULT_TASK_LIST_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_TASK_LIST_UNDEFINED"); -static const int DEFAULT_TASK_START_TO_CLOSE_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_TASK_START_TO_CLOSE_TIMEOUT_UNDEFINED"); -static const int DEFAULT_CHILD_POLICY_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_CHILD_POLICY_UNDEFINED"); -static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); namespace Aws { @@ -40,6 +29,18 @@ namespace Aws namespace StartChildWorkflowExecutionFailedCauseMapper { + static const int WORKFLOW_TYPE_DOES_NOT_EXIST_HASH = HashingUtils::HashString("WORKFLOW_TYPE_DOES_NOT_EXIST"); + static const int WORKFLOW_TYPE_DEPRECATED_HASH = HashingUtils::HashString("WORKFLOW_TYPE_DEPRECATED"); + static const int OPEN_CHILDREN_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("OPEN_CHILDREN_LIMIT_EXCEEDED"); + static const int OPEN_WORKFLOWS_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("OPEN_WORKFLOWS_LIMIT_EXCEEDED"); + static const int CHILD_CREATION_RATE_EXCEEDED_HASH = HashingUtils::HashString("CHILD_CREATION_RATE_EXCEEDED"); + static const int WORKFLOW_ALREADY_RUNNING_HASH = HashingUtils::HashString("WORKFLOW_ALREADY_RUNNING"); + static const int DEFAULT_EXECUTION_START_TO_CLOSE_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_EXECUTION_START_TO_CLOSE_TIMEOUT_UNDEFINED"); + static const int DEFAULT_TASK_LIST_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_TASK_LIST_UNDEFINED"); + static const int DEFAULT_TASK_START_TO_CLOSE_TIMEOUT_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_TASK_START_TO_CLOSE_TIMEOUT_UNDEFINED"); + static const int DEFAULT_CHILD_POLICY_UNDEFINED_HASH = HashingUtils::HashString("DEFAULT_CHILD_POLICY_UNDEFINED"); + static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); + StartChildWorkflowExecutionFailedCause GetStartChildWorkflowExecutionFailedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionFailedEventAttributes.cpp index b70ae3ec9cc..390bd2c3f5e 100644 --- a/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + StartChildWorkflowExecutionFailedEventAttributes::StartChildWorkflowExecutionFailedEventAttributes() : m_workflowTypeHasBeenSet(false), m_causeHasBeenSet(false), @@ -133,4 +139,8 @@ JsonValue StartChildWorkflowExecutionFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionInitiatedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionInitiatedEventAttributes.cpp index b837cc07dcd..7664302391a 100644 --- a/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionInitiatedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/StartChildWorkflowExecutionInitiatedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + StartChildWorkflowExecutionInitiatedEventAttributes::StartChildWorkflowExecutionInitiatedEventAttributes() : m_workflowIdHasBeenSet(false), m_workflowTypeHasBeenSet(false), @@ -229,4 +235,8 @@ JsonValue StartChildWorkflowExecutionInitiatedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/StartLambdaFunctionFailedCause.cpp b/aws-cpp-sdk-swf/source/model/StartLambdaFunctionFailedCause.cpp index 5e7bc8e6bb0..395438b0dec 100644 --- a/aws-cpp-sdk-swf/source/model/StartLambdaFunctionFailedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/StartLambdaFunctionFailedCause.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int ASSUME_ROLE_FAILED_HASH = HashingUtils::HashString("ASSUME_ROLE_FAILED"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace StartLambdaFunctionFailedCauseMapper { + static const int ASSUME_ROLE_FAILED_HASH = HashingUtils::HashString("ASSUME_ROLE_FAILED"); + StartLambdaFunctionFailedCause GetStartLambdaFunctionFailedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/StartLambdaFunctionFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/StartLambdaFunctionFailedEventAttributes.cpp index b83fa07a961..c331fb67f20 100644 --- a/aws-cpp-sdk-swf/source/model/StartLambdaFunctionFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/StartLambdaFunctionFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + StartLambdaFunctionFailedEventAttributes::StartLambdaFunctionFailedEventAttributes() : m_scheduledEventId(0), m_scheduledEventIdHasBeenSet(false), @@ -86,4 +92,8 @@ JsonValue StartLambdaFunctionFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/StartTimerDecisionAttributes.cpp b/aws-cpp-sdk-swf/source/model/StartTimerDecisionAttributes.cpp index ab6027fb97b..62f97363770 100644 --- a/aws-cpp-sdk-swf/source/model/StartTimerDecisionAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/StartTimerDecisionAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + StartTimerDecisionAttributes::StartTimerDecisionAttributes() : m_timerIdHasBeenSet(false), m_controlHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue StartTimerDecisionAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/StartTimerFailedCause.cpp b/aws-cpp-sdk-swf/source/model/StartTimerFailedCause.cpp index 7b19e32aef0..7fab0331a9f 100644 --- a/aws-cpp-sdk-swf/source/model/StartTimerFailedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/StartTimerFailedCause.cpp @@ -19,10 +19,6 @@ using namespace Aws::Utils; -static const int TIMER_ID_ALREADY_IN_USE_HASH = HashingUtils::HashString("TIMER_ID_ALREADY_IN_USE"); -static const int OPEN_TIMERS_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("OPEN_TIMERS_LIMIT_EXCEEDED"); -static const int TIMER_CREATION_RATE_EXCEEDED_HASH = HashingUtils::HashString("TIMER_CREATION_RATE_EXCEEDED"); -static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); namespace Aws { @@ -33,6 +29,11 @@ namespace Aws namespace StartTimerFailedCauseMapper { + static const int TIMER_ID_ALREADY_IN_USE_HASH = HashingUtils::HashString("TIMER_ID_ALREADY_IN_USE"); + static const int OPEN_TIMERS_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("OPEN_TIMERS_LIMIT_EXCEEDED"); + static const int TIMER_CREATION_RATE_EXCEEDED_HASH = HashingUtils::HashString("TIMER_CREATION_RATE_EXCEEDED"); + static const int OPERATION_NOT_PERMITTED_HASH = HashingUtils::HashString("OPERATION_NOT_PERMITTED"); + StartTimerFailedCause GetStartTimerFailedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/StartTimerFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/StartTimerFailedEventAttributes.cpp index db88624bcd8..15d9c27c49b 100644 --- a/aws-cpp-sdk-swf/source/model/StartTimerFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/StartTimerFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + StartTimerFailedEventAttributes::StartTimerFailedEventAttributes() : m_timerIdHasBeenSet(false), m_causeHasBeenSet(false), @@ -86,4 +92,8 @@ JsonValue StartTimerFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/TagFilter.cpp b/aws-cpp-sdk-swf/source/model/TagFilter.cpp index fc9a1e547ec..0f56123e458 100644 --- a/aws-cpp-sdk-swf/source/model/TagFilter.cpp +++ b/aws-cpp-sdk-swf/source/model/TagFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + TagFilter::TagFilter() : m_tagHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue TagFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/TaskList.cpp b/aws-cpp-sdk-swf/source/model/TaskList.cpp index 88367da4446..9a5d9ef466d 100644 --- a/aws-cpp-sdk-swf/source/model/TaskList.cpp +++ b/aws-cpp-sdk-swf/source/model/TaskList.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + TaskList::TaskList() : m_nameHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue TaskList::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/TimerCanceledEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/TimerCanceledEventAttributes.cpp index 573989db90d..d8a23645819 100644 --- a/aws-cpp-sdk-swf/source/model/TimerCanceledEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/TimerCanceledEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + TimerCanceledEventAttributes::TimerCanceledEventAttributes() : m_timerIdHasBeenSet(false), m_startedEventId(0), @@ -89,4 +95,8 @@ JsonValue TimerCanceledEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/TimerFiredEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/TimerFiredEventAttributes.cpp index 11dbc6e9f74..d67f5ab1231 100644 --- a/aws-cpp-sdk-swf/source/model/TimerFiredEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/TimerFiredEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + TimerFiredEventAttributes::TimerFiredEventAttributes() : m_timerIdHasBeenSet(false), m_startedEventId(0), @@ -72,4 +78,8 @@ JsonValue TimerFiredEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/TimerStartedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/TimerStartedEventAttributes.cpp index ff2e4a927a0..73c07c77696 100644 --- a/aws-cpp-sdk-swf/source/model/TimerStartedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/TimerStartedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + TimerStartedEventAttributes::TimerStartedEventAttributes() : m_timerIdHasBeenSet(false), m_controlHasBeenSet(false), @@ -102,4 +108,8 @@ JsonValue TimerStartedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecution.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecution.cpp index b6bcc9022a5..2f61ca36e6e 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecution.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecution.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowExecution::WorkflowExecution() : m_workflowIdHasBeenSet(false), m_runIdHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue WorkflowExecution::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionCancelRequestedCause.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionCancelRequestedCause.cpp index e13dbee0ab7..d2bf2f32649 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionCancelRequestedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionCancelRequestedCause.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int CHILD_POLICY_APPLIED_HASH = HashingUtils::HashString("CHILD_POLICY_APPLIED"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace WorkflowExecutionCancelRequestedCauseMapper { + static const int CHILD_POLICY_APPLIED_HASH = HashingUtils::HashString("CHILD_POLICY_APPLIED"); + WorkflowExecutionCancelRequestedCause GetWorkflowExecutionCancelRequestedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionCancelRequestedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionCancelRequestedEventAttributes.cpp index d30df8569d4..3c60bfe49d5 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionCancelRequestedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionCancelRequestedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowExecutionCancelRequestedEventAttributes::WorkflowExecutionCancelRequestedEventAttributes() : m_externalWorkflowExecutionHasBeenSet(false), m_externalInitiatedEventId(0), @@ -86,4 +92,8 @@ JsonValue WorkflowExecutionCancelRequestedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionCanceledEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionCanceledEventAttributes.cpp index 34d01566f24..f59d1012f3d 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionCanceledEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionCanceledEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowExecutionCanceledEventAttributes::WorkflowExecutionCanceledEventAttributes() : m_detailsHasBeenSet(false), m_decisionTaskCompletedEventId(0), @@ -72,4 +78,8 @@ JsonValue WorkflowExecutionCanceledEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionCompletedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionCompletedEventAttributes.cpp index 718bb67e6df..710288102f0 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionCompletedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionCompletedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowExecutionCompletedEventAttributes::WorkflowExecutionCompletedEventAttributes() : m_resultHasBeenSet(false), m_decisionTaskCompletedEventId(0), @@ -72,4 +78,8 @@ JsonValue WorkflowExecutionCompletedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionConfiguration.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionConfiguration.cpp index 05c8c8f9dd7..f736b6bf5e3 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionConfiguration.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowExecutionConfiguration::WorkflowExecutionConfiguration() : m_taskStartToCloseTimeoutHasBeenSet(false), m_executionStartToCloseTimeoutHasBeenSet(false), @@ -129,4 +135,8 @@ JsonValue WorkflowExecutionConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionContinuedAsNewEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionContinuedAsNewEventAttributes.cpp index e77971cf269..943cba32e84 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionContinuedAsNewEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionContinuedAsNewEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowExecutionContinuedAsNewEventAttributes::WorkflowExecutionContinuedAsNewEventAttributes() : m_inputHasBeenSet(false), m_decisionTaskCompletedEventId(0), @@ -214,4 +220,8 @@ JsonValue WorkflowExecutionContinuedAsNewEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionFailedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionFailedEventAttributes.cpp index 6b1b798fe42..c2bf13adb3b 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionFailedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionFailedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowExecutionFailedEventAttributes::WorkflowExecutionFailedEventAttributes() : m_reasonHasBeenSet(false), m_detailsHasBeenSet(false), @@ -87,4 +93,8 @@ JsonValue WorkflowExecutionFailedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionFilter.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionFilter.cpp index bce764c4c5b..5575b073e54 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionFilter.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowExecutionFilter::WorkflowExecutionFilter() : m_workflowIdHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue WorkflowExecutionFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionInfo.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionInfo.cpp index 2a5db8aeeab..4aac9667c44 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionInfo.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowExecutionInfo::WorkflowExecutionInfo() : m_executionHasBeenSet(false), m_workflowTypeHasBeenSet(false), @@ -181,4 +187,8 @@ JsonValue WorkflowExecutionInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionOpenCounts.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionOpenCounts.cpp index 35595c37273..367d76dc830 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionOpenCounts.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionOpenCounts.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowExecutionOpenCounts::WorkflowExecutionOpenCounts() : m_openActivityTasks(0), m_openActivityTasksHasBeenSet(false), @@ -125,4 +131,8 @@ JsonValue WorkflowExecutionOpenCounts::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionSignaledEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionSignaledEventAttributes.cpp index a10b675734a..537b7b0c659 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionSignaledEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionSignaledEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowExecutionSignaledEventAttributes::WorkflowExecutionSignaledEventAttributes() : m_signalNameHasBeenSet(false), m_inputHasBeenSet(false), @@ -102,4 +108,8 @@ JsonValue WorkflowExecutionSignaledEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionStartedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionStartedEventAttributes.cpp index 36fce5fe5bd..3e886956d62 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionStartedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionStartedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowExecutionStartedEventAttributes::WorkflowExecutionStartedEventAttributes() : m_inputHasBeenSet(false), m_executionStartToCloseTimeoutHasBeenSet(false), @@ -229,4 +235,8 @@ JsonValue WorkflowExecutionStartedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionTerminatedCause.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionTerminatedCause.cpp index 27bf92707b8..4d04c7b08e7 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionTerminatedCause.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionTerminatedCause.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int CHILD_POLICY_APPLIED_HASH = HashingUtils::HashString("CHILD_POLICY_APPLIED"); -static const int EVENT_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("EVENT_LIMIT_EXCEEDED"); -static const int OPERATOR_INITIATED_HASH = HashingUtils::HashString("OPERATOR_INITIATED"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace WorkflowExecutionTerminatedCauseMapper { + static const int CHILD_POLICY_APPLIED_HASH = HashingUtils::HashString("CHILD_POLICY_APPLIED"); + static const int EVENT_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("EVENT_LIMIT_EXCEEDED"); + static const int OPERATOR_INITIATED_HASH = HashingUtils::HashString("OPERATOR_INITIATED"); + WorkflowExecutionTerminatedCause GetWorkflowExecutionTerminatedCauseForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionTerminatedEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionTerminatedEventAttributes.cpp index 32297634c1a..cb43b814c37 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionTerminatedEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionTerminatedEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowExecutionTerminatedEventAttributes::WorkflowExecutionTerminatedEventAttributes() : m_reasonHasBeenSet(false), m_detailsHasBeenSet(false), @@ -98,4 +104,8 @@ JsonValue WorkflowExecutionTerminatedEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionTimedOutEventAttributes.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionTimedOutEventAttributes.cpp index 3deeddeb115..c731e5152b5 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionTimedOutEventAttributes.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionTimedOutEventAttributes.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowExecutionTimedOutEventAttributes::WorkflowExecutionTimedOutEventAttributes() : m_timeoutTypeHasBeenSet(false), m_childPolicyHasBeenSet(false) @@ -68,4 +74,8 @@ JsonValue WorkflowExecutionTimedOutEventAttributes::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowExecutionTimeoutType.cpp b/aws-cpp-sdk-swf/source/model/WorkflowExecutionTimeoutType.cpp index 57b104191b3..409ee91c76d 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowExecutionTimeoutType.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowExecutionTimeoutType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int START_TO_CLOSE_HASH = HashingUtils::HashString("START_TO_CLOSE"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace WorkflowExecutionTimeoutTypeMapper { + static const int START_TO_CLOSE_HASH = HashingUtils::HashString("START_TO_CLOSE"); + WorkflowExecutionTimeoutType GetWorkflowExecutionTimeoutTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-swf/source/model/WorkflowType.cpp b/aws-cpp-sdk-swf/source/model/WorkflowType.cpp index 177d5b08edc..cc3f1d6dc18 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowType.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowType.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowType::WorkflowType() : m_nameHasBeenSet(false), m_versionHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue WorkflowType::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowTypeConfiguration.cpp b/aws-cpp-sdk-swf/source/model/WorkflowTypeConfiguration.cpp index bb7ed825489..4b4b6967239 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowTypeConfiguration.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowTypeConfiguration.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowTypeConfiguration::WorkflowTypeConfiguration() : m_defaultTaskStartToCloseTimeoutHasBeenSet(false), m_defaultExecutionStartToCloseTimeoutHasBeenSet(false), @@ -129,4 +135,8 @@ JsonValue WorkflowTypeConfiguration::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowTypeFilter.cpp b/aws-cpp-sdk-swf/source/model/WorkflowTypeFilter.cpp index 341a9f22c4a..303cb6aa30c 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowTypeFilter.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowTypeFilter.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowTypeFilter::WorkflowTypeFilter() : m_nameHasBeenSet(false), m_versionHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue WorkflowTypeFilter::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-swf/source/model/WorkflowTypeInfo.cpp b/aws-cpp-sdk-swf/source/model/WorkflowTypeInfo.cpp index 6d70f3225dc..d935c34bdc0 100644 --- a/aws-cpp-sdk-swf/source/model/WorkflowTypeInfo.cpp +++ b/aws-cpp-sdk-swf/source/model/WorkflowTypeInfo.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::SWF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace SWF +{ +namespace Model +{ + WorkflowTypeInfo::WorkflowTypeInfo() : m_workflowTypeHasBeenSet(false), m_statusHasBeenSet(false), @@ -112,4 +118,8 @@ JsonValue WorkflowTypeInfo::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace SWF +} // namespace Aws diff --git a/aws-cpp-sdk-transfer-tests/TransferTests.cpp b/aws-cpp-sdk-transfer-tests/TransferTests.cpp index 433df5c818f..175a575fcfe 100644 --- a/aws-cpp-sdk-transfer-tests/TransferTests.cpp +++ b/aws-cpp-sdk-transfer-tests/TransferTests.cpp @@ -28,8 +28,10 @@ #include #include #include +#include #include #include +#include #include #include @@ -46,30 +48,31 @@ using namespace Aws::Client; using namespace Aws::Http; using namespace Aws::Utils; + static const char* TEST_FILE_NAME = "TransferTestFile.txt"; // Also used as key static const char* SMALL_TEST_FILE_NAME = "SmallTransferTestFile.txt"; -static const char* SMALL_FILE_KEY = "SmallFileKey"; +//static const char* SMALL_FILE_KEY = "SmallFileKey"; static const char* MEDIUM_TEST_FILE_NAME = "MedTransferTestFile.txt"; -static const char* MEDIUM_FILE_KEY = "MediumFileKey"; +//static const char* MEDIUM_FILE_KEY = "MediumFileKey"; static const char* MULTI_PART_CONTENT_FILE = "MultiContentTransferTestFile.txt"; -static const char* MULTI_PART_CONTENT_KEY = "MultiContentKey"; +//static const char* MULTI_PART_CONTENT_KEY = "MultiContentKey"; static const char* MULTI_PART_CONTENT_TEXT = "This is a test..##"; static const char* MULTI_PART_CONTENT_DOWNLOAD = "MultiContentDownloadTransferTestFile.txt"; static const char* CONTENT_TEST_FILE_TEXT = "This is a test.."; static const char* CONTENT_TEST_FILE_NAME = "ContentTransferTestFile.txt"; static const char* CONTENT_TEST_DOWNLOAD_FILE_NAME = "ContentTransferTestFileDownload.txt"; -static const char* CONTENT_FILE_KEY = "ContentFileKey"; +//static const char* CONTENT_FILE_KEY = "ContentFileKey"; static const char* BIG_TEST_FILE_NAME = "BigTransferTestFile.txt"; static const char* BIG_FILE_KEY = "BigFileKey"; static const char* CANCEL_TEST_FILE_NAME = "CancelTestFile.txt"; -static const char* CANCEL_FILE_KEY = "CancelFileKey"; -static const char* CANCEL_FILE_KEY2 = "CancelFileKey2"; +//static const char* CANCEL_FILE_KEY = "CancelFileKey"; +//static const char* CANCEL_FILE_KEY2 = "CancelFileKey2"; static const char* TEST_BUCKET_NAME_BASE = "transferintegrationtestbucket"; static const unsigned SMALL_TEST_SIZE = MB5_BUFFER_SIZE / 2; @@ -77,7 +80,7 @@ static const unsigned MEDIUM_TEST_SIZE = MB5_BUFFER_SIZE * 3 / 2; static const unsigned CANCEL_TEST_SIZE = MB5_BUFFER_SIZE * 30; -static const unsigned PARTS_IN_MEDIUM_TEST = 2; +//static const unsigned PARTS_IN_MEDIUM_TEST = 2; static const unsigned PARTS_IN_BIG_TEST = 15; static const unsigned BIG_TEST_SIZE = MB5_BUFFER_SIZE * PARTS_IN_BIG_TEST; @@ -97,6 +100,17 @@ class TransferTests : public ::testing::Test static std::shared_ptr m_s3Client; static std::shared_ptr m_transferClient; + static Aws::String m_testFileName; + static Aws::String m_smallTestFileName; + static Aws::String m_bigTestFileName; + static Aws::String m_mediumTestFileName; + static Aws::String m_contentTestFileName; + static Aws::String m_cancelTestFileName; + static Aws::String m_multiPartContentFile; + + static Aws::String m_contentTestDownloadFileName; + static Aws::String m_multiPartContentDownload; + protected: static void CreateTestFile(const Aws::String& fileName, unsigned fileSize, const Aws::String& putString) @@ -242,13 +256,33 @@ class TransferTests : public ::testing::Test DeleteBucket(GetTestBucketName()); - CreateTestFile(TEST_FILE_NAME, MB5_BUFFER_SIZE, testString); - CreateTestFile(SMALL_TEST_FILE_NAME, SMALL_TEST_SIZE, testString); - CreateTestFile(BIG_TEST_FILE_NAME, BIG_TEST_SIZE, testString); - CreateTestFile(MEDIUM_TEST_FILE_NAME, MEDIUM_TEST_SIZE, testString); - CreateTestFile(CONTENT_TEST_FILE_NAME, CONTENT_TEST_FILE_TEXT); - CreateTestFile(CANCEL_TEST_FILE_NAME, CANCEL_TEST_SIZE, testString); - CreateTestFile(MULTI_PART_CONTENT_FILE, MEDIUM_TEST_SIZE, MULTI_PART_CONTENT_TEXT); + m_testFileName = MakeFilePath( TEST_FILE_NAME ); + m_smallTestFileName = MakeFilePath( SMALL_TEST_FILE_NAME ); + m_bigTestFileName = MakeFilePath( BIG_TEST_FILE_NAME ); + m_mediumTestFileName = MakeFilePath( MEDIUM_TEST_FILE_NAME ); + m_contentTestFileName = MakeFilePath( CONTENT_TEST_FILE_NAME ); + m_cancelTestFileName = MakeFilePath( CANCEL_TEST_FILE_NAME ); + m_multiPartContentFile = MakeFilePath( MULTI_PART_CONTENT_FILE ); + + CreateTestFile(m_testFileName, MB5_BUFFER_SIZE, testString); + CreateTestFile(m_smallTestFileName, SMALL_TEST_SIZE, testString); + CreateTestFile(m_bigTestFileName, BIG_TEST_SIZE, testString); + CreateTestFile(m_mediumTestFileName, MEDIUM_TEST_SIZE, testString); + CreateTestFile(m_contentTestFileName, CONTENT_TEST_FILE_TEXT); + CreateTestFile(m_cancelTestFileName, CANCEL_TEST_SIZE, testString); + CreateTestFile(m_multiPartContentFile, MEDIUM_TEST_SIZE, MULTI_PART_CONTENT_TEXT); + + m_contentTestDownloadFileName = MakeFilePath( CONTENT_TEST_DOWNLOAD_FILE_NAME ); + m_multiPartContentDownload = MakeFilePath( MULTI_PART_CONTENT_DOWNLOAD ); + } + + static Aws::String MakeFilePath(const char* fileName) + { + #ifdef __ANDROID__ + return Aws::Platform::GetCacheDirectory() + Aws::String( fileName ); + #else + return Aws::String( fileName ); + #endif // __ANDROID__ } static bool EmptyBucket(const Aws::String& bucketName) @@ -451,29 +485,29 @@ class TransferTests : public ::testing::Test std::this_thread::sleep_for(std::chrono::seconds(TEST_WAIT_TIMEOUT)); AbortMultiPartUpload(GetTestBucketName(), BIG_FILE_KEY); DeleteBucket(GetTestBucketName()); - remove(TEST_FILE_NAME); - remove(SMALL_TEST_FILE_NAME); - remove(CONTENT_TEST_FILE_NAME); - remove(BIG_TEST_FILE_NAME); - remove(MEDIUM_TEST_FILE_NAME); - remove(CONTENT_TEST_DOWNLOAD_FILE_NAME); - remove(CANCEL_TEST_FILE_NAME); - remove(MULTI_PART_CONTENT_FILE); - remove(MULTI_PART_CONTENT_DOWNLOAD); + FileSystemUtils::RemoveFileIfExists(m_testFileName.c_str()); + FileSystemUtils::RemoveFileIfExists(m_smallTestFileName.c_str()); + FileSystemUtils::RemoveFileIfExists(m_contentTestFileName.c_str()); + FileSystemUtils::RemoveFileIfExists(m_bigTestFileName.c_str()); + FileSystemUtils::RemoveFileIfExists(m_mediumTestFileName.c_str()); + FileSystemUtils::RemoveFileIfExists(m_contentTestDownloadFileName.c_str()); + FileSystemUtils::RemoveFileIfExists(m_cancelTestFileName.c_str()); + FileSystemUtils::RemoveFileIfExists(m_multiPartContentFile.c_str()); + FileSystemUtils::RemoveFileIfExists(m_multiPartContentDownload.c_str()); const uint32_t cConcurrentTestDownloads = 5; for (uint32_t i = 1; i <= cConcurrentTestDownloads; ++i) { - Aws::String testFile(CONTENT_TEST_DOWNLOAD_FILE_NAME); + Aws::String testFile(m_contentTestDownloadFileName); testFile += StringUtils::to_string(i); - remove(testFile.c_str()); + FileSystemUtils::RemoveFileIfExists(testFile.c_str()); } const uint32_t cConcurrentBigTestDownloads = 3; for (uint32_t i = 1; i <= cConcurrentBigTestDownloads; ++i) { - Aws::String testFile(BIG_TEST_FILE_NAME); + Aws::String testFile(m_bigTestFileName); testFile += StringUtils::to_string(i); - remove(testFile.c_str()); + FileSystemUtils::RemoveFileIfExists(testFile.c_str()); } m_s3Client = nullptr; m_transferClient = nullptr; @@ -493,6 +527,15 @@ class TransferTests : public ::testing::Test std::shared_ptr TransferTests::m_s3Client(nullptr); std::shared_ptr TransferTests::m_transferClient(nullptr); +Aws::String TransferTests::m_testFileName; +Aws::String TransferTests::m_smallTestFileName; +Aws::String TransferTests::m_bigTestFileName; +Aws::String TransferTests::m_mediumTestFileName; +Aws::String TransferTests::m_contentTestFileName; +Aws::String TransferTests::m_cancelTestFileName; +Aws::String TransferTests::m_multiPartContentFile; +Aws::String TransferTests::m_contentTestDownloadFileName; +Aws::String TransferTests::m_multiPartContentDownload; // Basic test of a 5 meg file meaning it should be exactly at the limit of a single part upload TEST_F(TransferTests, SinglePartUploadTest) @@ -511,7 +554,7 @@ TEST_F(TransferTests, SinglePartUploadTest) const bool cCreateBucket = true; const bool cConsistencyChecks = true; // Test with default behavior of using file name as key - std::shared_ptr requestPtr = m_transferClient->UploadFile(TEST_FILE_NAME, GetTestBucketName(), "", "", cCreateBucket, cConsistencyChecks); + std::shared_ptr requestPtr = m_transferClient->UploadFile(m_testFileName, GetTestBucketName(), "", "", cCreateBucket, cConsistencyChecks); ASSERT_EQ(requestPtr->GetTotalParts(), 1u); // Should be just under 5 megs @@ -531,6 +574,8 @@ TEST_F(TransferTests, SinglePartUploadTest) ASSERT_TRUE(CheckListObjectsValidation(requestPtr)); } +#ifdef NEVER + // Half size file - similar to our 5 meg test, let's make sure we're processing < 1 part files correctly TEST_F(TransferTests, SmallTest) { @@ -1284,5 +1329,6 @@ TEST_F(TransferTests, MultipartUploadWithMetadataTest) } +#endif // NEVER } diff --git a/aws-cpp-sdk-waf/CMakeLists.txt b/aws-cpp-sdk-waf/CMakeLists.txt index 91639a39cb4..c884436c9ac 100644 --- a/aws-cpp-sdk-waf/CMakeLists.txt +++ b/aws-cpp-sdk-waf/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-waf) "source/model/*.cpp" ) - file(GLOB WAF_SRC + file(GLOB WAF_UNIFIED_HEADERS ${AWS_WAF_HEADERS} ${AWS_WAF_MODEL_HEADERS} + ) + + file(GLOB WAF_UNITY_SRC ${AWS_WAF_SOURCE} ${AWS_WAF_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("WAF" WAF_UNITY_SRC) + endif() + + file(GLOB WAF_SRC + ${WAF_UNIFIED_HEADERS} + ${WAF_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-waf/source/WAFErrors.cpp b/aws-cpp-sdk-waf/source/WAFErrors.cpp index 8e5a581c662..a948643267b 100644 --- a/aws-cpp-sdk-waf/source/WAFErrors.cpp +++ b/aws-cpp-sdk-waf/source/WAFErrors.cpp @@ -20,6 +20,13 @@ using namespace Aws::Client; using namespace Aws::WAF; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace WAFErrorMapper +{ + static const int W_A_F_DISALLOWED_NAME_HASH = HashingUtils::HashString("WAFDisallowedNameException"); static const int W_A_F_INVALID_OPERATION_HASH = HashingUtils::HashString("WAFInvalidOperationException"); static const int W_A_F_NON_EMPTY_ENTITY_HASH = HashingUtils::HashString("WAFNonEmptyEntityException"); @@ -32,12 +39,6 @@ static const int W_A_F_STALE_DATA_HASH = HashingUtils::HashString("WAFStaleDataE static const int W_A_F_INVALID_ACCOUNT_HASH = HashingUtils::HashString("WAFInvalidAccountException"); static const int W_A_F_INVALID_PARAMETER_HASH = HashingUtils::HashString("WAFInvalidParameterException"); -namespace Aws -{ -namespace WAF -{ -namespace WAFErrorMapper -{ AWSError GetErrorForName(const char* errorName) { diff --git a/aws-cpp-sdk-waf/source/model/ActivatedRule.cpp b/aws-cpp-sdk-waf/source/model/ActivatedRule.cpp index da81f1dc401..97cb382350a 100644 --- a/aws-cpp-sdk-waf/source/model/ActivatedRule.cpp +++ b/aws-cpp-sdk-waf/source/model/ActivatedRule.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + ActivatedRule::ActivatedRule() : m_priority(0), m_priorityHasBeenSet(false), @@ -87,4 +93,8 @@ JsonValue ActivatedRule::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/ByteMatchSet.cpp b/aws-cpp-sdk-waf/source/model/ByteMatchSet.cpp index 84e1f495fb0..33224b96555 100644 --- a/aws-cpp-sdk-waf/source/model/ByteMatchSet.cpp +++ b/aws-cpp-sdk-waf/source/model/ByteMatchSet.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + ByteMatchSet::ByteMatchSet() : m_byteMatchSetIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -93,4 +99,8 @@ JsonValue ByteMatchSet::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/ByteMatchSetSummary.cpp b/aws-cpp-sdk-waf/source/model/ByteMatchSetSummary.cpp index f777471e569..063404a0e47 100644 --- a/aws-cpp-sdk-waf/source/model/ByteMatchSetSummary.cpp +++ b/aws-cpp-sdk-waf/source/model/ByteMatchSetSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + ByteMatchSetSummary::ByteMatchSetSummary() : m_byteMatchSetIdHasBeenSet(false), m_nameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue ByteMatchSetSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/ByteMatchSetUpdate.cpp b/aws-cpp-sdk-waf/source/model/ByteMatchSetUpdate.cpp index 6647eb35b08..f2a9ac98574 100644 --- a/aws-cpp-sdk-waf/source/model/ByteMatchSetUpdate.cpp +++ b/aws-cpp-sdk-waf/source/model/ByteMatchSetUpdate.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + ByteMatchSetUpdate::ByteMatchSetUpdate() : m_actionHasBeenSet(false), m_byteMatchTupleHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue ByteMatchSetUpdate::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/ByteMatchTuple.cpp b/aws-cpp-sdk-waf/source/model/ByteMatchTuple.cpp index a1ce0c80bcc..5cc186188a5 100644 --- a/aws-cpp-sdk-waf/source/model/ByteMatchTuple.cpp +++ b/aws-cpp-sdk-waf/source/model/ByteMatchTuple.cpp @@ -18,10 +18,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + ByteMatchTuple::ByteMatchTuple() : m_fieldToMatchHasBeenSet(false), m_targetStringHasBeenSet(false), @@ -97,4 +103,8 @@ JsonValue ByteMatchTuple::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws diff --git a/aws-cpp-sdk-waf/source/model/ChangeAction.cpp b/aws-cpp-sdk-waf/source/model/ChangeAction.cpp index 5fe91ce93c2..6ea218873c4 100644 --- a/aws-cpp-sdk-waf/source/model/ChangeAction.cpp +++ b/aws-cpp-sdk-waf/source/model/ChangeAction.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int INSERT_HASH = HashingUtils::HashString("INSERT"); -static const int DELETE__HASH = HashingUtils::HashString("DELETE"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ChangeActionMapper { + static const int INSERT_HASH = HashingUtils::HashString("INSERT"); + static const int DELETE__HASH = HashingUtils::HashString("DELETE"); + ChangeAction GetChangeActionForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-waf/source/model/ChangeTokenStatus.cpp b/aws-cpp-sdk-waf/source/model/ChangeTokenStatus.cpp index 592ad462420..4c2e2484f44 100644 --- a/aws-cpp-sdk-waf/source/model/ChangeTokenStatus.cpp +++ b/aws-cpp-sdk-waf/source/model/ChangeTokenStatus.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int PROVISIONED_HASH = HashingUtils::HashString("PROVISIONED"); -static const int PENDING_HASH = HashingUtils::HashString("PENDING"); -static const int INSYNC_HASH = HashingUtils::HashString("INSYNC"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ChangeTokenStatusMapper { + static const int PROVISIONED_HASH = HashingUtils::HashString("PROVISIONED"); + static const int PENDING_HASH = HashingUtils::HashString("PENDING"); + static const int INSYNC_HASH = HashingUtils::HashString("INSYNC"); + ChangeTokenStatus GetChangeTokenStatusForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-waf/source/model/ComparisonOperator.cpp b/aws-cpp-sdk-waf/source/model/ComparisonOperator.cpp index 8225f10acc6..793b1bc4782 100644 --- a/aws-cpp-sdk-waf/source/model/ComparisonOperator.cpp +++ b/aws-cpp-sdk-waf/source/model/ComparisonOperator.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int EQ_HASH = HashingUtils::HashString("EQ"); -static const int NE_HASH = HashingUtils::HashString("NE"); -static const int LE_HASH = HashingUtils::HashString("LE"); -static const int LT_HASH = HashingUtils::HashString("LT"); -static const int GE_HASH = HashingUtils::HashString("GE"); -static const int GT_HASH = HashingUtils::HashString("GT"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace ComparisonOperatorMapper { + static const int EQ_HASH = HashingUtils::HashString("EQ"); + static const int NE_HASH = HashingUtils::HashString("NE"); + static const int LE_HASH = HashingUtils::HashString("LE"); + static const int LT_HASH = HashingUtils::HashString("LT"); + static const int GE_HASH = HashingUtils::HashString("GE"); + static const int GT_HASH = HashingUtils::HashString("GT"); + ComparisonOperator GetComparisonOperatorForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-waf/source/model/FieldToMatch.cpp b/aws-cpp-sdk-waf/source/model/FieldToMatch.cpp index 66f98f54a26..7070d7ae948 100644 --- a/aws-cpp-sdk-waf/source/model/FieldToMatch.cpp +++ b/aws-cpp-sdk-waf/source/model/FieldToMatch.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + FieldToMatch::FieldToMatch() : m_typeHasBeenSet(false), m_dataHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue FieldToMatch::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/HTTPHeader.cpp b/aws-cpp-sdk-waf/source/model/HTTPHeader.cpp index 5a866180006..21b7261d46b 100644 --- a/aws-cpp-sdk-waf/source/model/HTTPHeader.cpp +++ b/aws-cpp-sdk-waf/source/model/HTTPHeader.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + HTTPHeader::HTTPHeader() : m_nameHasBeenSet(false), m_valueHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue HTTPHeader::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/HTTPRequest.cpp b/aws-cpp-sdk-waf/source/model/HTTPRequest.cpp index 3bf9f300be6..15a6bdb1674 100644 --- a/aws-cpp-sdk-waf/source/model/HTTPRequest.cpp +++ b/aws-cpp-sdk-waf/source/model/HTTPRequest.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + HTTPRequest::HTTPRequest() : m_clientIPHasBeenSet(false), m_countryHasBeenSet(false), @@ -138,4 +144,8 @@ JsonValue HTTPRequest::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/IPSet.cpp b/aws-cpp-sdk-waf/source/model/IPSet.cpp index 587b3e9c4bf..8aca0e656c2 100644 --- a/aws-cpp-sdk-waf/source/model/IPSet.cpp +++ b/aws-cpp-sdk-waf/source/model/IPSet.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + IPSet::IPSet() : m_iPSetIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -93,4 +99,8 @@ JsonValue IPSet::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/IPSetDescriptor.cpp b/aws-cpp-sdk-waf/source/model/IPSetDescriptor.cpp index 3432896c9f2..5711ea4a042 100644 --- a/aws-cpp-sdk-waf/source/model/IPSetDescriptor.cpp +++ b/aws-cpp-sdk-waf/source/model/IPSetDescriptor.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + IPSetDescriptor::IPSetDescriptor() : m_typeHasBeenSet(false), m_valueHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue IPSetDescriptor::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/IPSetDescriptorType.cpp b/aws-cpp-sdk-waf/source/model/IPSetDescriptorType.cpp index bb069633ae3..2c129583d5e 100644 --- a/aws-cpp-sdk-waf/source/model/IPSetDescriptorType.cpp +++ b/aws-cpp-sdk-waf/source/model/IPSetDescriptorType.cpp @@ -19,7 +19,6 @@ using namespace Aws::Utils; -static const int IPV4_HASH = HashingUtils::HashString("IPV4"); namespace Aws { @@ -30,6 +29,8 @@ namespace Aws namespace IPSetDescriptorTypeMapper { + static const int IPV4_HASH = HashingUtils::HashString("IPV4"); + IPSetDescriptorType GetIPSetDescriptorTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-waf/source/model/IPSetSummary.cpp b/aws-cpp-sdk-waf/source/model/IPSetSummary.cpp index 89a0520aac2..171a6af2848 100644 --- a/aws-cpp-sdk-waf/source/model/IPSetSummary.cpp +++ b/aws-cpp-sdk-waf/source/model/IPSetSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + IPSetSummary::IPSetSummary() : m_iPSetIdHasBeenSet(false), m_nameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue IPSetSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/IPSetUpdate.cpp b/aws-cpp-sdk-waf/source/model/IPSetUpdate.cpp index d12a9117b99..4f3b6d8079f 100644 --- a/aws-cpp-sdk-waf/source/model/IPSetUpdate.cpp +++ b/aws-cpp-sdk-waf/source/model/IPSetUpdate.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + IPSetUpdate::IPSetUpdate() : m_actionHasBeenSet(false), m_iPSetDescriptorHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue IPSetUpdate::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/MatchFieldType.cpp b/aws-cpp-sdk-waf/source/model/MatchFieldType.cpp index 4780c9061c9..8b3f6357204 100644 --- a/aws-cpp-sdk-waf/source/model/MatchFieldType.cpp +++ b/aws-cpp-sdk-waf/source/model/MatchFieldType.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int URI_HASH = HashingUtils::HashString("URI"); -static const int QUERY_STRING_HASH = HashingUtils::HashString("QUERY_STRING"); -static const int HEADER_HASH = HashingUtils::HashString("HEADER"); -static const int METHOD_HASH = HashingUtils::HashString("METHOD"); -static const int BODY_HASH = HashingUtils::HashString("BODY"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace MatchFieldTypeMapper { + static const int URI_HASH = HashingUtils::HashString("URI"); + static const int QUERY_STRING_HASH = HashingUtils::HashString("QUERY_STRING"); + static const int HEADER_HASH = HashingUtils::HashString("HEADER"); + static const int METHOD_HASH = HashingUtils::HashString("METHOD"); + static const int BODY_HASH = HashingUtils::HashString("BODY"); + MatchFieldType GetMatchFieldTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-waf/source/model/ParameterExceptionField.cpp b/aws-cpp-sdk-waf/source/model/ParameterExceptionField.cpp index 19097b62584..4f09ecb32a3 100644 --- a/aws-cpp-sdk-waf/source/model/ParameterExceptionField.cpp +++ b/aws-cpp-sdk-waf/source/model/ParameterExceptionField.cpp @@ -19,15 +19,6 @@ using namespace Aws::Utils; -static const int CHANGE_ACTION_HASH = HashingUtils::HashString("CHANGE_ACTION"); -static const int WAF_ACTION_HASH = HashingUtils::HashString("WAF_ACTION"); -static const int PREDICATE_TYPE_HASH = HashingUtils::HashString("PREDICATE_TYPE"); -static const int IPSET_TYPE_HASH = HashingUtils::HashString("IPSET_TYPE"); -static const int BYTE_MATCH_FIELD_TYPE_HASH = HashingUtils::HashString("BYTE_MATCH_FIELD_TYPE"); -static const int SQL_INJECTION_MATCH_FIELD_TYPE_HASH = HashingUtils::HashString("SQL_INJECTION_MATCH_FIELD_TYPE"); -static const int BYTE_MATCH_TEXT_TRANSFORMATION_HASH = HashingUtils::HashString("BYTE_MATCH_TEXT_TRANSFORMATION"); -static const int BYTE_MATCH_POSITIONAL_CONSTRAINT_HASH = HashingUtils::HashString("BYTE_MATCH_POSITIONAL_CONSTRAINT"); -static const int SIZE_CONSTRAINT_COMPARISON_OPERATOR_HASH = HashingUtils::HashString("SIZE_CONSTRAINT_COMPARISON_OPERATOR"); namespace Aws { @@ -38,6 +29,16 @@ namespace Aws namespace ParameterExceptionFieldMapper { + static const int CHANGE_ACTION_HASH = HashingUtils::HashString("CHANGE_ACTION"); + static const int WAF_ACTION_HASH = HashingUtils::HashString("WAF_ACTION"); + static const int PREDICATE_TYPE_HASH = HashingUtils::HashString("PREDICATE_TYPE"); + static const int IPSET_TYPE_HASH = HashingUtils::HashString("IPSET_TYPE"); + static const int BYTE_MATCH_FIELD_TYPE_HASH = HashingUtils::HashString("BYTE_MATCH_FIELD_TYPE"); + static const int SQL_INJECTION_MATCH_FIELD_TYPE_HASH = HashingUtils::HashString("SQL_INJECTION_MATCH_FIELD_TYPE"); + static const int BYTE_MATCH_TEXT_TRANSFORMATION_HASH = HashingUtils::HashString("BYTE_MATCH_TEXT_TRANSFORMATION"); + static const int BYTE_MATCH_POSITIONAL_CONSTRAINT_HASH = HashingUtils::HashString("BYTE_MATCH_POSITIONAL_CONSTRAINT"); + static const int SIZE_CONSTRAINT_COMPARISON_OPERATOR_HASH = HashingUtils::HashString("SIZE_CONSTRAINT_COMPARISON_OPERATOR"); + ParameterExceptionField GetParameterExceptionFieldForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-waf/source/model/ParameterExceptionReason.cpp b/aws-cpp-sdk-waf/source/model/ParameterExceptionReason.cpp index d2b27da459b..9f765539d4e 100644 --- a/aws-cpp-sdk-waf/source/model/ParameterExceptionReason.cpp +++ b/aws-cpp-sdk-waf/source/model/ParameterExceptionReason.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int INVALID_OPTION_HASH = HashingUtils::HashString("INVALID_OPTION"); -static const int ILLEGAL_COMBINATION_HASH = HashingUtils::HashString("ILLEGAL_COMBINATION"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace ParameterExceptionReasonMapper { + static const int INVALID_OPTION_HASH = HashingUtils::HashString("INVALID_OPTION"); + static const int ILLEGAL_COMBINATION_HASH = HashingUtils::HashString("ILLEGAL_COMBINATION"); + ParameterExceptionReason GetParameterExceptionReasonForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-waf/source/model/PositionalConstraint.cpp b/aws-cpp-sdk-waf/source/model/PositionalConstraint.cpp index 22c0ebbaacb..5f935e31a29 100644 --- a/aws-cpp-sdk-waf/source/model/PositionalConstraint.cpp +++ b/aws-cpp-sdk-waf/source/model/PositionalConstraint.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int EXACTLY_HASH = HashingUtils::HashString("EXACTLY"); -static const int STARTS_WITH_HASH = HashingUtils::HashString("STARTS_WITH"); -static const int ENDS_WITH_HASH = HashingUtils::HashString("ENDS_WITH"); -static const int CONTAINS_HASH = HashingUtils::HashString("CONTAINS"); -static const int CONTAINS_WORD_HASH = HashingUtils::HashString("CONTAINS_WORD"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace PositionalConstraintMapper { + static const int EXACTLY_HASH = HashingUtils::HashString("EXACTLY"); + static const int STARTS_WITH_HASH = HashingUtils::HashString("STARTS_WITH"); + static const int ENDS_WITH_HASH = HashingUtils::HashString("ENDS_WITH"); + static const int CONTAINS_HASH = HashingUtils::HashString("CONTAINS"); + static const int CONTAINS_WORD_HASH = HashingUtils::HashString("CONTAINS_WORD"); + PositionalConstraint GetPositionalConstraintForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-waf/source/model/Predicate.cpp b/aws-cpp-sdk-waf/source/model/Predicate.cpp index 60a95788276..79934dfcf9a 100644 --- a/aws-cpp-sdk-waf/source/model/Predicate.cpp +++ b/aws-cpp-sdk-waf/source/model/Predicate.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + Predicate::Predicate() : m_negated(false), m_negatedHasBeenSet(false), @@ -86,4 +92,8 @@ JsonValue Predicate::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/PredicateType.cpp b/aws-cpp-sdk-waf/source/model/PredicateType.cpp index 11f62a6274b..0040fe3c905 100644 --- a/aws-cpp-sdk-waf/source/model/PredicateType.cpp +++ b/aws-cpp-sdk-waf/source/model/PredicateType.cpp @@ -15,15 +15,9 @@ #include #include #include -#include using namespace Aws::Utils; -static const int IPMatch_HASH = HashingUtils::HashString("IPMatch"); -static const int ByteMatch_HASH = HashingUtils::HashString("ByteMatch"); -static const int SqlInjectionMatch_HASH = HashingUtils::HashString("SqlInjectionMatch"); -static const int SizeConstraint_HASH = HashingUtils::HashString("SizeConstraint"); -static const int XssMatch_HASH = HashingUtils::HashString("XssMatch"); namespace Aws { @@ -34,6 +28,11 @@ namespace Aws namespace PredicateTypeMapper { + static const int IPMatch_HASH = HashingUtils::HashString("IPMatch"); + static const int ByteMatch_HASH = HashingUtils::HashString("ByteMatch"); + static const int SqlInjectionMatch_HASH = HashingUtils::HashString("SqlInjectionMatch"); + static const int SizeConstraint_HASH = HashingUtils::HashString("SizeConstraint"); + PredicateType GetPredicateTypeForName(const Aws::String& name) { @@ -54,11 +53,7 @@ namespace Aws { return PredicateType::SizeConstraint; } - else if (hashCode == XssMatch_HASH) - { - return PredicateType::XssMatch; - } - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { overflowContainer->StoreOverflow(hashCode, name); @@ -80,10 +75,8 @@ namespace Aws return "SqlInjectionMatch"; case PredicateType::SizeConstraint: return "SizeConstraint"; - case PredicateType::XssMatch: - return "XssMatch"; default: - EnumParseOverflowContainer* overflowContainer = Aws::GetEnumOverflowContainer(); + EnumParseOverflowContainer* overflowContainer = g_enumOverflow.load(); if(overflowContainer) { return overflowContainer->RetrieveOverflow(static_cast(enumValue)); diff --git a/aws-cpp-sdk-waf/source/model/Rule.cpp b/aws-cpp-sdk-waf/source/model/Rule.cpp index 460eb458662..23214ba9239 100644 --- a/aws-cpp-sdk-waf/source/model/Rule.cpp +++ b/aws-cpp-sdk-waf/source/model/Rule.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + Rule::Rule() : m_ruleIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -108,4 +114,8 @@ JsonValue Rule::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/RuleSummary.cpp b/aws-cpp-sdk-waf/source/model/RuleSummary.cpp index 39d0b5a8798..698579abcf9 100644 --- a/aws-cpp-sdk-waf/source/model/RuleSummary.cpp +++ b/aws-cpp-sdk-waf/source/model/RuleSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + RuleSummary::RuleSummary() : m_ruleIdHasBeenSet(false), m_nameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue RuleSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/RuleUpdate.cpp b/aws-cpp-sdk-waf/source/model/RuleUpdate.cpp index 402babfef31..ea7f0500f51 100644 --- a/aws-cpp-sdk-waf/source/model/RuleUpdate.cpp +++ b/aws-cpp-sdk-waf/source/model/RuleUpdate.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + RuleUpdate::RuleUpdate() : m_actionHasBeenSet(false), m_predicateHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue RuleUpdate::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/SampledHTTPRequest.cpp b/aws-cpp-sdk-waf/source/model/SampledHTTPRequest.cpp index 01b9bc775b5..e8365b2a202 100644 --- a/aws-cpp-sdk-waf/source/model/SampledHTTPRequest.cpp +++ b/aws-cpp-sdk-waf/source/model/SampledHTTPRequest.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + SampledHTTPRequest::SampledHTTPRequest() : m_requestHasBeenSet(false), m_weight(0), @@ -101,4 +107,8 @@ JsonValue SampledHTTPRequest::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws diff --git a/aws-cpp-sdk-waf/source/model/SizeConstraint.cpp b/aws-cpp-sdk-waf/source/model/SizeConstraint.cpp index 27a2dc0e772..0f3e681c3d6 100644 --- a/aws-cpp-sdk-waf/source/model/SizeConstraint.cpp +++ b/aws-cpp-sdk-waf/source/model/SizeConstraint.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + SizeConstraint::SizeConstraint() : m_fieldToMatchHasBeenSet(false), m_textTransformationHasBeenSet(false), @@ -100,4 +106,8 @@ JsonValue SizeConstraint::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/SizeConstraintSet.cpp b/aws-cpp-sdk-waf/source/model/SizeConstraintSet.cpp index ae717f55ec6..04e022da81d 100644 --- a/aws-cpp-sdk-waf/source/model/SizeConstraintSet.cpp +++ b/aws-cpp-sdk-waf/source/model/SizeConstraintSet.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + SizeConstraintSet::SizeConstraintSet() : m_sizeConstraintSetIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -93,4 +99,8 @@ JsonValue SizeConstraintSet::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/SizeConstraintSetSummary.cpp b/aws-cpp-sdk-waf/source/model/SizeConstraintSetSummary.cpp index cc33cea46ed..cb52c4c1119 100644 --- a/aws-cpp-sdk-waf/source/model/SizeConstraintSetSummary.cpp +++ b/aws-cpp-sdk-waf/source/model/SizeConstraintSetSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + SizeConstraintSetSummary::SizeConstraintSetSummary() : m_sizeConstraintSetIdHasBeenSet(false), m_nameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue SizeConstraintSetSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/SizeConstraintSetUpdate.cpp b/aws-cpp-sdk-waf/source/model/SizeConstraintSetUpdate.cpp index 0a62715a2ec..f6d3c5f6a60 100644 --- a/aws-cpp-sdk-waf/source/model/SizeConstraintSetUpdate.cpp +++ b/aws-cpp-sdk-waf/source/model/SizeConstraintSetUpdate.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + SizeConstraintSetUpdate::SizeConstraintSetUpdate() : m_actionHasBeenSet(false), m_sizeConstraintHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue SizeConstraintSetUpdate::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/SqlInjectionMatchSet.cpp b/aws-cpp-sdk-waf/source/model/SqlInjectionMatchSet.cpp index 40ee149435d..61e9fa57a97 100644 --- a/aws-cpp-sdk-waf/source/model/SqlInjectionMatchSet.cpp +++ b/aws-cpp-sdk-waf/source/model/SqlInjectionMatchSet.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + SqlInjectionMatchSet::SqlInjectionMatchSet() : m_sqlInjectionMatchSetIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -93,4 +99,8 @@ JsonValue SqlInjectionMatchSet::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/SqlInjectionMatchSetSummary.cpp b/aws-cpp-sdk-waf/source/model/SqlInjectionMatchSetSummary.cpp index 517f24e9216..fa047295df7 100644 --- a/aws-cpp-sdk-waf/source/model/SqlInjectionMatchSetSummary.cpp +++ b/aws-cpp-sdk-waf/source/model/SqlInjectionMatchSetSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + SqlInjectionMatchSetSummary::SqlInjectionMatchSetSummary() : m_sqlInjectionMatchSetIdHasBeenSet(false), m_nameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue SqlInjectionMatchSetSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/SqlInjectionMatchSetUpdate.cpp b/aws-cpp-sdk-waf/source/model/SqlInjectionMatchSetUpdate.cpp index cf32e348afe..d2d8e0935f0 100644 --- a/aws-cpp-sdk-waf/source/model/SqlInjectionMatchSetUpdate.cpp +++ b/aws-cpp-sdk-waf/source/model/SqlInjectionMatchSetUpdate.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + SqlInjectionMatchSetUpdate::SqlInjectionMatchSetUpdate() : m_actionHasBeenSet(false), m_sqlInjectionMatchTupleHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue SqlInjectionMatchSetUpdate::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/SqlInjectionMatchTuple.cpp b/aws-cpp-sdk-waf/source/model/SqlInjectionMatchTuple.cpp index 61c08181f97..94ca57d7762 100644 --- a/aws-cpp-sdk-waf/source/model/SqlInjectionMatchTuple.cpp +++ b/aws-cpp-sdk-waf/source/model/SqlInjectionMatchTuple.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + SqlInjectionMatchTuple::SqlInjectionMatchTuple() : m_fieldToMatchHasBeenSet(false), m_textTransformationHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue SqlInjectionMatchTuple::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/TextTransformation.cpp b/aws-cpp-sdk-waf/source/model/TextTransformation.cpp index 573bc20842d..d4c17c95f8a 100644 --- a/aws-cpp-sdk-waf/source/model/TextTransformation.cpp +++ b/aws-cpp-sdk-waf/source/model/TextTransformation.cpp @@ -19,12 +19,6 @@ using namespace Aws::Utils; -static const int NONE_HASH = HashingUtils::HashString("NONE"); -static const int COMPRESS_WHITE_SPACE_HASH = HashingUtils::HashString("COMPRESS_WHITE_SPACE"); -static const int HTML_ENTITY_DECODE_HASH = HashingUtils::HashString("HTML_ENTITY_DECODE"); -static const int LOWERCASE_HASH = HashingUtils::HashString("LOWERCASE"); -static const int CMD_LINE_HASH = HashingUtils::HashString("CMD_LINE"); -static const int URL_DECODE_HASH = HashingUtils::HashString("URL_DECODE"); namespace Aws { @@ -35,6 +29,13 @@ namespace Aws namespace TextTransformationMapper { + static const int NONE_HASH = HashingUtils::HashString("NONE"); + static const int COMPRESS_WHITE_SPACE_HASH = HashingUtils::HashString("COMPRESS_WHITE_SPACE"); + static const int HTML_ENTITY_DECODE_HASH = HashingUtils::HashString("HTML_ENTITY_DECODE"); + static const int LOWERCASE_HASH = HashingUtils::HashString("LOWERCASE"); + static const int CMD_LINE_HASH = HashingUtils::HashString("CMD_LINE"); + static const int URL_DECODE_HASH = HashingUtils::HashString("URL_DECODE"); + TextTransformation GetTextTransformationForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-waf/source/model/TimeWindow.cpp b/aws-cpp-sdk-waf/source/model/TimeWindow.cpp index cd6389ceefc..683d45463b5 100644 --- a/aws-cpp-sdk-waf/source/model/TimeWindow.cpp +++ b/aws-cpp-sdk-waf/source/model/TimeWindow.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + TimeWindow::TimeWindow() : m_startTimeHasBeenSet(false), m_endTimeHasBeenSet(false) @@ -68,4 +74,8 @@ JsonValue TimeWindow::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws diff --git a/aws-cpp-sdk-waf/source/model/WafAction.cpp b/aws-cpp-sdk-waf/source/model/WafAction.cpp index 4256642d4be..b4057c29da8 100644 --- a/aws-cpp-sdk-waf/source/model/WafAction.cpp +++ b/aws-cpp-sdk-waf/source/model/WafAction.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + WafAction::WafAction() : m_typeHasBeenSet(false) { @@ -54,4 +60,8 @@ JsonValue WafAction::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/WafActionType.cpp b/aws-cpp-sdk-waf/source/model/WafActionType.cpp index 901e0861fd4..438f49b2b5f 100644 --- a/aws-cpp-sdk-waf/source/model/WafActionType.cpp +++ b/aws-cpp-sdk-waf/source/model/WafActionType.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int BLOCK_HASH = HashingUtils::HashString("BLOCK"); -static const int ALLOW_HASH = HashingUtils::HashString("ALLOW"); -static const int COUNT_HASH = HashingUtils::HashString("COUNT"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace WafActionTypeMapper { + static const int BLOCK_HASH = HashingUtils::HashString("BLOCK"); + static const int ALLOW_HASH = HashingUtils::HashString("ALLOW"); + static const int COUNT_HASH = HashingUtils::HashString("COUNT"); + WafActionType GetWafActionTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-waf/source/model/WebACL.cpp b/aws-cpp-sdk-waf/source/model/WebACL.cpp index dedb95cc308..c92ec7e3f86 100644 --- a/aws-cpp-sdk-waf/source/model/WebACL.cpp +++ b/aws-cpp-sdk-waf/source/model/WebACL.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + WebACL::WebACL() : m_webACLIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -123,4 +129,8 @@ JsonValue WebACL::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/WebACLSummary.cpp b/aws-cpp-sdk-waf/source/model/WebACLSummary.cpp index 83e6f30c535..8b8da0735ff 100644 --- a/aws-cpp-sdk-waf/source/model/WebACLSummary.cpp +++ b/aws-cpp-sdk-waf/source/model/WebACLSummary.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + WebACLSummary::WebACLSummary() : m_webACLIdHasBeenSet(false), m_nameHasBeenSet(false) @@ -70,4 +76,8 @@ JsonValue WebACLSummary::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-waf/source/model/WebACLUpdate.cpp b/aws-cpp-sdk-waf/source/model/WebACLUpdate.cpp index 5cff117bf65..77ad0d27f66 100644 --- a/aws-cpp-sdk-waf/source/model/WebACLUpdate.cpp +++ b/aws-cpp-sdk-waf/source/model/WebACLUpdate.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WAF::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WAF +{ +namespace Model +{ + WebACLUpdate::WebACLUpdate() : m_actionHasBeenSet(false), m_activatedRuleHasBeenSet(false) @@ -69,4 +75,8 @@ JsonValue WebACLUpdate::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WAF +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-workspaces/CMakeLists.txt b/aws-cpp-sdk-workspaces/CMakeLists.txt index 5babf84d605..512d734886e 100644 --- a/aws-cpp-sdk-workspaces/CMakeLists.txt +++ b/aws-cpp-sdk-workspaces/CMakeLists.txt @@ -17,13 +17,25 @@ project(aws-cpp-sdk-workspaces) "source/model/*.cpp" ) - file(GLOB WORKSPACES_SRC + file(GLOB WORKSPACES_UNIFIED_HEADERS ${AWS_WORKSPACES_HEADERS} ${AWS_WORKSPACES_MODEL_HEADERS} + ) + + file(GLOB WORKSPACES_UNITY_SRC ${AWS_WORKSPACES_SOURCE} ${AWS_WORKSPACES_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("WORKSPACES" WORKSPACES_UNITY_SRC) + endif() + + file(GLOB WORKSPACES_SRC + ${WORKSPACES_UNIFIED_HEADERS} + ${WORKSPACES_UNITY_SRC} + ) + if(WIN32) #if we are compiling for visual studio, create a sane directory tree. if(MSVC) diff --git a/aws-cpp-sdk-workspaces/source/WorkSpacesErrors.cpp b/aws-cpp-sdk-workspaces/source/WorkSpacesErrors.cpp index dc8393d5993..ebc895c6cc3 100644 --- a/aws-cpp-sdk-workspaces/source/WorkSpacesErrors.cpp +++ b/aws-cpp-sdk-workspaces/source/WorkSpacesErrors.cpp @@ -20,10 +20,6 @@ using namespace Aws::Client; using namespace Aws::WorkSpaces; using namespace Aws::Utils; -static const int INVALID_PARAMETER_VALUES_HASH = HashingUtils::HashString("InvalidParameterValuesException"); -static const int RESOURCE_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("ResourceLimitExceededException"); -static const int RESOURCE_UNAVAILABLE_HASH = HashingUtils::HashString("ResourceUnavailableException"); - namespace Aws { namespace WorkSpaces @@ -31,6 +27,11 @@ namespace WorkSpaces namespace WorkSpacesErrorMapper { +static const int INVALID_PARAMETER_VALUES_HASH = HashingUtils::HashString("InvalidParameterValuesException"); +static const int RESOURCE_LIMIT_EXCEEDED_HASH = HashingUtils::HashString("ResourceLimitExceededException"); +static const int RESOURCE_UNAVAILABLE_HASH = HashingUtils::HashString("ResourceUnavailableException"); + + AWSError GetErrorForName(const char* errorName) { int hashCode = HashingUtils::HashString(errorName); diff --git a/aws-cpp-sdk-workspaces/source/model/Compute.cpp b/aws-cpp-sdk-workspaces/source/model/Compute.cpp index 6b554152e0a..e71efc18eaf 100644 --- a/aws-cpp-sdk-workspaces/source/model/Compute.cpp +++ b/aws-cpp-sdk-workspaces/source/model/Compute.cpp @@ -19,9 +19,6 @@ using namespace Aws::Utils; -static const int VALUE_HASH = HashingUtils::HashString("VALUE"); -static const int STANDARD_HASH = HashingUtils::HashString("STANDARD"); -static const int PERFORMANCE_HASH = HashingUtils::HashString("PERFORMANCE"); namespace Aws { @@ -32,6 +29,10 @@ namespace Aws namespace ComputeMapper { + static const int VALUE_HASH = HashingUtils::HashString("VALUE"); + static const int STANDARD_HASH = HashingUtils::HashString("STANDARD"); + static const int PERFORMANCE_HASH = HashingUtils::HashString("PERFORMANCE"); + Compute GetComputeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-workspaces/source/model/ComputeType.cpp b/aws-cpp-sdk-workspaces/source/model/ComputeType.cpp index ffc1fb8b65b..50f6d154fb5 100644 --- a/aws-cpp-sdk-workspaces/source/model/ComputeType.cpp +++ b/aws-cpp-sdk-workspaces/source/model/ComputeType.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WorkSpaces::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WorkSpaces +{ +namespace Model +{ + ComputeType::ComputeType() : m_nameHasBeenSet(false) { @@ -54,4 +60,8 @@ JsonValue ComputeType::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WorkSpaces +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-workspaces/source/model/DefaultWorkspaceCreationProperties.cpp b/aws-cpp-sdk-workspaces/source/model/DefaultWorkspaceCreationProperties.cpp index c68d80b6aee..00efd0d6e4b 100644 --- a/aws-cpp-sdk-workspaces/source/model/DefaultWorkspaceCreationProperties.cpp +++ b/aws-cpp-sdk-workspaces/source/model/DefaultWorkspaceCreationProperties.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WorkSpaces::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WorkSpaces +{ +namespace Model +{ + DefaultWorkspaceCreationProperties::DefaultWorkspaceCreationProperties() : m_enableWorkDocs(false), m_enableWorkDocsHasBeenSet(false), @@ -121,4 +127,8 @@ JsonValue DefaultWorkspaceCreationProperties::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WorkSpaces +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-workspaces/source/model/FailedCreateWorkspaceRequest.cpp b/aws-cpp-sdk-workspaces/source/model/FailedCreateWorkspaceRequest.cpp index 49659851e3c..fa2c2f15dff 100644 --- a/aws-cpp-sdk-workspaces/source/model/FailedCreateWorkspaceRequest.cpp +++ b/aws-cpp-sdk-workspaces/source/model/FailedCreateWorkspaceRequest.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WorkSpaces::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WorkSpaces +{ +namespace Model +{ + FailedCreateWorkspaceRequest::FailedCreateWorkspaceRequest() : m_workspaceRequestHasBeenSet(false), m_errorCodeHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue FailedCreateWorkspaceRequest::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WorkSpaces +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-workspaces/source/model/FailedWorkspaceChangeRequest.cpp b/aws-cpp-sdk-workspaces/source/model/FailedWorkspaceChangeRequest.cpp index c8c67b957b0..cad96c4db68 100644 --- a/aws-cpp-sdk-workspaces/source/model/FailedWorkspaceChangeRequest.cpp +++ b/aws-cpp-sdk-workspaces/source/model/FailedWorkspaceChangeRequest.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WorkSpaces::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WorkSpaces +{ +namespace Model +{ + FailedWorkspaceChangeRequest::FailedWorkspaceChangeRequest() : m_workspaceIdHasBeenSet(false), m_errorCodeHasBeenSet(false), @@ -85,4 +91,8 @@ JsonValue FailedWorkspaceChangeRequest::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WorkSpaces +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-workspaces/source/model/RebootRequest.cpp b/aws-cpp-sdk-workspaces/source/model/RebootRequest.cpp index 502159ce587..3bf58391c21 100644 --- a/aws-cpp-sdk-workspaces/source/model/RebootRequest.cpp +++ b/aws-cpp-sdk-workspaces/source/model/RebootRequest.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WorkSpaces::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WorkSpaces +{ +namespace Model +{ + RebootRequest::RebootRequest() : m_workspaceIdHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue RebootRequest::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WorkSpaces +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-workspaces/source/model/RebuildRequest.cpp b/aws-cpp-sdk-workspaces/source/model/RebuildRequest.cpp index 7cbad6dcaba..e4cadf1bf4a 100644 --- a/aws-cpp-sdk-workspaces/source/model/RebuildRequest.cpp +++ b/aws-cpp-sdk-workspaces/source/model/RebuildRequest.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WorkSpaces::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WorkSpaces +{ +namespace Model +{ + RebuildRequest::RebuildRequest() : m_workspaceIdHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue RebuildRequest::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WorkSpaces +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-workspaces/source/model/TerminateRequest.cpp b/aws-cpp-sdk-workspaces/source/model/TerminateRequest.cpp index e62af45a313..a392041cca5 100644 --- a/aws-cpp-sdk-workspaces/source/model/TerminateRequest.cpp +++ b/aws-cpp-sdk-workspaces/source/model/TerminateRequest.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WorkSpaces::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WorkSpaces +{ +namespace Model +{ + TerminateRequest::TerminateRequest() : m_workspaceIdHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue TerminateRequest::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WorkSpaces +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-workspaces/source/model/UserStorage.cpp b/aws-cpp-sdk-workspaces/source/model/UserStorage.cpp index 2a0295ee943..315986569f2 100644 --- a/aws-cpp-sdk-workspaces/source/model/UserStorage.cpp +++ b/aws-cpp-sdk-workspaces/source/model/UserStorage.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WorkSpaces::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WorkSpaces +{ +namespace Model +{ + UserStorage::UserStorage() : m_capacityHasBeenSet(false) { @@ -55,4 +61,8 @@ JsonValue UserStorage::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WorkSpaces +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-workspaces/source/model/Workspace.cpp b/aws-cpp-sdk-workspaces/source/model/Workspace.cpp index b9332222fa2..d89c29aafaf 100644 --- a/aws-cpp-sdk-workspaces/source/model/Workspace.cpp +++ b/aws-cpp-sdk-workspaces/source/model/Workspace.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WorkSpaces::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WorkSpaces +{ +namespace Model +{ + Workspace::Workspace() : m_workspaceIdHasBeenSet(false), m_directoryIdHasBeenSet(false), @@ -238,4 +244,8 @@ JsonValue Workspace::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WorkSpaces +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-workspaces/source/model/WorkspaceBundle.cpp b/aws-cpp-sdk-workspaces/source/model/WorkspaceBundle.cpp index 66ef8408ffa..ebf8c580e7a 100644 --- a/aws-cpp-sdk-workspaces/source/model/WorkspaceBundle.cpp +++ b/aws-cpp-sdk-workspaces/source/model/WorkspaceBundle.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WorkSpaces::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WorkSpaces +{ +namespace Model +{ + WorkspaceBundle::WorkspaceBundle() : m_bundleIdHasBeenSet(false), m_nameHasBeenSet(false), @@ -130,4 +136,8 @@ JsonValue WorkspaceBundle::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WorkSpaces +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-workspaces/source/model/WorkspaceDirectory.cpp b/aws-cpp-sdk-workspaces/source/model/WorkspaceDirectory.cpp index b6f22ef0bf5..29a1779d4b6 100644 --- a/aws-cpp-sdk-workspaces/source/model/WorkspaceDirectory.cpp +++ b/aws-cpp-sdk-workspaces/source/model/WorkspaceDirectory.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WorkSpaces::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WorkSpaces +{ +namespace Model +{ + WorkspaceDirectory::WorkspaceDirectory() : m_directoryIdHasBeenSet(false), m_aliasHasBeenSet(false), @@ -234,4 +240,8 @@ JsonValue WorkspaceDirectory::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WorkSpaces +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-workspaces/source/model/WorkspaceDirectoryState.cpp b/aws-cpp-sdk-workspaces/source/model/WorkspaceDirectoryState.cpp index b521787c375..a45d582ac61 100644 --- a/aws-cpp-sdk-workspaces/source/model/WorkspaceDirectoryState.cpp +++ b/aws-cpp-sdk-workspaces/source/model/WorkspaceDirectoryState.cpp @@ -19,11 +19,6 @@ using namespace Aws::Utils; -static const int REGISTERING_HASH = HashingUtils::HashString("REGISTERING"); -static const int REGISTERED_HASH = HashingUtils::HashString("REGISTERED"); -static const int DEREGISTERING_HASH = HashingUtils::HashString("DEREGISTERING"); -static const int DEREGISTERED_HASH = HashingUtils::HashString("DEREGISTERED"); -static const int ERROR__HASH = HashingUtils::HashString("ERROR"); namespace Aws { @@ -34,6 +29,12 @@ namespace Aws namespace WorkspaceDirectoryStateMapper { + static const int REGISTERING_HASH = HashingUtils::HashString("REGISTERING"); + static const int REGISTERED_HASH = HashingUtils::HashString("REGISTERED"); + static const int DEREGISTERING_HASH = HashingUtils::HashString("DEREGISTERING"); + static const int DEREGISTERED_HASH = HashingUtils::HashString("DEREGISTERED"); + static const int ERROR__HASH = HashingUtils::HashString("ERROR"); + WorkspaceDirectoryState GetWorkspaceDirectoryStateForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-workspaces/source/model/WorkspaceDirectoryType.cpp b/aws-cpp-sdk-workspaces/source/model/WorkspaceDirectoryType.cpp index 66143883829..c5a07b44d8e 100644 --- a/aws-cpp-sdk-workspaces/source/model/WorkspaceDirectoryType.cpp +++ b/aws-cpp-sdk-workspaces/source/model/WorkspaceDirectoryType.cpp @@ -19,8 +19,6 @@ using namespace Aws::Utils; -static const int SIMPLE_AD_HASH = HashingUtils::HashString("SIMPLE_AD"); -static const int AD_CONNECTOR_HASH = HashingUtils::HashString("AD_CONNECTOR"); namespace Aws { @@ -31,6 +29,9 @@ namespace Aws namespace WorkspaceDirectoryTypeMapper { + static const int SIMPLE_AD_HASH = HashingUtils::HashString("SIMPLE_AD"); + static const int AD_CONNECTOR_HASH = HashingUtils::HashString("AD_CONNECTOR"); + WorkspaceDirectoryType GetWorkspaceDirectoryTypeForName(const Aws::String& name) { diff --git a/aws-cpp-sdk-workspaces/source/model/WorkspaceRequest.cpp b/aws-cpp-sdk-workspaces/source/model/WorkspaceRequest.cpp index 8f1b459a158..6f931d68b4c 100644 --- a/aws-cpp-sdk-workspaces/source/model/WorkspaceRequest.cpp +++ b/aws-cpp-sdk-workspaces/source/model/WorkspaceRequest.cpp @@ -17,10 +17,16 @@ #include -using namespace Aws::WorkSpaces::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace WorkSpaces +{ +namespace Model +{ + WorkspaceRequest::WorkspaceRequest() : m_directoryIdHasBeenSet(false), m_userNameHasBeenSet(false), @@ -134,4 +140,8 @@ JsonValue WorkspaceRequest::Jsonize() const } return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace WorkSpaces +} // namespace Aws \ No newline at end of file diff --git a/aws-cpp-sdk-workspaces/source/model/WorkspaceState.cpp b/aws-cpp-sdk-workspaces/source/model/WorkspaceState.cpp index d06296ab260..80167768772 100644 --- a/aws-cpp-sdk-workspaces/source/model/WorkspaceState.cpp +++ b/aws-cpp-sdk-workspaces/source/model/WorkspaceState.cpp @@ -19,16 +19,6 @@ using namespace Aws::Utils; -static const int PENDING_HASH = HashingUtils::HashString("PENDING"); -static const int AVAILABLE_HASH = HashingUtils::HashString("AVAILABLE"); -static const int IMPAIRED_HASH = HashingUtils::HashString("IMPAIRED"); -static const int UNHEALTHY_HASH = HashingUtils::HashString("UNHEALTHY"); -static const int REBOOTING_HASH = HashingUtils::HashString("REBOOTING"); -static const int REBUILDING_HASH = HashingUtils::HashString("REBUILDING"); -static const int TERMINATING_HASH = HashingUtils::HashString("TERMINATING"); -static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); -static const int SUSPENDED_HASH = HashingUtils::HashString("SUSPENDED"); -static const int ERROR__HASH = HashingUtils::HashString("ERROR"); namespace Aws { @@ -39,6 +29,17 @@ namespace Aws namespace WorkspaceStateMapper { + static const int PENDING_HASH = HashingUtils::HashString("PENDING"); + static const int AVAILABLE_HASH = HashingUtils::HashString("AVAILABLE"); + static const int IMPAIRED_HASH = HashingUtils::HashString("IMPAIRED"); + static const int UNHEALTHY_HASH = HashingUtils::HashString("UNHEALTHY"); + static const int REBOOTING_HASH = HashingUtils::HashString("REBOOTING"); + static const int REBUILDING_HASH = HashingUtils::HashString("REBUILDING"); + static const int TERMINATING_HASH = HashingUtils::HashString("TERMINATING"); + static const int TERMINATED_HASH = HashingUtils::HashString("TERMINATED"); + static const int SUSPENDED_HASH = HashingUtils::HashString("SUSPENDED"); + static const int ERROR__HASH = HashingUtils::HashString("ERROR"); + WorkspaceState GetWorkspaceStateForName(const Aws::String& name) { diff --git a/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/cpp/PlatformAndKeywordSanitizer.java b/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/cpp/PlatformAndKeywordSanitizer.java index 35e5cdf8a8f..84c3a272295 100644 --- a/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/cpp/PlatformAndKeywordSanitizer.java +++ b/code-generation/generator/src/main/java/com/amazonaws/util/awsclientgenerator/domainmodels/codegeneration/cpp/PlatformAndKeywordSanitizer.java @@ -69,6 +69,8 @@ public class PlatformAndKeywordSanitizer { words.add("STATIC"); words.add("double"); words.add("Double"); + words.add("ANDROID"); + words.add("DEBUG"); words.add("*"); //ok you get the idea... add them as you encounter them. FORBIDDEN_WORDS = Collections.unmodifiableSet(words); diff --git a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/CMakeFile.vm b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/CMakeFile.vm index ad108fce086..cb72f6491c5 100644 --- a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/CMakeFile.vm +++ b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/CMakeFile.vm @@ -20,13 +20,25 @@ project(aws-cpp-sdk-${metadata.projectName}) ) #set($cmakeVarStart = "${") - file(GLOB ${projectNameCaps}_SRC + file(GLOB ${projectNameCaps}_UNIFIED_HEADERS ${cmakeVarStart}AWS_${projectNameCaps}_HEADERS} ${cmakeVarStart}AWS_${projectNameCaps}_MODEL_HEADERS} + ) + + file(GLOB ${projectNameCaps}_UNITY_SRC ${cmakeVarStart}AWS_${projectNameCaps}_SOURCE} ${cmakeVarStart}AWS_${projectNameCaps}_MODEL_SOURCE} ) + if(ENABLE_UNITY_BUILD) + enable_unity_build("${projectNameCaps}" ${projectNameCaps}_UNITY_SRC) + endif() + + file(GLOB ${projectNameCaps}_SRC + ${cmakeVarStart}${projectNameCaps}_UNIFIED_HEADERS} + ${cmakeVarStart}${projectNameCaps}_UNITY_SRC} + ) + #set($dirDelim = "\\") if(WIN32) \#if we are compiling for visual studio, create a sane directory tree. diff --git a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/EnumSource.vm b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/EnumSource.vm index b5e61a80bb4..2097a643efd 100644 --- a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/EnumSource.vm +++ b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/EnumSource.vm @@ -8,9 +8,6 @@ using namespace Aws::Utils; -#foreach($enumMember in $enumModel.members) -static const int ${enumMember.memberName}_HASH = HashingUtils::HashString("${enumMember.memberStringValue}"); -#end namespace Aws { @@ -21,6 +18,10 @@ namespace Aws namespace ${enumModel.name}Mapper { +#foreach($enumMember in $enumModel.members) + static const int ${enumMember.memberName}_HASH = HashingUtils::HashString("${enumMember.memberStringValue}"); +#end + #if ($enumModel.members.size() > 121) /* The if-else chains in this file are converted into a jump table by the compiler, diff --git a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceErrorsSource.vm b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceErrorsSource.vm index 1de3332de82..addf3cb6535 100644 --- a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceErrorsSource.vm +++ b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceErrorsSource.vm @@ -12,17 +12,18 @@ using namespace Aws::Client; using namespace Aws::${metadata.namespace}; using namespace Aws::Utils; -#foreach($error in $serviceModel.serviceErrors) -#set($constName = ${ErrorFormatter.formatErrorConstName($error.name)}) -static const int ${constName}_HASH = HashingUtils::HashString("${error.text}"); -#end - namespace Aws { namespace ${metadata.namespace} { namespace ${metadata.classNamePrefix}ErrorMapper { + +#foreach($error in $serviceModel.serviceErrors) +#set($constName = ${ErrorFormatter.formatErrorConstName($error.name)}) +static const int ${constName}_HASH = HashingUtils::HashString("${error.text}"); +#end + #if ($serviceModel.serviceErrors.size() > 121) /* diff --git a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonSubObjectSource.vm b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonSubObjectSource.vm index 1760926fd77..6440410df44 100644 --- a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonSubObjectSource.vm +++ b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonSubObjectSource.vm @@ -9,10 +9,16 @@ \#include -using namespace Aws::${metadata.namespace}::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; +namespace Aws +{ +namespace ${metadata.namespace} +{ +namespace Model +{ + #set($useRequiredField = true) #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/ModelClassMembersGenerateInitializers.vm") ${typeInfo.className}::${typeInfo.className}()$initializers @@ -38,4 +44,8 @@ JsonValue ${typeInfo.className}::Jsonize() const #set($useRequiredField = true) #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/json/ModelClassMembersJsonizeSource.vm") return payload; -} \ No newline at end of file +} + +} // namespace Model +} // namespace ${metadata.namespace} +} // namespace Aws \ No newline at end of file diff --git a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryXmlSubObjectSource.vm b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryXmlSubObjectSource.vm index 125772f27b7..042fa446783 100644 --- a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryXmlSubObjectSource.vm +++ b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryXmlSubObjectSource.vm @@ -11,10 +11,16 @@ \#include -using namespace Aws::${metadata.namespace}::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ${metadata.namespace} +{ +namespace Model +{ + #set($useRequiredField = true) #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/ModelClassMembersGenerateInitializers.vm") ${typeInfo.className}::${typeInfo.className}()$initializers @@ -174,3 +180,7 @@ void ${typeInfo.className}::OutputToStream(Aws::OStream& oStream, const char* lo #end #end } + +} // namespace Model +} // namespace ${metadata.namespace} +} // namespace Aws diff --git a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/rest/RestXmlSubObjectSource.vm b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/rest/RestXmlSubObjectSource.vm index 5b65502d1ee..9fe4eefa88e 100644 --- a/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/rest/RestXmlSubObjectSource.vm +++ b/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/rest/RestXmlSubObjectSource.vm @@ -11,10 +11,16 @@ \#include -using namespace Aws::${metadata.namespace}::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; +namespace Aws +{ +namespace ${metadata.namespace} +{ +namespace Model +{ + #set($useRequiredField = true) #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/ModelClassMembersGenerateInitializers.vm") ${typeInfo.className}::${typeInfo.className}()$initializers @@ -44,3 +50,7 @@ void ${typeInfo.className}::AddToNode(XmlNode& parentNode) const #set($useRequiredField = true) #parse("com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/ModelClassMembersXmlizeSource.vm") } + +} // namespace Model +} // namespace ${metadata.namespace} +} // namespace Aws diff --git a/scripts/build_3rdparty.py b/scripts/build_3rdparty.py index afc19a603fe..5dd5c26d63a 100644 --- a/scripts/build_3rdparty.py +++ b/scripts/build_3rdparty.py @@ -1,4 +1,4 @@ -# +# # Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"). @@ -51,7 +51,7 @@ def GetPlatformBuildTargets(): 'cmake_params' : "-DSTATIC_LINKING=1", 'build_params' : [ "-p:Configuration=Release" ], 'config' : 'Release' } }, - 'global_cmake_params' : "-G \"Visual Studio 12 Win64\" -DCUSTOM_MEMORY_MANAGEMENT=1 -DGENERATE_VERSION_INFO=0 -DCMAKE_CONFIGURATION_TYPES=\"Debug;Release;MinSizeRel;RelWithDebInfo\" -DCMAKE_CXX_FLAGS_DEBUGOPT=\"\" -DCMAKE_EXE_LINKER_FLAGS_DEBUGOPT=\"\" -DCMAKE_SHARED_LINKER_FLAGS_DEBUGOPT=\"\"" }, + 'global_cmake_params' : "-G \"Visual Studio 12 Win64\" -DCUSTOM_MEMORY_MANAGEMENT=1 -DGENERATE_VERSION_INFO=0 -DMINIMIZE_SIZE=ON -DCMAKE_CONFIGURATION_TYPES=\"Debug;Release;MinSizeRel;RelWithDebInfo\" -DCMAKE_CXX_FLAGS_DEBUGOPT=\"\" -DCMAKE_EXE_LINKER_FLAGS_DEBUGOPT=\"\" -DCMAKE_SHARED_LINKER_FLAGS_DEBUGOPT=\"\"" }, 'Android' : { 'buildPlatforms' : [ 'Linux' ], 'configs' : { 'DebugDynamic' : { 'directory' : '_build_android_dynamic_debug', 'cmake_params' : "-DSTATIC_LINKING=0 -DANDROID_STL=gnustl_shared -DCMAKE_BUILD_TYPE=Debug", @@ -74,7 +74,8 @@ def GetPlatformBuildTargets(): "-DANDROID_STL_FORCE_FEATURES=OFF " \ "-DTARGET_ARCH=ANDROID " \ "-DANDROID_ABI=armeabi-v7a " \ - "-DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 " }, + "-DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 " \ + "-DMINIMIZE_SIZE=ON" }, 'Linux' : { 'buildPlatforms' : [ 'Linux' ], 'configs' : { 'DebugDynamic' : { 'directory' : '_build_linux_dynamic_debug', 'cmake_params' : "-DSTATIC_LINKING=0 -DCMAKE_BUILD_TYPE=Debug", @@ -92,7 +93,7 @@ def GetPlatformBuildTargets(): 'cmake_params' : "-DSTATIC_LINKING=1 -DCMAKE_BUILD_TYPE=Release", 'build_params' : [], 'config' : 'Release' } }, - 'global_cmake_params' : "-DCUSTOM_MEMORY_MANAGEMENT=1 -DGENERATE_VERSION_INFO=0" }, + 'global_cmake_params' : "-DCUSTOM_MEMORY_MANAGEMENT=1 -DGENERATE_VERSION_INFO=0 -DMINIMIZE_SIZE=ON" }, 'Darwin' : { 'buildPlatforms' : [ 'Darwin' ], 'configs' : { 'DebugDynamic' : { 'directory' : '_build_darwin_dynamic_debug', 'cmake_params' : "-DSTATIC_LINKING=0 -DCMAKE_BUILD_TYPE=Debug", @@ -132,7 +133,7 @@ def ParseArguments(platformEnvironments): argMap[ "installDir" ] = args[ "installdir" ] or platformEnv['default_install_directory'] argMap[ "cmakeParams" ] = re.sub(r'^"|"$', '', args[ "cmake_params" ] or "") argMap[ "architecture" ] = re.sub(r'^"|"$', '', args[ "architecture" ] or platformName) - argMap[ "configs" ] = re.sub(r'^"\"$', '', args[ "configs" ] or "DebugDynamic ReleaseDynamic ReleaseStatic").split() + argMap[ "configs" ] = re.sub(r'^"\"$', '', args[ "configs" ] or "DebugStatic DebugDynamic ReleaseDynamic ReleaseStatic").split() argMap[ "parallel" ] = args[ "parallel" ] or "2" argMap[ "generateClients" ] = args[ "generateClients" ] or "0" argMap[ "sourcedir" ] = args[ "sourcedir"] or ".." diff --git a/scripts/gather_3rdparty.py b/scripts/gather_3rdparty.py new file mode 100644 index 00000000000..0a12ee1ba87 --- /dev/null +++ b/scripts/gather_3rdparty.py @@ -0,0 +1,208 @@ +# +# Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"). +# You may not use this file except in compliance with the License. +# A copy of the License is located at +# +# http://aws.amazon.com/apache2.0 +# +# or in the "license" file accompanying this file. This file is distributed +# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either +# express or implied. See the License for the specific language governing +# permissions and limitations under the License. +# + +import argparse +import os +import platform +import shutil +import subprocess +import time + +def GetPlatformEnvironments(): + return { 'Windows' : { 'destination_directory' : 'C:\\temp' }, + 'Linux' : { 'destination_directory' : '/tmp' }, + 'Darwin' : { 'destination_directory' : '/tmp' } } + +def GetGeneratedSDKs(): + return [ #"acm", + #"apigateway", + "autoscaling", + #"cloudhsm", + "cloudformation", + "cloudfront", + #"cloudsearch", + #"cloudsearchdomain", + #"cloudtrail", + #"codecommit", + "codedeploy", + #"codepipeline", + "cognito-identity", + #"cognito-sync", + #"config", + #"datapipeline", + #"devicefarm", + #"directconnect", + #"ds", + "dynamodb", + #"ec2", + "ecs", + #"ecr", + "elasticache", + "elasticbeanstalk", + "elasticfilesystem", + "elasticloadbalancing", + "elasticmapreduce", + "elastictranscoder", + "email", + #"es", + #"events", + #"firehose", + "gamelift", + "glacier", + "iam", + #"importexport", + #"inspector", + #"iot", + "kinesis", + "kms", + "lambda", + "logs", + "machinelearning", + #"marketplacecommerceanalytics", + "mobileanalytics", + "monitoring", + "opsworks", + "rds", + "redshift", + #"route53", + #"route53domains", + "s3", + "sdb", + "sns", + "sqs", + #"ssm", + #"storagegateway", + "sts", + #"support", + "swf" + #"waf", + #"workspaces" + ] + +def GetGeneratedSDKDirectories(): + return [ "aws-cpp-sdk-" + dir for dir in GetGeneratedSDKs() ] + +def GetC2JFiles(): + sdks = GetGeneratedSDKs() + apiDir = os.path.join( os.getcwd(), "code-generation", "api-descriptions" ) + fileList = [] + for baseDir, dirNames, fileNames in os.walk( apiDir ): + if baseDir == apiDir: + for fileName in fileNames: + for sdk in sdks: + if fileName.startswith(sdk): + fileList.append(fileName) + break + + return fileList + + + +def GetTestDirectories(): + return [ "testing-resources", + "aws-cpp-sdk-transfer-tests", + "aws-cpp-sdk-sqs-integration-tests", + "aws-cpp-sdk-s3-integration-tests", + "aws-cpp-sdk-redshift-integration-tests", + "aws-cpp-sdk-lambda-integration-tests", + "aws-cpp-sdk-identity-management-tests", + "aws-cpp-sdk-dynamodb-integration-tests", + "aws-cpp-sdk-cognitoidentity-integration-tests", + "aws-cpp-sdk-cloudfront-integration-tests", + "aws-cpp-sdk-core-tests", + "android-tests", + "android-unified-tests" ] + +def GetCoreDirectories(): + return [ "aws-cpp-sdk-core", "code-generation/generator", "scripts", "doxygen", "android-build" ] + +def GetHighLevelSDKDirectories(): + return [ "aws-cpp-sdk-access-management", + "aws-cpp-sdk-identity-management", + "aws-cpp-sdk-queues", + "aws-cpp-sdk-transfer" ] + +def GetAllDirectories(): + return GetCoreDirectories() + GetGeneratedSDKDirectories() + GetTestDirectories() + GetHighLevelSDKDirectories() + +def GetLooseFiles(): + return [ "CMakeLists.txt", "LICENSE.txt", "NOTICE.txt", "README.md" ] + + +def ParseArguments(platformEnv): + argMap = {} + + parser = argparse.ArgumentParser(description="AWSNativeSDK 3rdParty Gather Script") + parser.add_argument("--destdir", action="store") + + args = vars( parser.parse_args() ) + argMap[ "destDir" ] = args[ "destdir" ] or platformEnv['destination_directory'] + + return argMap + + + +def Main(): + platformEnvironments = GetPlatformEnvironments() + platformEnv = platformEnvironments[ platform.system() ] + arguments = ParseArguments(platformEnv) + + baseDir = arguments[ "destDir" ] + sdkDir = "aws-sdk-cpp" + uploadFilename = "latestSnapshot.zip" + destDir = os.path.join(baseDir, sdkDir) + uploadZipFile = os.path.join( baseDir, uploadFilename ) + + if os.path.exists( destDir ): + shutil.rmtree( destDir ) + + if os.path.exists( uploadZipFile ): + os.remove( uploadZipFile ) + + time.sleep(2) + + os.mkdir( destDir ) + + # copy all files needed + sourceDir = os.getcwd() + for dir in GetAllDirectories(): + sourceTree = os.path.join( sourceDir, dir ) + destTree = os.path.join( destDir, dir ) + shutil.copytree( sourceTree, destTree ) + + for filename in GetLooseFiles(): + sourceFile = os.path.join( sourceDir, filename ) + shutil.copy( sourceFile, destDir ) + + # c2j files need to be individually filtered to keep out services we don't want + c2jDir = os.path.join( destDir, "code-generation", "api-descriptions" ) + os.mkdir( c2jDir ) + for c2jFile in GetC2JFiles(): + shutil.copy( os.path.join( sourceDir, "code-generation", "api-descriptions", c2jFile ), c2jDir ) + + # zip up the target directory + os.chdir(baseDir) + zipCommand = "jar -cMf \"" + uploadZipFile + "\" " + sdkDir + subprocess.check_call( zipCommand, shell = True ) + os.chdir(sourceDir) + + # shutil.rmtree( destDir ) + + print( "Aws SDK for C++ finished 3rd party pre-build gather into: " + uploadZipFile ) + + +Main() + + diff --git a/scripts/sdk_directories.py b/scripts/sdk_directories.py index 6621d0c4194..57162176fa6 100644 --- a/scripts/sdk_directories.py +++ b/scripts/sdk_directories.py @@ -1,4 +1,4 @@ -# +# # Copyright 2010-2015 Amazon.com, Inc. or its affiliates. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License",. @@ -18,68 +18,68 @@ def getDirectories(): return [ "aws-cpp-sdk-autoscaling", - "aws-cpp-sdk-acm", - "aws-cpp-sdk-apigateway", - "aws-cpp-sdk-cloudhsm", - "aws-cpp-sdk-cloudformation", - "aws-cpp-sdk-cloudfront", - "aws-cpp-sdk-cloudsearch", - "aws-cpp-sdk-cloudsearchdomain", - "aws-cpp-sdk-cloudtrail", - "aws-cpp-sdk-codecommit", - "aws-cpp-sdk-codedeploy", - "aws-cpp-sdk-codepipeline", - "aws-cpp-sdk-cognito-identity", - "aws-cpp-sdk-cognito-sync", - "aws-cpp-sdk-config", - "aws-cpp-sdk-datapipeline", - "aws-cpp-sdk-devicefarm", - "aws-cpp-sdk-directconnect", - "aws-cpp-sdk-ds", - "aws-cpp-sdk-dynamodb", - "aws-cpp-sdk-ec2", - "aws-cpp-sdk-ecs", - "aws-cpp-sdk-ecr", - "aws-cpp-sdk-elasticache", - "aws-cpp-sdk-elasticbeanstalk", - "aws-cpp-sdk-elasticfilesystem", - "aws-cpp-sdk-elasticloadbalancing", - "aws-cpp-sdk-elasticmapreduce", - "aws-cpp-sdk-elastictranscoder", - "aws-cpp-sdk-email", - "aws-cpp-sdk-es", - "aws-cpp-sdk-events", - "aws-cpp-sdk-firehose", - "aws-cpp-sdk-gamelift", - "aws-cpp-sdk-glacier", - "aws-cpp-sdk-iam", - "aws-cpp-sdk-importexport", - "aws-cpp-sdk-inspector", - "aws-cpp-sdk-iot", - "aws-cpp-sdk-kinesis", - "aws-cpp-sdk-kms", - "aws-cpp-sdk-lambda", - "aws-cpp-sdk-logs", - "aws-cpp-sdk-machinelearning", - "aws-cpp-sdk-marketplacecommerceanalytics", - "aws-cpp-sdk-mobileanalytics", - "aws-cpp-sdk-monitoring", - "aws-cpp-sdk-opsworks", - "aws-cpp-sdk-rds", - "aws-cpp-sdk-redshift", - "aws-cpp-sdk-route53", - "aws-cpp-sdk-route53domains", - "aws-cpp-sdk-s3", - "aws-cpp-sdk-sdb", - "aws-cpp-sdk-sns", - "aws-cpp-sdk-sqs", - "aws-cpp-sdk-ssm", - "aws-cpp-sdk-storagegateway", - "aws-cpp-sdk-sts", - "aws-cpp-sdk-support", - "aws-cpp-sdk-swf", - "aws-cpp-sdk-waf", - "aws-cpp-sdk-workspaces" ] + "aws-cpp-sdk-acm", + "aws-cpp-sdk-apigateway", + "aws-cpp-sdk-cloudhsm", + "aws-cpp-sdk-cloudformation", + "aws-cpp-sdk-cloudfront", + "aws-cpp-sdk-cloudsearch", + "aws-cpp-sdk-cloudsearchdomain", + "aws-cpp-sdk-cloudtrail", + "aws-cpp-sdk-codecommit", + "aws-cpp-sdk-codedeploy", + "aws-cpp-sdk-codepipeline", + "aws-cpp-sdk-cognito-identity", + "aws-cpp-sdk-cognito-sync", + "aws-cpp-sdk-config", + "aws-cpp-sdk-datapipeline", + "aws-cpp-sdk-devicefarm", + "aws-cpp-sdk-directconnect", + "aws-cpp-sdk-ds", + "aws-cpp-sdk-dynamodb", + "aws-cpp-sdk-ec2", + "aws-cpp-sdk-ecs", + "aws-cpp-sdk-ecr", + "aws-cpp-sdk-elasticache", + "aws-cpp-sdk-elasticbeanstalk", + "aws-cpp-sdk-elasticfilesystem", + "aws-cpp-sdk-elasticloadbalancing", + "aws-cpp-sdk-elasticmapreduce", + "aws-cpp-sdk-elastictranscoder", + "aws-cpp-sdk-email", + "aws-cpp-sdk-es", + "aws-cpp-sdk-events", + "aws-cpp-sdk-firehose", + "aws-cpp-sdk-gamelift", + "aws-cpp-sdk-glacier", + "aws-cpp-sdk-iam", + "aws-cpp-sdk-importexport", + "aws-cpp-sdk-inspector", + "aws-cpp-sdk-iot", + "aws-cpp-sdk-kinesis", + "aws-cpp-sdk-kms", + "aws-cpp-sdk-lambda", + "aws-cpp-sdk-logs", + "aws-cpp-sdk-machinelearning", + "aws-cpp-sdk-marketplacecommerceanalytics", + "aws-cpp-sdk-mobileanalytics", + "aws-cpp-sdk-monitoring", + "aws-cpp-sdk-opsworks", + "aws-cpp-sdk-rds", + "aws-cpp-sdk-redshift", + "aws-cpp-sdk-route53", + "aws-cpp-sdk-route53domains", + "aws-cpp-sdk-s3", + "aws-cpp-sdk-sdb", + "aws-cpp-sdk-sns", + "aws-cpp-sdk-sqs", + "aws-cpp-sdk-ssm", + "aws-cpp-sdk-storagegateway", + "aws-cpp-sdk-sts", + "aws-cpp-sdk-support", + "aws-cpp-sdk-swf", + "aws-cpp-sdk-waf", + "aws-cpp-sdk-workspaces" ] def wipeGeneratedCode(): for directory in getDirectories(): diff --git a/testing-resources/include/aws/testing/android/AndroidTesting.h b/testing-resources/include/aws/testing/android/AndroidTesting.h index 7dc6d619a8a..43a9bcbb5f2 100644 --- a/testing-resources/include/aws/testing/android/AndroidTesting.h +++ b/testing-resources/include/aws/testing/android/AndroidTesting.h @@ -27,7 +27,7 @@ extern "C" { #endif // __cplusplus JNIEXPORT jint JNICALL -AWS_TESTING_API Java_aws_coretests_TestActivity_runTests( JNIEnv* env, jobject thisRef ); +AWS_TESTING_API Java_aws_coretests_TestActivity_runTests( JNIEnv* env, jobject classRef, jobject context ); #ifdef __cplusplus } diff --git a/testing-resources/source/android/AndroidTesting.cpp b/testing-resources/source/android/AndroidTesting.cpp index f1e19ad65d3..358bf3df485 100644 --- a/testing-resources/source/android/AndroidTesting.cpp +++ b/testing-resources/source/android/AndroidTesting.cpp @@ -21,9 +21,14 @@ #include #include #include +#include +#include #include +#include +#include +#include #include #include #include @@ -104,6 +109,74 @@ void RedirectStdoutToLogcat() std::this_thread::sleep_for(std::chrono::seconds(1)); } +/* + +Based on http://stackoverflow.com/questions/2180079/how-can-i-copy-a-file-on-unix-using-c + + */ +static int CopyFile(const char *from, const char *to) +{ + int fd_to, fd_from; + char buf[4096]; + ssize_t nread; + int saved_errno; + + fd_from = open(from, O_RDONLY); + if (fd_from < 0) + { + return -1; + } + + fd_to = open(to, O_WRONLY | O_CREAT | O_EXCL, 0666); + if (fd_to < 0) + { + goto out_error; + } + + while (nread = read(fd_from, buf, sizeof buf), nread > 0) + { + char *out_ptr = buf; + ssize_t nwritten; + + do { + nwritten = write(fd_to, out_ptr, nread); + + if (nwritten >= 0) + { + nread -= nwritten; + out_ptr += nwritten; + } + else if (errno != EINTR) + { + goto out_error; + } + } while (nread > 0); + } + + if (nread == 0) + { + if (close(fd_to) < 0) + { + fd_to = -1; + goto out_error; + } + close(fd_from); + + /* Success! */ + return 0; + } + + out_error: + saved_errno = errno; + + close(fd_from); + if (fd_to >= 0) + close(fd_to); + + errno = saved_errno; + return -1; +} + #ifdef __ANDROID__ static const char* ALLOCATION_TAG = "AndroidTests"; @@ -130,15 +203,41 @@ static jint RunAndroidTestsInternal() return (jint) result; } +// Copes a file that's been uploaded to the activity's directory into the activity's cache, preserving the directory structure +void CacheFile(const Aws::String &fileName, const Aws::String& directory) +{ + Aws::String destDirectory = Aws::Platform::GetCacheDirectory() + directory; + Aws::Utils::FileSystemUtils::CreateDirectoryIfNotExists(destDirectory.c_str()); + + Aws::String sourceFileName = "/data/data/aws.coretests/" + directory + Aws::String( "/" ) + fileName; + Aws::String destFileName = destDirectory + Aws::String( "/" ) + fileName; + + CopyFile(sourceFileName.c_str(), destFileName.c_str()); +} + #ifdef __cplusplus extern "C" { #endif // __cplusplus JNIEXPORT jint JNICALL -Java_aws_coretests_TestActivity_runTests( JNIEnv* env, jobject thisRef ) +Java_aws_coretests_TestActivity_runTests( JNIEnv* env, jobject classRef, jobject context ) { - jint result = 0; + Aws::Platform::InitAndroid(env, context); + + // If we upload files to where we expect them to be (cache) then we lose write access to the cache + // directory since it gets created by the root user before the application has an opportunity to create it. + // So when running tests, wait until the application + // is running before copying data from their upload location to their expected location. + // + // Real development should be done via the Cognito/PersistentIdentity credentials providers, where this is not as much + // a problem + CacheFile("credentials", ".aws"); + CacheFile("handled.zip", "resources"); + CacheFile("succeed.zip", "resources"); + CacheFile("unhandled.zip", "resources"); + jint result = 0; + AWS_UNREFERENCED_PARAM(classRef); AWS_BEGIN_MEMORY_TEST(1024, 128) result = RunAndroidTestsInternal(); diff --git a/android-build/android.toolchain.cmake b/toolchains/android.toolchain.cmake similarity index 98% rename from android-build/android.toolchain.cmake rename to toolchains/android.toolchain.cmake index 410bf428c09..d47a6933dbd 100644 --- a/android-build/android.toolchain.cmake +++ b/toolchains/android.toolchain.cmake @@ -216,7 +216,7 @@ set( CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "" ) set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." ) # NDK search paths -set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r10d -r10c -r10b -r10 -r9d -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" ) +set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r11c -r11b -r11 -r10e -r10d -r10c -r10b -r10 -r9d -r9c -r9b -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" ) if( NOT DEFINED ANDROID_NDK_SEARCH_PATHS ) if( CMAKE_HOST_WIN32 ) file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS ) @@ -815,7 +815,6 @@ else() endif() unset( __levelIdx ) - # remember target ABI set( ANDROID_ABI "${ANDROID_ABI}" CACHE STRING "The target ABI for Android. If arm, then armeabi-v7a is recommended for hardware floating point." FORCE ) if( CMAKE_VERSION VERSION_GREATER "2.8" ) @@ -833,7 +832,7 @@ set( ANDROID_STL_FORCE_FEATURES ON CACHE BOOL "automatically configure rtti and mark_as_advanced( ANDROID_STL ANDROID_STL_FORCE_FEATURES ) if( BUILD_WITH_ANDROID_NDK ) - if( NOT "${ANDROID_STL}" MATCHES "^(none|system|system_re|gabi\\+\\+_static|gabi\\+\\+_shared|stlport_static|stlport_shared|gnustl_static|gnustl_shared)$") + if( NOT "${ANDROID_STL}" MATCHES "^(none|system|system_re|gabi\\+\\+_static|gabi\\+\\+_shared|stlport_static|stlport_shared|gnustl_static|gnustl_shared|libc\\+\\+_static|libc\\+\\+_shared)$") message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\". The possible values are: none -> Do not configure the runtime. @@ -845,15 +844,19 @@ The possible values are: stlport_shared -> Use the STLport runtime as a shared library. gnustl_static -> (default) Use the GNU STL as a static library. gnustl_shared -> Use the GNU STL as a shared library. + libc++_static -> Use clang's runtime as a static library + libc++_shared -> Use clang's runtime as a shared library " ) endif() elseif( BUILD_WITH_STANDALONE_TOOLCHAIN ) - if( NOT "${ANDROID_STL}" MATCHES "^(none|gnustl_static|gnustl_shared)$") + if( NOT "${ANDROID_STL}" MATCHES "^(none|gnustl_static|gnustl_shared|libc\\+\\+_static|libc\\+\\+_shared)$") message( FATAL_ERROR "ANDROID_STL is set to invalid value \"${ANDROID_STL}\". The possible values are: none -> Do not configure the runtime. gnustl_static -> (default) Use the GNU STL as a static library. gnustl_shared -> Use the GNU STL as a shared library. + libc++_static -> Use clang's runtime as a static library + libc++_shared -> Use clang's runtime as a shared library " ) endif() endif() @@ -891,7 +894,6 @@ See https://android.googlesource.com/platform/development.git f907f4f9d4e56ccc80 " ) endif() - # setup paths and STL for standalone toolchain if( BUILD_WITH_STANDALONE_TOOLCHAIN ) set( ANDROID_TOOLCHAIN_ROOT "${ANDROID_STANDALONE_TOOLCHAIN}" ) @@ -911,6 +913,11 @@ if( BUILD_WITH_STANDALONE_TOOLCHAIN ) else() list( APPEND ANDROID_STL_INCLUDE_DIRS "${ANDROID_STL_INCLUDE_DIRS}/${ANDROID_TOOLCHAIN_MACHINE_NAME}" ) endif() + + if( ANDROID_STL MATCHES "libc\\+\\+") + list( APPEND ANDROID_STL_INCLUDE_DIRS "" ) + endif() + # always search static GNU STL to get the location of libsupc++.a if( ARMEABI_V7A AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb/libstdc++.a" ) set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/thumb" ) @@ -922,10 +929,12 @@ if( BUILD_WITH_STANDALONE_TOOLCHAIN ) set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib" ) endif() if( __libstl ) - set( __libsupcxx "${__libstl}/libsupc++.a" ) + if( ANDROID_STL MATCHES "gnustl" ) + set( __libsupcxx "${__libstl}/libsupc++.a" ) + endif() set( __libstl "${__libstl}/libstdc++.a" ) endif() - if( NOT EXISTS "${__libsupcxx}" ) + if( ANDROID_STL MATCHES "gnustl" AND NOT EXISTS "${__libsupcxx}" ) message( FATAL_ERROR "The required libstdsupc++.a is missing in your standalone toolchain. Usually it happens because of bug in make-standalone-toolchain.sh script from NDK r7, r7b and r7c. You need to either upgrade to newer NDK or manually copy @@ -934,6 +943,8 @@ if( BUILD_WITH_STANDALONE_TOOLCHAIN ) ${__libsupcxx} " ) endif() + + #TODO: use string manip to collapse this if( ANDROID_STL STREQUAL "gnustl_shared" ) if( ARMEABI_V7A AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" ) set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_shared.so" ) @@ -942,6 +953,15 @@ if( BUILD_WITH_STANDALONE_TOOLCHAIN ) elseif( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libgnustl_shared.so" ) set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libgnustl_shared.so" ) endif() + elseif( ANDROID_STL STREQUAL "libc++_shared") + if( ARMEABI_V7A AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libc++_shared.so" ) + set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/${CMAKE_SYSTEM_PROCESSOR}/libc++_shared.so" ) + elseif( ARMEABI AND NOT ANDROID_FORCE_ARM_BUILD AND EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libc++_shared.so" ) + set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/thumb/libc++_shared.so" ) + elseif( EXISTS "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libc++_shared.so" ) + set( __libstl "${ANDROID_STANDALONE_TOOLCHAIN}/${ANDROID_TOOLCHAIN_MACHINE_NAME}/lib/libc++_shared.so" ) + endif() + endif() endif() endif()