From e81df0df1f6e617f101cd310ec3d7f09ce1ffd1e Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Sun, 20 Oct 2013 15:56:33 +0100
Subject: [PATCH] Fix FGViewer compilation when HLA is disabled.

Changed definition in config_cmake.in means #ifdef is no longer
a valid test; use #if instead.
---
 utils/fgviewer/SlaveCamera.cxx |  8 ++++----
 utils/fgviewer/Viewer.cxx      |  6 +++---
 utils/fgviewer/Viewer.hxx      |  6 +++---
 utils/fgviewer/fgviewer.cxx    | 11 ++++++-----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/utils/fgviewer/SlaveCamera.cxx b/utils/fgviewer/SlaveCamera.cxx
index 41fc51669..9976ee489 100644
--- a/utils/fgviewer/SlaveCamera.cxx
+++ b/utils/fgviewer/SlaveCamera.cxx
@@ -26,7 +26,7 @@
 
 #include "Viewer.hxx"
 
-#ifdef FG_HAVE_HLA
+#if FG_HAVE_HLA
 #include "HLAViewerFederate.hxx"    
 #include "HLAPerspectiveViewer.hxx"    
 #endif
@@ -203,7 +203,7 @@ SlaveCamera::setMonitorProjectionReferences(double width, double height,
 osg::Vec3
 SlaveCamera::getLeftEyeOffset(const Viewer& viewer) const
 {
-#ifdef FG_HAVE_HLA
+#if FG_HAVE_HLA
     const HLAViewerFederate* viewerFederate = viewer.getViewerFederate();
     if (!viewerFederate)
         return osg::Vec3(0, 0, 0);
@@ -219,7 +219,7 @@ SlaveCamera::getLeftEyeOffset(const Viewer& viewer) const
 osg::Vec3
 SlaveCamera::getRightEyeOffset(const Viewer& viewer) const
 {
-#ifdef FG_HAVE_HLA
+#if FG_HAVE_HLA
     const HLAViewerFederate* viewerFederate = viewer.getViewerFederate();
     if (!viewerFederate)
         return osg::Vec3(0, 0, 0);
@@ -235,7 +235,7 @@ SlaveCamera::getRightEyeOffset(const Viewer& viewer) const
 double
 SlaveCamera::getZoomFactor(const Viewer& viewer) const
 {
-#ifdef FG_HAVE_HLA
+#if FG_HAVE_HLA
     const HLAViewerFederate* viewerFederate = viewer.getViewerFederate();
     if (!viewerFederate)
         return 1;
diff --git a/utils/fgviewer/Viewer.cxx b/utils/fgviewer/Viewer.cxx
index e84092342..1066b54b6 100644
--- a/utils/fgviewer/Viewer.cxx
+++ b/utils/fgviewer/Viewer.cxx
@@ -55,7 +55,7 @@ Viewer::~Viewer()
 {
     stopThreading();
 
-#ifdef FG_HAVE_HLA
+#if FG_HAVE_HLA
     if (_viewerFederate.valid())
         _viewerFederate->shutdown();
     _viewerFederate = 0;
@@ -476,7 +476,7 @@ Viewer::advance(double)
 void
 Viewer::updateTraversal()
 {
-#ifdef FG_HAVE_HLA
+#if FG_HAVE_HLA
     if (_viewerFederate.valid()) {
         if (_timeIncrement == SGTimeStamp::fromSec(0)) {
             if (!_viewerFederate->timeAdvanceAvailable()) {
@@ -733,7 +733,7 @@ Viewer::createGraphicsContext(osg::GraphicsContext::Traits* traits)
     return graphicsContext;
 }
 
-#ifdef FG_HAVE_HLA
+#if FG_HAVE_HLA
 const HLAViewerFederate*
 Viewer::getViewerFederate() const
 {
diff --git a/utils/fgviewer/Viewer.hxx b/utils/fgviewer/Viewer.hxx
index 9503c44c5..9342becb6 100644
--- a/utils/fgviewer/Viewer.hxx
+++ b/utils/fgviewer/Viewer.hxx
@@ -32,7 +32,7 @@
 #include "Renderer.hxx"
 #include "SlaveCamera.hxx"
 
-#ifdef FG_HAVE_HLA
+#if FG_HAVE_HLA
 #include "HLAViewerFederate.hxx"    
 #endif
 
@@ -105,7 +105,7 @@ public:
     /// Helper to create an new graphics context from traits.
     osg::GraphicsContext* createGraphicsContext(osg::GraphicsContext::Traits* traits);
 
-#ifdef FG_HAVE_HLA
+#if FG_HAVE_HLA
     /// The federate if configured, can only be set once
     const HLAViewerFederate* getViewerFederate() const;
     HLAViewerFederate* getViewerFederate();
@@ -147,7 +147,7 @@ private:
     /// The current simulation time of the viewer
     SGTimeStamp _simTime;
 
-#ifdef FG_HAVE_HLA
+#if FG_HAVE_HLA
     /// The federate if configured
     SGSharedPtr<HLAViewerFederate> _viewerFederate;
 #endif
diff --git a/utils/fgviewer/fgviewer.cxx b/utils/fgviewer/fgviewer.cxx
index 8f9ef93ec..f8cbdaccc 100644
--- a/utils/fgviewer/fgviewer.cxx
+++ b/utils/fgviewer/fgviewer.cxx
@@ -42,7 +42,7 @@
 #include "Renderer.hxx"
 #include "Viewer.hxx"
 
-#ifdef FG_HAVE_HLA
+#if FG_HAVE_HLA
 #include "HLACameraManipulator.hxx"
 #include "HLAViewerFederate.hxx"
 #endif
@@ -210,9 +210,7 @@ main(int argc, char** argv)
     arguments.writeErrorMessages(std::cerr);
 
     if (props->getNode("hla/federate/federation")) {
-#if !defined FG_HAVE_HLA
-        SG_LOG(SG_GENERAL, SG_ALERT, "Unable to enter HLA/RTI viewer mode: HLA/RTI disabled at compile time.");
-#else
+#if FG_HAVE_HLA
         const SGPropertyNode* federateNode = props->getNode("hla/federate");
         
         SGSharedPtr<fgviewer::HLAViewerFederate> viewerFederate;
@@ -230,13 +228,16 @@ main(int argc, char** argv)
             objectModel = path.str();
         }
         viewerFederate->setFederationObjectModel(objectModel);
-
+        
         if (!viewerFederate->init()) {
             SG_LOG(SG_NETWORK, SG_ALERT, "Got error from federate init!");
         } else {
             viewer.setViewerFederate(viewerFederate.get());
             viewer.setCameraManipulator(new fgviewer::HLACameraManipulator(viewerFederate->getViewer()));
         }
+
+#else
+        SG_LOG(SG_GENERAL, SG_ALERT, "Unable to enter HLA/RTI viewer mode: HLA/RTI disabled at compile time.");
 #endif
     }
 
-- 
2.39.2