Browse Source

Fixed merging problem.

pull/1/head
triton 13 years ago
parent
commit
09f12f35ae
  1. 8
      src/Generator/Types/TypeMap.cs

8
src/Generator/Types/TypeMap.cs

@ -91,22 +91,16 @@ namespace Cxxi.Types
{ {
foreach (var typeMap in types) foreach (var typeMap in types)
{ {
var attrs = typeMap.GetCustomAttributes<TypeMapAttribute>(); var attrs = typeMap.GetCustomAttributes(typeof(TypeMapAttribute));
if (attrs == null) continue; if (attrs == null) continue;
foreach (var attr in attrs) foreach (var attr in attrs)
{
var attrs = typeMap.GetCustomAttributes(typeof(TypeMapAttribute), true);
if (attrs == null) continue;
foreach (TypeMapAttribute attr in attrs)
{ {
Console.WriteLine("Found typemap: {0}", attr.Type); Console.WriteLine("Found typemap: {0}", attr.Type);
TypeMaps[attr.Type] = typeMap; TypeMaps[attr.Type] = typeMap;
} }
} }
} }
}
public bool FindTypeMap(Declaration decl, out TypeMap typeMap) public bool FindTypeMap(Declaration decl, out TypeMap typeMap)
{ {

Loading…
Cancel
Save