Ditch the DISALLOW_COPY_AND_ASSIGN macro.
Change-Id: Ib20ff382eee55eaef0d59f1af7e2f4571662f20e
Reviewed-on: https://code-review.googlesource.com/6833
Reviewed-by: Paul Wankadia <[email protected]>
diff --git a/re2/regexp.cc b/re2/regexp.cc
index a46665b..183b243 100644
--- a/re2/regexp.cc
+++ b/re2/regexp.cc
@@ -533,7 +533,9 @@
private:
int ncapture_;
- DISALLOW_COPY_AND_ASSIGN(NumCapturesWalker);
+
+ NumCapturesWalker(const NumCapturesWalker&) = delete;
+ NumCapturesWalker& operator=(const NumCapturesWalker&) = delete;
};
int Regexp::NumCaptures() {
@@ -577,7 +579,9 @@
private:
std::map<string, int>* map_;
- DISALLOW_COPY_AND_ASSIGN(NamedCapturesWalker);
+
+ NamedCapturesWalker(const NamedCapturesWalker&) = delete;
+ NamedCapturesWalker& operator=(const NamedCapturesWalker&) = delete;
};
std::map<string, int>* Regexp::NamedCaptures() {
@@ -617,7 +621,9 @@
private:
std::map<int, string>* map_;
- DISALLOW_COPY_AND_ASSIGN(CaptureNamesWalker);
+
+ CaptureNamesWalker(const CaptureNamesWalker&) = delete;
+ CaptureNamesWalker& operator=(const CaptureNamesWalker&) = delete;
};
std::map<int, string>* Regexp::CaptureNames() {
