Merge pull request #245 from evoskuil/master

Rename DEFAULT/DELETE macros.

Author: evoskuil

include/bitcoin/protocol/config/authority.hpp

@@ -36,7 +36,7 @@ namespace protocol {
 class BCP_API authority
 {
 public:
-    DEFAULT5(authority);
+    DEFAULT_COPY_MOVE_DESTRUCT(authority);
 
     typedef std::shared_ptr<authority> ptr;
 

include/bitcoin/protocol/config/endpoint.hpp

@@ -36,7 +36,7 @@ namespace protocol {
 class BCP_API endpoint
 {
 public:
-    DEFAULT5(endpoint);
+    DEFAULT_COPY_MOVE_DESTRUCT(endpoint);
 
     typedef std::shared_ptr<endpoint> ptr;
 

include/bitcoin/protocol/config/sodium.hpp

@@ -32,7 +32,7 @@ namespace protocol {
 class BCP_API sodium
 {
 public:
-    DEFAULT5(sodium);
+    DEFAULT_COPY_MOVE_DESTRUCT(sodium);
 
     /// A list of base85 values.
     /// This must provide operator<< for ostream in order to be used as a

include/bitcoin/protocol/zmq/authenticator.hpp

@@ -40,7 +40,7 @@ class BCP_API authenticator
   : public worker
 {
 public:
-    DELETE4(authenticator);
+    DELETE_COPY_MOVE(authenticator);
 
     /// A shared authenticator pointer.
     typedef std::shared_ptr<authenticator> ptr;

include/bitcoin/protocol/zmq/certificate.hpp

@@ -34,7 +34,7 @@ namespace zmq {
 class BCP_API certificate
 {
 public:
-    DEFAULT5(certificate);
+    DEFAULT_COPY_MOVE_DESTRUCT(certificate);
 
     /// Construct an arbitary keypair as a new certificate.
     /// This always reduces keyspace, disallowing '#' in text encoding.

include/bitcoin/protocol/zmq/context.hpp

@@ -36,7 +36,7 @@ class BCP_API context
   : public enable_shared_from_base<context>
 {
 public:
-    DELETE4(context);
+    DELETE_COPY_MOVE(context);
 
     /// A shared context pointer.
     typedef std::shared_ptr<context> ptr;

include/bitcoin/protocol/zmq/frame.hpp

@@ -35,7 +35,7 @@ class BCP_API frame
   : public enable_shared_from_base<frame>
 {
 public:
-    DEFAULT4(frame);
+    DEFAULT_COPY_MOVE(frame);
 
     /// A shared frame pointer.
     typedef std::shared_ptr<frame> ptr;
@@ -72,7 +72,7 @@ class BCP_API frame
     bool destroy() NOEXCEPT;
 
     bool more_;
-    const bool valid_;
+    bool valid_;
 
     // Mutability is a hack around lack of const overloads in zeromq, allowing
     // the payload method to be properly const while other access is not.

include/bitcoin/protocol/zmq/identifiers.hpp

@@ -35,7 +35,7 @@ typedef intptr_t identifier;
 class BCP_API identifiers
 {
 public:
-    DEFAULT5(identifiers);
+    DEFAULT_COPY_MOVE_DESTRUCT(identifiers);
 
     /// Construct.
     identifiers() NOEXCEPT;

include/bitcoin/protocol/zmq/message.hpp

@@ -35,7 +35,7 @@ namespace zmq {
 class BCP_API message
 {
 public:
-    DEFAULT5(message);
+    DEFAULT_COPY_MOVE_DESTRUCT(message);
 
     /// A zeromq route identifier is always this size.
     static constexpr size_t address_size = 5;

include/bitcoin/protocol/zmq/poller.hpp

@@ -38,7 +38,7 @@ class BCP_API poller
   : public enable_shared_from_base<poller>
 {
 public:
-    DELETE5(poller);
+    DELETE_COPY_MOVE_DESTRUCT(poller);
 
     /// A shared poller pointer.
     typedef std::shared_ptr<poller> ptr;