From 13fd92f4c8e4f68bf4f9cc0b7de95e7ee7fe9d82 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 7 Jan 2017 17:22:02 +0300 Subject: Increase size of variable value::data_ to compile with libc++ --- build2/module | 2 +- build2/variable | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build2/module b/build2/module index 8c64676..7d6439f 100644 --- a/build2/module +++ b/build2/module @@ -68,7 +68,7 @@ namespace build2 struct loaded_module_map: std::map { - template + template T* lookup (const string& name) const { diff --git a/build2/variable b/build2/variable index 047dc04..6aec85b 100644 --- a/build2/variable +++ b/build2/variable @@ -220,9 +220,9 @@ namespace build2 public: // Fast, unchecked cast of data_ to T. // - template T& as () & {return reinterpret_cast (data_);} - template T&& as () && {return move (as ());} - template const T& as () const& { + template T& as () & {return reinterpret_cast (data_);} + template T&& as () && {return move (as ());} + template const T& as () const& { return reinterpret_cast (data_);} public: @@ -232,7 +232,7 @@ namespace build2 // specialization below). Types that don't fit will have to be handled // with an extra dynamic allocation. // - std::aligned_storage::type data_; + std::aligned_storage::type data_; // VC14 needs decltype. // -- cgit v1.1