]> git.mxchange.org Git - flightgear.git/commitdiff
VS2015 fixes
authorJames Turner <zakalawe@mac.com>
Wed, 1 Jun 2016 21:57:11 +0000 (22:57 +0100)
committerRoland Haeder <roland@mxchange.org>
Thu, 22 Sep 2016 21:27:35 +0000 (23:27 +0200)
Explicitly specialize these templates.

src/Input/FGKeyboardInput.cxx
src/Main/fg_props.cxx

index 8ff3d0a81b9fac1141321c1565240c550332d596..3476c2c35da03be0e8c352e9e0d3821e4d6bfde5 100644 (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));
index 3558b74940fe0095ae96bb75e7cc241e32700ed5..7e4c6859c6508eb4db41433b680ef2856f04c9b2 100644 (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