[toolchain upgrade] fixed build errors and warnings in gcc6x mode

Change-Id: I52e494e0a6c54fe7ae8d0264157d3a70aaebcaba

diff --git a/inc/engine/common/HereMaps_global.h b/inc/engine/common/HereMaps_global.h
index d772e1915a1c4dd78d08533b8eabce3b1772375c..0521465e1266b51b9930469119c4dcbeebf9f42a 100644 (file)
--- a/inc/engine/common/HereMaps_global.h
+++ b/inc/engine/common/HereMaps_global.h
@@ -35,6 +35,8 @@
 #define TIZEN_CFG_CURL_TIMEOUT         120     /* seconds */
 #define TIZEN_CFG_CURL_MULTITHREADS    8       /* the limit of multi-threads for CURL */
 
+#define TIZEN_CFG_CPP11_UNIQUE_PTR
+
 /* for debugging */
 //#define TIZEN_PROFILING_CURL_TIME
 //#define TIZEN_PROFILING_MEMLEAK

diff --git a/inc/engine/maps/DrawableBitmap.h b/inc/engine/maps/DrawableBitmap.h
index 3819e7cd13c0f49ef49bc7670a2f43da0a3c7abf..7ec797be018426c0c07280d9a4fdb4ec5263373b 100644 (file)
--- a/inc/engine/maps/DrawableBitmap.h
+++ b/inc/engine/maps/DrawableBitmap.h
@@ -46,7 +46,7 @@ public:
      * 
      * @param bitmap A pointer to an existing bitmap.
      */
-#ifdef TIZEN_MIGRATION
+#ifdef TIZEN_CFG_CPP11_UNIQUE_PTR
     DrawableBitmap(std::unique_ptr<Tizen::Maps::Bitmap>& bitmap);
 #else
     DrawableBitmap(std::auto_ptr<Tizen::Graphics::Bitmap>& bitmap);

diff --git a/inc/engine/maps/GeoMapObject.h b/inc/engine/maps/GeoMapObject.h
index 17507e62f9f98aacda3a41fcc857f87fb1875b65..a26d9752bb717b3d009302f580d96b0cfcef55a0 100644 (file)
--- a/inc/engine/maps/GeoMapObject.h
+++ b/inc/engine/maps/GeoMapObject.h
@@ -120,7 +120,11 @@ private:
     HERE_MAPS_NO_COPY_NO_ASSIGN(GeoMapObject);
 
     class GeoMapObjectImpl;
+#ifdef TIZEN_CFG_CPP11_UNIQUE_PTR
+    std::unique_ptr<GeoMapObjectImpl> m_impl;
+#else
     std::auto_ptr<GeoMapObjectImpl> m_impl;
+#endif
 };
 
 HERE_MAPS_END_NAMESPACE

diff --git a/inc/engine/maps/GeoMapObjectPolyline.h b/inc/engine/maps/GeoMapObjectPolyline.h
index 4da09592547250bb59573c3356ef626708380b3c..5f3a9631b80f7cade141657124a24b67e94b370a 100644 (file)
--- a/inc/engine/maps/GeoMapObjectPolyline.h
+++ b/inc/engine/maps/GeoMapObjectPolyline.h
@@ -233,7 +233,11 @@ private:
     HERE_MAPS_NO_COPY_NO_ASSIGN(GeoMapObjectPolyline);
 
     class GeoMapObjectPolylineImpl;
+#ifdef TIZEN_CFG_CPP11_UNIQUE_PTR
+    std::unique_ptr<GeoMapObjectPolylineImpl> m_impl;
+#else
     std::auto_ptr<GeoMapObjectPolylineImpl> m_impl;
+#endif
 };
 
 HERE_MAPS_END_NAMESPACE

diff --git a/inc/engine/maps/GeoObjectProvider.h b/inc/engine/maps/GeoObjectProvider.h
index b7422034d3760fc4a9fb6a646e429ce7ed1a3c7d..03cf9c3d3cb72c0ec0fed7826121b111a3f8d31b 100644 (file)
--- a/inc/engine/maps/GeoObjectProvider.h
+++ b/inc/engine/maps/GeoObjectProvider.h
@@ -132,7 +132,11 @@ private:
     HERE_MAPS_NO_COPY_NO_ASSIGN(GeoObjectProvider);
 
     class GeoObjectProviderImpl;
+#ifdef TIZEN_CFG_CPP11_UNIQUE_PTR
+    std::unique_ptr<GeoObjectProviderImpl> m_impl;
+#else
     std::auto_ptr<GeoObjectProviderImpl> m_impl;
+#endif
 };
 
 HERE_MAPS_END_NAMESPACE

diff --git a/inc/engine/maps/GeoTileProvider.h b/inc/engine/maps/GeoTileProvider.h
index b3531feaf2960e6601a697246abd2bc8c4eb5953..595d4bb9d3702f812984342ffb5fb4d0b6348bb3 100644 (file)
--- a/inc/engine/maps/GeoTileProvider.h
+++ b/inc/engine/maps/GeoTileProvider.h
@@ -87,7 +87,11 @@ public:
 
 private:
     class GeoTileProviderImpl;
+#ifdef TIZEN_CFG_CPP11_UNIQUE_PTR
+    std::unique_ptr<GeoTileProviderImpl> m_impl;
+#else
     std::auto_ptr<GeoTileProviderImpl> m_impl;
+#endif
 };
 
 HERE_MAPS_END_NAMESPACE