added test for ambigious class memebers

kdlib/source/udtfiled.cpp

@@ -15,7 +15,13 @@ const TypeFieldPtr& FieldCollection::lookup(const std::wstring &name) const
     FieldList::const_iterator it;
     for (it = m_fields.begin(); it != m_fields.end(); ++it)
     {
-        if ( (*it)->getName() == name )
+        if ( !(*it)->isInheritedMember() && (*it)->getName() == name)
+            return *it;
+    }
+
+    for (it = m_fields.begin(); it != m_fields.end(); ++it)
+    {
+        if ( (*it)->isInheritedMember() && (*it)->getName() == name )
             return *it;
     }
 

kdlib/tests/kdlibtest/typedvartest.cpp

@@ -221,6 +221,13 @@ TEST_F( TypedVarTest, DISABLED_StaticMember )
     EXPECT_EQ( g_classChild.m_staticConst, *var->getElement(L"m_staticConst") );
 }
 
+TEST_F(TypedVarTest, AmbiguiousFields)
+{
+    TypedVarPtr   var;
+    ASSERT_NO_THROW(var = loadTypedVar(L"g_virtChild"));
+
+    EXPECT_EQ(g_virtChild.m_member, *var->getElement(L"m_member"));
+}
 
 TEST_F( TypedVarTest, VirtualMember )
 {