Merge branch '1.0.0-697-fix-warnings' into 1.0.0-beta.5-proposed-update

DARMA-tasking · Feb 19, 2020 · acdc52e · acdc52e
2 parents 1d27431 + cd6b91c
commit acdc52e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/vt/trace/trace_log.h b/src/vt/trace/trace_log.h
@@ -136,13 +136,13 @@ struct Log final {
     } user;
 
     // Copy based on type.
-    Data(Data const& data) {
-      copyFrom(data);
+    Data(Data const& in) {
+      copyFrom(in);
     }
 
     // Move based on type
-    Data(Data&& data) {
-      moveFrom(std::move(data));
+    Data(Data&& in) {
+      moveFrom(std::move(in));
     }
 
     Data &operator=(Data const& other_data) {