diff --git a/paddle/fluid/platform/cudnn_helper.h b/paddle/fluid/platform/cudnn_helper.h
index df6e2c7293524bb5f224e68be40c794b8000aa94..2947cd016ef32eae1be62fab6797e962b261d983 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 f7dba693dc65a8ffa20f3bb0680e7c36724d0cc4..2fd02ac3a9ebb2c235634ee1e4bce2ad23120d3d 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 baa5c2743f9d0796173c7fd0c00fb910ba60d77b..2e89dbf8fdd153a2e16594ed27a3e9691193ee1e 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 8d11855b70de824159f19f2997b876564e7719b1..4550b99a064a3950554ade662b768d1d147d729e 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,