Source release 19.3.0

oemcrypto/util/include/cbor_validator.h

@@ -7,11 +7,15 @@
 #ifndef WVOEC_UTIL_CBOR_VALIDATOR_H_
 #define WVOEC_UTIL_CBOR_VALIDATOR_H_
 
+#include <inttypes.h>
+
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "cppbor.h"
 #include "cppbor_parse.h"
+#include "wv_class_utils.h"
 
 namespace wvoec {
 namespace util {
@@ -33,10 +37,9 @@ std::string CborMessageStatusToString(CborMessageStatus status);
 
 class CborValidator {
  public:
-  explicit CborValidator() {}
+  CborValidator() = default;
+  WVCDM_DISALLOW_COPY_AND_MOVE(CborValidator);
   virtual ~CborValidator() = default;
-  CborValidator(const CborValidator&) = delete;
-  CborValidator& operator=(const CborValidator&) = delete;
 
   // Decodes |cbor| and sets |message_status_|.
   virtual CborMessageStatus Parse(const std::vector<uint8_t>& cbor);
@@ -80,7 +83,7 @@ class CborValidator {
   // Internal status of parsing and validating.
   cppbor::ParseResult parse_result_ = {};
   std::vector<std::pair<CborMessageStatus, std::string>> validate_messages_;
-};
+};  // class CborValidator
 }  // namespace util
 }  // namespace wvoec
 #endif  // WVOEC_UTIL_CBOR_VALIDATOR_H_