From 755c52639a26610d325fe5169ab4fa36e2f7694e Mon Sep 17 00:00:00 2001
From: Rene Milk <rene.milk@wwu.de>
Date: Wed, 6 Apr 2016 14:32:11 +0200
Subject: [PATCH] qualify make_unique
dune-common turns on c++14 automatically, so it's natively
available, leading to ambiguous calls
---
dune/xt/common/filesystem.cc | 4 ++--
dune/xt/common/logging.cc | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dune/xt/common/filesystem.cc b/dune/xt/common/filesystem.cc
index 0887f1315..493d3e2b8 100644
--- a/dune/xt/common/filesystem.cc
+++ b/dune/xt/common/filesystem.cc
@@ -51,14 +51,14 @@ std::unique_ptr<boost::filesystem::ofstream> make_ofstream(const boost::filesyst
const std::ios_base::openmode mode)
{
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,
const std::ios_base::openmode mode)
{
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
diff --git a/dune/xt/common/logging.cc b/dune/xt/common/logging.cc
index e3d660e77..a6c6b0ddf 100644
--- a/dune/xt/common/logging.cc
+++ b/dune/xt/common/logging.cc
@@ -29,7 +29,7 @@ Logging::Logging()
, emptyLogStream_(logflags_)
{
for (const auto id : streamIDs_)
- streammap_[id] = make_unique<EmptyLogStream>(logflags_);
+ streammap_[id] = Dune::XT::Common::make_unique<EmptyLogStream>(logflags_);
}
void Logging::deinit()
@@ -66,7 +66,7 @@ void Logging::create(int logflags, const std::string logfile, const std::string
for (const auto id : streamIDs_) {
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
@@ -119,7 +119,7 @@ int Logging::add_stream(int flags)
int streamID = streamID_int;
streamIDs_.push_back(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;
} // add_stream
--
GitLab