diff options
| author | wangli28 <wangli28@beyondsoft.com> | 2019-09-03 02:53:02 +0000 |
|---|---|---|
| committer | wangli28 <wangli28@beyondsoft.com> | 2019-09-03 02:53:38 +0000 |
| commit | d9c301bd3f6e72954a676d048aa6e9a42dfada74 (patch) | |
| tree | b2ef15d7110a5703922e9517a3d1902bbcadadbd | |
| parent | 2b78cac373da1bde47d4c99d3c7c5f96398181a4 (diff) | |
| download | vcpkg-d9c301bd3f6e72954a676d048aa6e9a42dfada74.tar.gz vcpkg-d9c301bd3f6e72954a676d048aa6e9a42dfada74.zip | |
[dimcli] Upgrade to version 5.0.1
| -rw-r--r-- | ports/dimcli/CONTROL | 2 | ||||
| -rw-r--r-- | ports/dimcli/fix-NameBoolean.patch | 126 | ||||
| -rw-r--r-- | ports/dimcli/portfile.cmake | 4 |
3 files changed, 66 insertions, 66 deletions
diff --git a/ports/dimcli/CONTROL b/ports/dimcli/CONTROL index a477eb38b..4f6049616 100644 --- a/ports/dimcli/CONTROL +++ b/ports/dimcli/CONTROL @@ -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 diff --git a/ports/dimcli/fix-NameBoolean.patch b/ports/dimcli/fix-NameBoolean.patch index 35eb64d68..a0d9afb56 100644 --- a/ports/dimcli/fix-NameBoolean.patch +++ b/ports/dimcli/fix-NameBoolean.patch @@ -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(""));
diff --git a/ports/dimcli/portfile.cmake b/ports/dimcli/portfile.cmake index 2c8049a43..938d313a9 100644 --- a/ports/dimcli/portfile.cmake +++ b/ports/dimcli/portfile.cmake @@ -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 |
