Merge branch 'devel/master' into sandbox/dkdk/tizen

[platform/core/uifw/dali-adaptor.git] / dali / internal / trace / generic / trace-manager-impl-generic.h

diff --git a/dali/internal/trace/generic/trace-manager-impl-generic.h b/dali/internal/trace/generic/trace-manager-impl-generic.h
index c9a755f..d7ff58f 100644 (file)
--- a/dali/internal/trace/generic/trace-manager-impl-generic.h
+++ b/dali/internal/trace/generic/trace-manager-impl-generic.h
@@ -1,8 +1,8 @@
-#ifndef DALI_INTERNAL_TRACE_MANAGER_IMPL_UBUNTU_H
-#define DALI_INTERNAL_TRACE_MANAGER_IMPL_UBUNTU_H
+#ifndef DALI_INTERNAL_TRACE_MANAGER_IMPL_GENERIC_H
+#define DALI_INTERNAL_TRACE_MANAGER_IMPL_GENERIC_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.
@@ -37,7 +37,7 @@ class TraceManagerGeneric : public Dali::Internal::Adaptor::TraceManager
 {
 public:
   /**
-   * Static member to hold TraceManagerUbuntu instance. This allows
+   * Static member to hold TraceManagerGeneric instance. This allows
    * to access PerformanceInterface for network logging.
    */
   static TraceManagerGeneric* traceManagerGeneric;
@@ -54,14 +54,14 @@ protected:
   ~TraceManagerGeneric() override = default;
 
   /**
-   * Obtain the LogContextFunction method (Ubuntu specific) used for tracing
+   * Obtain the LogContextFunction method (Generic specific) used for tracing
    */
-  virtual Dali::Integration::Trace::LogContextFunction GetLogContextFunction() final;
+  Dali::Integration::Trace::LogContextFunction GetLogContextFunction() final;
 
 private:
 
   /**
-   * LogContext method (Ubuntu specific) used for tracing
+   * LogContext method (Generic specific) used for tracing
    */
   static void LogContext( bool start, const char* tag );
 };
@@ -72,4 +72,4 @@ private:
 
 } // namespace Dali
 
-#endif // DALI_INTERNAL_TRACE_MANAGER_IMPL_UBUNTU_H
+#endif // DALI_INTERNAL_TRACE_MANAGER_IMPL_GENERIC_H