Skip to content

Commit

Permalink
use new str::upper() overloads from CODA-OSS
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan Smith committed Dec 6, 2023
1 parent 0f14cd1 commit 6f68578
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions six/modules/c++/cphd03/source/CPHDXMLControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -778,8 +778,7 @@ void CPHDXMLControl::fromXML(const xml::lite::Element* srpXML, SRP& srp)
#if ENFORCESPEC
srp.srpType = cphd::SRPType(getFirstAndOnly(srpXML, "SRPType")->getCharacterData());
#else
std::string s(getFirstAndOnly(srpXML, "SRPType")->getCharacterData());
str::upper(s);
const auto s = str::upper(getFirstAndOnly(srpXML, "SRPType")->getCharacterData());
srp.srpType = cphd::SRPType::toType(s);
#endif
parseInt(getFirstAndOnly(srpXML, "NumSRPs"), srp.numSRPs);
Expand Down
3 changes: 1 addition & 2 deletions six/modules/c++/samples/check_valid_six.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ static int main_(int argc, char** argv)
const std::string inputPath(options->get<std::string>("input"));
std::vector<std::string> inputPathnames = getPathnames(inputPath);
const std::string logFile(options->get<std::string>("log"));
std::string level(options->get<std::string>("level"));
auto level = str::upper(options->get<std::string>("level"));
std::vector<std::string> schemaPaths;
getSchemaPaths(*options, "--schema", "schema", schemaPaths);

Expand All @@ -200,7 +200,6 @@ static int main_(int argc, char** argv)
xmlRegistry.addCreator<six::sicd::ComplexXMLControl>();
xmlRegistry.addCreator<six::sidd::DerivedXMLControl>();

str::upper(level);
str::trim(level);
std::unique_ptr<logging::Logger> log =
logging::setupLogger(fs::path(argv[0]).filename().string(), level, logFile);
Expand Down

0 comments on commit 6f68578

Please sign in to comment.