From 68bda5fa5f0aaeb2b0162c4af960e87de1a4938e Mon Sep 17 00:00:00 2001 From: Chris Laurel Date: Thu, 9 Sep 2004 05:40:59 +0000 Subject: [PATCH] Added typedefs with typename keyword so that the ResourceManager class builds on g++ 3.4. --- src/celutil/resmanager.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/celutil/resmanager.h b/src/celutil/resmanager.h index 02af610b0..733281acc 100644 --- a/src/celutil/resmanager.h +++ b/src/celutil/resmanager.h @@ -56,6 +56,9 @@ template class ResourceManager typedef std::map ResourceHandleMap; typedef std::map NameMap; + typedef typename ResourceHandleMap::value_type ResourceHandleMapValue; + typedef typename NameMap::value_type NameMapValue; + ResourceTable resources; ResourceHandleMap handles; NameMap loadedResources; @@ -72,7 +75,7 @@ template class ResourceManager { ResourceHandle h = handles.size(); resources.insert(resources.end(), info); - handles.insert(ResourceHandleMap::value_type(info, h)); + handles.insert(ResourceHandleMapValue(info, h)); return h; } } @@ -105,7 +108,7 @@ template class ResourceManager else { resources[h].state = ResourceLoaded; - loadedResources.insert(NameMap::value_type(resources[h].resolvedName, resources[h].resource)); + loadedResources.insert(NameMapValue(resources[h].resolvedName, resources[h].resource)); } } }