Merge branch 'master' of https://github.com/DHrpcs3/rpcs3
Conflicts: Utilities/BEType.h
This commit is contained in:
+4
-3
@@ -50,10 +50,11 @@ class be_t
|
||||
|
||||
public:
|
||||
typedef T type;
|
||||
#ifdef __GNUG__
|
||||
be_t() noexcept = default;
|
||||
#else
|
||||
|
||||
#ifdef _WIN32
|
||||
be_t(){}
|
||||
#else
|
||||
be_t() noexcept = default
|
||||
#endif
|
||||
|
||||
be_t(const T& value)
|
||||
|
||||
Reference in New Issue
Block a user