aboutsummaryrefslogtreecommitdiff
path: root/odb/context.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'odb/context.cxx')
-rw-r--r--odb/context.cxx18
1 files changed, 1 insertions, 17 deletions
diff --git a/odb/context.cxx b/odb/context.cxx
index fbab993..657c283 100644
--- a/odb/context.cxx
+++ b/odb/context.cxx
@@ -1068,23 +1068,7 @@ type_val_type (semantics::type& t,
bool context::
composite_ (semantics::class_& c)
{
- bool r (true);
-
- if (c.count ("value"))
- {
- for (pragma_name_set::const_iterator i (simple_value_pragmas_.begin ()),
- e (simple_value_pragmas_.end ()); i != e; ++i)
- {
- if (c.count (*i))
- {
- r = false;
- break;
- }
- }
- }
- else
- r = false;
-
+ bool r (c.count ("value") && !c.count ("simple") && !c.count ("container"));
c.set ("composite-value", r);
return r;
}