Merge "Remove std::vector dependency for dali-signal.h" into devel/master

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 6609ae5..6313fc9 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -630,7 +630,7 @@ MESSAGE( STATUS "Use pkg configure:             " ${ENABLE_PKG_CONFIGURE} )
 MESSAGE( STATUS "Vector Based Text Rendering:   " ${ENABLE_VECTOR_BASED_TEXT_RENDERING} )
 MESSAGE( STATUS "Enable link test:              " ${ENABLE_LINK_TEST} )
 MESSAGE( STATUS "Configure automated tests:     " ${CONFIGURE_AUTOMATED_TESTS} )
-MESSAGE( STATUS "Build Dali Scene3D:       " ${BUILD_SCENE3D} )
+MESSAGE( STATUS "Build Dali Scene3D:            " ${BUILD_SCENE3D} )
 MESSAGE( STATUS "CXXFLAGS:                      " ${CMAKE_CXX_FLAGS} )
 MESSAGE( STATUS "LDFLAGS:                       " ${CMAKE_SHARED_LINKER_FLAGS_INIT}${CMAKE_SHARED_LINKER_FLAGS} )
 

diff --git a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.h b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.h
index 7303324..9672929 100644 (file)
--- a/dali-toolkit/internal/controls/scene3d-view/gltf-loader.h
+++ b/dali-toolkit/internal/controls/scene3d-view/gltf-loader.h
@@ -21,6 +21,7 @@
 // EXTERNAL INCLUDES\r
 #include <dali/public-api/actors/layer.h>\r
 #include <dali/public-api/animation/animation.h>\r
+#include <dali/public-api/common/vector-wrapper.h>\r
 #include <dali/public-api/rendering/renderer.h>\r
 #include <dali/public-api/rendering/shader.h>\r
 \r

diff --git a/dali-toolkit/internal/transition/transition-impl.h b/dali-toolkit/internal/transition/transition-impl.h
index 7230e2b..22cc01f 100644 (file)
--- a/dali-toolkit/internal/transition/transition-impl.h
+++ b/dali-toolkit/internal/transition/transition-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TRANSITION_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -24,6 +24,7 @@
 #include <dali-toolkit/public-api/transition/transition.h>
 
 // EXTERNAL INCLUDES
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/weak-handle.h>
 
 namespace Dali

diff --git a/dali-toolkit/internal/transition/transition-set-impl.h b/dali-toolkit/internal/transition/transition-set-impl.h
index eb9962d..b980a46 100644 (file)
--- a/dali-toolkit/internal/transition/transition-set-impl.h
+++ b/dali-toolkit/internal/transition/transition-set-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_TRANSITION_SET_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -24,6 +24,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/processor-interface.h>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/object/base-object.h>
 #include <dali/public-api/signals/connection-tracker.h>