Changeset 478 for trunk

Timestamp:

10/26/15 17:38:14 (10 years ago)

Author:

epyon

Message:

• fixes

File:

• trunk/nv/core/resource.hh (modified) (4 diffs)

trunk/nv/core/resource.hh

@@ -85 +85 @@
                 friend constexpr bool operator==( const resource< U >&, const resource< U >& );
                 template < typename U >
+                friend constexpr bool operator!=( const resource< U >&, const resource< U >& );
+                template < typename U >
                 friend constexpr bool operator<( const resource< U >&, const resource< U >& );
                 template < typename U >
@@ -96 +98 @@
         constexpr bool operator== ( const resource< T >& lhs, const resource< T >& rhs )
         {
-                return lhs.m_id == lhs.m_id && rhs.m_handler == rhs.m_handler;
+                return lhs.m_id == rhs.m_id && lhs.m_handler == rhs.m_handler;
+        }
+
+        template < typename T >
+        constexpr bool operator!= ( const resource< T >& lhs, const resource< T >& rhs )
+        {
+                return lhs.m_id != rhs.m_id || lhs.m_handler != rhs.m_handler;
         }
 
@@ -102 +110 @@
         constexpr bool operator< ( const resource< T >& lhs, const resource< T >& rhs )
         {
-                return lhs.m_id.value() < lhs.m_id.value();
+                return lhs.m_id.value() < rhs.m_id.value();
         }
 
@@ -108 +116 @@
         constexpr bool operator> ( const resource< T >& lhs, const resource< T >& rhs )
         {
-                return lhs.m_id.value() > lhs.m_id.value();
+                return lhs.m_id.value() > rhs.m_id.value();
         }