From 7d913dc558c5cad4e0f5423c49ec0863f77bbcfe Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Mon, 4 Jan 2010 10:08:14 +0100 Subject: [PATCH] start moving some metaprogramming helpers to lib::meta --- src/lib/format.hpp | 4 ++-- src/lib/itertools.hpp | 2 +- src/lib/meta/trait.hpp | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/lib/format.hpp b/src/lib/format.hpp index 084a5c941..0e75f6da2 100644 --- a/src/lib/format.hpp +++ b/src/lib/format.hpp @@ -46,8 +46,8 @@ namespace util { - using lumiera::typelist::can_ToString; - using lumiera::typelist::can_lexical2string; + using lib::meta::can_ToString; + using lib::meta::can_lexical2string; using lib::Symbol; using boost::enable_if; using boost::disable_if; diff --git a/src/lib/itertools.hpp b/src/lib/itertools.hpp index bf8cd8bff..20a20e025 100644 --- a/src/lib/itertools.hpp +++ b/src/lib/itertools.hpp @@ -84,7 +84,7 @@ namespace lib { using std::tr1::function; using util::unConst; - using lumiera::typelist::RefTraits; + using lib::meta::RefTraits; diff --git a/src/lib/meta/trait.hpp b/src/lib/meta/trait.hpp index 010a7bcbc..b70310588 100644 --- a/src/lib/meta/trait.hpp +++ b/src/lib/meta/trait.hpp @@ -21,11 +21,12 @@ */ -#ifndef LUMIERA_META_TRAIT_H -#define LUMIERA_META_TRAIT_H +#ifndef LIB_META_TRAIT_H +#define LIB_META_TRAIT_H #include "lib/meta/util.hpp" +#include "lib/meta/duck-detector.hpp" #include "lib/wrapper.hpp" ////////////////////////TODO only because of AssignableRefWrapper -- can we get rid of this import? #include @@ -34,8 +35,8 @@ #include -namespace lumiera { -namespace typelist { +namespace lib { +namespace meta { @@ -105,5 +106,5 @@ namespace typelist { //////////////////////////////////////////TODO: not needed 12/09 -- obsolete? useful? keep it? -}} // namespace lumiera::typelist +}} // namespace lib::meta #endif