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

[platform/core/uifw/dali-adaptor.git] / dali / internal / graphics / gles / egl-sync-implementation.h

diff --git a/dali/internal/graphics/gles/egl-sync-implementation.h b/dali/internal/graphics/gles/egl-sync-implementation.h
index 932a3fe..be69521 100644 (file)
--- a/dali/internal/graphics/gles/egl-sync-implementation.h
+++ b/dali/internal/graphics/gles/egl-sync-implementation.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_INTERNAL_ADAPTOR_EGL_SYNC_IMPLEMENTATION_H__
-#define __DALI_INTERNAL_ADAPTOR_EGL_SYNC_IMPLEMENTATION_H__
+#ifndef DALI_INTERNAL_ADAPTOR_EGL_SYNC_IMPLEMENTATION_H
+#define DALI_INTERNAL_ADAPTOR_EGL_SYNC_IMPLEMENTATION_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.
@@ -19,8 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
+#include <dali/internal/graphics/common/egl-include.h>
 #include <dali/public-api/common/dali-vector.h>
 #include <dali/integration-api/gl-sync-abstraction.h>
 
@@ -51,7 +50,7 @@ public:
   /**
    * @copydoc Dali::Integration::GlSyncAbstraction::SyncObject::IsSynced()
    */
-  virtual bool IsSynced();
+  bool IsSynced() override;
 
 private:
 #ifdef _ARCH_ARM_
@@ -93,12 +92,12 @@ public:
   /**
    * @copydoc Dali::Integration::GlSyncAbstraction::CreateSyncObject()
    */
-  virtual SyncObject* CreateSyncObject();
+  SyncObject* CreateSyncObject() override;
 
   /**
    * @copydoc Dali::Integration::GlSyncAbstraction::DestroySyncObject()
    */
-  virtual void DestroySyncObject(SyncObject* syncObject);
+  void DestroySyncObject(SyncObject* syncObject) override;
 
 private:
   /**
@@ -121,4 +120,4 @@ private:
 } // namespace Internal
 } // namespace Dali
 
-#endif // __DALI_INTERNAL_EGL_ADAPTOR_SYNC_IMPLEMENTATION_H__
+#endif // DALI_INTERNAL_EGL_ADAPTOR_SYNC_IMPLEMENTATION_H