Changeset e43e4e

Timestamp:

06/04/12 16:07:37 (12 months ago)

Author:

Tiago de Paula Peixoto <tiago@…>

Branches:

master

Children:

fa8ca4

Parents:

70a2ce

git-author:

Tiago de Paula Peixoto <tiago@…> (06/04/12 16:07:37)

git-committer:

Tiago de Paula Peixoto <tiago@…> (06/04/12 16:07:37)

Message:

Fix some remaining issues with the clang compiler in MacOS X

Location:

src/graph

Files:

• graph_properties.hh (modified) (3 diffs)
• layout/graph_sfdp.hh (modified) (1 diff)

src/graph/graph_properties.hh

@@ -212 +212 @@
     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),
@@ -229 +229 @@
         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;
@@ -250 +250 @@
 
     const char** _type_names;
-    static vector<string> _all_names;
+    vector<string> _all_names;
 };
 

src/graph/layout/graph_sfdp.hh

@@ -129 +129 @@
     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);
 }