Commit 2f017e36 authored by Tiago Peixoto's avatar Tiago Peixoto
Browse files

Specify std namespace for type_info

This avoid a namespace clash when using run_action.inline().
parent 60acdcfa
......@@ -111,14 +111,14 @@ using namespace boost;
class ActionNotFound: public GraphException
{
public:
ActionNotFound(const boost::any& graph_view, const type_info& action,
const vector<const type_info*>& args);
ActionNotFound(const boost::any& graph_view, const std::type_info& action,
const vector<const std::type_info*>& args);
virtual const char * what () const throw ();
virtual ~ActionNotFound() throw () {}
private:
boost::any _graph_view;
const type_info& _action;
vector<const type_info*> _args;
const std::type_info& _action;
vector<const std::type_info*> _args;
};
namespace detail
......@@ -592,7 +592,7 @@ struct graph_action
if (!found)
{
throw ActionNotFound(gview, typeid(Action),
vector<const type_info*>());
vector<const std::type_info*>());
}
}
......@@ -604,7 +604,7 @@ struct graph_action
(boost::mpl::select_types(_a, found, gview, a1));
if (!found)
{
vector<const type_info*> args;
vector<const std::type_info*> args;
args.push_back(&a1.type());
throw ActionNotFound(gview, typeid(Action), args);
}
......@@ -618,7 +618,7 @@ struct graph_action
(boost::mpl::select_types(_a, found, gview, a1, a2));
if (!found)
{
vector<const type_info*> args;
vector<const std::type_info*> args;
args.push_back(&a1.type());
args.push_back(&a2.type());
throw ActionNotFound(gview, typeid(Action), args);
......@@ -633,7 +633,7 @@ struct graph_action
(boost::mpl::select_types(_a, found, gview, a1, a2, a3));
if (!found)
{
vector<const type_info*> args;
vector<const std::type_info*> args;
args.push_back(&a1.type());
args.push_back(&a2.type());
args.push_back(&a3.type());
......@@ -650,7 +650,7 @@ struct graph_action
(boost::mpl::select_types(_a, found, gview, a1, a2, a3,a4));
if (!found)
{
vector<const type_info*> args;
vector<const std::type_info*> args;
args.push_back(&a1.type());
args.push_back(&a2.type());
args.push_back(&a3.type());
......
......@@ -18,6 +18,7 @@
#ifndef GRAPH_PROPERTIES_HH
#define GRAPH_PROPERTIES_HH
#include <typeinfo>
#include <string>
#include <vector>
#if (GCC_VERSION >= 40400)
......@@ -206,7 +207,7 @@ public:
}
}
const string& operator()(const type_info& type) const
const string& operator()(const std::type_info& type) const
{
string* name;
mpl::for_each<TypeSequence>
......@@ -224,7 +225,7 @@ private:
struct find_name
{
template <class Type>
void operator()(Type, const type_info& type,
void operator()(Type, const std::type_info& type,
vector<string>& all_names,
string*& name) const
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment