aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-04-03 14:52:47 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-04-04 16:44:42 -0700
commit378b018321ef443b027fc02e78c57721edc68d94 (patch)
treeef9dea5b7c766243ed137d7bd683a6b2e63dfa88
parentfdda06e83d7da985bf78ea81e2da450052798204 (diff)
downloadvcpkg-378b018321ef443b027fc02e78c57721edc68d94.tar.gz
vcpkg-378b018321ef443b027fc02e78c57721edc68d94.zip
LinkageType to UpperCamelCase
-rw-r--r--toolsrc/include/PostBuildLint_BuildInfo.h4
-rw-r--r--toolsrc/include/PostBuildLint_BuildType.h8
-rw-r--r--toolsrc/include/PostBuildLint_LinkageType.h22
-rw-r--r--toolsrc/src/PostBuildLint.cpp6
-rw-r--r--toolsrc/src/PostBuildLint_BuildType.cpp4
-rw-r--r--toolsrc/src/PostBuildLint_LinkageType.cpp4
6 files changed, 24 insertions, 24 deletions
diff --git a/toolsrc/include/PostBuildLint_BuildInfo.h b/toolsrc/include/PostBuildLint_BuildInfo.h
index 271279f82..8bac18861 100644
--- a/toolsrc/include/PostBuildLint_BuildInfo.h
+++ b/toolsrc/include/PostBuildLint_BuildInfo.h
@@ -11,8 +11,8 @@ namespace vcpkg::PostBuildLint
{
static BuildInfo create(std::unordered_map<std::string, std::string> pgh);
- LinkageType::type crt_linkage;
- LinkageType::type library_linkage;
+ LinkageType::Type crt_linkage;
+ LinkageType::Type library_linkage;
std::map<BuildPolicies::Type, OptBoolT> policies;
};
diff --git a/toolsrc/include/PostBuildLint_BuildType.h b/toolsrc/include/PostBuildLint_BuildType.h
index 1df260101..06728cb4d 100644
--- a/toolsrc/include/PostBuildLint_BuildType.h
+++ b/toolsrc/include/PostBuildLint_BuildType.h
@@ -18,20 +18,20 @@ namespace vcpkg::PostBuildLint::BuildType
{
Type() = delete;
- constexpr explicit Type(const BackingEnum backing_enum, const ConfigurationType::Type config, const LinkageType::type linkage) :
+ constexpr explicit Type(const BackingEnum backing_enum, const ConfigurationType::Type config, const LinkageType::Type linkage) :
backing_enum(backing_enum), m_config(config), m_linkage(linkage) { }
constexpr operator BackingEnum() const { return backing_enum; }
const ConfigurationType::Type& config() const;
- const LinkageType::type& linkage() const;
+ const LinkageType::Type& linkage() const;
const std::regex& crt_regex() const;
const std::string& toString() const;
private:
BackingEnum backing_enum;
ConfigurationType::Type m_config;
- LinkageType::type m_linkage;
+ LinkageType::Type m_linkage;
};
static const std::string ENUM_NAME = "vcpkg::PostBuildLint::BuildType";
@@ -43,5 +43,5 @@ namespace vcpkg::PostBuildLint::BuildType
static constexpr std::array<Type, 4> values = { DEBUG_STATIC, DEBUG_DYNAMIC, RELEASE_STATIC, RELEASE_DYNAMIC };
- Type value_of(const ConfigurationType::Type& config, const LinkageType::type& linkage);
+ Type value_of(const ConfigurationType::Type& config, const LinkageType::Type& linkage);
}
diff --git a/toolsrc/include/PostBuildLint_LinkageType.h b/toolsrc/include/PostBuildLint_LinkageType.h
index 0cecc8c9f..03ed4eb53 100644
--- a/toolsrc/include/PostBuildLint_LinkageType.h
+++ b/toolsrc/include/PostBuildLint_LinkageType.h
@@ -3,32 +3,32 @@
namespace vcpkg::PostBuildLint::LinkageType
{
- enum class backing_enum_t
+ enum class BackingEnum
{
NULLVALUE = 0,
DYNAMIC,
STATIC
};
- struct type
+ struct Type
{
- constexpr type() : backing_enum(backing_enum_t::NULLVALUE) {}
- constexpr explicit type(backing_enum_t backing_enum) : backing_enum(backing_enum) { }
- constexpr operator backing_enum_t() const { return backing_enum; }
+ constexpr Type() : backing_enum(BackingEnum::NULLVALUE) {}
+ constexpr explicit Type(BackingEnum backing_enum) : backing_enum(backing_enum) { }
+ constexpr operator BackingEnum() const { return backing_enum; }
const std::string& toString() const;
private:
- backing_enum_t backing_enum;
+ BackingEnum backing_enum;
};
static const std::string ENUM_NAME = "vcpkg::PostBuildLint::LinkageType";
- static constexpr type NULLVALUE(backing_enum_t::NULLVALUE);
- static constexpr type DYNAMIC(backing_enum_t::DYNAMIC);
- static constexpr type STATIC(backing_enum_t::STATIC);
+ static constexpr Type NULLVALUE(BackingEnum::NULLVALUE);
+ static constexpr Type DYNAMIC(BackingEnum::DYNAMIC);
+ static constexpr Type STATIC(BackingEnum::STATIC);
- static constexpr std::array<type, 2> values = { DYNAMIC, STATIC };
+ static constexpr std::array<Type, 2> values = { DYNAMIC, STATIC };
- type value_of(const std::string& as_string);
+ Type value_of(const std::string& as_string);
}
diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp
index 71923277d..62269a7d2 100644
--- a/toolsrc/src/PostBuildLint.cpp
+++ b/toolsrc/src/PostBuildLint.cpp
@@ -662,7 +662,7 @@ namespace vcpkg::PostBuildLint
switch (build_info.library_linkage)
{
- case LinkageType::backing_enum_t::DYNAMIC:
+ case LinkageType::BackingEnum::DYNAMIC:
{
const std::vector<fs::path> debug_dlls = Files::recursive_find_files_with_extension_in_dir(debug_bin_dir, ".dll");
const std::vector<fs::path> release_dlls = Files::recursive_find_files_with_extension_in_dir(release_bin_dir, ".dll");
@@ -683,7 +683,7 @@ namespace vcpkg::PostBuildLint
error_count += check_outdated_crt_linkage_of_dlls(dlls, toolset.dumpbin);
break;
}
- case LinkageType::backing_enum_t::STATIC:
+ case LinkageType::BackingEnum::STATIC:
{
std::vector<fs::path> dlls;
Files::recursive_find_files_with_extension_in_dir(package_dir, ".dll", &dlls);
@@ -698,7 +698,7 @@ namespace vcpkg::PostBuildLint
error_count += check_crt_linkage_of_libs(BuildType::value_of(ConfigurationType::RELEASE, build_info.crt_linkage), release_libs, toolset.dumpbin);
break;
}
- case LinkageType::backing_enum_t::NULLVALUE:
+ case LinkageType::BackingEnum::NULLVALUE:
default:
Checks::unreachable(VCPKG_LINE_INFO);
}
diff --git a/toolsrc/src/PostBuildLint_BuildType.cpp b/toolsrc/src/PostBuildLint_BuildType.cpp
index 43a9f4416..ced5ad928 100644
--- a/toolsrc/src/PostBuildLint_BuildType.cpp
+++ b/toolsrc/src/PostBuildLint_BuildType.cpp
@@ -4,7 +4,7 @@
namespace vcpkg::PostBuildLint::BuildType
{
- Type value_of(const ConfigurationType::Type& config, const LinkageType::type& linkage)
+ Type value_of(const ConfigurationType::Type& config, const LinkageType::Type& linkage)
{
if (config == ConfigurationType::DEBUG && linkage == LinkageType::STATIC)
{
@@ -34,7 +34,7 @@ namespace vcpkg::PostBuildLint::BuildType
return this->m_config;
}
- const LinkageType::type& Type::linkage() const
+ const LinkageType::Type& Type::linkage() const
{
return this->m_linkage;
}
diff --git a/toolsrc/src/PostBuildLint_LinkageType.cpp b/toolsrc/src/PostBuildLint_LinkageType.cpp
index c6cb9ed58..fee74ea83 100644
--- a/toolsrc/src/PostBuildLint_LinkageType.cpp
+++ b/toolsrc/src/PostBuildLint_LinkageType.cpp
@@ -10,7 +10,7 @@ namespace vcpkg::PostBuildLint::LinkageType
static const std::string NAME_DYNAMIC = "dynamic";
static const std::string NAME_STATIC = "static";
- const std::string& type::toString() const
+ const std::string& Type::toString() const
{
switch (this->backing_enum)
{
@@ -25,7 +25,7 @@ namespace vcpkg::PostBuildLint::LinkageType
}
}
- type value_of(const std::string& as_string)
+ Type value_of(const std::string& as_string)
{
if (as_string == NAME_DYNAMIC)
{