Remove the base/macros.h file and fix its users.

We live in a C++11 world, and haven't needed the indirection for a good
while.

Author: pphaneuf

cpp/base/macros.h

@@ -5,15 +5,15 @@
 #include <condition_variable>
 #include <mutex>
 
-#include "base/macros.h"
-
 namespace cert_trans {
 
 
 class Notification {
  public:
   Notification() : notified_(false) {
   }
+  Notification(const Notification&) = delete;
+  Notification& operator=(const Notification&) = delete;
 
   void Notify();
 
@@ -30,8 +30,6 @@ class Notification {
   mutable std::mutex lock_;
   mutable std::condition_variable cv_;
   bool notified_;
-
-  DISALLOW_COPY_AND_ASSIGN(Notification);
 };
 
 

cpp/base/notification.h

@@ -8,7 +8,6 @@
 #include <utility>
 #include <vector>
 
-#include "base/macros.h"
 #include "net/url_fetcher.h"
 #include "proto/ct.pb.h"
 
@@ -53,6 +52,8 @@ class AsyncLogClient {
   // instead of a string?
   AsyncLogClient(util::Executor* const executor, UrlFetcher* fetcher,
                  const std::string& server_uri);
+  AsyncLogClient(const AsyncLogClient&) = delete;
+  AsyncLogClient& operator=(const AsyncLogClient&) = delete;
 
   void GetSTH(ct::SignedTreeHead* sth, const Callback& done);
 
@@ -102,8 +103,6 @@ class AsyncLogClient {
   util::Executor* const executor_;
   UrlFetcher* const fetcher_;
   const URL server_url_;
-
-  DISALLOW_COPY_AND_ASSIGN(AsyncLogClient);
 };
 
 

cpp/client/async_log_client.h

@@ -4,14 +4,14 @@
 #include <stdint.h>
 #include <string>
 
-#include "base/macros.h"
-
 // Socket creation for client connections.
 class Client {
  public:
   Client(const std::string& server, const std::string& port);
 
   ~Client();
+  Client(const Client&) = delete;
+  Client& operator=(const Client&) = delete;
 
   // Create a TCP socket and attempt to connect to server:port.
   // The Connect()-Disconnect() sequence can be called repeatedly.
@@ -36,8 +36,6 @@ class Client {
   const std::string server_;
   const std::string port_;
   int fd_;
-
-  DISALLOW_COPY_AND_ASSIGN(Client);
 };
 
 #endif  // CERT_TRANS_CLIENT_CLIENT_H_

cpp/client/client.h

@@ -5,7 +5,6 @@
 #include <memory>
 #include <string>
 
-#include "base/macros.h"
 #include "client/async_log_client.h"
 #include "proto/ct.pb.h"
 #include "util/libevent_wrapper.h"
@@ -20,6 +19,8 @@ class Cert;
 class HTTPLogClient {
  public:
   explicit HTTPLogClient(const std::string& server);
+  HTTPLogClient(const HTTPLogClient&) = delete;
+  HTTPLogClient& operator=(const HTTPLogClient&) = delete;
 
   util::StatusOr<ct::SignedCertificateTimestamp> UploadSubmission(
       const std::string& submission, bool pre);
@@ -42,8 +43,6 @@ class HTTPLogClient {
   ThreadPool pool_;
   UrlFetcher fetcher_;
   AsyncLogClient client_;
-
-  DISALLOW_COPY_AND_ASSIGN(HTTPLogClient);
 };
 
 

cpp/client/http_log_client.h

@@ -4,7 +4,6 @@
 #include <openssl/ssl.h>
 #include <openssl/x509.h>
 
-#include "base/macros.h"
 #include "client/client.h"
 #include "client/ssl_client.h"
 #include "log/log_verifier.h"
@@ -25,6 +24,8 @@ class SSLClient {
             const std::string& ca_dir, LogVerifier* verifier);
 
   ~SSLClient();
+  SSLClient(const SSLClient&) = delete;
+  SSLClient& operator=(const SSLClient&) = delete;
 
   enum HandshakeResult {
     OK = 0,
@@ -103,8 +104,6 @@ class SSLClient {
   void ResetVerifyCallbackArgs(bool strict);
 
   HandshakeResult SSLConnect(bool strict);
-
-  DISALLOW_COPY_AND_ASSIGN(SSLClient);
 };
 
 

cpp/client/ssl_client.h

@@ -32,6 +32,8 @@ class ContinuousFetcherImpl : public ContinuousFetcher {
  public:
   ContinuousFetcherImpl(libevent::Base* base, Executor* executor, Database* db,
                         const LogVerifier* log_verifier, bool fetch_scts);
+  ContinuousFetcherImpl(const ContinuousFetcherImpl&) = delete;
+  ContinuousFetcherImpl& operator=(const ContinuousFetcherImpl&) = delete;
 
   void AddPeer(const string& node_id, const shared_ptr<Peer>& peer) override;
   void RemovePeer(const string& node_id) override;
@@ -52,8 +54,6 @@ class ContinuousFetcherImpl : public ContinuousFetcher {
 
   bool restart_fetch_;
   unique_ptr<Task> fetch_task_;
-
-  DISALLOW_COPY_AND_ASSIGN(ContinuousFetcherImpl);
 };
 
 

cpp/fetcher/continuous_fetcher.cc

@@ -7,7 +7,6 @@
 #include <set>
 #include <string>
 
-#include "base/macros.h"
 #include "fetcher/peer.h"
 #include "log/database.h"
 #include "log/logged_entry.h"
@@ -27,6 +26,8 @@ class ContinuousFetcher {
       const LogVerifier* log_verifier, bool fetch_scts);
 
   virtual ~ContinuousFetcher() = default;
+  ContinuousFetcher(const ContinuousFetcher&) = delete;
+  ContinuousFetcher& operator=(const ContinuousFetcher&) = delete;
 
   virtual void AddPeer(const std::string& node_id,
                        const std::shared_ptr<Peer>& peer) = 0;
@@ -35,9 +36,6 @@ class ContinuousFetcher {
 
  protected:
   ContinuousFetcher() = default;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ContinuousFetcher);
 };
 
 

cpp/fetcher/continuous_fetcher.h

@@ -5,7 +5,6 @@
 #include <memory>
 #include <mutex>
 
-#include "base/macros.h"
 #include "log/log_verifier.h"
 #include "monitoring/monitoring.h"
 
@@ -64,6 +63,8 @@ struct Range {
 struct FetchState {
   FetchState(Database* db, unique_ptr<PeerGroup> peer_group,
              const LogVerifier* log_verifier, Task* task);
+  FetchState(const FetchState&) = delete;
+  FetchState& operator=(const FetchState&) = delete;
 
   void WalkEntries();
   void FetchRange(const unique_lock<mutex>& lock, Range* current,
@@ -80,9 +81,6 @@ struct FetchState {
   mutex lock_;
   int64_t start_;
   unique_ptr<Range> entries_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(FetchState);
 };
 
 

cpp/fetcher/fetcher.cc

@@ -3,7 +3,6 @@
 
 #include <memory>
 
-#include "base/macros.h"
 #include "client/async_log_client.h"
 
 namespace cert_trans {
@@ -12,8 +11,9 @@ namespace cert_trans {
 class Peer {
  public:
   Peer(std::unique_ptr<AsyncLogClient> client);
-  virtual ~Peer() {
-  }
+  virtual ~Peer() = default;
+  Peer(const Peer&) = delete;
+  Peer& operator=(const Peer&) = delete;
 
   AsyncLogClient& client() {
     return *client_;
@@ -24,9 +24,6 @@ class Peer {
 
  protected:
   const std::unique_ptr<AsyncLogClient> client_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(Peer);
 };