Fix errors caused by -Wold-style-cast

Change-Id: Ie1dd73e2c13253e5fb464d49d7d67ae3af90d559

diff --git a/adaptors/common/abort-handler.cpp b/adaptors/common/abort-handler.cpp
index ed4d09e..6f507a9 100644 (file)
--- a/adaptors/common/abort-handler.cpp
+++ b/adaptors/common/abort-handler.cpp
@@ -64,13 +64,17 @@ bool AbortHandler::AbortOnSignal( int signum )
   {
     SignalHandlerFuncPtr signalHandlerPrevious = signal( signum, &AbortHandler::SignalHandler );
 
-    if ( SIG_ERR != signalHandlerPrevious )
+// SIG_ERR is a macro with C cast
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+  if ( SIG_ERR != signalHandlerPrevious )
     {
       mSignalOldHandlers[signum-1] = signalHandlerPrevious;
       mSignalMask |= ( 1 << (signum-1) );
       status = true;
     }
   }
+#pragma GCC diagnostic pop
   return status;
 }
 

diff --git a/adaptors/common/gl/egl-image-extensions.cpp b/adaptors/common/gl/egl-image-extensions.cpp
index 4792522..154a521 100644 (file)
--- a/adaptors/common/gl/egl-image-extensions.cpp
+++ b/adaptors/common/gl/egl-image-extensions.cpp
@@ -87,6 +87,9 @@ void* EglImageExtensions::CreateImageKHR(EGLClientBuffer clientBuffer)
     EGL_NONE
   };
 
+// EGL constants use C casts
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
   EGLImageKHR eglImage  = eglCreateImageKHRProc( mEglImplementation->GetDisplay(),
                                              EGL_NO_CONTEXT,
                                              EGL_NATIVE_PIXMAP_KHR,
@@ -138,6 +141,7 @@ void* EglImageExtensions::CreateImageKHR(EGLClientBuffer clientBuffer)
       }
     }
   }
+#pragma GCC diagnostic pop
 
   return eglImage;
 }

diff --git a/adaptors/common/gl/egl-implementation.cpp b/adaptors/common/gl/egl-implementation.cpp
index 88a7b64..c73525f 100644 (file)
--- a/adaptors/common/gl/egl-implementation.cpp
+++ b/adaptors/common/gl/egl-implementation.cpp
@@ -28,6 +28,10 @@
 #include <gl/gl-implementation.h>
 #include <gl/egl-debug.h>
 
+// EGL constants use C style casts
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+
 namespace Dali
 {
 
@@ -460,3 +464,5 @@ EGLDisplay EglImplementation::GetContext() const
 } // namespace Internal
 
 } // namespace Dali
+
+#pragma GCC diagnostic pop

diff --git a/adaptors/common/networking/socket-impl.cpp b/adaptors/common/networking/socket-impl.cpp
index 968cca4..4d962eb 100644 (file)
--- a/adaptors/common/networking/socket-impl.cpp
+++ b/adaptors/common/networking/socket-impl.cpp
@@ -27,6 +27,9 @@
 #include <unistd.h>
 #include <dali/integration-api/debug.h>
 
+// Sockets enums like INADDR_ANY use C-Casts
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
 
 namespace Dali
 {
@@ -359,6 +362,9 @@ bool Socket::Write( const void* buffer, unsigned int bufferSizeInBytes )
 }
 
 } // Adaptor
+
 } // Internal
+
 } // Dali
 
+#pragma GCC diagnostic pop

diff --git a/adaptors/common/shared-file.cpp b/adaptors/common/shared-file.cpp
index c62a663..806cc5a 100644 (file)
--- a/adaptors/common/shared-file.cpp
+++ b/adaptors/common/shared-file.cpp
@@ -106,10 +106,14 @@ bool SharedFile::OpenFile(const char* filename, int size, bool isSystem)
     mSize = size;
     mAddress = mmap( NULL, mSize, PROT_READ, MAP_SHARED, mFileDescriptor, 0 );
 
+// MAP_FAILED is a macro with C cast
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
     if( mAddress != MAP_FAILED )
     {
       opened = true;
     }
+#pragma GCC diagnostic pop
   }
   return opened;
 }

diff --git a/adaptors/x11/ecore-x-window-interface.cpp b/adaptors/x11/ecore-x-window-interface.cpp
index b820656..3357d44 100644 (file)
--- a/adaptors/x11/ecore-x-window-interface.cpp
+++ b/adaptors/x11/ecore-x-window-interface.cpp
@@ -52,7 +52,11 @@ Ecore_X_Window GetWindow()
   Ecore_X_Window xCbhmWin = 0;
   unsigned char *buf = NULL;
   int num = 0;
+// XA_WINDOW is a macro with C cast
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
   int ret = ecore_x_window_prop_property_get( 0, xAtomCbhm, XA_WINDOW, 0, &buf, &num );
+#pragma GCC diagnostic pop
 
   if ( ret && num )
   {

diff --git a/platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp b/platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp
index 6066192..3daef0a 100755 (executable)
--- a/platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp
+++ b/platform-abstractions/tizen/image-loaders/loader-jpeg-turbo.cpp
@@ -205,7 +205,11 @@ bool LoadJpegHeader( FILE *fp, unsigned int &width, unsigned int &height )
     return false;
   }
 
+// jpeg_create_decompress internally uses C casts
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
   jpeg_create_decompress( &cinfo );
+#pragma GCC diagnostic pop
 
   jpeg_stdio_src( &cinfo, fp );