1.3-gccfixes.patch

1.3-gccfixes.patch (text/plain), 2.85 KB, created by Josh Nichols (RETIRED) on 2005-02-20 23:18:51 UTC

Only in /opt/Torque-mod/engine/core: .resManager.h.swp
diff -u -r /opt/Torque/engine/core/resManager.h /opt/Torque-mod/engine/core/resManager.h
--- /opt/Torque/engine/core/resManager.h	2005-01-28 15:20:42.000000000 -0500
+++ /opt/Torque-mod/engine/core/resManager.h	2005-02-21 00:10:01.559371864 -0500
@@ -249,6 +249,8 @@
    void purge();
 };
 
+// These functions need to be declared after ResManager
+/*
 template<class T> inline void Resource<T>::unlock()
 {
    if (obj) {
@@ -277,6 +279,7 @@
    if (obj)
       ResourceManager->unlock( obj );
 }
+*/
 
 #define INVALID_ID ((U32)(~0))
 
@@ -471,4 +474,35 @@
 #endif
 };
 
+// Resource functions, which needed ResourceManager to be declared
+template<class T> inline void Resource<T>::unlock()
+{
+   if (obj) {
+      ResourceManager->unlock( obj );
+      obj=NULL;
+   }
+}
+
+template<class T> inline void Resource<T>::purge()
+{
+   if (obj) { 
+      ResourceManager->unlock( obj );
+      if (obj->lockCount == 0)
+         ResourceManager->purge(obj); 
+      obj = NULL;
+   }
+}
+template <class T> inline void Resource<T>::_lock()
+{
+   if (obj)
+      obj->lockCount++;
+}
+
+template <class T> inline void Resource<T>::_unlock()
+{
+   if (obj)
+      ResourceManager->unlock( obj );
+}
+
+
 #endif //_RESMANAGER_H_
diff -u -r /opt/Torque/engine/platform/event.h /opt/Torque-mod/engine/platform/event.h
--- /opt/Torque/engine/platform/event.h	2005-01-28 15:20:44.000000000 -0500
+++ /opt/Torque-mod/engine/platform/event.h	2005-02-21 00:18:13.924520984 -0500
@@ -12,6 +12,7 @@
 
 /// Calculates the location in memory of a given member x of class cls from the
 /// start of the class.
+/*
 #ifndef Offset
 #if defined(TORQUE_COMPILER_GCC) && (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))
 #define Offset(m,T) ((int)(&((T *)1)->m) - 1)
@@ -19,6 +20,12 @@
 #define Offset(x, cls) ((dsize_t)((const char *)&(((cls *)0)->x)-(const char *)0))
 #endif
 #endif
+*/
+#ifndef Offset
+#include <stddef.h>
+#undef Offset
+#define Offset(m,T) offsetof(T,m)
+#endif
 
 typedef int NetConnectionId;
 
@@ -131,6 +138,7 @@
 };
 
 /// Header sizes for events defined later on.
+/*
 enum HeaderSizes
 {
    /// Byte offset to payload of a PacketReceiveEvent
@@ -143,6 +151,20 @@
    ConsoleEventHeaderSize = Offset(data,ConsoleEvent)
 
 };
+*/
+/// Header sizes for events defined later on.
+enum HeaderSizes
+{
+   /// Byte offset to payload of a PacketReceiveEvent
+   PacketReceiveEventHeaderSize = sizeof(PacketReceiveEvent) - MaxPacketDataSize,//Of fset(data,PacketReceiveEvent),
+
+   /// Byte offset to payload of a ConnectedReceiveEvent
+   ConnectedReceiveEventHeaderSize = sizeof(ConnectedReceiveEvent) - MaxPacketDataSize,//Offset(data,ConnectedReceiveEvent),
+
+   /// Byte offset to payload of a ConsoleEvent
+   ConsoleEventHeaderSize = sizeof(ConsoleEvent) - MaxConsoleLineSize //Offset(data,ConsoleEvent)
+
+};
 
 
 /// Mouse input event.