Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0

[libdcp.git] / src / ref.h

diff --git a/src/ref.h b/src/ref.h
index c22222cc1dc5fdf2f48bb60dad3c2d6103bfc7d0..8194e5855f7ee3833e76b645036d4d19a0c9d333 100644 (file)
--- a/src/ref.h
+++ b/src/ref.h
@@ -26,6 +26,7 @@
 
 #include "exceptions.h"
 #include "object.h"
+#include "util.h"
 #include <boost/shared_ptr.hpp>
 #include <string>
 
@@ -69,7 +70,7 @@ public:
        void resolve (std::list<boost::shared_ptr<Object> > objects)
        {
                typename std::list<boost::shared_ptr<Object> >::iterator i = objects.begin();
-               while (i != objects.end() && (*i)->id() != _id) {
+               while (i != objects.end() && !ids_equal ((*i)->id(), _id)) {
                        ++i;
                }