Use and instead

f934f7a9 · Paul · a740f253 · f934f7a9
Commit f934f7a9 authored Jun 08, 2018 by Paul
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

src/include/rtg/raw_data.hpp src/include/rtg/raw_data.hpp +2 -4

No files found.
--- a/src/include/rtg/raw_data.hpp
+++ b/src/include/rtg/raw_data.hpp
@@ -101,8 +101,7 @@ struct raw_data : raw_data_base

 template <class T,
          class U,
-          RTG_REQUIRES(std::is_base_of<raw_data_base, T>{}),
-          RTG_REQUIRES(std::is_base_of<raw_data_base, U>{})>
+          RTG_REQUIRES(std::is_base_of<raw_data_base, T>{} && std::is_base_of<raw_data_base, U>{})>
 bool operator==(const T& x, const U& y)
 {
    auto&& xshape = x.get_shape();
@@ -124,8 +123,7 @@ bool operator==(const T& x, const U& y)

 template <class T,
          class U,
-          RTG_REQUIRES(std::is_base_of<raw_data_base, T>{}),
-          RTG_REQUIRES(std::is_base_of<raw_data_base, U>{})>
+          RTG_REQUIRES(std::is_base_of<raw_data_base, T>{} && std::is_base_of<raw_data_base, U>{})>
 bool operator!=(const T& x, const U& y)
 {
    return !(x == y);