Skip to content
Snippets Groups Projects
Commit badc9c8f authored by Marco Biasini's avatar Marco Biasini
Browse files

fixes to make it compile with boost 1.46

parent 4a8f2b26
No related branches found
No related tags found
No related merge requests found
......@@ -271,9 +271,9 @@ else(Boost_FIND_VERSION_EXACT)
# The user has not requested an exact version. Among known
# versions, find those that are acceptable to the user request.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
"1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0"
"1.37" "1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
"1.34" "1.33.1" "1.33.0" "1.33")
"1.46" "1.45" "1.44" "1.43" "1.42" "1.41.0" "1.41" "1.40.0" "1.40" "1.39.0"
"1.39" "1.38.0" "1.38" "1.37.0" "1.37" "1.36.1" "1.36.0" "1.36" "1.35.1"
"1.35.0" "1.35" "1.34.1" "1.34.0" "1.34" "1.33.1" "1.33.0" "1.33")
set(_boost_TEST_VERSIONS)
if(Boost_FIND_VERSION)
set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
......
......@@ -223,7 +223,11 @@ CRDWriter::CRDWriter(std::ostream& ostream) :
{}
CRDWriter::CRDWriter(const boost::filesystem::path& filename) :
#if BOOST_FILESYSTEM_VERSION==3
outfile_(filename.filename().string().c_str()), outstream_(outfile_),
#else
outfile_(filename.file_string().c_str()), outstream_(outfile_),
#endif
atom_count_(0)
{}
......
......@@ -329,7 +329,11 @@ PDBWriter::PDBWriter(std::ostream& stream, const IOProfile& profile):
PDBWriter::PDBWriter(const boost::filesystem::path& filename,
const IOProfile& profile):
#if BOOST_FILESYSTEM_VERSION==3
outfile_(filename.filename().string().c_str()), outstream_(outfile_),
#else
outfile_(filename.file_string().c_str()), outstream_(outfile_),
#endif
mol_count_(0), line_(80), multi_model_(false),
charmm_style_(profile.dialect=="CHARMM"), is_pqr_(false),
profile_(profile)
......
......@@ -95,8 +95,13 @@ SDFWriter::SDFWriter(const String& filename)
: outfile_(filename.c_str()), ostr_(outfile_), counter_(0) {
}
SDFWriter::SDFWriter(const boost::filesystem::path& filename)
: outfile_(filename.file_string().c_str()), ostr_(outfile_), counter_(0) {
SDFWriter::SDFWriter(const boost::filesystem::path& filename):
#if BOOST_FILESYSTEM_VERSION==3
outfile_(filename.filename().string().c_str()),
#else
outfile_(filename.file_string().c_str()),
#endif
ostr_(outfile_), counter_(0) {
}
void SDFWriter::Write(const mol::EntityView& ent) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment