Bernie Bright:

gcc 3.4 has changed the rules for unqualified template name lookup.  This
affects SGQueue.hxx.  The changes I've made are backwards compatible with
earlier gcc versions.  Everything else compiles pretty much okay except for a
few warnings.  The resultant executable seems a bit faster too.

diff --git a/simgear/threads/SGQueue.hxx b/simgear/threads/SGQueue.hxx
index 9d4dcf31259840442a6f697c23aacd730b52956f..83a1cfebecdf2352117984b8af7bda77eb5280df 100644 (file)
--- a/simgear/threads/SGQueue.hxx
+++ b/simgear/threads/SGQueue.hxx
@@ -93,7 +93,7 @@ public:
      */
     virtual bool empty() {
        SGGuard<SGLOCK> g(mutex);
-       return fifo.empty();
+       return this->fifo.empty();
     }
 
     /**
@@ -103,7 +103,7 @@ public:
      */
     virtual void push( const T& item ) {
        SGGuard<SGLOCK> g(mutex);
-       fifo.push( item );
+       this->fifo.push( item );
     }
 
     /**
@@ -113,8 +113,8 @@ public:
      */
     virtual T front() {
        SGGuard<SGLOCK> g(mutex);
-       assert( ! fifo.empty() );
-       T item = fifo.front();
+       assert( ! this->fifo.empty() );
+       T item = this->fifo.front();
        return item;
     }
 
@@ -126,14 +126,14 @@ public:
     virtual T pop() {
        SGGuard<SGLOCK> g(mutex);
        //if (fifo.empty()) throw NoSuchElementException();
-       assert( ! fifo.empty() );
+       assert( ! this->fifo.empty() );
 //     if (fifo.empty())
 //     {
 //         mutex.unlock();
 //         pthread_exit( PTHREAD_CANCELED );
 //     }
-       T item = fifo.front();
-       fifo.pop();
+       T item = this->fifo.front();
+       this->fifo.pop();
        return item;
     }
 private:
@@ -172,7 +172,7 @@ public:
      */
     virtual bool empty() {
        SGGuard<SGMutex> g(mutex);
-       return fifo.empty();
+       return this->fifo.empty();
     }
 
     /**
@@ -182,7 +182,7 @@ public:
      */
     virtual void push( const T& item ) {
        SGGuard<SGMutex> g(mutex);
-       fifo.push( item );
+       this->fifo.push( item );
        not_empty.signal();
     }
 
@@ -195,10 +195,10 @@ public:
     virtual T front() {
        SGGuard<SGMutex> g(mutex);
 
-       assert(fifo.empty() != true);
+       assert(this->fifo.empty() != true);
        //if (fifo.empty()) throw ??
 
-       T item = fifo.front();
+       T item = this->fifo.front();
        return item;
     }
 
@@ -211,14 +211,14 @@ public:
     virtual T pop() {
        SGGuard<SGMutex> g(mutex);
 
-       while (fifo.empty())
+       while (this->fifo.empty())
            not_empty.wait(mutex);
 
-       assert(fifo.empty() != true);
+       assert(this->fifo.empty() != true);
        //if (fifo.empty()) throw ??
 
-       T item = fifo.front();
-       fifo.pop();
+       T item = this->fifo.front();
+       this->fifo.pop();
        return item;
     }