Changeset 357 for ps

Timestamp:

06/02/04 18:11:32 (21 years ago)

Author:

Simon Brenner

Message:

• Minor GCC compat changes
• return( [CLASS]() ); generates a parse error (GCC Bug)

Location:

ps/trunk/source/simulation

Files:

• Collision.cpp (modified) (1 diff)
• Entity.h (modified) (1 diff)
• EntityHandles.h (modified) (1 diff)
• EntityManager.h (modified) (2 diffs)
• EntityProperties.cpp (modified) (4 diffs)

ps/trunk/source/simulation/Collision.cpp

@@ -42 +42 @@
 
     delete( entities );
-    return( HEntity() );
+    return HEntity();
 }
 

ps/trunk/source/simulation/Entity.h

@@ -50 +50 @@
 class CEntity
 {
-    friend CEntityManager;
+    friend class CEntityManager;
 private:
     // Intrinsic properties

ps/trunk/source/simulation/EntityHandles.h

@@ -38 +38 @@
 class HEntity
 {
-    friend CEntityManager;
+    friend class CEntityManager;
     u16 m_handle;
     void addRef();

ps/trunk/source/simulation/EntityManager.h

@@ -30 +30 @@
 class CEntityManager : public Singleton<CEntityManager>
 {
-friend HEntity;
-friend CHandle;
+friend class HEntity;
+friend class CHandle;
     CHandle m_entities[MAX_HANDLES];
     std::vector<HEntity> m_reaper;
@@ -56 +56 @@
 
 #endif
+

ps/trunk/source/simulation/EntityProperties.cpp

@@ -300 +300 @@
         }
     case PROP_PTR:
-        return( CStr() );
-    default:
-        assert( 0 && "Invalid property type" );
-    }
-    return( CStr() );
+        return CStr();
+    default:
+        assert( 0 && "Invalid property type" );
+    }
+    return CStr();
 }
 
@@ -317 +317 @@
     case PROP_STRING:
     case PROP_PTR:
-        return( CVector3D() );
-    default:
-        assert( 0 && "Invalid property type" );
-    }
-    return( CVector3D() );
+        return CVector3D();
+    default:
+        assert( 0 && "Invalid property type" );
+    }
+    return CVector3D();
 }
 
@@ -552 +552 @@
         return( CStr( *m_floatptr ) );
     default:
-        return( CStr() );
+        return CStr();
     }
 }
@@ -563 +563 @@
         return( *m_vector );
     default:
-        return( CVector3D() );
+        return CVector3D();
     }
 }