Changeset 10769 for code/branches/cpp11_v2/src/libraries/core/object
- Timestamp:
- Nov 7, 2015, 10:23:42 AM (9 years ago)
- Location:
- code/branches/cpp11_v2/src/libraries/core/object
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h
r10624 r10769 52 52 53 53 private: 54 std::vector<StrongPtr<Destroyable> 54 std::vector<StrongPtr<Destroyable>> retainedInstances_; 55 55 56 56 static DestroyLaterManager* singletonPtr_s; -
code/branches/cpp11_v2/src/libraries/core/object/Iterator.h
r10736 r10769 70 70 */ 71 71 template <class T> 72 class Iterator : public IteratorBase<T, Iterator<T> 72 class Iterator : public IteratorBase<T, Iterator<T>> 73 73 { 74 74 public: … … 76 76 @brief Constructor: Sets the element, whereon the iterator points, to zero. 77 77 */ 78 inline Iterator() : IteratorBase<T, Iterator<T> 78 inline Iterator() : IteratorBase<T, Iterator<T>>() {} 79 79 80 80 /** … … 83 83 */ 84 84 template <class OT, class OI> 85 inline Iterator(const IteratorBase<OT, OI>& other) : IteratorBase<T, Iterator<T> 85 inline Iterator(const IteratorBase<OT, OI>& other) : IteratorBase<T, Iterator<T>>(other) {} 86 86 87 87 /** -
code/branches/cpp11_v2/src/libraries/core/object/ObjectListIterator.h
r10736 r10769 68 68 */ 69 69 template <class T> 70 class ObjectListIterator : public IteratorBase<T, ObjectListIterator<T> 70 class ObjectListIterator : public IteratorBase<T, ObjectListIterator<T>> 71 71 { 72 72 public: … … 74 74 @brief Constructor: Sets the element, whereon the ObjectListIterator points, to zero. 75 75 */ 76 inline ObjectListIterator() : IteratorBase<T, ObjectListIterator<T> 76 inline ObjectListIterator() : IteratorBase<T, ObjectListIterator<T>>() {} 77 77 78 78 /** … … 80 80 @param element The element to start with 81 81 */ 82 inline ObjectListIterator(ObjectListElement<T>* element) : IteratorBase<T, ObjectListIterator<T> 82 inline ObjectListIterator(ObjectListElement<T>* element) : IteratorBase<T, ObjectListIterator<T>>(element) {} 83 83 84 84 /** … … 87 87 */ 88 88 template <class OI> 89 inline ObjectListIterator(const IteratorBase<T, OI>& other) : IteratorBase<T, ObjectListIterator<T> 89 inline ObjectListIterator(const IteratorBase<T, OI>& other) : IteratorBase<T, ObjectListIterator<T>>(other) {} 90 90 91 91 /**
Note: See TracChangeset
for help on using the changeset viewer.