Adding 'override', removing 'virtual' from overriding functions' declarations in...

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / test-gl-sync-abstraction.h

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h
index 8ce96a4..6524a06 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-sync-abstraction.h
@@ -1,8 +1,8 @@
-#ifndef __TEST_GL_SYNC_ABSTRACTION_H__
-#define __TEST_GL_SYNC_ABSTRACTION_H__
+#ifndef TEST_GL_SYNC_ABSTRACTION_H
+#define TEST_GL_SYNC_ABSTRACTION_H
 
 /*
- * Copyright (c) 2016 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.
@@ -31,12 +31,12 @@
 namespace Dali
 {
 
-class DALI_IMPORT_API TestSyncObject : public Integration::GlSyncAbstraction::SyncObject
+class DALI_CORE_API TestSyncObject : public Integration::GlSyncAbstraction::SyncObject
 {
 public:
   TestSyncObject(TraceCallStack& trace);
-  ~TestSyncObject();
-  bool IsSynced();
+  ~TestSyncObject() override;
+  bool IsSynced() override;
   bool synced;
   TraceCallStack& mTrace;
 };
@@ -44,7 +44,7 @@ public:
 /**
  * Class to emulate the GL sync functions with tracing
  */
-class DALI_IMPORT_API TestGlSyncAbstraction: public Integration::GlSyncAbstraction
+class DALI_CORE_API TestGlSyncAbstraction: public Integration::GlSyncAbstraction
 {
 public:
   /**
@@ -55,7 +55,7 @@ public:
   /**
    * Destructor
    */
-  ~TestGlSyncAbstraction();
+  ~TestGlSyncAbstraction() override;
 
   /**
    * Initialize the sync objects - clear down the map
@@ -66,13 +66,13 @@ public:
    * Create a sync object
    * @return the sync object
    */
-  virtual Integration::GlSyncAbstraction::SyncObject* CreateSyncObject( );
+  Integration::GlSyncAbstraction::SyncObject* CreateSyncObject( ) override;
 
   /**
    * Destroy a sync object
    * @param[in] syncObject The object to destroy
    */
-  virtual void DestroySyncObject( Integration::GlSyncAbstraction::SyncObject* syncObject );
+  void DestroySyncObject( Integration::GlSyncAbstraction::SyncObject* syncObject ) override;
 
 
 public: // TEST FUNCTIONS
@@ -105,7 +105,7 @@ public: // TEST FUNCTIONS
    *
    * @return the number of sync objects
    */
-  int GetNumberOfSyncObjects();
+  int32_t GetNumberOfSyncObjects();
 
 private:
 
@@ -120,4 +120,4 @@ private:
 
 } // Dali
 
-#endif // __TEST_GL_SYNC_ABSTRACTION_H__
+#endif // TEST_GL_SYNC_ABSTRACTION_H