Merge branch 'master' into result_of

Author: artemp

scripts/osx.sh

@@ -4,6 +4,7 @@ set -e -u
 set -o pipefail
 
 # install boost headers
+brew unlink boost
 brew install boost
 
 # run tests

test/binary_visitor_test.cpp

@@ -78,7 +78,7 @@ struct javascript_equal_visitor : util::static_visitor<bool>
     template <typename T0, typename T1>
     bool operator() (T0 lhs, T1 rhs) const
     {
-        return lhs == rhs;
+        return lhs == static_cast<T0>(rhs);
     }
 };