From 8d3cc73605c0f627edc50b82425022b4d445c110 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Wed, 28 Mar 2018 19:35:14 +0900 Subject: [PATCH] Remove the weak pointer in the header files - Removed the __attribute__((weak)) from the header files, because this attribute should only be in the cpp files. Change-Id: Iad1242a15ef48fabf0de522f0ad204af75c4975f Signed-off-by: Seoyeon Kim --- dali/internal/accessibility/common/tts-player-factory.h | 2 +- dali/internal/imaging/common/native-image-source-factory.h | 1 - dali/internal/input/common/imf-manager-factory.h | 1 - dali/internal/sensor/common/tilt-sensor-factory.h | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dali/internal/accessibility/common/tts-player-factory.h b/dali/internal/accessibility/common/tts-player-factory.h index 8bf0e78..aac8e85 100644 --- a/dali/internal/accessibility/common/tts-player-factory.h +++ b/dali/internal/accessibility/common/tts-player-factory.h @@ -37,7 +37,7 @@ namespace TtsPlayerFactory * Factory function that ought to be overriden by platform implementation. * @return */ -__attribute__((weak)) std::unique_ptr New(Dali::TtsPlayer::Mode mode); +std::unique_ptr New(Dali::TtsPlayer::Mode mode); } // namespace TtsPlayerFactory diff --git a/dali/internal/imaging/common/native-image-source-factory.h b/dali/internal/imaging/common/native-image-source-factory.h index 3f3d759..8c9d7d3 100644 --- a/dali/internal/imaging/common/native-image-source-factory.h +++ b/dali/internal/imaging/common/native-image-source-factory.h @@ -32,7 +32,6 @@ class NativeImageSource; namespace NativeImageSourceFactory { -__attribute__((weak)) std::unique_ptr New(unsigned int width, unsigned int height, Dali::NativeImageSource::ColorDepth depth, diff --git a/dali/internal/input/common/imf-manager-factory.h b/dali/internal/input/common/imf-manager-factory.h index d3e6660..ac3dee7 100644 --- a/dali/internal/input/common/imf-manager-factory.h +++ b/dali/internal/input/common/imf-manager-factory.h @@ -33,7 +33,6 @@ namespace ImfManagerFactory // Factory function creating new IMFManager // Symbol exists but may be overriden during linking -__attribute__((weak)) Dali::ImfManager CreateImfManager(); } diff --git a/dali/internal/sensor/common/tilt-sensor-factory.h b/dali/internal/sensor/common/tilt-sensor-factory.h index 25d94f7..fe7ec28 100644 --- a/dali/internal/sensor/common/tilt-sensor-factory.h +++ b/dali/internal/sensor/common/tilt-sensor-factory.h @@ -35,7 +35,7 @@ namespace TiltSensorFactory * Creates new instance of tilt sensor implementation * @return pointer to tilt sensor implementation instance */ -__attribute__((weak)) Dali::Internal::Adaptor::TiltSensor* Create(); +Dali::Internal::Adaptor::TiltSensor* Create(); /** * Obtains existing or creates new instance of the tilt sensor -- 2.7.4