Skip to content
Snippets Groups Projects
Unverified Commit 755c5263 authored by René Fritze's avatar René Fritze
Browse files

qualify make_unique

dune-common turns on c++14 automatically, so it's natively
available, leading to ambiguous calls
parent 7b5be154
No related branches found
No related tags found
No related merge requests found
...@@ -51,14 +51,14 @@ std::unique_ptr<boost::filesystem::ofstream> make_ofstream(const boost::filesyst ...@@ -51,14 +51,14 @@ std::unique_ptr<boost::filesystem::ofstream> make_ofstream(const boost::filesyst
const std::ios_base::openmode mode) const std::ios_base::openmode mode)
{ {
test_create_directory(path.string()); test_create_directory(path.string());
return make_unique<boost::filesystem::ofstream>(path, mode); return Dune::XT::Common::make_unique<boost::filesystem::ofstream>(path, mode);
} }
std::unique_ptr<boost::filesystem::ifstream> make_ifstream(const boost::filesystem::path& path, std::unique_ptr<boost::filesystem::ifstream> make_ifstream(const boost::filesystem::path& path,
const std::ios_base::openmode mode) const std::ios_base::openmode mode)
{ {
test_create_directory(path.string()); test_create_directory(path.string());
return make_unique<boost::filesystem::ifstream>(path, mode); return Dune::XT::Common::make_unique<boost::filesystem::ifstream>(path, mode);
} }
//! read a file and output all lines containing filter string to a stream //! read a file and output all lines containing filter string to a stream
......
...@@ -29,7 +29,7 @@ Logging::Logging() ...@@ -29,7 +29,7 @@ Logging::Logging()
, emptyLogStream_(logflags_) , emptyLogStream_(logflags_)
{ {
for (const auto id : streamIDs_) for (const auto id : streamIDs_)
streammap_[id] = make_unique<EmptyLogStream>(logflags_); streammap_[id] = Dune::XT::Common::make_unique<EmptyLogStream>(logflags_);
} }
void Logging::deinit() void Logging::deinit()
...@@ -66,7 +66,7 @@ void Logging::create(int logflags, const std::string logfile, const std::string ...@@ -66,7 +66,7 @@ void Logging::create(int logflags, const std::string logfile, const std::string
for (const auto id : streamIDs_) { for (const auto id : streamIDs_) {
flagmap_[id] = logflags; flagmap_[id] = logflags;
streammap_[id] = make_unique<FileLogStream>(id, flagmap_[id], logfile_); streammap_[id] = Dune::XT::Common::make_unique<FileLogStream>(id, flagmap_[id], logfile_);
} }
} // create } // create
...@@ -119,7 +119,7 @@ int Logging::add_stream(int flags) ...@@ -119,7 +119,7 @@ int Logging::add_stream(int flags)
int streamID = streamID_int; int streamID = streamID_int;
streamIDs_.push_back(streamID); streamIDs_.push_back(streamID);
flagmap_[streamID] = (flags | streamID); flagmap_[streamID] = (flags | streamID);
streammap_[streamID] = make_unique<FileLogStream>(streamID, flagmap_[streamID], logfile_); streammap_[streamID] = Dune::XT::Common::make_unique<FileLogStream>(streamID, flagmap_[streamID], logfile_);
return streamID_int; return streamID_int;
} // add_stream } // add_stream
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment