Revert "Merge branch 'fields_cache' into 'dev-1.0'"

This reverts merge request !6

kdlib/source/clang/clang.cpp

@@ -208,7 +208,7 @@ TypeInfoPtr TypeFieldClangField::getTypeInfo()
 ///////////////////////////////////////////////////////////////////////////////
 
 TypeInfoClangStruct::TypeInfoClangStruct(const std::wstring & name, ClangASTSessionPtr& session, clang::RecordDecl*  decl) :
-        TypeInfoFields(name, L""),
+        TypeInfoFields(name),
         m_astSession(session),
         m_decl(decl)
 {

kdlib/source/clang/clang.h

@@ -279,7 +279,7 @@ class TypeInfoClangEnum : public TypeInfoFields
 public:
 
      TypeInfoClangEnum(ClangASTSessionPtr& session, clang::EnumDecl* decl) :
-        TypeInfoFields(strToWStr(decl->getNameAsString()), L""),
+        TypeInfoFields(strToWStr(decl->getNameAsString())),
         m_astSession(session),
         m_decl(decl)
      {}

kdlib/source/customtypes.cpp

@@ -14,7 +14,7 @@ class CustomBase : public TypeInfoFields {
 protected:
 
     CustomBase( const std::wstring &name, size_t align ) :
-        TypeInfoFields(name, L"")
+        TypeInfoFields(name)
         {
             m_align = align ? align : ptrSize();
             m_size = 0;

kdlib/source/net/nettype.h

@@ -322,7 +322,7 @@ public:
 private:
 
     NetTypeClass(COR_TYPEID& typeId, MetaDataProviderPtr& metaProvider, const std::wstring& name, mdTypeDef token) :
-        TypeInfoFields(name, L""),
+        TypeInfoFields(name),
         m_typeId(typeId),
         m_metaProvider(metaProvider),
         m_name(name),

kdlib/source/typeinfo.cpp

@@ -1064,31 +1064,6 @@ size_t TypeInfoFields::getAlignReq()
     return alignReq;
 }
 
-typedef std::map<std::pair<std::wstring, std::wstring>, FieldCollection> TypeInfoFieldsCache;
-static TypeInfoFieldsCache fieldsCache;
-
-void TypeInfoFields::checkFields()
-{
-  if (!m_fieldsGot)
-  {
-    if (!m_scopeName.empty())
-    {
-      TypeInfoFieldsCache::key_type cacheKey(m_scopeName, m_name);
-      TypeInfoFieldsCache::iterator fields = fieldsCache.find(cacheKey);
-      if (fields != fieldsCache.end())
-        m_fields = fields->second;
-      else
-      {
-        getFields();
-        fieldsCache.insert(std::make_pair(cacheKey, m_fields));
-      }
-    }
-    else
-      getFields();
-    m_fieldsGot = true;
-  }
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 
 void TypeInfoUdt::getVirtualDisplacement( const std::wstring& fieldName, MEMOFFSET_32 &virtualBasePtr, size_t &virtualDispIndex, size_t &virtualDispSize )

kdlib/source/typeinfoimp.h

@@ -348,17 +348,15 @@ protected:
 
 protected:
 
-    TypeInfoFields( const std::wstring &name, const std::wstring &scopeName ) :
+    TypeInfoFields( const std::wstring &name ) :
         m_fields( name ),
         m_name( name ),
-        m_scopeName(scopeName),
         m_fieldsGot(false)
         {}
 
     FieldCollection  m_fields;
 
     std::wstring  m_name;
-    std::wstring  m_scopeName;
 
     virtual void getFields() = 0;
 
@@ -366,7 +364,15 @@ private:
 
     bool m_fieldsGot;
 
-    void checkFields();
+    void checkFields()
+    {
+        if ( !m_fieldsGot )
+        {
+            getFields();
+            m_fieldsGot = true;
+        }
+    }
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -375,7 +381,7 @@ class SymbolFields : public TypeInfoFields
 {
 public:
     SymbolFields(SymbolPtr &symbol) :
-         TypeInfoFields( symbol->getName(), symbol->getScopeName() ),
+         TypeInfoFields( symbol->getName() ),
          m_symbol(symbol)
     {}