Merge branch 'master' of https://github.com/vincefn/objcryst into upstream-objcryst

Author: vincefn

ObjCryst/RefinableObj/RefinableObj.h

@@ -736,19 +736,19 @@ template<class T> class ObjRegistry
        * but the objects themselves can be modified.
        * This iterator should remain valid even if an object is removed.
        */
-      typename list<T*>::const_iterator list_begin() const;
+      typename std::list<T*>::const_iterator list_begin() const;
       /** low-level access to the underlying list end().
        * Const access as we do not want the number and order of objects to change,
        * but the objects themselves can be modified.
        * This iterator should remain valid even if an object is removed.
        */
-      typename list<T*>::const_iterator list_end() const;
+      typename std::list<T*>::const_iterator list_end() const;
    private:
       /// The registry of objects
       vector<T*> mvpRegistry;
       /// Another view of the registry of objects - this time as a std::list, which
       /// will not be invalidated if one object is deleted
-      list<T*> mvpRegistryList;
+      std::list<T*> mvpRegistryList;
       /// Name of this registry
       string mName;
       /// Last time an object was added or removed