fly/flightgear
1
0
Fork 0
Code Activity

VS2015 fixes

Browse source 
Explicitly specialize these templates.
This commit is contained in:
James Turner 2016-06-01 22:57:11 +01:00
parent 1a0f3d8826
commit 861b682acf
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Input/FGKeyboardInput.cxx
View file

@ -134,13 +134,13 @@ void FGKeyboardInput::postinit()
void FGKeyboardInput::bind()
{
_tiedProperties.setRoot(fgGetNode("/devices/status", true));
_tiedProperties.Tie("keyboard", getModifiers);
_tiedProperties.Tie("keyboard/shift", getModShift);
_tiedProperties.Tie("keyboard/ctrl", getModCtrl);
_tiedProperties.Tie("keyboard/alt", getModAlt);
_tiedProperties.Tie("keyboard/meta", getModMeta);
_tiedProperties.Tie("keyboard/super", getModSuper);
_tiedProperties.Tie("keyboard/hyper", getModHyper);
_tiedProperties.Tie<int>("keyboard", getModifiers);
_tiedProperties.Tie<bool>("keyboard/shift", getModShift);
_tiedProperties.Tie<bool>("keyboard/ctrl", getModCtrl);
_tiedProperties.Tie<bool>("keyboard/alt", getModAlt);
_tiedProperties.Tie<bool>("keyboard/meta", getModMeta);
_tiedProperties.Tie<bool>("keyboard/super", getModSuper);
_tiedProperties.Tie<bool>("keyboard/hyper", getModHyper);
_tiedProperties.Tie(_key_event->getNode("key", true), SGRawValuePointer<int>(&_key_code));
_tiedProperties.Tie(_key_event->getNode("pressed", true), SGRawValuePointer<bool>(&_key_pressed));

12
src/Main/fg_props.cxx
View file

@ -575,18 +575,18 @@ FGProperties::bind ()
_tiedProperties.Tie("/sim/logging/classes", getLoggingClasses, setLoggingClasses);
_tiedProperties.Tie("/sim/freeze/master", getFreeze, setFreeze);
_tiedProperties.Tie("/sim/time/elapsed-sec", getElapsedTime_sec);
_tiedProperties.Tie<double>("/sim/time/elapsed-sec", getElapsedTime_sec);
_tiedProperties.Tie("/sim/time/gmt", getDateString, setDateString);
fgSetArchivable("/sim/time/gmt");
_tiedProperties.Tie("/sim/time/gmt-string", getGMTString);
_tiedProperties.Tie<const char*>("/sim/time/gmt-string", getGMTString);
// Position
_tiedProperties.Tie("/position/latitude-string", getLatitudeString);
_tiedProperties.Tie("/position/longitude-string", getLongitudeString);
_tiedProperties.Tie<const char*>("/position/latitude-string", getLatitudeString);
_tiedProperties.Tie<const char*>("/position/longitude-string", getLongitudeString);
// Orientation
_tiedProperties.Tie("/orientation/heading-magnetic-deg", getHeadingMag);
_tiedProperties.Tie("/orientation/track-magnetic-deg", getTrackMag);
_tiedProperties.Tie<double>("/orientation/heading-magnetic-deg", getHeadingMag);
_tiedProperties.Tie<double>("/orientation/track-magnetic-deg", getTrackMag);
}
void