Source release 15.0.0

metrics/include/event_metric.h

@@ -7,17 +7,16 @@
 
 #include <cstdarg>
 #include <map>
+#include <mutex>
 #include <string>
 #include <vector>
 
 #include "OEMCryptoCENC.h"
 #include "attribute_handler.h"
 #include "distribution.h"
-#include "lock.h"
 #include "log.h"
 #include "metrics.pb.h"
 #include "pow2bucket.h"
-#include "shared_ptr.h"
 
 namespace wvcdm {
 namespace metrics {
@@ -51,7 +50,7 @@ class BaseEventMetric {
    * This locks the internal state of the event metric to ensure safety across
    * multiple threads preventing the caller from worrying about locking.
    */
-  Lock internal_lock_;
+  std::mutex internal_lock_;
 };
 
 // The EventMetric class is used to capture statistics about an event such as