make error for atom_diag.cpp

[mzingl]

Hi,
using the newest commits of triqs and cthyb gives the error below during compilation.
I'd guess that the error is caused by the triqs commit 572ad4d (For commit f583999 the compilation of cthyb works.).

Regards,
Manuel

[ 8%] Building CXX object c++/CMakeFiles/cthyb_c.dir/atom_diag.cpp.o
/home/manuel/Tools/cthyb/src/c++/atom_diag.cpp: In function ‘std::string triqs::hilbert_space::get_triqs_hdf5_data_scheme(const triqs::hilbert_space::sub_hilbert_space&)’:
/home/manuel/Tools/cthyb/src/c++/atom_diag.cpp:193:14: error: redefinition of ‘std::string triqs::hilbert_space::get_triqs_hdf5_data_scheme(const triqs::hilbert_space::sub_hilbert_space&)’
std::string get_triqs_hdf5_data_scheme(sub_hilbert_space const&) { return "sub_hilbert_space"; }
^
In file included from /home/manuel/Tools/TRIQS/include/triqs/hilbert_space/state.hpp:28:0,
from /home/manuel/Tools/cthyb/src/c++/././config.hpp:28,
from /home/manuel/Tools/cthyb/src/c++/./atom_diag.hpp:22,
from /home/manuel/Tools/cthyb/src/c++/atom_diag.cpp:21:
/home/manuel/Tools/TRIQS/include/triqs/hilbert_space/hilbert_space.hpp:148:21: note: ‘std::string triqs::hilbert_space::get_triqs_hdf5_data_scheme(const triqs::hilbert_space::sub_hilbert_space&)’ previously defined here
friend std::string get_triqs_hdf5_data_scheme(sub_hilbert_space const&) { return "sub_hilbert_space"; }
^
/home/manuel/Tools/cthyb/src/c++/atom_diag.cpp: In function ‘void triqs::hilbert_space::h5_write(triqs::h5::group, const string&, const triqs::hilbert_space::sub_hilbert_space&)’:
/home/manuel/Tools/cthyb/src/c++/atom_diag.cpp:197:7: error: redefinition of ‘void triqs::hilbert_space::h5_write(triqs::h5::group, const string&, const triqs::hilbert_space::sub_hilbert_space&)’
void h5_write(h5::group fg, std::string const& name, sub_hilbert_space const& x) {
^
In file included from /home/manuel/Tools/TRIQS/include/triqs/hilbert_space/state.hpp:28:0,
from /home/manuel/Tools/cthyb/src/c++/././config.hpp:28,
from /home/manuel/Tools/cthyb/src/c++/./atom_diag.hpp:22,
from /home/manuel/Tools/cthyb/src/c++/atom_diag.cpp:21:
/home/manuel/Tools/TRIQS/include/triqs/hilbert_space/hilbert_space.hpp:150:14: note: ‘void triqs::hilbert_space::h5_write(triqs::h5::group, const string&, const triqs::hilbert_space::sub_hilbert_space&)’ previously defined here
friend void h5_write(h5::group fg, std::string const& name, sub_hilbert_space const& hs) {
^
/home/manuel/Tools/cthyb/src/c++/atom_diag.cpp: In function ‘void triqs::hilbert_space::h5_read(triqs::h5::group, const string&, triqs::hilbert_space::sub_hilbert_space&)’:
/home/manuel/Tools/cthyb/src/c++/atom_diag.cpp:204:7: error: redefinition of ‘void triqs::hilbert_space::h5_read(triqs::h5::group, const string&, triqs::hilbert_space::sub_hilbert_space&)’
void h5_read(h5::group fg, std::string const& name, sub_hilbert_space& x) {
^
In file included from /home/manuel/Tools/TRIQS/include/triqs/hilbert_space/state.hpp:28:0,
from /home/manuel/Tools/cthyb/src/c++/././config.hpp:28,
from /home/manuel/Tools/cthyb/src/c++/./atom_diag.hpp:22,
from /home/manuel/Tools/cthyb/src/c++/atom_diag.cpp:21:
/home/manuel/Tools/TRIQS/include/triqs/hilbert_space/hilbert_space.hpp:156:14: note: ‘void triqs::hilbert_space::h5_read(triqs::h5::group, const string&, triqs::hilbert_space::sub_hilbert_space&)’ previously defined here
friend void h5_read(h5::group fg, std::string const& name, sub_hilbert_space & hs) {
^
make[2]: *** [c++/CMakeFiles/cthyb_c.dir/atom_diag.cpp.o] Error 1
make[1]: *** [c++/CMakeFiles/cthyb_c.dir/all] Error 2
make: *** [all] Error 2