Source release 19.3.0

oemcrypto/util/include/signed_csr_payload_validator.h

@@ -12,6 +12,7 @@
 
 #include "cbor_validator.h"
 #include "cppbor.h"
+#include "wv_class_utils.h"
 
 namespace wvoec {
 namespace util {
@@ -23,9 +24,7 @@ class SignedCsrPayloadValidator : public CborValidator {
  public:
   explicit SignedCsrPayloadValidator() {}
   virtual ~SignedCsrPayloadValidator() override = default;
-  SignedCsrPayloadValidator(const SignedCsrPayloadValidator&) = delete;
-  SignedCsrPayloadValidator& operator=(const SignedCsrPayloadValidator&) =
-      delete;
+  WVCDM_DISALLOW_COPY_AND_MOVE(SignedCsrPayloadValidator);
 
   // Verifies the Cbor struct of a client generated SignedData<CsrPayload>.
   virtual CborMessageStatus Validate() override;
@@ -38,7 +37,7 @@ class SignedCsrPayloadValidator : public CborValidator {
   CborMessageStatus ValidateDataToBeSigned(const cppbor::Bstr* data);
   // Used to generate formatted message.
   std::stringstream msg_ss_;
-};
+};  // class SignedCsrPayloadValidator
 }  // namespace util
 }  // namespace wvoec
 #endif  // WVOEC_UTIL_SIGNED_CSR_PAYLOAD_VALIDATOR_H_