Clean up old style angle brackets in nested templates

src/util/delayed_index_maps.hpp

@@ -18,7 +18,7 @@
 
 template <typename Key, typename Value>
 IndexMap<Key,Value>& DelayedIndexMaps<Key,Value>::get(const String& name, const vector<Key>& init_with) {
-  intrusive_ptr<DelayedIndexMapsData<Key,Value> >& item = data[name];
+  intrusive_ptr<DelayedIndexMapsData<Key,Value>>& item = data[name];
   if (!item) { // no item, make a new one
     item = make_intrusive<DelayedIndexMapsData<Key,Value>>();
     item->read_data.init(init_with);

src/util/index_map.hpp

@@ -133,7 +133,7 @@ inline void swap(IndexMap<Key,Value>& a, IndexMap<Key,Value>& b) {
 /* Invariant: read_data is initialized <=> unread_data.empty()
  */
 template <typename Key, typename Value>
-struct DelayedIndexMapsData : public IntrusivePtrBase<DelayedIndexMapsData<Key, Value> > {
+struct DelayedIndexMapsData : public IntrusivePtrBase<DelayedIndexMapsData<Key, Value>> {
   String              unread_data;
   IndexMap<Key,Value> read_data;
 };
@@ -150,7 +150,7 @@ public:
   /// Clear the delayed index map
   void clear();
 private:
-  map<String, intrusive_ptr<DelayedIndexMapsData<Key,Value> > > data;
+  map<String, intrusive_ptr<DelayedIndexMapsData<Key,Value>>> data;
   friend class Reader;
   friend class Writer;
   friend class GetDefaultMember;

src/util/order_cache.hpp

@@ -15,7 +15,7 @@
 /// Object that cashes an ordered version of a list of items, for finding the position of objects
 /** Can be used as a map "void* -> int" for finding the position of an object */
 template <typename T>
-class OrderCache : public IntrusivePtrBase<OrderCache<T> > {
+class OrderCache : public IntrusivePtrBase<OrderCache<T>> {
 public:
   /// Initialize the order cache, ordering the keys by their string values from the other vector
   /** Optionally filter the list using a vector of booleans of items to keep (note: vector<bool> is evil)