Browse Source

change some file , for compile in 18.04, 18.04 not use c++17, change to c++1z.

yuchuli 1 year ago
parent
commit
e0781785c2

+ 1 - 1
src/common/interpolation/interpolation.pro

@@ -3,7 +3,7 @@ CONFIG -= qt
 TEMPLATE = lib
 DEFINES += INTERPOLATION_LIBRARY
 
-CONFIG += c++17
+CONFIG += c++1z
 
 CONFIG += plugin
 

+ 6 - 0
src/common/interpolation/spline_interpolation_points_2d.cpp

@@ -16,6 +16,12 @@
 
 #include <vector>
 
+#include <math.h>
+#include <algorithm>
+#include <cstdint>
+#include <iomanip>
+#include <random>
+
 namespace
 {
 std::vector<double> calcEuclidDist(const std::vector<double> & x, const std::vector<double> & y)

+ 1 - 1
src/decition/mpccontroller/mpccontroller.pro

@@ -4,7 +4,7 @@ QT       += core
 TEMPLATE = lib
 DEFINES += MPCCONTROLLER_LIBRARY
 
-CONFIG += c++17
+CONFIG += c++1z
 CONFIG += plugin
 
 # You can make your code fail to compile if it uses deprecated APIs.

+ 11 - 2
src/tool/simple_planning_simulator/mainwindow.cpp

@@ -326,7 +326,9 @@ void MainWindow::on_actionLoad_triggered()
     QString str = QFileDialog::getOpenFileName(this,"Load XODR",".","*.xodr");
     if(str.isEmpty())return;
 
-    OpenDrive * pxodr = new OpenDrive();  //because add to xodr,so don't delete
+
+
+    OpenDrive * pxodr = &mxodr;//new OpenDrive();  //because add to xodr,so don't delete
     OpenDriveXmlParser x(pxodr);
     if(!x.ReadFile(str.toStdString()))
     {
@@ -335,6 +337,7 @@ void MainWindow::on_actionLoad_triggered()
     }
 
 
+
     unsigned short int revMajor,revMinor;
     std::string name,date;
     float version;
@@ -349,12 +352,18 @@ void MainWindow::on_actionLoad_triggered()
         lon0 = 119.0;
     }
 
+
+
+
     glat0 = lat0;
     glon0 = lon0;
 
     mpsimmodel->SetLon0Lat0(glon0,glat0);
 
-    mxodr = *pxodr;
+
+
+//    mxodr = *pxodr;
+
 
     UpdateScene();
 }

+ 2 - 0
src/tool/simple_planning_simulator/simmodel.cpp

@@ -2,6 +2,8 @@
 
 #include "gnss_coordinate_convert.h"
 
+#include <iostream>
+
 simmodel::simmodel()
 {
     mx = 0;