Changeset 670 in dev for trunk/ab5.0/abdev/ab_common/include

Timestamp:

Jun 28, 2008, 9:58:04 PM (16 years ago)

Author:

dai_9181

Message:

Importsが正常に解釈されない不具合を修正

File:

• trunk/ab5.0/abdev/ab_common/include/Lexical/NamespaceSupporter.h (modified) (2 diffs)

trunk/ab5.0/abdev/ab_common/include/Lexical/NamespaceSupporter.h

@@ -25 +25 @@
     }
 
-    const NamespaceScopesCollection &GetImportedNamespaces()
+    const NamespaceScopesCollection &GetImportedNamespaces() const
     {
         return importedNamespaces;
@@ -60 +60 @@
     // entryName =   "ActiveBasic"
     // この場合、living は entryName を包括している。
-    bool IsCoverd( const NamespaceScopes &namespaceScopes, const std::string &entryName ) const
-    {
-        if( namespaceScopes.IsEqual( entryName ) )
-        {
-            return true;
-        }
-
-        std::string thisStr = namespaceScopes.ToString();
-
-        NamespaceScopes tempLivingNamespaceScopes = livingNamespaceScopes;
-
-        while( tempLivingNamespaceScopes.size() )
-        {
-            std::string tempStr = tempLivingNamespaceScopes.ToString() + "." + entryName;
-            if( thisStr == tempStr )
-            {
-                return true;
-            }
-
-            tempLivingNamespaceScopes.pop_back();
-        }
-        return false;
-    }
-    bool IsCoverd( const NamespaceScopes &baseNamespaceScopes, const NamespaceScopes &entryNamespaceScopes ) const
-    {
-        return IsCoverd( baseNamespaceScopes, entryNamespaceScopes.ToString() );
-    }
+    bool IsCoverd( const NamespaceScopes &base, const NamespaceScopes &entry ) const;