From 6956d142e4b3608d6b5abc5b07f818ae5619f5a7 Mon Sep 17 00:00:00 2001 From: Matt Date: Sun, 18 Aug 2024 19:47:40 -0700 Subject: [PATCH] Ooga booga --- .../photon/targeting/PhotonPipelineResult.h | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/photon-targeting/src/main/native/include/photon/targeting/PhotonPipelineResult.h b/photon-targeting/src/main/native/include/photon/targeting/PhotonPipelineResult.h index a59c36a474..c466d35009 100644 --- a/photon-targeting/src/main/native/include/photon/targeting/PhotonPipelineResult.h +++ b/photon-targeting/src/main/native/include/photon/targeting/PhotonPipelineResult.h @@ -38,35 +38,24 @@ class PhotonPipelineResult : public PhotonPipelineResult_PhotonStruct { using Base = PhotonPipelineResult_PhotonStruct; public: - explicit PhotonPipelineResult(Base&& data) : Base(data) { - fmt::println("Hello, from a base-move ctor"); - } + explicit PhotonPipelineResult(Base&& data) : Base(data) {} // Don't forget to deal with our ntRecieveTimestamp PhotonPipelineResult(const PhotonPipelineResult& other) - : Base(other), ntReceiveTimestamp(other.ntReceiveTimestamp) { - fmt::println("Hello, from a const-copy ctor"); - } + : Base(other), ntReceiveTimestamp(other.ntReceiveTimestamp) {} PhotonPipelineResult(PhotonPipelineResult& other) - : Base(other), ntReceiveTimestamp(other.ntReceiveTimestamp) { - fmt::println("Hello, from a copy ctor"); - } - + : Base(other), ntReceiveTimestamp(other.ntReceiveTimestamp) {} PhotonPipelineResult(PhotonPipelineResult&& other) : Base(std::move(other)), - ntReceiveTimestamp(std::move(other.ntReceiveTimestamp)) { - fmt::println("Hello, from a move ctor"); - } - auto operator=(PhotonPipelineResult& other) { - fmt::println("Hello from operator="); + ntReceiveTimestamp(std::move(other.ntReceiveTimestamp)) {} + auto operator=(const PhotonPipelineResult& other) { Base::operator=(other); ntReceiveTimestamp = other.ntReceiveTimestamp; return *this; } - auto operator=(PhotonPipelineResult other) { - fmt::println("Hello from operator="); - Base::operator=(other); + auto operator=(PhotonPipelineResult&& other) { ntReceiveTimestamp = other.ntReceiveTimestamp; + Base::operator=(std::move(other)); return *this; }