fly/terragear
1
0
Fork 0
Code Activity

Hans Janssen: Build fixes for GCC 4.6.1 on Fedora

Browse source
This commit is contained in:
Martin Spott 2011-09-25 15:48:36 -07:00
parent 55e68f9eda
commit 952e3c3489
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Lib/Geometry/contour_tree.hxx
View file

@ -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;
}
};

10
src/Lib/vpf/component.hxx
View file

@ -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;
};