cemu-project/vcpkg
1
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2024-11-23 11:19:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[dimcli] Upgrade to version 5.0.1

Browse Source
This commit is contained in:
wangli28 2019-09-03 02:53:02 +00:00
parent 2b78cac373
commit d9c301bd3f
3 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/dimcli/CONTROL
View File

@ -1,4 +1,4 @@
Source: dimcli
Version: 5.0.0
Version: 5.0.1
Homepage: https://github.com/gknowles/dimcli
Description: C++ command line parser toolkit

126
ports/dimcli/fix-NameBoolean.patch
View File

@ -1,63 +1,63 @@
diff --git a/libs/dimcli/cli.cpp b/libs/dimcli/cli.cpp
index 9e67c12..c96bd24 100644
--- a/libs/dimcli/cli.cpp
+++ b/libs/dimcli/cli.cpp
@@ -388,8 +388,8 @@ GroupConfig const & Cli::Config::findGrpOrDie(Cli const & cli) {
***/
//===========================================================================
-Cli::OptBase::OptBase(string const & names, bool boolean)
- : m_bool{boolean}
+Cli::OptBase::OptBase(string const & names, bool in_boolean)
+ : m_bool{in_boolean}
, m_names{names}
{
// set m_fromName and assert if names is malformed
@@ -486,12 +486,12 @@ static bool includeName(
OptName const & name,
NameListType type,
Cli::OptBase const & opt,
- bool boolean,
+ bool in_boolean,
bool inverted
) {
if (name.opt != &opt)
return false;
- if (boolean) {
+ if (in_boolean) {
if (type == kNameEnable)
return !name.invert;
if (type == kNameDisable)
diff --git a/libs/dimcli/cli.h b/libs/dimcli/cli.h
index 2c1615c..3e4f405 100644
--- a/libs/dimcli/cli.h
+++ b/libs/dimcli/cli.h
@@ -818,7 +818,7 @@ public:
};
public:
- OptBase(std::string const & keys, bool boolean);
+ OptBase(std::string const & keys, bool in_boolean);
virtual ~OptBase() {}
//-----------------------------------------------------------------------
@@ -952,7 +952,7 @@ inline void Cli::OptBase::setValueDesc<DIMCLI_LIB_FILESYSTEM_PATH>() {
template <typename A, typename T>
class Cli::OptShim : public OptBase {
public:
- OptShim(std::string const & keys, bool boolean);
+ OptShim(std::string const & keys, bool in_boolean);
OptShim(OptShim const &) = delete;
OptShim & operator=(OptShim const &) = delete;
@@ -1100,8 +1100,8 @@ protected:
//===========================================================================
template <typename A, typename T>
-Cli::OptShim<A, T>::OptShim(std::string const & keys, bool boolean)
- : OptBase(keys, boolean)
+Cli::OptShim<A, T>::OptShim(std::string const & keys, bool in_boolean)
+ : OptBase(keys, in_boolean)
{
setValueDesc<T>();
}
diff --git a/libs/dimcli/cli.cpp b/libs/dimcli/cli.cpp
index 45dac3b..6129884 100644
--- a/libs/dimcli/cli.cpp
+++ b/libs/dimcli/cli.cpp
@@ -392,8 +392,8 @@ GroupConfig const & Cli::Config::findGrpOrDie(Cli const & cli) {
***/
//===========================================================================
-Cli::OptBase::OptBase(string const & names, bool boolean)
- : m_bool{boolean}
+Cli::OptBase::OptBase(string const & names, bool in_boolean)
+ : m_bool{in_boolean}
, m_names{names}
{
// set m_fromName and assert if names is malformed
@@ -526,12 +526,12 @@ static bool includeName(
OptName const & name,
NameListType type,
Cli::OptBase const & opt,
- bool boolean,
+ bool in_boolean,
bool inverted
) {
if (name.opt != &opt)
return false;
- if (boolean) {
+ if (in_boolean) {
if (type == kNameEnable)
return !name.invert;
if (type == kNameDisable)
diff --git a/libs/dimcli/cli.h b/libs/dimcli/cli.h
index d4941dc..fa8d526 100644
--- a/libs/dimcli/cli.h
+++ b/libs/dimcli/cli.h
@@ -777,7 +777,7 @@ public:
};
public:
- OptBase(std::string const & keys, bool boolean);
+ OptBase(std::string const & keys, bool in_boolean);
virtual ~OptBase() {}
//-----------------------------------------------------------------------
@@ -1062,7 +1062,7 @@ std::string Cli::OptBase::toValueDesc<DIMCLI_LIB_FILESYSTEM_PATH>() const {
template <typename A, typename T>
class Cli::OptShim : public OptBase {
public:
- OptShim(std::string const & keys, bool boolean);
+ OptShim(std::string const & keys, bool in_boolean);
OptShim(OptShim const &) = delete;
OptShim & operator=(OptShim const &) = delete;
@@ -1249,8 +1249,8 @@ protected:
//===========================================================================
template <typename A, typename T>
-Cli::OptShim<A, T>::OptShim(std::string const & keys, bool boolean)
- : OptBase(keys, boolean)
+Cli::OptShim<A, T>::OptShim(std::string const & keys, bool in_boolean)
+ : OptBase(keys, in_boolean)
{
if (std::is_arithmetic<T>::value)
this->imbue(std::locale(""));

4
ports/dimcli/portfile.cmake
View File

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO gknowles/dimcli
REF v5.0.0
SHA512 504e6f53e83ce17e8e4b59ecf1a610c2249c2bf48a308b1ee5db0e0e85d3cb08178d24534b5dee8bfaac83fd44c68cbbe8d300283d0023467b724a9340b56e4c
REF v5.0.1
SHA512 ff005777230f9ded5e407f11ebed7d70db2a18ec60da8c80d36644b96c9d090d2f211e3c36b7d296a446c1b54d61c359a51082034b94e2398cc2305316f33d0f
HEAD_REF master
PATCHES
fix-NameBoolean.patch