From a6d3f65d4c869ed02e15b056bec0b974047f1d78 Mon Sep 17 00:00:00 2001
From: Rene Milk <rene.milk@uni-muenster.de>
Date: Tue, 23 Sep 2014 18:31:38 +0200
Subject: [PATCH] [misc] constness++
---
dune/stuff/functions/combined.hh | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dune/stuff/functions/combined.hh b/dune/stuff/functions/combined.hh
index 17ca192b0..a32ac4caf 100644
--- a/dune/stuff/functions/combined.hh
+++ b/dune/stuff/functions/combined.hh
@@ -326,11 +326,12 @@ public:
ThisType& operator=(ThisType&& other) = delete;
- virtual std::unique_ptr<LocalfunctionType> local_function(const EntityType& entity) const /*DS_OVERRIDE DS_FINAL*/
+ virtual std::unique_ptr<LocalfunctionType> local_function(const EntityType& entity) const DS_OVERRIDE DS_FINAL
{
typedef CombinedLocalFunction<LeftType, RightType, comb> RealLocalFunctionType;
- return std::unique_ptr<RealLocalFunctionType>(
- new RealLocalFunctionType(left_->storage_access(), right_->storage_access(), entity));
+ assert(left_);
+ assert(right_);
+ return DSC::make_unique<RealLocalFunctionType>(left_->storage_access(), right_->storage_access(), entity);
} // ... local_function(...)
virtual ThisType* copy() const
--
GitLab