Deprecate DISALLOW_COPY_AND_ASSIGN.
Chromium has decided to follow Google C++ styleguide (crbug/1010217)
when it comes to deleting implicit copy constructors and assign
operators, and will deprecate DISALLOW_COPY_AND_ASSIGN in favor of
manually deleted constructor in public.
This CL changes DISALLOW_COPY_AND_ASSIGN to deleted constructor, and
tries to move it to the right place.
This script tries to locate the constructor, and move deleted
constructor nearby (and optimistically assumes it is public). If not
found, it tries to move the lines below `public:`.
camera is excluded since it has external style code and will be handled
manually later.
Script used is at Idfe5d64ffb1fdbf53f00cf76ff63cd1e66ba934b
BUG=chromium:1144735
TEST=CQ
Exempt-From-Owner-Approval: Mechanical change involving a lot of owners.
Change-Id: I91c772eb49db979c0cd0773d090c3e4527874cc1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2526882
Tested-by: Qijiang Fan <fqj@google.com>
Commit-Queue: Qijiang Fan <fqj@google.com>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Miriam Zimmerman <mutexlox@chromium.org>
diff --git a/patchpanel/ndproxy.h b/patchpanel/ndproxy.h
index 3857169..a2d608b 100644
--- a/patchpanel/ndproxy.h
+++ b/patchpanel/ndproxy.h
@@ -41,6 +41,9 @@
static constexpr ssize_t kTranslateErrorBufferMisaligned = -4;
NDProxy();
+ NDProxy(const NDProxy&) = delete;
+ NDProxy& operator=(const NDProxy&) = delete;
+
virtual ~NDProxy() = default;
ssize_t TranslateNDFrame(const uint8_t* in_frame,
@@ -150,7 +153,6 @@
base::WeakPtrFactory<NDProxy> weak_factory_{this};
FRIEND_TEST(NDProxyTest, TranslateFrame);
- DISALLOW_COPY_AND_ASSIGN(NDProxy);
};
// A wrapper class for running NDProxy in a daemon process. Control messages and
@@ -158,6 +160,9 @@
class NDProxyDaemon : public brillo::Daemon {
public:
explicit NDProxyDaemon(base::ScopedFD control_fd);
+ NDProxyDaemon(const NDProxyDaemon&) = delete;
+ NDProxyDaemon& operator=(const NDProxyDaemon&) = delete;
+
virtual ~NDProxyDaemon();
private:
@@ -193,8 +198,6 @@
NDProxy proxy_;
base::WeakPtrFactory<NDProxyDaemon> weak_factory_{this};
-
- DISALLOW_COPY_AND_ASSIGN(NDProxyDaemon);
};
} // namespace patchpanel