From c29af56d1c22a8f1d4d95628d77a2ecee04f0a1c Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sat, 9 Jan 2016 01:55:28 +0100 Subject: [PATCH] sanity: better not to unwrap Placements automatically quite sure I never really meant to do that, just, at that time, it seemed logical to treat Placement as yet another smart-ptr. But in the light of what crucial entity Placement became meanwhile, I can't imagine a single case where anyone wants to wrap away a placement as if it was some shrink-wrap --- src/lib/format-util.hpp | 2 +- src/lib/meta/trait.hpp | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/lib/format-util.hpp b/src/lib/format-util.hpp index 96e539c67..21105d7ca 100644 --- a/src/lib/format-util.hpp +++ b/src/lib/format-util.hpp @@ -175,7 +175,7 @@ namespace util { inline string join (CON&& coll, string const& delim =", ") { - using Coll = typename lib::meta::Strip::Type; + using Coll = typename lib::meta::Strip::TypePlain; using Val = typename Coll::value_type; std::function toString = [] (Val const& val) { return util::toString(val); }; diff --git a/src/lib/meta/trait.hpp b/src/lib/meta/trait.hpp index 399276768..b92de002a 100644 --- a/src/lib/meta/trait.hpp +++ b/src/lib/meta/trait.hpp @@ -182,19 +182,6 @@ namespace meta { } }; - template - struct Unwrap > - { - typedef X Type; - - static X& - extract (mobject::Placement placement) - { - ASSERT (placement.isValid()); - return *placement; - } - }; - /** convenience shortcut: unwrapping free function. * @return reference to the bare element.