X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-gl-sync-abstraction.h;h=1990b9ced1b5d09a5a35196c379ee650c850f701;hp=8ce96a40b2f47735ecd6775fcd5b94b5827f0103;hb=268f651469300b3950b3f314fa33803b6c24273e;hpb=a2e3740073b4cb92846a68831ad5bb35b12ac69a 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..1990b9c 100644 --- 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,7 +31,7 @@ namespace Dali { -class DALI_IMPORT_API TestSyncObject : public Integration::GlSyncAbstraction::SyncObject +class DALI_CORE_API TestSyncObject : public Integration::GlSyncAbstraction::SyncObject { public: TestSyncObject(TraceCallStack& trace); @@ -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: /** @@ -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