mirror of
https://github.com/cemu-project/vcpkg.git
synced 2025-02-22 10:37:10 +01:00
[dimcli] Upgrade to version 5.0.1
This commit is contained in:
parent
2b78cac373
commit
d9c301bd3f
@ -1,4 +1,4 @@
|
|||||||
Source: dimcli
|
Source: dimcli
|
||||||
Version: 5.0.0
|
Version: 5.0.1
|
||||||
Homepage: https://github.com/gknowles/dimcli
|
Homepage: https://github.com/gknowles/dimcli
|
||||||
Description: C++ command line parser toolkit
|
Description: C++ command line parser toolkit
|
||||||
|
@ -1,63 +1,63 @@
|
|||||||
diff --git a/libs/dimcli/cli.cpp b/libs/dimcli/cli.cpp
|
diff --git a/libs/dimcli/cli.cpp b/libs/dimcli/cli.cpp
|
||||||
index 9e67c12..c96bd24 100644
|
index 45dac3b..6129884 100644
|
||||||
--- a/libs/dimcli/cli.cpp
|
--- a/libs/dimcli/cli.cpp
|
||||||
+++ b/libs/dimcli/cli.cpp
|
+++ b/libs/dimcli/cli.cpp
|
||||||
@@ -388,8 +388,8 @@ GroupConfig const & Cli::Config::findGrpOrDie(Cli const & cli) {
|
@@ -392,8 +392,8 @@ GroupConfig const & Cli::Config::findGrpOrDie(Cli const & cli) {
|
||||||
***/
|
***/
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
-Cli::OptBase::OptBase(string const & names, bool boolean)
|
-Cli::OptBase::OptBase(string const & names, bool boolean)
|
||||||
- : m_bool{boolean}
|
- : m_bool{boolean}
|
||||||
+Cli::OptBase::OptBase(string const & names, bool in_boolean)
|
+Cli::OptBase::OptBase(string const & names, bool in_boolean)
|
||||||
+ : m_bool{in_boolean}
|
+ : m_bool{in_boolean}
|
||||||
, m_names{names}
|
, m_names{names}
|
||||||
{
|
{
|
||||||
// set m_fromName and assert if names is malformed
|
// set m_fromName and assert if names is malformed
|
||||||
@@ -486,12 +486,12 @@ static bool includeName(
|
@@ -526,12 +526,12 @@ static bool includeName(
|
||||||
OptName const & name,
|
OptName const & name,
|
||||||
NameListType type,
|
NameListType type,
|
||||||
Cli::OptBase const & opt,
|
Cli::OptBase const & opt,
|
||||||
- bool boolean,
|
- bool boolean,
|
||||||
+ bool in_boolean,
|
+ bool in_boolean,
|
||||||
bool inverted
|
bool inverted
|
||||||
) {
|
) {
|
||||||
if (name.opt != &opt)
|
if (name.opt != &opt)
|
||||||
return false;
|
return false;
|
||||||
- if (boolean) {
|
- if (boolean) {
|
||||||
+ if (in_boolean) {
|
+ if (in_boolean) {
|
||||||
if (type == kNameEnable)
|
if (type == kNameEnable)
|
||||||
return !name.invert;
|
return !name.invert;
|
||||||
if (type == kNameDisable)
|
if (type == kNameDisable)
|
||||||
diff --git a/libs/dimcli/cli.h b/libs/dimcli/cli.h
|
diff --git a/libs/dimcli/cli.h b/libs/dimcli/cli.h
|
||||||
index 2c1615c..3e4f405 100644
|
index d4941dc..fa8d526 100644
|
||||||
--- a/libs/dimcli/cli.h
|
--- a/libs/dimcli/cli.h
|
||||||
+++ b/libs/dimcli/cli.h
|
+++ b/libs/dimcli/cli.h
|
||||||
@@ -818,7 +818,7 @@ public:
|
@@ -777,7 +777,7 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
public:
|
public:
|
||||||
- OptBase(std::string const & keys, bool boolean);
|
- OptBase(std::string const & keys, bool boolean);
|
||||||
+ OptBase(std::string const & keys, bool in_boolean);
|
+ OptBase(std::string const & keys, bool in_boolean);
|
||||||
virtual ~OptBase() {}
|
virtual ~OptBase() {}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------
|
//-----------------------------------------------------------------------
|
||||||
@@ -952,7 +952,7 @@ inline void Cli::OptBase::setValueDesc<DIMCLI_LIB_FILESYSTEM_PATH>() {
|
@@ -1062,7 +1062,7 @@ std::string Cli::OptBase::toValueDesc<DIMCLI_LIB_FILESYSTEM_PATH>() const {
|
||||||
template <typename A, typename T>
|
template <typename A, typename T>
|
||||||
class Cli::OptShim : public OptBase {
|
class Cli::OptShim : public OptBase {
|
||||||
public:
|
public:
|
||||||
- OptShim(std::string const & keys, bool boolean);
|
- OptShim(std::string const & keys, bool boolean);
|
||||||
+ OptShim(std::string const & keys, bool in_boolean);
|
+ OptShim(std::string const & keys, bool in_boolean);
|
||||||
OptShim(OptShim const &) = delete;
|
OptShim(OptShim const &) = delete;
|
||||||
OptShim & operator=(OptShim const &) = delete;
|
OptShim & operator=(OptShim const &) = delete;
|
||||||
|
|
||||||
@@ -1100,8 +1100,8 @@ protected:
|
@@ -1249,8 +1249,8 @@ protected:
|
||||||
|
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
template <typename A, typename T>
|
template <typename A, typename T>
|
||||||
-Cli::OptShim<A, T>::OptShim(std::string const & keys, bool boolean)
|
-Cli::OptShim<A, T>::OptShim(std::string const & keys, bool boolean)
|
||||||
- : OptBase(keys, boolean)
|
- : OptBase(keys, boolean)
|
||||||
+Cli::OptShim<A, T>::OptShim(std::string const & keys, bool in_boolean)
|
+Cli::OptShim<A, T>::OptShim(std::string const & keys, bool in_boolean)
|
||||||
+ : OptBase(keys, in_boolean)
|
+ : OptBase(keys, in_boolean)
|
||||||
{
|
{
|
||||||
setValueDesc<T>();
|
if (std::is_arithmetic<T>::value)
|
||||||
}
|
this->imbue(std::locale(""));
|
||||||
|
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
|
|||||||
vcpkg_from_github(
|
vcpkg_from_github(
|
||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO gknowles/dimcli
|
REPO gknowles/dimcli
|
||||||
REF v5.0.0
|
REF v5.0.1
|
||||||
SHA512 504e6f53e83ce17e8e4b59ecf1a610c2249c2bf48a308b1ee5db0e0e85d3cb08178d24534b5dee8bfaac83fd44c68cbbe8d300283d0023467b724a9340b56e4c
|
SHA512 ff005777230f9ded5e407f11ebed7d70db2a18ec60da8c80d36644b96c9d090d2f211e3c36b7d296a446c1b54d61c359a51082034b94e2398cc2305316f33d0f
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
fix-NameBoolean.patch
|
fix-NameBoolean.patch
|
||||||
|
Loading…
x
Reference in New Issue
Block a user