From 77dd0d97bbb4a08044dc80467bc9f37ead00c3d8 Mon Sep 17 00:00:00 2001
From: wangchaochaohu <wangchao66@baidu.com>
Date: Fri, 7 Feb 2020 02:54:14 +1400
Subject: [PATCH] use enum class to replace the usage of enum in some condition
 test=develop (#22464)

---
 paddle/fluid/platform/cudnn_helper.h | 2 +-
 paddle/fluid/platform/event.h        | 2 +-
 paddle/fluid/platform/profiler.cc    | 3 +--
 paddle/fluid/platform/profiler.h     | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/paddle/fluid/platform/cudnn_helper.h b/paddle/fluid/platform/cudnn_helper.h
index df6e2c7293..2947cd016e 100644
--- a/paddle/fluid/platform/cudnn_helper.h
+++ b/paddle/fluid/platform/cudnn_helper.h
@@ -75,7 +75,7 @@ enum class PoolingMode {
   kAverageInclusive,
 };
 
-enum ActivationMode {
+enum class ActivationMode {
   kNone,  // activation identity
   kSigmoid,
   kRelu,
diff --git a/paddle/fluid/platform/event.h b/paddle/fluid/platform/event.h
index f7dba693dc..2fd02ac3a9 100644
--- a/paddle/fluid/platform/event.h
+++ b/paddle/fluid/platform/event.h
@@ -23,7 +23,7 @@ limitations under the License. */
 namespace paddle {
 namespace platform {
 
-enum EventType { kMark, kPushRange, kPopRange };
+enum class EventType { kMark, kPushRange, kPopRange };
 
 class Event {
  public:
diff --git a/paddle/fluid/platform/profiler.cc b/paddle/fluid/platform/profiler.cc
index baa5c2743f..2e89dbf8fd 100644
--- a/paddle/fluid/platform/profiler.cc
+++ b/paddle/fluid/platform/profiler.cc
@@ -340,8 +340,7 @@ void PrintProfiler(const std::vector<std::vector<EventItem>> &events_table,
     } else {
       PADDLE_THROW(platform::errors::InvalidArgument(
           "Except profiler state must to be one of ['CPU', 'GPU' 'ALL'], but "
-          "received Invalid profiler state %s",
-          g_state));
+          "received Invalid profiler state"));
     }
 
     if (merge_thread) {
diff --git a/paddle/fluid/platform/profiler.h b/paddle/fluid/platform/profiler.h
index 8d11855b70..4550b99a06 100644
--- a/paddle/fluid/platform/profiler.h
+++ b/paddle/fluid/platform/profiler.h
@@ -32,7 +32,7 @@ limitations under the License. */
 namespace paddle {
 namespace platform {
 
-enum ProfilerState {
+enum class ProfilerState {
   kDisabled,  // disabled state
   kCPU,       // CPU profiling state
   kCUDA,      // GPU profiling state
@@ -116,7 +116,7 @@ struct RecordBlock {
 std::vector<std::vector<Event>> GetAllEvents();
 
 // Candidate keys to sort the profiling report
-enum EventSortingKey {
+enum class EventSortingKey {
   kDefault,
   kCalls,
   kTotal,
-- 
GitLab