Merge "Changed 'virtual' function override declarations to 'override' in automated...

[platform/core/uifw/dali-adaptor.git] / dali / internal / system / common / performance-server.h

diff --git a/dali/internal/system/common/performance-server.h b/dali/internal/system/common/performance-server.h
index 2a6b386..74b1c0d 100644 (file)
--- a/dali/internal/system/common/performance-server.h
+++ b/dali/internal/system/common/performance-server.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_PERFORMANCE_SERVER_H__
-#define __DALI_INTERNAL_ADAPTOR_PERFORMANCE_SERVER_H__
+#ifndef DALI_INTERNAL_ADAPTOR_PERFORMANCE_SERVER_H
+#define DALI_INTERNAL_ADAPTOR_PERFORMANCE_SERVER_H
 
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -65,22 +65,22 @@ public:
   /**
    * @copydoc PerformanceLogger::AddContext()
    */
-  virtual ContextId AddContext( const char* name );
+  ContextId AddContext( const char* name ) override;
 
   /**
    * @copydoc PerformanceLogger::RemoveContext()
    */
-  virtual void RemoveContext( ContextId contextId );
+  void RemoveContext( ContextId contextId ) override;
 
   /**
    * @copydoc PerformanceInterface::AddMarker( MarkerType markerType )
    */
-  virtual void AddMarker( MarkerType markerType );
+  void AddMarker( MarkerType markerType ) override;
 
   /**
    * @copydoc PerformanceLogger::AddMarker( MarkerType markerType, ContextId contextId )
    */
-  virtual void AddMarker( MarkerType markerType, ContextId contextId );
+  void AddMarker( MarkerType markerType, ContextId contextId ) override;
 
   /**
    * @copydoc PerformanceInterface::SetLogging()
@@ -92,19 +92,19 @@ public:
   /**
    * @copydoc PerformanceLogger::SetLoggingFrequency()
    */
-  virtual void SetLoggingFrequency( unsigned int logFrequency, ContextId contextId );
+  void SetLoggingFrequency( unsigned int logFrequency, ContextId contextId ) override;
 
   /**
    * @copydoc PerformanceLogger::EnableLogging()
    */
-  virtual void EnableLogging( bool enable, ContextId contextId );
+  void EnableLogging( bool enable, ContextId contextId ) override;
 
 public: //StatLogInterface
 
   /**
    * @copydoc StatLogInterface::LogContextStatistics()
    */
-  virtual void LogContextStatistics( const char* const text );
+  void LogContextStatistics( const char* const text ) override;
 
 private:
 
@@ -142,4 +142,4 @@ private:
 
 } // namespace Dali
 
-#endif
+#endif // DALI_INTERNAL_ADAPTOR_PERFORMANCE_SERVER_H