[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 d772e19..0521465 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 3819e7c..7ec797b 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 17507e6..a26d975 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 4da0959..5f3a963 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 b742203..03cf9c3 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 b3531fe..595d4bb 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