Skip to content

Commit 9c00806

Browse files
committed
RefinableObj: change list<> to std::list<> to avoid compiler ambiguity with boost list.
1 parent c5ea86c commit 9c00806

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ObjCryst/RefinableObj/RefinableObj.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -736,19 +736,19 @@ template<class T> class ObjRegistry
736736
* but the objects themselves can be modified.
737737
* This iterator should remain valid even if an object is removed.
738738
*/
739-
typename list<T*>::const_iterator list_begin() const;
739+
typename std::list<T*>::const_iterator list_begin() const;
740740
/** low-level access to the underlying list end().
741741
* Const access as we do not want the number and order of objects to change,
742742
* but the objects themselves can be modified.
743743
* This iterator should remain valid even if an object is removed.
744744
*/
745-
typename list<T*>::const_iterator list_end() const;
745+
typename std::list<T*>::const_iterator list_end() const;
746746
private:
747747
/// The registry of objects
748748
vector<T*> mvpRegistry;
749749
/// Another view of the registry of objects - this time as a std::list, which
750750
/// will not be invalidated if one object is deleted
751-
list<T*> mvpRegistryList;
751+
std::list<T*> mvpRegistryList;
752752
/// Name of this registry
753753
string mName;
754754
/// Last time an object was added or removed

0 commit comments

Comments
 (0)