From 016b3b0d2764bccf881558d712decc6e9fe1fadd Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 31 May 2017 12:31:11 +0200 Subject: [PATCH] Remake socketcan only movable Change-Id: If81e2a18c0beec392a98f8b835c7a5d154360500 Signed-off-by: Romain Forlot --- CAN-binder/low-can-binding/utils/socketcan.cpp | 9 +-------- CAN-binder/low-can-binding/utils/socketcan.hpp | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CAN-binder/low-can-binding/utils/socketcan.cpp b/CAN-binder/low-can-binding/utils/socketcan.cpp index ffd46151..1f7aaa61 100644 --- a/CAN-binder/low-can-binding/utils/socketcan.cpp +++ b/CAN-binder/low-can-binding/utils/socketcan.cpp @@ -31,17 +31,10 @@ namespace utils : socket_{INVALID_SOCKET} {} - /// @brief Construct a socket by copying an existing one. - socketcan_t::socketcan_t(const socketcan_t& s) - : socket_{s.socket_} - {} - /// @brief Construct a socket by moving an existing one. socketcan_t::socketcan_t(socketcan_t&& s) : socket_{s.socket_} - { - s.socket_ = INVALID_SOCKET; - } + {} socketcan_t& socketcan_t::operator=(const socketcan_t& s) { diff --git a/CAN-binder/low-can-binding/utils/socketcan.hpp b/CAN-binder/low-can-binding/utils/socketcan.hpp index 1e7cd3cb..8300e6b5 100644 --- a/CAN-binder/low-can-binding/utils/socketcan.hpp +++ b/CAN-binder/low-can-binding/utils/socketcan.hpp @@ -33,7 +33,7 @@ namespace utils { public: socketcan_t(); - socketcan_t(const socketcan_t& s); + socketcan_t(const socketcan_t& s) = delete; socketcan_t(socketcan_t&&); socketcan_t& operator=(const socketcan_t& s); virtual ~socketcan_t(); -- 2.16.6