Commit e43e4e8b authored by Tiago Peixoto's avatar Tiago Peixoto
Browse files

Fix some remaining issues with the clang compiler in MacOS X

parent 70a2ce29
......@@ -211,7 +211,7 @@ public:
const string& operator()(const std::type_info& type) const
{
string* name;
string const* name;
mpl::for_each<TypeSequence>
(bind<void>(find_name(), _1, ref(type),
ref(_all_names), ref(name)));
......@@ -228,8 +228,8 @@ private:
{
template <class Type>
void operator()(Type, const std::type_info& type,
vector<string>& all_names,
string*& name) const
const vector<string>& all_names,
string const*& name) const
{
size_t index = mpl::find<TypeSequence,Type>::type::pos::value;
if (type == typeid(Type))
......@@ -249,7 +249,7 @@ private:
};
const char** _type_names;
static vector<string> _all_names;
vector<string> _all_names;
};
//
......
......@@ -128,7 +128,7 @@ inline double dist(const Pos& p1, const Pos& p2)
{
double r = 0;
for (size_t i = 0; i < 2; ++i)
r += pow(p1[i] - p2[i], 2.);
r += pow(double(p1[i] - p2[i]), 2.);
return sqrt(r);
}
......
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