diff options
| author | atkawa7 <atkawa7@yahoo.com> | 2017-06-13 17:12:54 -0700 |
|---|---|---|
| committer | atkawa7 <atkawa7@yahoo.com> | 2017-06-13 17:12:54 -0700 |
| commit | aa83671a723da212e640990ef9b9efafccba8af1 (patch) | |
| tree | f50d482f3d2b4e3545a672eb58712ac553d272de /toolsrc/src/PostBuildLint_BuildType.cpp | |
| parent | 9a409006cf7ec63bebe0d9341799b5cb529155ae (diff) | |
| parent | 548ff8d3db47e83ebecc5b57dcbd63723cee7546 (diff) | |
| download | vcpkg-aa83671a723da212e640990ef9b9efafccba8af1.tar.gz vcpkg-aa83671a723da212e640990ef9b9efafccba8af1.zip | |
Merge https://github.com/Microsoft/vcpkg into live555
Diffstat (limited to 'toolsrc/src/PostBuildLint_BuildType.cpp')
| -rw-r--r-- | toolsrc/src/PostBuildLint_BuildType.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/toolsrc/src/PostBuildLint_BuildType.cpp b/toolsrc/src/PostBuildLint_BuildType.cpp index e690036d2..649f0ccca 100644 --- a/toolsrc/src/PostBuildLint_BuildType.cpp +++ b/toolsrc/src/PostBuildLint_BuildType.cpp @@ -5,24 +5,24 @@ namespace vcpkg::PostBuildLint { - BuildType BuildType::value_of(const ConfigurationType& config, const LinkageType& linkage) + BuildType BuildType::value_of(const ConfigurationType& config, const Build::LinkageType& linkage) { - if (config == ConfigurationTypeC::DEBUG && linkage == LinkageTypeC::STATIC) + if (config == ConfigurationType::DEBUG && linkage == Build::LinkageType::STATIC) { return BuildTypeC::DEBUG_STATIC; } - if (config == ConfigurationTypeC::DEBUG && linkage == LinkageTypeC::DYNAMIC) + if (config == ConfigurationType::DEBUG && linkage == Build::LinkageType::DYNAMIC) { return BuildTypeC::DEBUG_DYNAMIC; } - if (config == ConfigurationTypeC::RELEASE && linkage == LinkageTypeC::STATIC) + if (config == ConfigurationType::RELEASE && linkage == Build::LinkageType::STATIC) { return BuildTypeC::RELEASE_STATIC; } - if (config == ConfigurationTypeC::RELEASE && linkage == LinkageTypeC::DYNAMIC) + if (config == ConfigurationType::RELEASE && linkage == Build::LinkageType::DYNAMIC) { return BuildTypeC::RELEASE_DYNAMIC; } @@ -32,7 +32,7 @@ namespace vcpkg::PostBuildLint const ConfigurationType& BuildType::config() const { return this->m_config; } - const LinkageType& BuildType::linkage() const { return this->m_linkage; } + const Build::LinkageType& BuildType::linkage() const { return this->m_linkage; } const std::regex& BuildType::crt_regex() const { |