Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use BOOST_OVERRIDE #97

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Use BOOST_OVERRIDE #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/boost/program_options/detail/config_file.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#define BOOST_CONFIG_FILE_VP_2003_01_02

#include <iosfwd>
#include <string>
#include <set>
#include <string>

#include <boost/noncopyable.hpp>
#include <boost/program_options/config.hpp>
Expand Down Expand Up @@ -131,7 +131,7 @@ namespace boost { namespace program_options { namespace detail {

private: // base overrides

bool getline(std::string&);
bool getline(std::string&) BOOST_OVERRIDE;

private: // internal data
shared_ptr<std::basic_istream<charT> > is;
Expand Down
40 changes: 20 additions & 20 deletions include/boost/program_options/errors.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

#include <boost/program_options/config.hpp>

#include <string>
#include <map>
#include <stdexcept>
#include <string>
#include <vector>
#include <map>


#if defined(BOOST_MSVC)
Expand Down Expand Up @@ -121,7 +121,7 @@ namespace boost { namespace program_options {
/** gcc says that throw specification on dtor is loosened
* without this line
* */
~error_with_option_name() throw() {}
~error_with_option_name() throw() BOOST_OVERRIDE {}


//void dump() const
Expand Down Expand Up @@ -183,7 +183,7 @@ namespace boost { namespace program_options {

/** Creates the error_message on the fly
* Currently a thin wrapper for substitute_placeholders() */
virtual const char* what() const throw();
const char* what() const throw() BOOST_OVERRIDE;

protected:
/** Used to hold the error text returned by what() */
Expand All @@ -209,7 +209,7 @@ namespace boost { namespace program_options {
multiple_values()
: error_with_option_name("option '%canonical_option%' only takes a single argument"){}

~multiple_values() throw() {}
~multiple_values() throw() BOOST_OVERRIDE {}
};

/** Class thrown when there are several occurrences of an
Expand All @@ -220,8 +220,7 @@ namespace boost { namespace program_options {
multiple_occurrences()
: error_with_option_name("option '%canonical_option%' cannot be specified more than once"){}

~multiple_occurrences() throw() {}

~multiple_occurrences() throw() BOOST_OVERRIDE {}
};

/** Class thrown when a required/mandatory option is missing */
Expand All @@ -233,7 +232,7 @@ namespace boost { namespace program_options {
{
}

~required_option() throw() {}
~required_option() throw() BOOST_OVERRIDE {}
};

/** Base class of unparsable options,
Expand All @@ -243,7 +242,7 @@ namespace boost { namespace program_options {
* It makes no sense to have an option name, when we can't match an option to the
* parameter
*
* Having this a part of the error_with_option_name hierachy makes error handling
* Having this a part of the error_with_option_name hierarchy makes error handling
* a lot easier, even if the name indicates some sort of conceptual dissonance!
*
* */
Expand All @@ -256,9 +255,9 @@ namespace boost { namespace program_options {
}

/** Does NOT set option name, because no option name makes sense */
virtual void set_option_name(const std::string&) {}
void set_option_name(const std::string&) BOOST_OVERRIDE {}

~error_with_no_option_name() throw() {}
~error_with_no_option_name() throw() BOOST_OVERRIDE {}
};


Expand All @@ -270,26 +269,26 @@ namespace boost { namespace program_options {
{
}

~unknown_option() throw() {}
~unknown_option() throw() BOOST_OVERRIDE {}
};



/** Class thrown when there's ambiguity amoung several possible options. */
/** Class thrown when there's ambiguity among several possible options. */
class BOOST_PROGRAM_OPTIONS_DECL ambiguous_option : public error_with_no_option_name {
public:
ambiguous_option(const std::vector<std::string>& xalternatives)
: error_with_no_option_name("option '%canonical_option%' is ambiguous"),
m_alternatives(xalternatives)
{}

~ambiguous_option() throw() {}
~ambiguous_option() throw() BOOST_OVERRIDE {}

const std::vector<std::string>& alternatives() const throw() {return m_alternatives;}

protected:
/** Makes all substitutions using the template */
virtual void substitute_placeholders(const std::string& error_template) const;
void substitute_placeholders(const std::string& error_template) const BOOST_OVERRIDE;
private:
// TODO: copy ctor might throw
std::vector<std::string> m_alternatives;
Expand Down Expand Up @@ -320,7 +319,7 @@ namespace boost { namespace program_options {
{
}

~invalid_syntax() throw() {}
~invalid_syntax() throw() BOOST_OVERRIDE {}

kind_t kind() const {return m_kind;}

Expand All @@ -340,10 +339,10 @@ namespace boost { namespace program_options {
m_substitutions["invalid_line"] = invalid_line;
}

~invalid_config_file_syntax() throw() {}
~invalid_config_file_syntax() throw() BOOST_OVERRIDE {}

/** Convenience functions for backwards compatibility */
virtual std::string tokens() const {return m_substitutions.find("invalid_line")->second; }
std::string tokens() const BOOST_OVERRIDE { return m_substitutions.find("invalid_line")->second; }
};


Expand All @@ -355,7 +354,8 @@ namespace boost { namespace program_options {
const std::string& original_token = "",
int option_style = 0):
invalid_syntax(kind, option_name, original_token, option_style) {}
~invalid_command_line_syntax() throw() {}

~invalid_command_line_syntax() throw() BOOST_OVERRIDE {}
};


Expand All @@ -380,7 +380,7 @@ namespace boost { namespace program_options {
{
}

~validation_error() throw() {}
~validation_error() throw() BOOST_OVERRIDE {}

kind_t kind() const { return m_kind; }

Expand Down
44 changes: 22 additions & 22 deletions include/boost/program_options/value_semantic.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
#include <boost/function/function1.hpp>
#include <boost/lexical_cast.hpp>

#include <limits>
#include <string>
#include <vector>
#include <typeinfo>
#include <limits>
#include <vector>

namespace boost { namespace program_options {

Expand Down Expand Up @@ -92,7 +92,7 @@ namespace boost { namespace program_options {
private: // base overrides
void parse(boost::any& value_store,
const std::vector<std::string>& new_tokens,
bool utf8) const;
bool utf8) const BOOST_OVERRIDE;
protected: // interface for derived classes.
virtual void xparse(boost::any& value_store,
const std::vector<std::string>& new_tokens)
Expand All @@ -112,7 +112,7 @@ namespace boost { namespace program_options {
private: // base overrides
void parse(boost::any& value_store,
const std::vector<std::string>& new_tokens,
bool utf8) const;
bool utf8) const BOOST_OVERRIDE;
protected: // interface for derived classes.
#if !defined(BOOST_NO_STD_WSTRING)
virtual void xparse(boost::any& value_store,
Expand All @@ -130,28 +130,28 @@ namespace boost { namespace program_options {
: m_zero_tokens(zero_tokens)
{}

std::string name() const;
std::string name() const BOOST_OVERRIDE;

unsigned min_tokens() const;
unsigned max_tokens() const;
unsigned min_tokens() const BOOST_OVERRIDE;
unsigned max_tokens() const BOOST_OVERRIDE;

bool is_composing() const { return false; }
bool is_composing() const BOOST_OVERRIDE { return false; }

bool is_required() const { return false; }
bool is_required() const BOOST_OVERRIDE { return false; }

/** If 'value_store' is already initialized, or new_tokens
has more than one elements, throws. Otherwise, assigns
the first string from 'new_tokens' to 'value_store', without
any modifications.
*/
void xparse(boost::any& value_store,
const std::vector<std::string>& new_tokens) const;
const std::vector<std::string>& new_tokens) const BOOST_OVERRIDE;

/** Does nothing. */
bool apply_default(boost::any&) const { return false; }
bool apply_default(boost::any&) const BOOST_OVERRIDE { return false; }

/** Does nothing. */
void notify(const boost::any&) const {}
void notify(const boost::any&) const BOOST_OVERRIDE {}
private:
bool m_zero_tokens;
};
Expand Down Expand Up @@ -299,11 +299,11 @@ namespace boost { namespace program_options {

public: // value semantic overrides

std::string name() const;
std::string name() const BOOST_OVERRIDE;

bool is_composing() const { return m_composing; }
bool is_composing() const BOOST_OVERRIDE { return m_composing; }

unsigned min_tokens() const
unsigned min_tokens() const BOOST_OVERRIDE
{
if (m_zero_tokens || !m_implicit_value.empty()) {
return 0;
Expand All @@ -312,7 +312,8 @@ namespace boost { namespace program_options {
}
}

unsigned max_tokens() const {
unsigned max_tokens() const BOOST_OVERRIDE
{
if (m_multitoken) {
return std::numeric_limits<unsigned>::max BOOST_PREVENT_MACRO_SUBSTITUTION();
} else if (m_zero_tokens) {
Expand All @@ -322,19 +323,19 @@ namespace boost { namespace program_options {
}
}

bool is_required() const { return m_required; }
bool is_required() const BOOST_OVERRIDE { return m_required; }

/** Creates an instance of the 'validator' class and calls
its operator() to perform the actual conversion. */
void xparse(boost::any& value_store,
const std::vector< std::basic_string<charT> >& new_tokens)
const;
const BOOST_OVERRIDE;

/** If default value was specified via previous call to
'default_value', stores that value into 'value_store'.
Returns true if default value was stored.
*/
virtual bool apply_default(boost::any& value_store) const
bool apply_default(boost::any& value_store) const BOOST_OVERRIDE
{
if (m_default_value.empty()) {
return false;
Expand All @@ -347,12 +348,12 @@ namespace boost { namespace program_options {
/** If an address of variable to store value was specified
when creating *this, stores the value there. Otherwise,
does nothing. */
void notify(const boost::any& value_store) const;
void notify(const boost::any& value_store) const BOOST_OVERRIDE;

public: // typed_value_base overrides

#ifndef BOOST_NO_RTTI
const std::type_info& value_type() const
const std::type_info& value_type() const BOOST_OVERRIDE
{
return typeid(T);
}
Expand Down Expand Up @@ -421,4 +422,3 @@ namespace boost { namespace program_options {
#include "boost/program_options/detail/value_semantic.hpp"

#endif

4 changes: 2 additions & 2 deletions include/boost/program_options/variables_map.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#include <boost/any.hpp>
#include <boost/shared_ptr.hpp>

#include <string>
#include <map>
#include <set>
#include <string>

#if defined(BOOST_MSVC)
# pragma warning (push)
Expand Down Expand Up @@ -162,7 +162,7 @@ namespace boost { namespace program_options {
private:
/** Implementation of abstract_variables_map::get
which does 'find' in *this. */
const variable_value& get(const std::string& name) const;
const variable_value& get(const std::string& name) const BOOST_OVERRIDE;

/** Names of option with 'final' values \-- which should not
be changed by subsequence assignments. */
Expand Down
14 changes: 6 additions & 8 deletions src/cmdline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,15 @@

#include <boost/bind/bind.hpp>

#include <string>
#include <utility>
#include <vector>
#include <cassert>
#include <cstring>
#include <cctype>
#include <climits>

#include <cstdio>

#include <cstring>
#include <iostream>
#include <string>
#include <utility>
#include <vector>

using namespace boost::placeholders;

Expand Down Expand Up @@ -210,7 +208,7 @@ namespace boost { namespace program_options { namespace detail {
// of unparsed tokens and can consume some of them (by
// removing elements on front) and return a vector of options.
//
// We try each style parser in turn, untill some input
// We try each style parser in turn, until some input
// is consumed. The returned vector of option may contain the
// result of just syntactic parsing of token, say --foo will
// be parsed as option with name 'foo', and the style parser
Expand Down Expand Up @@ -407,7 +405,7 @@ namespace boost { namespace program_options { namespace detail {
// Be defensive:
// will have no original token if option created by handle_additional_parser()
std::string original_token_for_exceptions = opt.string_key;
if (opt.original_tokens.size())
if (!opt.original_tokens.empty())
original_token_for_exceptions = opt.original_tokens[0];

try
Expand Down
5 changes: 2 additions & 3 deletions src/convert.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
// (See accompanying file LICENSE_1_0.txt
// or copy at http://www.boost.org/LICENSE_1_0.txt)

#include <clocale>
#include <fstream>
#include <locale.h>
#include <locale>
#include <iostream>
#include <string>
#include <locale>
#include <stdexcept>
#include <string>

#include <boost/config.hpp>

Expand Down
Loading