From 1d805d74cc78ecf61e9530f1132faa9eae68287a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 21 May 2010 09:59:31 +0200
Subject: Go into the std namespace even if it is builtin

---
 odb/parser.cxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'odb/parser.cxx')

diff --git a/odb/parser.cxx b/odb/parser.cxx
index 03cecde..1f7ba46 100644
--- a/odb/parser.cxx
+++ b/odb/parser.cxx
@@ -282,7 +282,7 @@ emit_class (tree c, path const& file, size_t line, size_t clmn, bool stub)
   //
   decl_set decls;
 
-  for (tree d (TYPE_FIELDS (c)); d != NULL_TREE ; d = TREE_CHAIN (d))
+  for (tree d (TYPE_FIELDS (c)); d != NULL_TREE; d = TREE_CHAIN (d))
   {
     switch (TREE_CODE (d))
     {
@@ -645,9 +645,7 @@ collect (tree ns)
   //
   for(decl = level->namespaces; decl != NULL_TREE; decl = TREE_CHAIN (decl))
   {
-    // !DECL_NAMESPACE_STD_P (decl)
-
-    if (!DECL_IS_BUILTIN (decl))
+    if (!DECL_IS_BUILTIN (decl) || DECL_NAMESPACE_STD_P (decl))
     {
       if (trace)
       {
-- 
cgit v1.1