resolve merge conflicts

marian-nmt · Mar 10, 2020 · 8640031 · 8640031
2 parents aad22c9 + cf7f032
commit 8640031
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/common/definitions.h b/src/common/definitions.h
@@ -21,10 +21,10 @@
 #  else
 #    define MAYBE_UNUSED
 #  endif
+#else
+#  define MAYBE_UNUSED
 #endif
 
-
-
 #define THREAD_GUARD(body) [&]() { body; }() // test if THREAD_GUARD is neccessary, remove if no problems occur.
 #define NodeOp(op) [=]() { op; }
 

diff --git a/src/common/intrusive_ptr.h b/src/common/intrusive_ptr.h
@@ -148,33 +148,33 @@ inline bool operator!=(const IntrusivePtr<T>& a, const IntrusivePtr<U>& b) {
 }
 
 template<class T>
-inline bool operator==(const IntrusivePtr<T>& a, T* b) {
-  return a.get() == b;
+inline bool operator==(const IntrusivePtr<T>& a, std::nullptr_t) {
+  return a.get() == 0;
 }
 
 template<class T>
-inline bool operator!=(const IntrusivePtr<T>& a, T* b) {
-  return a.get() != b;
+inline bool operator!=(const IntrusivePtr<T>& a, std::nullptr_t) {
+  return a.get() != 0;
 }
 
 template<class T>
-inline bool operator==(const IntrusivePtr<T>& a, std::nullptr_t) {
-  return a.get() == 0;
+inline bool operator==(const IntrusivePtr<T>& a, T* b) {
+  return a.get() == b;
 }
 
 template<class T>
-inline bool operator!=(const IntrusivePtr<T>& a, std::nullptr_t) {
-  return a.get() != 0;
+inline bool operator!=(const IntrusivePtr<T>& a, T* b) {
+  return a.get() != b;
 }
 
 template<class T>
 inline bool operator==(T* a, const IntrusivePtr<T>& b) {
-  return a == b.get(); // used to say: return b.get(); That cannot be right. [UG]
+  return a == b.get();
 }
 
 template<class T>
 inline bool operator!=(T* a, const IntrusivePtr<T>& b) {
-  return a != b.get(); // used to say: return b.get(); That cannot be right. [UG]
+  return a != b.get();
 }
 
 template<class T, class U>