mshr fails to build with latest DOLFIN

mshr currently fails to build with the latest DOLFIN master as you probably know. I think it started to fail after this commit in DOLFIN.
build   17-Feb-2017 22:58:07    /usr/lib/ccache/c++   -DDEBUG -DDOLFIN_LA_INDEX_SIZE=4 -DDOLFIN_SIZE_T=8 -DDOLFIN_VERSION=\"2017.1.0.dev0\" -DHAS_CHOLMOD -DHAS_HDF5 -DHAS_MPI -DHAS_OPENMP -DHAS_PARMETIS -DHAS_PETSC -DHAS_SCOTCH -DHAS_SLEPC -DHAS_TRILINOS -DHAS_UMFPACK -DHAS_ZLIB -DTETLIBRARY -D_FORTIFY_SOURCE=2 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -Dmshr_EXPORTS -I/home/fenics/local/src/mshr/include -I/home/fenics/local/src/mshr/3rdparty/tetgen1.5.0 -I/home/fenics/local/src/mshr/build/CGAL-installdir/include -I/usr/include/x86_64-linux-gnu -I/usr/lib/python2.7/dist-packages/numpy/core/include -I/usr/include/python2.7 -I/usr/local/lib/python2.7/dist-packages/petsc4py/include -I/usr/local/lib/python2.7/dist-packages/slepc4py/include -I/home/fenics/local/include -isystem /home/fenics/local/lib/python2.7/site-packages/ffc/backends/ufc -isystem /usr/local/petsc-32/include -isystem /usr/include/mpich -isystem /usr/include/eigen3 -isystem /usr/include/hdf5/mpich -isystem /usr/local/include -isystem /usr/local/slepc-32/include  -std=c++0x -Wall    -fopenmp -g -fPIC   -std=c++11 -o CMakeFiles/mshr.dir/src/CSGOperators.cpp.o -c /home/fenics/local/src/mshr/src/CSGOperators.cpp
error   17-Feb-2017 22:58:09    In file included from /home/fenics/local/src/mshr/src/CSGOperators.cpp:21:0:
error   17-Feb-2017 22:58:09    /home/fenics/local/src/mshr/include/mshr/CSGOperators.h: In function â€˜std::shared_ptr<mshr::CSGScaling> mshr::operator*(std::shared_ptr<mshr::CSGGeometry>, double)â€™:
error   17-Feb-2017 22:58:09    /home/fenics/local/src/mshr/include/mshr/CSGOperators.h:304:66: error: no matching function for call to â€˜mshr::CSGScaling::CSGScaling(std::shared_ptr<mshr::CSGGeometry>&, double&, bool)â€™
error   17-Feb-2017 22:58:09         return std::shared_ptr<CSGScaling>(new CSGScaling(g, s, false));
error   17-Feb-2017 22:58:09                                                                      ^
error   17-Feb-2017 22:58:09    /home/fenics/local/src/mshr/include/mshr/CSGOperators.h:147:5: note: candidate: mshr::CSGScaling::CSGScaling(std::shared_ptr<mshr::CSGGeometry>, dolfin::Point, double)
error   17-Feb-2017 22:58:09         CSGScaling(std::shared_ptr<CSGGeometry> g,
error   17-Feb-2017 22:58:09         ^
error   17-Feb-2017 22:58:09    /home/fenics/local/src/mshr/include/mshr/CSGOperators.h:147:5: note:   no known conversion for argument 2 from â€˜doubleâ€™ to â€˜dolfin::Pointâ€™
error   17-Feb-2017 22:58:09    /home/fenics/local/src/mshr/include/mshr/CSGOperators.h:140:5: note: candidate: mshr::CSGScaling::CSGScaling(std::shared_ptr<mshr::CSGGeometry>, double)
error   17-Feb-2017 22:58:09         CSGScaling(std::shared_ptr<CSGGeometry> g,
error   17-Feb-2017 22:58:09         ^
error   17-Feb-2017 22:58:09    /home/fenics/local/src/mshr/include/mshr/CSGOperators.h:140:5: note:   candidate expects 2 arguments, 3 provided
error   17-Feb-2017 22:58:09    /home/fenics/local/src/mshr/include/mshr/CSGOperators.h:133:9: note: candidate: mshr::CSGScaling::CSGScaling(const mshr::CSGScaling&)
error   17-Feb-2017 22:58:09       class CSGScaling : public CSGOperator
error   17-Feb-2017 22:58:09             ^
error   17-Feb-2017 22:58:09    /home/fenics/local/src/mshr/include/mshr/CSGOperators.h:133:9: note:   candidate expects 1 argument, 3 provided
error   17-Feb-2017 22:58:09    /home/fenics/local/src/mshr/include/mshr/CSGOperators.h:133:9: note: candidate: mshr::CSGScaling::CSGScaling(mshr::CSGScaling&&)
error   17-Feb-2017 22:58:09    /home/fenics/local/src/mshr/include/mshr/CSGOperators.h:133:9: note:   candidate expects 1 argument, 3 provided
error   17-Feb-2017 22:58:09    make[2]: *** [CMakeFiles/mshr.dir/src/CSGOperators.cpp.o] Error 1
build   17-Feb-2017 22:58:09    CMakeFiles/mshr.dir/build.make:110: recipe for target 'CMakeFiles/mshr.dir/src/CSGOperators.cpp.o' failed
build   17-Feb-2017 22:58:09    make[2]: Leaving directory '/home/fenics/local/src/mshr/build'
build   17-Feb-2017 22:58:09    CMakeFiles/Makefile2:68: recipe for target 'CMakeFiles/mshr.dir/all' failed
build   17-Feb-2017 22:58:09    make[1]: Leaving directory '/home/fenics/local/src/mshr/build'
error   17-Feb-2017 22:58:09    make[1]: *** [CMakeFiles/mshr.dir/all] Error 2
build   17-Feb-2017 22:58:09    Makefile:138: recipe for target 'all' failed
error   17-Feb-2017 22:58:09    make: *** [all] Error 2
Comments (2)
