[8080] Portability fixes for some Unix platforms. Author: VladimirMangos

    * Add #include <stdio.h> to some fiels where related functions call.
    * Avoid template dependent lookup for fields in class LockedQueue.

--HG--
branch : trunk

7 files changed, 33 insertions, 41 deletions

diff --git a/dep/src/sockets/SocketHandler.cpp b/dep/src/sockets/SocketHandler.cpp
index 48bd1a6f61c..84d110cfe72 100644
--- a/dep/src/sockets/SocketHandler.cpp
+++ b/dep/src/sockets/SocketHandler.cpp
@@ -33,6 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif
 #endif
 #include <stdlib.h>
+#include <stdio.h>
 #include <errno.h>
 #include <cstdio>
 
diff --git a/dep/src/sockets/StdoutLog.cpp b/dep/src/sockets/StdoutLog.cpp
index 092e014a68f..998613f0fb2 100644
--- a/dep/src/sockets/StdoutLog.cpp
+++ b/dep/src/sockets/StdoutLog.cpp
@@ -27,6 +27,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
+#include <stdio.h>
+
 #ifdef _MSC_VER
 #pragma warning(disable:4786)
 #endif
diff --git a/dep/src/sockets/TcpSocket.cpp b/dep/src/sockets/TcpSocket.cpp
index 523b83464bd..c4efa05d5bf 100644
--- a/dep/src/sockets/TcpSocket.cpp
+++ b/dep/src/sockets/TcpSocket.cpp
@@ -39,6 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <fcntl.h>
 #include <assert.h>
 #include <stdarg.h>
+#include <stdio.h>
 #ifdef HAVE_OPENSSL
 #include <openssl/rand.h>
 #include <openssl/err.h>
diff --git a/src/shared/LockedQueue.h b/src/shared/LockedQueue.h
index 5109b171677..4087ebff0cf 100644
--- a/src/shared/LockedQueue.h
+++ b/src/shared/LockedQueue.h
@@ -27,11 +27,9 @@
 
 namespace ACE_Based
 {
-
     template <class T, class LockType, typename StorageType=std::deque<T> >
         class LockedQueue
     {
-
         //! Serialize access to the Queue
         LockType _lock;
 
@@ -54,14 +52,12 @@ namespace ACE_Based
              */
             void add(const T& item)
             {
+                ACE_Guard<LockType> g(this->_lock);
 
-                ACE_Guard<LockType> g(_lock);
-
-                ASSERT(!_canceled);
+                ASSERT(!this->_canceled);
                 // throw Cancellation_Exception();
 
-                _queue.push_back(item);
-
+                this->_queue.push_back(item);
             }
 
             /**
@@ -69,27 +65,25 @@ namespace ACE_Based
              */
             T next()
             {
+                ACE_Guard<LockType> g(this->_lock);
 
-                ACE_Guard<LockType> g(_lock);
-
-                ASSERT (!_queue.empty() || !_canceled);
+                ASSERT (!_queue.empty() || !this->_canceled);
                 // throw Cancellation_Exception();
 
-                T item = _queue.front();
-                _queue.pop_front();
+                T item = this->_queue.front();
+                this->_queue.pop_front();
 
                 return item;
-
             }
 
             T front()
             {
-                ACE_Guard<LockType> g(_lock);
+                ACE_Guard<LockType> g(this->_lock);
 
-                ASSERT (!_queue.empty());
+                ASSERT (!this->_queue.empty());
                 // throw NoSuchElement_Exception();
 
-                return _queue.front();
+                return this->_queue.front();
             }
 
             /**
@@ -97,11 +91,9 @@ namespace ACE_Based
              */
             void cancel()
             {
+                ACE_Guard<LockType> g(this->_lock);
 
-                ACE_Guard<LockType> g(_lock);
-
-                _canceled = true;
-
+                this->_canceled = true;
             }
 
             /**
@@ -109,15 +101,13 @@ namespace ACE_Based
              */
             bool isCanceled()
             {
-
                 // Faster check since the queue will not become un-canceled
-                if(_canceled)
+                if(this->_canceled)
                     return true;
 
-                ACE_Guard<LockType> g(_lock);
-
-                return _canceled;
+                ACE_Guard<LockType> g(this->_lock);
 
+                return this->_canceled;
             }
 
             /**
@@ -125,20 +115,15 @@ namespace ACE_Based
              */
             size_t size()
             {
-
-                ACE_Guard<LockType> g(_lock);
-                return _queue.size();
-
+                ACE_Guard<LockType> g(this->_lock);
+                return this->_queue.size();
             }
 
             bool empty()
             {
-
-                ACE_Guard<LockType> g(_lock);
-                return _queue.empty();
+                ACE_Guard<LockType> g(this->_lock);
+                return this->_queue.empty();
             }
-
     };
-
 }
 #endif
diff --git a/src/shared/vmap/CoordModelMapping.cpp b/src/shared/vmap/CoordModelMapping.cpp
index 86e3347a614..39d1165f115 100644
--- a/src/shared/vmap/CoordModelMapping.cpp
+++ b/src/shared/vmap/CoordModelMapping.cpp
@@ -21,7 +21,7 @@
 #include "CoordModelMapping.h"
 
 #include <string.h>
-#include <cstdio>
+#include <stdio.h>
 
 using namespace G3D;
 
@@ -45,6 +45,13 @@ namespace VMAP
         return(CMappingEntry::getKeyString(iMapId,xPos, yPos));
     }
 
+    const std::string CMappingEntry::getKeyString( unsigned int pMapId, int pXPos, int pYPos )
+    {
+        char b[100];
+        sprintf(b,"%03u_%d_%d", pMapId, pXPos, pYPos);
+        return(std::string(b));
+    }
+
     //============================================================
     //============================================================
     //============================================================
diff --git a/src/shared/vmap/CoordModelMapping.h b/src/shared/vmap/CoordModelMapping.h
index c1f49462962..7684bf1b373 100644
--- a/src/shared/vmap/CoordModelMapping.h
+++ b/src/shared/vmap/CoordModelMapping.h
@@ -75,12 +75,7 @@ namespace VMAP
             const std::string getKeyString() const;
             inline const G3D::Array<std::string>& getFilenames() const { return(iFilenames); }
 
-            static const std::string getKeyString(unsigned int pMapId, int pXPos, int pYPos)
-            {
-                char b[100];
-                sprintf(b,"%03u_%d_%d", pMapId, pXPos, pYPos);
-                return(std::string(b));
-            }
+            static const std::string getKeyString(unsigned int pMapId, int pXPos, int pYPos);
 
     };
 
diff --git a/src/shared/vmap/DebugCmdLogger.cpp b/src/shared/vmap/DebugCmdLogger.cpp
index e6b36572c45..c899606045b 100644
--- a/src/shared/vmap/DebugCmdLogger.cpp
+++ b/src/shared/vmap/DebugCmdLogger.cpp
@@ -21,6 +21,7 @@
 #include <cstdio>
 
 #include "DebugCmdLogger.h"
+#include <stdio.h>
 
 using namespace G3D;