updated squirrel version

[supertux.git] / src / squirrel / squirrel / sqobject.h

diff --git a/src/squirrel/squirrel/sqobject.h b/src/squirrel/squirrel/sqobject.h
index 3e83d96..9f5823d 100644 (file)
--- a/src/squirrel/squirrel/sqobject.h
+++ b/src/squirrel/squirrel/sqobject.h
@@ -8,9 +8,6 @@
 #define SQ_CLOSURESTREAM_PART (('P'<<24)|('A'<<16)|('R'<<8)|('T'))
 #define SQ_CLOSURESTREAM_TAIL (('T'<<24)|('A'<<16)|('I'<<8)|('L'))
 
-#define SQ_TRY try
-#define SQ_CATCH(type, ex) catch(type &ex)
-
 struct SQSharedState;
 
 enum SQMetaMethod{
@@ -52,8 +49,6 @@ enum SQMetaMethod{
 
 struct SQRefCounted
 {
-       virtual ~SQRefCounted()
-       {}
        unsigned int _uiRef;
        virtual void Release()=0;
 };
@@ -231,13 +226,13 @@ struct SQObjectPtr : public SQObject
        {
                __Release(_type,_unVal);
        }
-       void Null()
+       inline void Null()
        {
                __Release(_type,_unVal);
                _type=OT_NULL;
                _unVal.pUserPointer=NULL;
        }
-       SQObjectPtr& operator=(const SQObjectPtr& obj)
+       inline SQObjectPtr& operator=(const SQObjectPtr& obj)
        { 
                SQObjectType tOldType;
                SQObjectValue unOldVal;
@@ -249,7 +244,7 @@ struct SQObjectPtr : public SQObject
                __Release(tOldType,unOldVal);
                return *this;
        }
-       SQObjectPtr& operator=(const SQObject& obj)
+       inline SQObjectPtr& operator=(const SQObject& obj)
        { 
                SQObjectType tOldType;
                SQObjectValue unOldVal;