Source release 19.3.0

core/include/buffer_reader.h

@@ -1,19 +1,17 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
 // source code may only be used and distributed under the Widevine License
 // Agreement.
-
 #ifndef WVCDM_CORE_BUFFER_READER_H_
 #define WVCDM_CORE_BUFFER_READER_H_
 
-#include <stdint.h>
+#include <inttypes.h>
 
 #include <string>
 #include <vector>
 
-#include "disallow_copy_and_assign.h"
+#include "wv_class_utils.h"
 
 namespace wvcdm {
-
 // Annotate a function indicating the caller must examine the return value.
 // Use like:
 //   int foo() WARN_UNUSED_RESULT;
@@ -26,6 +24,9 @@ namespace wvcdm {
 
 class BufferReader {
  public:
+  BufferReader() = delete;
+  WVCDM_DISALLOW_COPY_AND_MOVE(BufferReader);
+
   BufferReader(const uint8_t* buf, size_t size)
       : buf_(buf), size_(buf != nullptr ? size : 0), pos_(0) {}
 
@@ -64,10 +65,6 @@ class BufferReader {
 
   template <typename T>
   bool Read(T* t) WARN_UNUSED_RESULT;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(BufferReader);
-};
-
+};  // class BufferReader
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_BUFFER_READER_H_