Updates for modern compiler

diff --git a/build/scripts/dali_env b/build/scripts/dali_env
index 6597a81ee364d1ef86c72d42e71279ae20e86f72..afb01cf685f2d10f30f924cf5b513395b3eb004f 100755 (executable)
--- a/build/scripts/dali_env
+++ b/build/scripts/dali_env
@@ -171,7 +171,7 @@ if( $opt_vulkanVersion ne "" )
 else
 {
   # Default Vulkan Version if version not specified, will only be installed if --vulkan is specified
-  $opt_vulkanVersion="1.1.92.1"
+  $opt_vulkanVersion="1.1.108.0"
 }
 
 if( $opt_vulkanInstaller ne "" )

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 568ad3797e9d21d6d7d7477b4e1cb32854088431..ecee4e04c9a4b6a10edc2a5b8967f42e8fc1472d 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -33,7 +33,7 @@ AC_SUBST(DALI_VERSION)
 DALI_CFLAGS=-DPLATFORM_TIZEN
 
 # Use C++ 11
-DALI_CFLAGS="$DALI_CFLAGS -std=c++14 -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast -Werror -Wall -Wextra -Wno-unused-parameter -Wfloat-equal -Wconversion"
+DALI_CFLAGS="$DALI_CFLAGS -std=c++14 -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast -Werror -Wall -Wextra -Wno-unused-parameter -Wfloat-equal -Wconversion -Wno-cast-function-type -Wno-class-memaccess -Wno-string-plus-int "
 
 AC_ARG_ENABLE(exportall,
               [AC_HELP_STRING([--enable-exportall],

diff --git a/dali/internal/event/events/touch-event-processor.cpp b/dali/internal/event/events/touch-event-processor.cpp
index f11d69cc7eed86e09eaeaf043a58a742a0505c4f..de8794254c87ed857a0319101d67dbeab821fa91 100644 (file)
--- a/dali/internal/event/events/touch-event-processor.cpp
+++ b/dali/internal/event/events/touch-event-processor.cpp
@@ -412,6 +412,7 @@ void TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even
         mTouchDownConsumedActor.SetActor( NULL );
       }
       // No break, Fallthrough
+      __attribute__ ((fallthrough));
 
       case PointState::DOWN:
       {

diff --git a/dali/internal/update/gestures/scene-graph-pan-gesture.cpp b/dali/internal/update/gestures/scene-graph-pan-gesture.cpp
index 494146584a5bb1dac1c9222041d3aece3f16f862..e84ec6ac181db9ce3e43ec72b15fe3bdca0fefe3 100644 (file)
--- a/dali/internal/update/gestures/scene-graph-pan-gesture.cpp
+++ b/dali/internal/update/gestures/scene-graph-pan-gesture.cpp
@@ -551,7 +551,7 @@ bool PanGesture::UpdateProperties( unsigned int lastVSyncTime, unsigned int next
   mLastGesture = frameGesture;
   mLastUnmodifiedGesture = unmodifiedGesture;
 
-  mInGesture &= ~frameInfo.justFinished;
+  mInGesture &= !frameInfo.justFinished;
   if( mProfiling && frameInfo.justFinished )
   {
     mProfiling->PrintData();
@@ -1281,7 +1281,7 @@ bool PanGesture::NewAlgorithm( unsigned int lastVSyncTime, unsigned int nextVSyn
     }
   }
 
-  mInGesture &= ~justFinished;
+  mInGesture &= !justFinished;
 
   return performUpdate;
 }

diff --git a/dali/internal/update/rendering/scene-graph-renderer.cpp b/dali/internal/update/rendering/scene-graph-renderer.cpp
index 75b4e578c35be80c9ef899ad308540e5889da5df..94a750b147ce3a4f391561c5da9f1ed413138a34 100644 (file)
--- a/dali/internal/update/rendering/scene-graph-renderer.cpp
+++ b/dali/internal/update/rendering/scene-graph-renderer.cpp
@@ -21,7 +21,6 @@
 #include <dali/internal/common/internal-constants.h>
 #include <dali/internal/common/memory-pool-object-allocator.h>
 #include <dali/internal/update/nodes/node.h>
-#include <dali/internal/update/rendering/data-providers/node-data-provider.h>
 #include <dali/internal/update/rendering/render-instruction.h>
 #include <dali/internal/update/rendering/scene-graph-geometry.h>
 #include <dali/internal/update/rendering/scene-graph-property-buffer.h>