marian-nmt/marian
1
1
Fork 0
mirror of https://github.com/marian-nmt/marian.git synced 2024-09-11 06:15:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts

Browse Source
This commit is contained in:
Marcin Junczys-Dowmunt 2020-03-10 11:16:43 -07:00
commit 8640031437
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/definitions.h
View File

@ -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; }

24
src/common/intrusive_ptr.h
View File

@ -147,16 +147,6 @@ inline bool operator!=(const IntrusivePtr<T>& a, const IntrusivePtr<U>& b) {
return a.get() != b.get();
}
template<class T>
inline bool operator==(const IntrusivePtr<T>& a, T* b) {
return a.get() == b;
}
template<class T>
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;
@ -167,14 +157,24 @@ 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;
}
template<class T>
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>