summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2022-02-02 18:59:36 +0100
committerLioncash <mathew1800@gmail.com>2022-02-02 19:17:12 +0100
commitf785f73e9279dcb9cfdee93da694d7a1f55142ea (patch)
tree52edfca975d8df963ef38987ea1e99b7fb6f5553 /src/common
parentgeneral: Move deleted copy/move constructor/assignment operators to public interface (diff)
downloadyuzu-f785f73e9279dcb9cfdee93da694d7a1f55142ea.tar
yuzu-f785f73e9279dcb9cfdee93da694d7a1f55142ea.tar.gz
yuzu-f785f73e9279dcb9cfdee93da694d7a1f55142ea.tar.bz2
yuzu-f785f73e9279dcb9cfdee93da694d7a1f55142ea.tar.lz
yuzu-f785f73e9279dcb9cfdee93da694d7a1f55142ea.tar.xz
yuzu-f785f73e9279dcb9cfdee93da694d7a1f55142ea.tar.zst
yuzu-f785f73e9279dcb9cfdee93da694d7a1f55142ea.zip
Diffstat (limited to '')
-rw-r--r--src/common/telemetry.h26
1 files changed, 17 insertions, 9 deletions
diff --git a/src/common/telemetry.h b/src/common/telemetry.h
index 49186e848..d38aeac99 100644
--- a/src/common/telemetry.h
+++ b/src/common/telemetry.h
@@ -8,6 +8,7 @@
#include <map>
#include <memory>
#include <string>
+#include "common/common_funcs.h"
#include "common/common_types.h"
namespace Common::Telemetry {
@@ -28,7 +29,7 @@ struct VisitorInterface;
/**
* Interface class for telemetry data fields.
*/
-class FieldInterface : NonCopyable {
+class FieldInterface {
public:
virtual ~FieldInterface() = default;
@@ -52,14 +53,15 @@ public:
template <typename T>
class Field : public FieldInterface {
public:
+ YUZU_NON_COPYABLE(Field);
+
Field(FieldType type_, std::string name_, T value_)
: name(std::move(name_)), type(type_), value(std::move(value_)) {}
- Field(const Field&) = default;
- Field& operator=(const Field&) = default;
+ ~Field() override = default;
- Field(Field&&) = default;
- Field& operator=(Field&& other) = default;
+ Field(Field&&) noexcept = default;
+ Field& operator=(Field&& other) noexcept = default;
void Accept(VisitorInterface& visitor) const override;
@@ -98,9 +100,15 @@ private:
/**
* Collection of data fields that have been logged.
*/
-class FieldCollection final : NonCopyable {
+class FieldCollection final {
public:
+ YUZU_NON_COPYABLE(FieldCollection);
+
FieldCollection() = default;
+ ~FieldCollection() = default;
+
+ FieldCollection(FieldCollection&&) noexcept = default;
+ FieldCollection& operator=(FieldCollection&&) noexcept = default;
/**
* Accept method for the visitor pattern, visits each field in the collection.
@@ -133,7 +141,7 @@ private:
* Telemetry fields visitor interface class. A backend to log to a web service should implement
* this interface.
*/
-struct VisitorInterface : NonCopyable {
+struct VisitorInterface {
virtual ~VisitorInterface() = default;
virtual void Visit(const Field<bool>& field) = 0;
@@ -160,8 +168,8 @@ struct VisitorInterface : NonCopyable {
* Empty implementation of VisitorInterface that drops all fields. Used when a functional
* backend implementation is not available.
*/
-struct NullVisitor : public VisitorInterface {
- ~NullVisitor() = default;
+struct NullVisitor final : public VisitorInterface {
+ YUZU_NON_COPYABLE(NullVisitor);
void Visit(const Field<bool>& /*field*/) override {}
void Visit(const Field<double>& /*field*/) override {}