Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Sep 2018 20:22:08 +0000 (UTC)
From:      Ganael LAPLANCHE <martymac@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r478723 - head/games/flightgear/files
Message-ID:  <201809012022.w81KM8wi065007@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: martymac
Date: Sat Sep  1 20:22:08 2018
New Revision: 478723
URL: https://svnweb.freebsd.org/changeset/ports/478723

Log:
  Fix build with Clang7
  
  PR:		230502
  Submitted by:	jbeich

Added:
  head/games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx   (contents, props changed)
  head/games/flightgear/files/patch-clang7-stack_scope.diff   (contents, props changed)

Added: head/games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/flightgear/files/patch-clang7-src-AIModel-AIFlightPlanCreatePushBack.cxx	Sat Sep  1 20:22:08 2018	(r478723)
@@ -0,0 +1,15 @@
+Fix build with clang 7:
+
+src/AIModel/AIFlightPlanCreatePushBack.cxx:96:48: error: ordered comparison between pointer and zero ('FGTaxiNode *' and 'int')
+
+--- src/AIModel/AIFlightPlanCreatePushBack.cxx.orig	2018-08-17 19:14:25.768512000 +0200
++++ src/AIModel/AIFlightPlanCreatePushBack.cxx	2018-08-17 19:14:44.343865000 +0200
+@@ -93,7 +93,7 @@
+   
+     FGGroundNetwork* groundNet = dep->groundNetwork();
+     FGParking *parking = gate.parking();
+-    if (parking && parking->getPushBackPoint() > 0) {
++    if (parking && parking->getPushBackPoint() != NULL) {
+         FGTaxiRoute route = groundNet->findShortestRoute(parking, parking->getPushBackPoint(), false);
+       
+         int size = route.size();

Added: head/games/flightgear/files/patch-clang7-stack_scope.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/flightgear/files/patch-clang7-stack_scope.diff	Sat Sep  1 20:22:08 2018	(r478723)
@@ -0,0 +1,46 @@
+Fix scope of 'stack' when building with clang 7:
+
+error: reference to 'stack' is ambiguous
+
+--- src/FDM/UIUCModel/uiuc_aircraft.h.orig	2018-08-31 19:26:14.641298000 +0200
++++ src/FDM/UIUCModel/uiuc_aircraft.h	2018-08-31 19:50:35.444961000 +0200
+@@ -150,7 +150,7 @@
+ #include "uiuc_parsefile.h"
+ #include "uiuc_flapdata.h"
+ 
+-typedef stack :: iterator LIST;
++typedef ::stack :: iterator LIST;
+ 
+ /* Add more keywords here if required*/
+ enum {init_flag = 1000, geometry_flag, controlSurface_flag, controlsMixer_flag, 
+--- src/FDM/UIUCModel/uiuc_parsefile.h.orig	2018-08-31 19:34:45.641135000 +0200
++++ src/FDM/UIUCModel/uiuc_parsefile.h	2018-08-31 19:35:35.903930000 +0200
+@@ -23,7 +23,7 @@
+ {
+         private:
+                 
+-                stack commands;
++                ::stack commands;
+                 ifstream file;
+                 void readFile();
+ 
+@@ -37,7 +37,7 @@
+                 void removeComments(string& inputLine);
+                 string getToken(string inputLine, int tokenNo);
+                 void storeCommands(string inputLine);
+-                stack getCommands();
++                ::stack getCommands();
+ };
+ 
+ #endif  // _PARSE_FILE_H_
+--- src/FDM/UIUCModel/uiuc_recorder.cpp.orig	2018-08-31 19:16:32.680030000 +0200
++++ src/FDM/UIUCModel/uiuc_recorder.cpp	2018-08-31 19:16:57.872109000 +0200
+@@ -102,7 +102,7 @@
+ 
+ void uiuc_recorder( double dt )
+ {
+-  stack command_list;
++  ::stack command_list;
+   string linetoken;
+   // static int init = 0;
+   static int recordStep = 0;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809012022.w81KM8wi065007>