X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInput%2FFGJoystickInput.cxx;h=b15649cda3b334589e90c4b84495d68ea80e9fbd;hb=68c71d5787f2a0309e35c3e05939950113618cb7;hp=c2d300964ab1029dbad2636fd59c63b37d1524b0;hpb=e9ecf4eb522a697149d8f21ba1de3795019ac98b;p=flightgear.git diff --git a/src/Input/FGJoystickInput.cxx b/src/Input/FGJoystickInput.cxx index c2d300964..b15649cda 100644 --- a/src/Input/FGJoystickInput.cxx +++ b/src/Input/FGJoystickInput.cxx @@ -133,11 +133,11 @@ void FGJoystickInput::init() if (configMap.hasConfiguration(name)) { named = configMap.configurationForDeviceName(name); - string source = named->getStringValue("source", "user defined"); + std::string source = named->getStringValue("source", "user defined"); SG_LOG(SG_INPUT, SG_INFO, "... found joystick: " << source); } else if ((named = configMap.configurationForDeviceName("default"))) { - string source = named->getStringValue("source", "user defined"); + std::string source = named->getStringValue("source", "user defined"); SG_LOG(SG_INPUT, SG_INFO, "No config found for joystick \"" << name << "\"\nUsing default: \"" << source << '"'); @@ -205,7 +205,7 @@ void FGJoystickInput::postinit() // std::ostringstream str; str << "__js" << i; - string module = str.str(); + std::string module = str.str(); nasalsys->createModule(module.c_str(), module.c_str(), "", 0); PropertyList nasal = js_node->getChildren("nasal");