From 2833b2a9dbdd720d23463e60de4ebf8e80ebc96c Mon Sep 17 00:00:00 2001 From: oblivion Date: Tue, 22 Oct 2019 12:18:24 +0000 Subject: [PATCH] SSH: CLANG warning is fixed. git-svn-id: svn://ultimatepp.org/upp/trunk@13654 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/SSH/Channels.h | 3 --- uppsrc/Core/SSH/Core.h | 1 - uppsrc/Core/SSH/SFtp.h | 1 - uppsrc/Core/SSH/SSH.h | 10 ---------- uppsrc/Core/SSH/Session.h | 1 - 5 files changed, 16 deletions(-) diff --git a/uppsrc/Core/SSH/Channels.h b/uppsrc/Core/SSH/Channels.h index 026f28d1b..0e291a2d6 100644 --- a/uppsrc/Core/SSH/Channels.h +++ b/uppsrc/Core/SSH/Channels.h @@ -45,7 +45,6 @@ public: virtual ~SshChannel(); SshChannel(SshChannel&&) = default; - SshChannel& operator=(SshChannel&&) = default; protected: bool Init() override; @@ -107,7 +106,6 @@ public: virtual ~SshTunnel() { Exit(); } SshTunnel(SshTunnel&&) = default; - SshTunnel& operator=(SshTunnel&&) = default; private: void Exit() override; @@ -145,7 +143,6 @@ public: virtual ~SshShell(); SshShell(SshShell&&) = default; - SshShell& operator=(SshShell&&) = default; protected: void ReadWrite(String& in, const void* out, int out_len) override; diff --git a/uppsrc/Core/SSH/Core.h b/uppsrc/Core/SSH/Core.h index 396b08571..f1a85e3d9 100644 --- a/uppsrc/Core/SSH/Core.h +++ b/uppsrc/Core/SSH/Core.h @@ -24,7 +24,6 @@ public: virtual ~Ssh(); Ssh(Ssh&&) = default; - Ssh& operator=(Ssh&&) = default; struct Error : Exc { int code; diff --git a/uppsrc/Core/SSH/SFtp.h b/uppsrc/Core/SSH/SFtp.h index f7cfc5cdf..d7d240ee1 100644 --- a/uppsrc/Core/SSH/SFtp.h +++ b/uppsrc/Core/SSH/SFtp.h @@ -145,7 +145,6 @@ public: virtual ~SFtp(); SFtp(SFtp&&) = default; - SFtp& operator=(SFtp&&) = default; private: bool Init() override; diff --git a/uppsrc/Core/SSH/SSH.h b/uppsrc/Core/SSH/SSH.h index 479e140f5..f4677b10f 100644 --- a/uppsrc/Core/SSH/SSH.h +++ b/uppsrc/Core/SSH/SSH.h @@ -41,20 +41,10 @@ class SshTunnel; class SshShell; class SshHosts; -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdefaulted-function-deleted" // FIXME: Temporary suppression. -#endif - #include "Core.h" #include "Session.h" #include "SFtp.h" #include "Channels.h" #include "Hosts.h" - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - } #endif diff --git a/uppsrc/Core/SSH/Session.h b/uppsrc/Core/SSH/Session.h index 0a2e98a3f..6492dd24d 100644 --- a/uppsrc/Core/SSH/Session.h +++ b/uppsrc/Core/SSH/Session.h @@ -68,7 +68,6 @@ public: virtual ~SshSession(); SshSession(SshSession&&) = default; - SshSession& operator=(SshSession&&) = default; // DEPRECATED stuff. Use GetxxxFingerprint() methods instead. enum Hash { HASH_MD5, HASH_SHA1, HASH_SHA256 };