tools: replace boost::any usage with ndn::any
Change-Id: I7048a64b7c17353037ea9a64a11366d2fae6fd49
diff --git a/tools/nfdc/command-definition.hpp b/tools/nfdc/command-definition.hpp
index 5661ff2..c512948 100644
--- a/tools/nfdc/command-definition.hpp
+++ b/tools/nfdc/command-definition.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2017, Regents of the University of California,
+ * Copyright (c) 2014-2018, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -130,11 +130,7 @@
class Error : public std::invalid_argument
{
public:
- explicit
- Error(const std::string& what)
- : std::invalid_argument(what)
- {
- }
+ using std::invalid_argument::invalid_argument;
};
CommandDefinition(const std::string& noun, const std::string& verb);
@@ -195,13 +191,12 @@
parse(const std::vector<std::string>& tokens, size_t start = 0) const;
private:
- boost::any
+ ndn::any
parseValue(ArgValueType valueType, const std::string& token) const;
private:
std::string m_noun;
std::string m_verb;
-
std::string m_title;
struct Arg
@@ -211,8 +206,7 @@
bool isRequired;
std::string metavar;
};
- typedef std::map<std::string, Arg> ArgMap;
- ArgMap m_args;
+ std::map<std::string, Arg> m_args;
std::set<std::string> m_requiredArgs;
std::vector<std::string> m_positionalArgs;
};