From 09f12f35ae4eed0f69eeec2c225561cf4f7f3a74 Mon Sep 17 00:00:00 2001 From: triton Date: Wed, 30 Jan 2013 21:45:55 +0000 Subject: [PATCH] Fixed merging problem. --- src/Generator/Types/TypeMap.cs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Generator/Types/TypeMap.cs b/src/Generator/Types/TypeMap.cs index b50de044..2aecc193 100644 --- a/src/Generator/Types/TypeMap.cs +++ b/src/Generator/Types/TypeMap.cs @@ -91,19 +91,13 @@ namespace Cxxi.Types { foreach (var typeMap in types) { - var attrs = typeMap.GetCustomAttributes(); + var attrs = typeMap.GetCustomAttributes(typeof(TypeMapAttribute)); if (attrs == null) continue; 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); - TypeMaps[attr.Type] = typeMap; - } + Console.WriteLine("Found typemap: {0}", attr.Type); + TypeMaps[attr.Type] = typeMap; } } }