From: James Turner <zakalawe@mac.com>
Date: Wed, 1 Jun 2016 21:57:11 +0000 (+0100)
Subject: VS2015 fixes
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=33082b186f7a2c47a94dd20106f59180e8104db0;p=flightgear.git

VS2015 fixes

Explicitly specialize these templates.
---

diff --git a/src/Input/FGKeyboardInput.cxx b/src/Input/FGKeyboardInput.cxx
index 8ff3d0a81..3476c2c35 100644
--- a/src/Input/FGKeyboardInput.cxx
+++ b/src/Input/FGKeyboardInput.cxx
@@ -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));
diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index 3558b7494..7e4c6859c 100644
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -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