From 952e3c34893e904482ba81a4c5579b77812c98f2 Mon Sep 17 00:00:00 2001
From: Martin Spott <Martin.Spott@mgras.net>
Date: Sun, 25 Sep 2011 15:48:36 -0700
Subject: [PATCH] Hans Janssen: Build fixes for GCC 4.6.1 on Fedora

---
 src/Lib/Geometry/contour_tree.hxx | 13 +++++++------
 src/Lib/vpf/component.hxx         | 10 +++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/Lib/Geometry/contour_tree.hxx b/src/Lib/Geometry/contour_tree.hxx
index 1579523b..94633a7c 100644
--- a/src/Lib/Geometry/contour_tree.hxx
+++ b/src/Lib/Geometry/contour_tree.hxx
@@ -26,14 +26,15 @@
 #define _CONTOUR_TREE_HXX
 
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
-#endif                                   
+#endif
 
 
 #include <simgear/compiler.h>
 
 #include <vector>
+#include <cstddef>
 
 // forward declaration
 class TGContourNode;
@@ -51,7 +52,7 @@ class TGContourNode {
 
 private:
 
-    int contour_num;		// -1 for the root node
+    int contour_num;        // -1 for the root node
     contour_kids kids;
 
 public:
@@ -68,9 +69,9 @@ public:
     inline TGContourNode *get_kid( int n ) const { return kids[n]; }
     inline void add_kid( TGContourNode *kid ) { kids.push_back( kid ); }
     inline void remove_kid( int n ) {
-	// cout << "kids[" << n << "] = " << kids[n] << endl;
-	delete kids[n];
-	kids[n] = NULL;
+    // cout << "kids[" << n << "] = " << kids[n] << endl;
+    delete kids[n];
+    kids[n] = NULL;
     }
 };
 
diff --git a/src/Lib/vpf/component.hxx b/src/Lib/vpf/component.hxx
index 0808a550..7762228a 100644
--- a/src/Lib/vpf/component.hxx
+++ b/src/Lib/vpf/component.hxx
@@ -46,7 +46,7 @@ protected:
    * @param path The base path for the component.
    */
   VpfComponent (VpfTableManager &table_manager,
-		const std::string &path);
+        const std::string &path);
 
 
   /**
@@ -57,7 +57,7 @@ protected:
 #ifdef __MSDOS__
   static const char PATHSEP = '\\';
 #else
-  static const char PATHSEP = '/';	// FIXME: make more robust
+  static const char PATHSEP = '/';  // FIXME: make more robust
 #endif
 
 
@@ -105,7 +105,7 @@ protected:
    * @return true if the file exists, false otherwise.
    */
   virtual bool hasFile (const std::string &path,
-			const std::string &file) const;
+            const std::string &file) const;
 
 
   /**
@@ -121,7 +121,7 @@ protected:
    * @return The absolute file name.
    */
   virtual std::string getFileName (const std::string &path,
-				   const std::string &file) const;
+                   const std::string &file) const;
 
 
   /**
@@ -188,7 +188,7 @@ protected:
 
 private:
   std::string _path;
-  mutable VpfTableManager &_table_manager;
+  VpfTableManager &_table_manager;
 
 };