Ticket #2304: 0ad_osx10_9.patch

source/renderer/ModelRenderer.cpp

@@ -421 +421 @@
 
     Allocators::DynamicArena arena(256 * KiB);
     typedef ProxyAllocator<void*, Allocators::DynamicArena > ArenaProxyAllocator;
-    typedef std::vector<CModel*, ArenaProxyAllocator> ModelList_t;
+    typedef std::vector<CModel*, ProxyAllocator< CModel*, Allocators::DynamicArena > > ModelList_t;
     typedef boost::unordered_map<SMRMaterialBucketKey, ModelList_t, SMRMaterialBucketKeyHash,
-        std::equal_to<SMRMaterialBucketKey>, ProxyAllocator<void*, Allocators::DynamicArena >
+                                     std::equal_to<SMRMaterialBucketKey>, ProxyAllocator< std::pair<const SMRMaterialBucketKey, ModelList_t>, Allocators::DynamicArena >
     > MaterialBuckets_t;
     MaterialBuckets_t materialBuckets((MaterialBuckets_t::allocator_type(arena)));
 
@@ -477 +477 @@
         }
     }
 
-    std::vector<SMRSortByDistItem, ArenaProxyAllocator> sortByDistItems((ArenaProxyAllocator(arena)));
+    std::vector<SMRSortByDistItem, ProxyAllocator<SMRSortByDistItem, Allocators::DynamicArena> > sortByDistItems((ProxyAllocator<SMRSortByDistItem, Allocators::DynamicArena>(arena)));
 
-    std::vector<CShaderTechniquePtr, ArenaProxyAllocator> sortByDistTechs((ArenaProxyAllocator(arena)));
+    std::vector<CShaderTechniquePtr, ProxyAllocator<CShaderTechniquePtr, Allocators::DynamicArena> > sortByDistTechs((ProxyAllocator<CShaderTechniquePtr, Allocators::DynamicArena>(arena)));
         // indexed by sortByDistItems[i].techIdx
         // (which stores indexes instead of CShaderTechniquePtr directly
         // to avoid the shared_ptr copy cost when sorting; maybe it'd be better
@@ -486 +486 @@
         // if we just stored raw CShaderTechnique* and assumed the shader manager
         // will keep it alive long enough)
 
-    std::vector<SMRTechBucket, ArenaProxyAllocator> techBuckets((ArenaProxyAllocator(arena)));
+    std::vector<SMRTechBucket, ProxyAllocator<SMRTechBucket, Allocators::DynamicArena> > techBuckets((ProxyAllocator<SMRTechBucket, Allocators::DynamicArena>(arena)));
 
     {
         PROFILE3("processing material buckets");
@@ -546 +546 @@
     // (This exists primarily because techBuckets wants a CModel**;
     // we could avoid the cost of copying into this list by adding
     // a stride length into techBuckets and not requiring contiguous CModel*s)
-    std::vector<CModel*, ArenaProxyAllocator> sortByDistModels((ArenaProxyAllocator(arena)));
+    std::vector<CModel*, ProxyAllocator<CModel*, Allocators::DynamicArena> > sortByDistModels((ProxyAllocator<CModel*, Allocators::DynamicArena>(arena)));
 
     if (!sortByDistItems.empty())
     {
@@ -595 +595 @@
         // This vector keeps track of texture changes during rendering. It is kept outside the
         // loops to avoid excessive reallocations. The token allocation of 64 elements 
         // should be plenty, though it is reallocated below (at a cost) if necessary.
-        std::vector<CTexture*, ArenaProxyAllocator> currentTexs((ArenaProxyAllocator(arena)));
+        std::vector<CTexture*, ProxyAllocator<CTexture*, Allocators::DynamicArena> > currentTexs((ProxyAllocator<CTexture*, Allocators::DynamicArena>(arena)));
         currentTexs.reserve(64);
         
         // texBindings holds the identifier bindings in the shader, which can no longer be defined 
         // statically in the ShaderRenderModifier class. texBindingNames uses interned strings to
         // keep track of when bindings need to be reevaluated.
-        std::vector<CShaderProgram::Binding, ArenaProxyAllocator> texBindings((ArenaProxyAllocator(arena)));
+        std::vector<CShaderProgram::Binding, ProxyAllocator<CShaderProgram::Binding, Allocators::DynamicArena> > texBindings((ProxyAllocator<CShaderProgram::Binding, Allocators::DynamicArena>(arena)));
         texBindings.reserve(64);
-        std::vector<CStrIntern, ArenaProxyAllocator> texBindingNames((ArenaProxyAllocator(arena)));
+        std::vector<CStrIntern, ProxyAllocator<CStrIntern, Allocators::DynamicArena> > texBindingNames((ProxyAllocator<CStrIntern, Allocators::DynamicArena>(arena)));
         texBindingNames.reserve(64);
 
         while (idxTechStart < techBuckets.size())

source/tools/atlas/AtlasObject/AtlasObjectImpl.h

@@ -59 +59 @@
 
     std::wstring value;
 
-    typedef std::multimap<const std::string, const AtNode::Ptr> child_maptype;
-    typedef std::pair<const std::string, const AtNode::Ptr> child_pairtype;
+    typedef std::multimap<std::string, AtNode::Ptr> child_maptype;
+    typedef std::pair<std::string, AtNode::Ptr> child_pairtype;
 
     child_maptype children;