mirror of
				https://github.com/XRPLF/clio.git
				synced 2025-11-04 11:55:51 +00:00 
			
		
		
		
	fix: Use .contains() method where available (#2277)
This commit is contained in:
		@@ -60,17 +60,17 @@ CliArgs::parse(int argc, char const* argv[])
 | 
			
		||||
    po::store(po::command_line_parser(argc, argv).options(description).positional(positional).run(), parsed);
 | 
			
		||||
    po::notify(parsed);
 | 
			
		||||
 | 
			
		||||
    if (parsed.count("help") != 0u) {
 | 
			
		||||
    if (parsed.contains("help")) {
 | 
			
		||||
        std::cout << "Clio server " << util::build::getClioFullVersionString() << "\n\n" << description;
 | 
			
		||||
        return Action{Action::Exit{EXIT_SUCCESS}};
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (parsed.count("version") != 0u) {
 | 
			
		||||
    if (parsed.contains("version")) {
 | 
			
		||||
        std::cout << util::build::getClioFullVersionString() << '\n';
 | 
			
		||||
        return Action{Action::Exit{EXIT_SUCCESS}};
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (parsed.count("config-description") != 0u) {
 | 
			
		||||
    if (parsed.contains("config-description")) {
 | 
			
		||||
        std::filesystem::path const filePath = parsed["config-description"].as<std::string>();
 | 
			
		||||
 | 
			
		||||
        auto const res = util::config::ClioConfigDescription::generateConfigDescriptionToFile(filePath);
 | 
			
		||||
@@ -83,18 +83,17 @@ CliArgs::parse(int argc, char const* argv[])
 | 
			
		||||
 | 
			
		||||
    auto configPath = parsed["conf"].as<std::string>();
 | 
			
		||||
 | 
			
		||||
    if (parsed.count("migrate") != 0u) {
 | 
			
		||||
    if (parsed.contains("migrate")) {
 | 
			
		||||
        auto const opt = parsed["migrate"].as<std::string>();
 | 
			
		||||
        if (opt == "status")
 | 
			
		||||
            return Action{Action::Migrate{.configPath = std::move(configPath), .subCmd = MigrateSubCmd::status()}};
 | 
			
		||||
        return Action{Action::Migrate{.configPath = std::move(configPath), .subCmd = MigrateSubCmd::migration(opt)}};
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (parsed.count("verify") != 0u)
 | 
			
		||||
    if (parsed.contains("verify"))
 | 
			
		||||
        return Action{Action::VerifyConfig{.configPath = std::move(configPath)}};
 | 
			
		||||
 | 
			
		||||
    return Action{Action::Run{.configPath = std::move(configPath), .useNgWebServer = parsed.count("ng-web-server") != 0}
 | 
			
		||||
    };
 | 
			
		||||
    return Action{Action::Run{.configPath = std::move(configPath), .useNgWebServer = parsed.contains("ng-web-server")}};
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
}  // namespace app
 | 
			
		||||
 
 | 
			
		||||
@@ -280,7 +280,7 @@ TransactionFeed::pub(
 | 
			
		||||
                        data->getFieldAmount(ripple::sfTakerPays).issue(),
 | 
			
		||||
                        (*data)[~ripple::sfDomainID]
 | 
			
		||||
                    };
 | 
			
		||||
                    if (affectedBooks.find(book) == affectedBooks.end()) {
 | 
			
		||||
                    if (!affectedBooks.contains(book)) {
 | 
			
		||||
                        affectedBooks.insert(book);
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
 
 | 
			
		||||
@@ -31,7 +31,6 @@
 | 
			
		||||
#include <xrpl/basics/base_uint.h>
 | 
			
		||||
#include <xrpl/basics/chrono.h>
 | 
			
		||||
#include <xrpl/basics/strHex.h>
 | 
			
		||||
#include <xrpl/protocol/LedgerHeader.h>
 | 
			
		||||
#include <xrpl/protocol/jss.h>
 | 
			
		||||
 | 
			
		||||
#include <string>
 | 
			
		||||
 
 | 
			
		||||
@@ -36,7 +36,7 @@ LedgerTypes::getLedgerEntryTypeFromStr(std::string const& entryName)
 | 
			
		||||
        return map;
 | 
			
		||||
    }();
 | 
			
		||||
 | 
			
		||||
    if (kTYPE_MAP.find(entryName) == kTYPE_MAP.end())
 | 
			
		||||
    if (!kTYPE_MAP.contains(entryName))
 | 
			
		||||
        return ripple::ltANY;
 | 
			
		||||
 | 
			
		||||
    return kTYPE_MAP.at(entryName);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user