Просмотр исходного кода

Merge pull request #1392 from lioncash/move

backend: defaulted move constructor/assignment
Yuri Kunde Schlesner 10 лет назад
Родитель
Сommit
7400100da7
1 измененных файлов с 2 добавлено и 18 удалено
  1. 2 18
      src/common/logging/backend.h

+ 2 - 18
src/common/logging/backend.h

@@ -27,25 +27,9 @@ struct Entry {
     std::string message;
     std::string message;
 
 
     Entry() = default;
     Entry() = default;
+    Entry(Entry&& o) = default;
 
 
-    // TODO(yuriks) Use defaulted move constructors once MSVC supports them
-#define MOVE(member) member(std::move(o.member))
-    Entry(Entry&& o)
-        : MOVE(timestamp), MOVE(log_class), MOVE(log_level),
-        MOVE(location), MOVE(message)
-    {}
-#undef MOVE
-
-    Entry& operator=(const Entry&& o) {
-#define MOVE(member) member = std::move(o.member)
-        MOVE(timestamp);
-        MOVE(log_class);
-        MOVE(log_level);
-        MOVE(location);
-        MOVE(message);
-#undef MOVE
-        return *this;
-    }
+    Entry& operator=(Entry&& o) = default;
 };
 };
 
 
 /**
 /**