diff --git a/ggml/src/ggml-qnn/graph.hpp b/ggml/src/ggml-qnn/graph.hpp index c82b7d66a..01190e183 100644 --- a/ggml/src/ggml-qnn/graph.hpp +++ b/ggml/src/ggml-qnn/graph.hpp @@ -225,10 +225,8 @@ private: std::vector _qnn_tensor_outputs; std::vector _param_types; - ggml_qnn_graph(const ggml_qnn_graph &) = delete; - void operator=(const ggml_qnn_graph &) = delete; - ggml_qnn_graph(ggml_qnn_graph &&) = delete; - void operator=(ggml_qnn_graph &&) = delete; + DISABLE_COPY(ggml_qnn_graph); + DISABLE_MOVE(ggml_qnn_graph); }; } // namespace qnn diff --git a/ggml/src/ggml-qnn/qnn-types.hpp b/ggml/src/ggml-qnn/qnn-types.hpp index 58ca8648b..8fce790de 100644 --- a/ggml/src/ggml-qnn/qnn-types.hpp +++ b/ggml/src/ggml-qnn/qnn-types.hpp @@ -51,3 +51,11 @@ using pfn_qnnsysteminterface_getproviders = decltype(QnnSystemInterface_getProvi #define RPCMEM_DEFAULT_FLAGS 1 #define RPCMEM_HEAP_ID_SYSTEM 25 + +#define DISABLE_COPY(class_name) \ + class_name(const class_name &) = delete; \ + void operator=(const class_name &) = delete + +#define DISABLE_MOVE(class_name) \ + class_name(class_name &&) = delete; \ + void operator=(class_name &&) = delete diff --git a/ggml/src/ggml-qnn/tensor.hpp b/ggml/src/ggml-qnn/tensor.hpp index c4ea7a409..07fbfde78 100644 --- a/ggml/src/ggml-qnn/tensor.hpp +++ b/ggml/src/ggml-qnn/tensor.hpp @@ -193,10 +193,8 @@ private: Qnn_GraphHandle_t _graph_handle = nullptr; std::unique_ptr _qnn_rpc_buffer; - ggml_qnn_tensor(const ggml_qnn_tensor &) = delete; - void operator=(const ggml_qnn_tensor &) = delete; - ggml_qnn_tensor(ggml_qnn_tensor &&) = delete; - void operator=(ggml_qnn_tensor &&) = delete; + DISABLE_COPY(ggml_qnn_tensor); + DISABLE_MOVE(ggml_qnn_tensor); }; } // namespace qnn