Fix build error for toolchain upgrade

Change-Id: Iee92f146698bd34403fb5874d1765041bcf9da18

diff --git a/dali/devel-api/adaptor-framework/accessibility.h b/dali/devel-api/adaptor-framework/accessibility.h
index c424fde..7a8cb07 100644 (file)
--- a/dali/devel-api/adaptor-framework/accessibility.h
+++ b/dali/devel-api/adaptor-framework/accessibility.h
@@ -18,6 +18,7 @@
  */\r
 \r
 // EXTERNAL INCLUDES\r
+#include <cstdint>\r
 #include <string>\r
 #include <unordered_map>\r
 #include <vector>\r
@@ -350,8 +351,8 @@ enum class WindowEvent
  */\r
 enum class WindowRestoreType\r
 {\r
-  RESTORE_FROM_ICONIFY,  // The Window is Deiconified.\r
-  RESTORE_FROM_MAXIMIZE  // The Window is Unmaximized.\r
+  RESTORE_FROM_ICONIFY, // The Window is Deiconified.\r
+  RESTORE_FROM_MAXIMIZE // The Window is Unmaximized.\r
 };\r
 \r
 /**\r
@@ -512,11 +513,11 @@ enum class AtspiEvent
   MAX_COUNT\r
 };\r
 \r
-using AtspiInterfaces   = EnumBitSet<AtspiInterface, AtspiInterface::MAX_COUNT>;\r
-using AtspiEvents       = EnumBitSet<AtspiEvent, AtspiEvent::MAX_COUNT>;\r
-using ReadingInfoTypes  = EnumBitSet<ReadingInfoType, ReadingInfoType::MAX_COUNT>;\r
-using States            = EnumBitSet<State, State::MAX_COUNT>;\r
-using Attributes        = std::unordered_map<std::string, std::string>;\r
+using AtspiInterfaces  = EnumBitSet<AtspiInterface, AtspiInterface::MAX_COUNT>;\r
+using AtspiEvents      = EnumBitSet<AtspiEvent, AtspiEvent::MAX_COUNT>;\r
+using ReadingInfoTypes = EnumBitSet<ReadingInfoType, ReadingInfoType::MAX_COUNT>;\r
+using States           = EnumBitSet<State, State::MAX_COUNT>;\r
+using Attributes       = std::unordered_map<std::string, std::string>;\r
 \r
 namespace Internal\r
 {\r

diff --git a/dali/devel-api/adaptor-framework/image-loading.h b/dali/devel-api/adaptor-framework/image-loading.h
index 365b38d..c920c0c 100644 (file)
--- a/dali/devel-api/adaptor-framework/image-loading.h
+++ b/dali/devel-api/adaptor-framework/image-loading.h
@@ -2,7 +2,7 @@
 #define DALI_IMAGE_LOADING_H
 
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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,6 +19,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/devel-api/adaptor-framework/pixel-buffer.h>
+#include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/images/image-operations.h>
 #include <string>
 

diff --git a/dali/devel-api/adaptor-framework/web-engine/web-engine-console-message.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-console-message.h
old mode 100755 (executable)
new mode 100644 (file)
index 1456e43..5141d7f
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine-console-message.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-console-message.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_CONSOLE_MESSAGE_H
 
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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,6 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
+#include <cstdint>
 #include <string>
 
 namespace Dali

diff --git a/dali/devel-api/adaptor-framework/web-engine/web-engine-settings.h b/dali/devel-api/adaptor-framework/web-engine/web-engine-settings.h
old mode 100755 (executable)
new mode 100644 (file)
index ae7bc99..faee431
--- a/dali/devel-api/adaptor-framework/web-engine/web-engine-settings.h
+++ b/dali/devel-api/adaptor-framework/web-engine/web-engine-settings.h
@@ -2,7 +2,7 @@
 #define DALI_WEB_ENGINE_SETTINGS_H
 
 /*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2023 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,6 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
+#include <cstdint>
 
 namespace Dali
 {
@@ -82,7 +83,7 @@ public:
    * @param[in] enabled if true, to enable cache builder
    *        otherwise to disable
    */
-  virtual void EnableCacheBuilder( bool enabled ) = 0;
+  virtual void EnableCacheBuilder(bool enabled) = 0;
 
   /**
    * @brief Used/Unused scrollbar thumb focus notifications
@@ -90,7 +91,7 @@ public:
    * @param[in] used if true, to use scrollbar thumb focus notifications
    *          otherwise to unused
    */
-  virtual void UseScrollbarThumbFocusNotifications( bool used ) = 0;
+  virtual void UseScrollbarThumbFocusNotifications(bool used) = 0;
 
   /**
    * @brief Enable/Disable do not track
@@ -98,7 +99,7 @@ public:
    * @param[in] enabled if true, to enable do not track
    *        otherwise to disable
    */
-  virtual void EnableDoNotTrack( bool enabled ) = 0;
+  virtual void EnableDoNotTrack(bool enabled) = 0;
 
   /**
    * @brief Allow/Disallow file access from external url
@@ -136,7 +137,7 @@ public:
    * @param[in] enabled if true, to enable auto fitting
    *       otherwise to disable
    */
-  virtual void EnableAutoFitting( bool enabled ) = 0;
+  virtual void EnableAutoFitting(bool enabled) = 0;
 
   /**
    * @brief Check if plugins are enabled or not.
@@ -151,7 +152,7 @@ public:
    * @param[in] enabled if true, to enable plugins
    *       otherwise to disable
    */
-  virtual void EnablePlugins( bool enabled ) = 0;
+  virtual void EnablePlugins(bool enabled) = 0;
 
   /**
    * @brief Check if private browsing is enabled or not.
@@ -166,7 +167,7 @@ public:
    * @param[in] enabled if true, to enable private browsing
    *       otherwise to disable
    */
-  virtual void EnablePrivateBrowsing( bool enabled ) = 0;
+  virtual void EnablePrivateBrowsing(bool enabled) = 0;
 
   /**
    * @brief Check if link magnifier is enabled or not.
@@ -181,7 +182,7 @@ public:
    * @param[in] enabled if true, to enable link magnifier
    *        otherwise to disable
    */
-  virtual void EnableLinkMagnifier( bool enabled ) = 0;
+  virtual void EnableLinkMagnifier(bool enabled) = 0;
 
   /**
    * @brief Check if uses keypad without user action is used or not.
@@ -196,7 +197,7 @@ public:
    * @param[in] used if true, to use keypad without user action
    *       otherwise to unused
    */
-  virtual void UseKeypadWithoutUserAction( bool used ) = 0;
+  virtual void UseKeypadWithoutUserAction(bool used) = 0;
 
   /**
    * @brief Check if autofill password form is enabled or not.
@@ -211,7 +212,7 @@ public:
    * @param[in] enabled if true, to enable autofill_password_form
    *       otherwise to disable
    */
-  virtual void EnableAutofillPasswordForm( bool enabled ) = 0;
+  virtual void EnableAutofillPasswordForm(bool enabled) = 0;
 
   /**
    * @brief check if form candidate data is enabled or not.
@@ -226,7 +227,7 @@ public:
    * @param[in] enabled if true, to enable form candidate data
    *        otherwise to disable
    */
-  virtual void EnableFormCandidateData( bool enabled ) = 0;
+  virtual void EnableFormCandidateData(bool enabled) = 0;
 
   /**
    * @brief check if text selection is enabled or not.
@@ -241,7 +242,7 @@ public:
    * @param[in] enabled if true, to enable text selection
    *        otherwise to disable
    */
-  virtual void EnableTextSelection( bool enabled ) = 0;
+  virtual void EnableTextSelection(bool enabled) = 0;
 
   /**
    * @brief check if text autosizing is enabled or not.
@@ -256,14 +257,14 @@ public:
    * @param[in] enabled if true, to enable text autosizing
    *        otherwise to disable
    */
-  virtual void EnableTextAutosizing( bool enabled ) = 0;
+  virtual void EnableTextAutosizing(bool enabled) = 0;
 
   /**
    * @brief check if arrow scroll is enabled or not.
    *
    * @return true if enabled, false is disabled.
    */
-   virtual bool IsArrowScrollEnabled() const = 0;
+  virtual bool IsArrowScrollEnabled() const = 0;
 
   /**
    * @brief Enable/Disable arrow scroll
@@ -271,7 +272,7 @@ public:
    * @param[in] enable if true, to enable arrow scroll
    *        otherwise to disable
    */
-  virtual void EnableArrowScroll( bool enable ) = 0;
+  virtual void EnableArrowScroll(bool enable) = 0;
 
   /**
    * @brief check if clipboard is enabled or not.
@@ -286,7 +287,7 @@ public:
    * @param[in] enabled if true, to enable clipboard
    *          otherwise to disable
    */
-  virtual void EnableClipboard( bool enabled ) = 0;
+  virtual void EnableClipboard(bool enabled) = 0;
 
   /**
    * @brief check if ime panel is enabled or not.
@@ -301,7 +302,7 @@ public:
    * @param[in] enabled if true, to enable ime panel
    *          otherwise to disable
    */
-  virtual void EnableImePanel( bool enabled ) = 0;
+  virtual void EnableImePanel(bool enabled) = 0;
 
   /**
    * @brief Allow if the scripts can open new windows.

diff --git a/dali/internal/adaptor/common/framework.h b/dali/internal/adaptor/common/framework.h
index 894bb88..0f64fc5 100644 (file)
--- a/dali/internal/adaptor/common/framework.h
+++ b/dali/internal/adaptor/common/framework.h
@@ -20,6 +20,7 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/signals/callback.h>
+#include <functional>
 #include <string>
 #ifdef APPCORE_WATCH_AVAILABLE
 #include <dali/public-api/watch/watch-application.h>
@@ -332,7 +333,7 @@ private:
 
 private:
   // Undefined
-  Framework(const Framework&)      = delete;
+  Framework(const Framework&) = delete;
   Framework& operator=(Framework&) = delete;
 
 protected:
@@ -370,8 +371,8 @@ public:
 
 private:
   // Undefined
-  UIThreadLoader(const UIThreadLoader&);
-  UIThreadLoader& operator=(UIThreadLoader&);
+  UIThreadLoader(const UIThreadLoader&) = delete;
+  UIThreadLoader& operator=(UIThreadLoader&) = delete;
 
 private:
   int*    mArgc;