Fix a bug in dbus-c++ to allow build with gcc 7.2.0

thanks to Orcan Ogetbil <oget.fedora@gm...>

15 files changed, 51 insertions, 6 deletions

diff --git a/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx b/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
index 4cc3de7..755d73b 100644
--- a/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
+++ b/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
@@ -26,6 +26,9 @@
 *
 * @licence end@
 */
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
+#define DBUS_HAS_RECURSIVE_MUTEX
+#endif
 #include <dbus-c++/glib-integration.h>
 #include <locale.h>
 #include <stdlib.h>
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
index 702c596..bd61f43 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -23,6 +23,9 @@
 *
 * @licence end@
 */
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
+#define DBUS_HAS_RECURSIVE_MUTEX
+#endif
 #include <dbus-c++/glib-integration.h>
 #include <math.h>
 #include <unistd.h>
diff --git a/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx b/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
index 678f288..6ccbacf 100644
--- a/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
+++ b/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
@@ -25,6 +25,9 @@
 *
 * @licence end@
 */
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
+#define DBUS_HAS_RECURSIVE_MUTEX
+#endif
 #include <dbus-c++/glib-integration.h>
 #include "genivi-mapviewer-constants.h"
 #include "genivi-mapviewer-session_adaptor.h"
diff --git a/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx b/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
index 9d5ddce..69267b9 100644
--- a/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
+++ b/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
@@ -26,6 +26,9 @@
 *
 * @licence end@
 */
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
+#define DBUS_HAS_RECURSIVE_MUTEX
+#endif
 #include <dbus-c++/glib-integration.h>
 #include <locale.h>
 #include <stdlib.h>
diff --git a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx
index 534fcb0..db4de89 100644
--- a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx
+++ b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx
@@ -26,6 +26,9 @@
 * @licence end@
 */
 
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
+#define DBUS_HAS_RECURSIVE_MUTEX
+#endif
 #include <dbus-c++/glib-integration.h>
 #include <glib.h>
 #include <string.h>
diff --git a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
index 782150e..3f4c698 100644
--- a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
+++ b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
@@ -26,6 +26,9 @@
 *
 * @licence end@
 */
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
+#define DBUS_HAS_RECURSIVE_MUTEX
+#endif
 #include <dbus-c++/glib-integration.h>
 #include "genivi-navigationcore-constants.h"
 #include "genivi-navigationcore-guidance_adaptor.h"
diff --git a/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx b/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
index ea1458b..131ec61 100644
--- a/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
+++ b/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
@@ -25,6 +25,9 @@
 *
 * @licence end@
 */
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
+#define DBUS_HAS_RECURSIVE_MUTEX
+#endif
 #include <dbus-c++/glib-integration.h>
 #include "genivi-navigationcore-constants.h"
 #include "genivi-navigationcore-locationinput_adaptor.h"
diff --git a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
index 4f731e1..a3ea303 100644
--- a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
+++ b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
@@ -25,6 +25,9 @@
 *
 * @licence end@
 */
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
+#define DBUS_HAS_RECURSIVE_MUTEX
+#endif
 #include <dbus-c++/glib-integration.h>
 #include "genivi-navigationcore-constants.h"
 #include "genivi-navigationcore-mapmatchedposition_adaptor.h"
diff --git a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
index 6e68da5..8ef71be 100644
--- a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
+++ b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
@@ -26,6 +26,9 @@
 *
 * @licence end@
 */
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
+#define DBUS_HAS_RECURSIVE_MUTEX
+#endif
 #include <dbus-c++/glib-integration.h>
 #include "genivi-navigationcore-constants.h"
 #include "genivi-navigationcore-routing_adaptor.h"
diff --git a/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx b/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
index f6fdb48..845aada 100644
--- a/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
+++ b/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
@@ -25,6 +25,9 @@
 *
 * @licence end@
 */
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
+#define DBUS_HAS_RECURSIVE_MUTEX
+#endif
 #include <dbus-c++/glib-integration.h>
 #include "genivi-navigationcore-constants.h"
 #include "genivi-navigationcore-session_adaptor.h"
diff --git a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
index 951e670..92b210c 100644
--- a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
+++ b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
@@ -25,6 +25,9 @@
 *
 * @licence end@
 */
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
+#define DBUS_HAS_RECURSIVE_MUTEX
+#endif
 #include <dbus-c++/glib-integration.h>
 #include <config.h>
 #define USE_PLUGINS 1
diff --git a/src/navigation/update_third_party.sh b/src/navigation/update_third_party.sh
index 0657337..35204e8 100755
--- a/src/navigation/update_third_party.sh
+++ b/src/navigation/update_third_party.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-positioning_version='9725fe1f553197042d6445997690d452a73490c0'
-navit_version='f5abdd317e10d56226300d001469595658a605e4'
+positioning_version='d4c46f13019aefb11aebd0fc1210a29a46f0b521'
+navit_version='3f26accd04c0f9733f2c8bf7bf58235e2d47a734'
 
 echo "version of positioning is: $positioning_version"
 echo "version of navit is: $navit_version"
diff --git a/src/poi-service/poi-server/main.cpp b/src/poi-service/poi-server/main.cpp
index a6053b9..8ebf984 100644
--- a/src/poi-service/poi-server/main.cpp
+++ b/src/poi-service/poi-server/main.cpp
@@ -36,6 +36,9 @@
 #include <cmath>
 #include <typeinfo>
 #include <getopt.h>
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
+#define DBUS_HAS_RECURSIVE_MUTEX
+#endif
 #include <dbus-c++/glib-integration.h>
 
 #include "log.h"
diff --git a/src/speech-service/main.cpp b/src/speech-service/main.cpp
index 035ab6b..f99f1a3 100644
--- a/src/speech-service/main.cpp
+++ b/src/speech-service/main.cpp
@@ -36,6 +36,9 @@
 #include <iostream>
 #include <cmath>
 #include <typeinfo>
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
+#define DBUS_HAS_RECURSIVE_MUTEX
+#endif
 #include <dbus-c++/glib-integration.h>
 #include "genivi-speechservice-constants.h"
 #include "genivi-speechservice-speechoutput_adaptor.h"
diff --git a/test/navigation/script/test-all b/test/navigation/script/test-all
index f9bddab..6f8738c 100755
--- a/test/navigation/script/test-all
+++ b/test/navigation/script/test-all
@@ -37,7 +37,10 @@ then
 	./test-poi.py -l ../resource/location.xml -s "sChü" $remote
 	./test-poi-guidance.py -l ../resource/location-poi.xml -s "cOnT" $remote
 	./test-guidance.py -r ../resource/route.xml $remote
+	if [ "$remote" = "" ]
+	then
 	./test-map-viewer-control.py -l ../resource/location.xml $remote
+	fi
 else
 	result="$(./test-location-input.py -l ../resource/locations.xml $remote 2>&1 >/dev/null)"
 	echo $result
@@ -75,9 +78,12 @@ else
 		exit 1 
 	fi
 
-	result="$(./test-map-viewer-control.py -l ../resource/location.xml $remote  2>&1 >/dev/null)"
-	echo $result
-	if [[ $result == *"PASSED"* ]]; then 
-		echo "Batch test PASSED" 
+	if [ "$remote" = "" ]
+	then
+		result="$(./test-map-viewer-control.py -l ../resource/location.xml $remote  2>&1 >/dev/null)"
+		echo $result
+		if [[ $result == *"PASSED"* ]]; then 
+			echo "Batch test PASSED" 
+		fi
 	fi
 fi