p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix 'Yield' reserved word in Windows

This commit is contained in:
bernatx 2020-03-02 12:44:41 +01:00 committed by bernat
parent 1a76064e7f
commit 640d57abd7
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Docs/python_api.md
View File

@ -755,9 +755,9 @@ Type 133.
Type 138. Type 138.
- <a name="carla.LandmarkType.LevelCrossing"></a>**<font color="#f8805a">LevelCrossing</font>** - <a name="carla.LandmarkType.LevelCrossing"></a>**<font color="#f8805a">LevelCrossing</font>**
Type 150. Type 150.
- <a name="carla.LandmarkType.Stop"></a>**<font color="#f8805a">Stop</font>** - <a name="carla.LandmarkType.StopSign"></a>**<font color="#f8805a">Stop</font>**
Type 206. Type 206.
- <a name="carla.LandmarkType.Yield"></a>**<font color="#f8805a">Yield</font>** - <a name="carla.LandmarkType.YieldSign"></a>**<font color="#f8805a">Yield</font>**
Type 205. Type 205.
- <a name="carla.LandmarkType.MandatoryTurnDirection"></a>**<font color="#f8805a">MandatoryTurnDirection</font>** - <a name="carla.LandmarkType.MandatoryTurnDirection"></a>**<font color="#f8805a">MandatoryTurnDirection</font>**
Type 209. Type 209.
@ -2240,4 +2240,4 @@ Links another command to be executed right after. It allows to ease very common
- **Parameters:** - **Parameters:**
- `command` (_[carla.Command](#carla.Command)_) – CommandType. - `command` (_[carla.Command](#carla.Command)_) – CommandType.
--- ---

4
LibCarla/source/carla/client/Landmark.cpp
View File

@ -24,10 +24,10 @@ namespace client {
const std::string LandmarkType::LevelCrossing() { const std::string LandmarkType::LevelCrossing() {
return "150"; return "150";
} // = "150"; } // = "150";
const std::string LandmarkType::Yield() { const std::string LandmarkType::YieldSign() {
return "205"; return "205";
} // = "205"; } // = "205";
const std::string LandmarkType::Stop() { const std::string LandmarkType::StopSign() {
return "206"; return "206";
} // = "206"; } // = "206";
const std::string LandmarkType::MandatoryTurnDirection() { const std::string LandmarkType::MandatoryTurnDirection() {

4
LibCarla/source/carla/client/Landmark.h
View File

@ -27,8 +27,8 @@ namespace client {
static const std::string CautionPedestrian(); // = "133"; static const std::string CautionPedestrian(); // = "133";
static const std::string CautionBicycle(); // = "138"; static const std::string CautionBicycle(); // = "138";
static const std::string LevelCrossing(); // = "150"; static const std::string LevelCrossing(); // = "150";
static const std::string Yield(); // = "205"; static const std::string YieldSign(); // = "205";
static const std::string Stop(); // = "206"; static const std::string StopSign(); // = "206";
static const std::string MandatoryTurnDirection(); // = "209" // Left, right or forward static const std::string MandatoryTurnDirection(); // = "209" // Left, right or forward
static const std::string MandatoryLeftRightDirection(); // = "211"; static const std::string MandatoryLeftRightDirection(); // = "211";
static const std::string TwoChoiceTurnDirection(); // = "214" // Forward-left, forward-right, left-right static const std::string TwoChoiceTurnDirection(); // = "214" // Forward-left, forward-right, left-right

4
PythonAPI/carla/source/libcarla/Map.cpp
View File

@ -218,8 +218,8 @@ void export_map() {
.add_static_property("CautionPedestrian", &cc::LandmarkType::CautionPedestrian) .add_static_property("CautionPedestrian", &cc::LandmarkType::CautionPedestrian)
.add_static_property("CautionBicycle", &cc::LandmarkType::CautionBicycle) .add_static_property("CautionBicycle", &cc::LandmarkType::CautionBicycle)
.add_static_property("LevelCrossing", &cc::LandmarkType::LevelCrossing) .add_static_property("LevelCrossing", &cc::LandmarkType::LevelCrossing)
.add_static_property("Stop", &cc::LandmarkType::Stop) .add_static_property("StopSign", &cc::LandmarkType::StopSign)
.add_static_property("Yield", &cc::LandmarkType::Yield) .add_static_property("YieldSign", &cc::LandmarkType::YieldSign)
.add_static_property("MandatoryTurnDirection", &cc::LandmarkType::MandatoryTurnDirection) .add_static_property("MandatoryTurnDirection", &cc::LandmarkType::MandatoryTurnDirection)
.add_static_property("MandatoryLeftRightDirection", &cc::LandmarkType::MandatoryLeftRightDirection) .add_static_property("MandatoryLeftRightDirection", &cc::LandmarkType::MandatoryLeftRightDirection)
.add_static_property("TwoChoiceTurnDirection", &cc::LandmarkType::TwoChoiceTurnDirection) .add_static_property("TwoChoiceTurnDirection", &cc::LandmarkType::TwoChoiceTurnDirection)

4
PythonAPI/docs/map.yml
View File

@ -478,10 +478,10 @@
- var_name: LevelCrossing - var_name: LevelCrossing
doc: > doc: >
Type 150. Type 150.
- var_name: Stop - var_name: StopSign
doc: > doc: >
Type 206. Type 206.
- var_name: Yield - var_name: YieldSign
doc: > doc: >
Type 205. Type 205.
- var_name: MandatoryTurnDirection - var_name: MandatoryTurnDirection