[opengtl-commits] [415] some more gcc 3.3 compilation fixes

[subversion@xxxxxxxxxxxxx]

Revision: 415
Author:   cyrille
Date:     2008-09-30 22:29:08 +0200 (Tue, 30 Sep 2008)

Log Message:
-----------
some more gcc 3.3 compilation fixes

Modified Paths:
--------------
    trunk/OpenGTL/OpenGTL/GTLCore/Debug.cpp
    trunk/OpenGTL/OpenGTL/GTLCore/Debug.h
    trunk/OpenGTL/OpenGTL/GTLCore/ParserBase_p.cpp
    trunk/OpenGTL/OpenGTL/GTLCore/Type.h
    trunk/OpenGTL/OpenGTL/GTLCore/TypeManager.h
    trunk/OpenGTL/OpenGTL/GTLCore/TypeManager_p.h
    trunk/OpenGTL/OpenGTL/GTLCore/Utils_p.h


Modified: trunk/OpenGTL/OpenGTL/GTLCore/Debug.cpp
===================================================================
--- trunk/OpenGTL/OpenGTL/GTLCore/Debug.cpp	2008-09-21 15:19:27 UTC (rev 414)
+++ trunk/OpenGTL/OpenGTL/GTLCore/Debug.cpp	2008-09-30 20:29:08 UTC (rev 415)
@@ -4,7 +4,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
- * version 2 of the License.
+ * either version 2, or (at your option) any later version of the License.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -83,6 +83,8 @@
 }
 
 class NullStream : public std::ostream {
+  public:
+  	NullStream() : std::ostream(0) {}
 };
 
 Debug::Private::Private()

Modified: trunk/OpenGTL/OpenGTL/GTLCore/Debug.h
===================================================================
--- trunk/OpenGTL/OpenGTL/GTLCore/Debug.h	2008-09-21 15:19:27 UTC (rev 414)
+++ trunk/OpenGTL/OpenGTL/GTLCore/Debug.h	2008-09-30 20:29:08 UTC (rev 415)
@@ -4,7 +4,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
- * version 2 of the License.
+ * either version 2, or (at your option) any later version of the License.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

Modified: trunk/OpenGTL/OpenGTL/GTLCore/ParserBase_p.cpp
===================================================================
--- trunk/OpenGTL/OpenGTL/GTLCore/ParserBase_p.cpp	2008-09-21 15:19:27 UTC (rev 414)
+++ trunk/OpenGTL/OpenGTL/GTLCore/ParserBase_p.cpp	2008-09-30 20:29:08 UTC (rev 415)
@@ -715,7 +715,7 @@
                 initialiser = d->compiler->convertCenter()->createConvertExpression( parseExpression( false, ptype ), ptype);
                 if( not initialiser )
                 {
-                  reportError( "Can't convert initialiser expression to the parameter type, for parameter " + String::number(params.size() + 1) + ".", d->currentToken);
+                  reportError( "Can't convert initialiser expression to the parameter type, for parameter " + String::number((unsigned int)(params.size() + 1)) + ".", d->currentToken);
                   deleteAll( params );
                   return;
                 }

Modified: trunk/OpenGTL/OpenGTL/GTLCore/Type.h
===================================================================
--- trunk/OpenGTL/OpenGTL/GTLCore/Type.h	2008-09-21 15:19:27 UTC (rev 414)
+++ trunk/OpenGTL/OpenGTL/GTLCore/Type.h	2008-09-30 20:29:08 UTC (rev 415)
@@ -67,7 +67,7 @@
     friend class Function;
     friend class TypeManager;
 #if __GNUC__ == 3 && (__GNUC_MINOR__ <= 3 && __GNUC_MINOR__ <= 3)
-    friend class TypeManager::Private;
+    friend struct TypeManager::Private;
 #endif
     friend class Visitor;
     friend class VectorVisitor;

Modified: trunk/OpenGTL/OpenGTL/GTLCore/TypeManager.h
===================================================================
--- trunk/OpenGTL/OpenGTL/GTLCore/TypeManager.h	2008-09-21 15:19:27 UTC (rev 414)
+++ trunk/OpenGTL/OpenGTL/GTLCore/TypeManager.h	2008-09-30 20:29:08 UTC (rev 415)
@@ -21,7 +21,6 @@
 #define _OPENCTL_TYPE_MANAGER_H_
 
 #include <GTLCore/String.h>
-#include <GTLCore/Type.h>
 
 namespace OpenShiva {
   class Wrapper;
@@ -35,6 +34,9 @@
   class TypeManager {
     friend class ParserBase;
     friend class OpenShiva::Wrapper;
+#if __GNUC__ == 3 && (__GNUC_MINOR__ <= 3 && __GNUC_MINOR__ <= 3)
+		friend class Type;
+#endif
     public:
       TypeManager();
       ~TypeManager();

Modified: trunk/OpenGTL/OpenGTL/GTLCore/TypeManager_p.h
===================================================================
--- trunk/OpenGTL/OpenGTL/GTLCore/TypeManager_p.h	2008-09-21 15:19:27 UTC (rev 414)
+++ trunk/OpenGTL/OpenGTL/GTLCore/TypeManager_p.h	2008-09-30 20:29:08 UTC (rev 415)
@@ -21,6 +21,7 @@
 #define _GTLCORE_TYPEMANAGER_P_H
 
 #include "GTLCore/TypeManager.h"
+#include "GTLCore/Type.h"
 
 #include <map>
 

Modified: trunk/OpenGTL/OpenGTL/GTLCore/Utils_p.h
===================================================================
--- trunk/OpenGTL/OpenGTL/GTLCore/Utils_p.h	2008-09-21 15:19:27 UTC (rev 414)
+++ trunk/OpenGTL/OpenGTL/GTLCore/Utils_p.h	2008-09-30 20:29:08 UTC (rev 415)
@@ -28,7 +28,7 @@
    * @ingroup GTLCore
    */
   template<class _Type_>
-  void deleteAll( _Type_& list )
+  inline void deleteAll( _Type_& list )
   {
     for( typename _Type_::iterator it = list.begin(); it != list.end(); ++it)
     {
@@ -41,7 +41,7 @@
    * @ingroup GTLCore
    */
   template<class _Type_>
-  void deleteAllSecondMember( _Type_& map )
+  inline void deleteAllSecondMember( _Type_& map )
   {
     for( typename _Type_::iterator it = map.begin(); it != map.end(); ++it)
     {