[Rtk-cvs] rtk/rtk DList.h,1.2,1.3 Dict.h,1.6,1.7 TDict.h,1.1,1.2 TVector.h,1.3,1.4 rtkdef.h,1.9,1.10

[<laz...@us...>]

Update of /cvsroot/rtk/rtk/rtk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9771/rtk

Modified Files:
	DList.h Dict.h TDict.h TVector.h rtkdef.h 
Log Message:
 - Minor changes.
 - Fixed linux build (hopefully)

Index: DList.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/DList.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DList.h	28 Feb 2004 07:39:43 -0000	1.2
--- DList.h	9 Mar 2004 17:01:27 -0000	1.3
***************
*** 49,54 ****
  {
  
- #if USE_TEMPLATES
- 
  /** Double linked list */
  template <class T>
--- 49,52 ----
***************
*** 302,307 ****
  typedef DList<RCHAR*> RCharDList;
  
- #endif // USE_TEMPLATES
- 
  }; // namespace Rtk
  
--- 300,303 ----

Index: Dict.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/Dict.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Dict.h	7 Mar 2004 20:52:59 -0000	1.6
--- Dict.h	9 Mar 2004 17:01:27 -0000	1.7
***************
*** 45,49 ****
  //---------------------------------------------------------------------------
  
- #include "conf.h"
  #include "rtkdef.h"
  #include "Export.h"  	// needed for RTK_API
--- 45,48 ----

Index: TDict.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/TDict.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TDict.h	7 Mar 2004 20:52:59 -0000	1.1
--- TDict.h	9 Mar 2004 17:01:27 -0000	1.2
***************
*** 59,67 ****
  {
  public:
! 	static void *KeyCopyTempl(KEY *key)			{ return new KEY(*key); }
! 	static void KeyFreeTempl(KEY *key)			{ delete key; }
! 	static bool KeyCmpTempl(KEY *i1, KEY *i2)	{ return i1->Compare(i2); }
! 	static uint HashTempl(KEY *key)				{ return key->Hash(); }
! 	static void FreeDataTempl(VALUE *val)		{ delete val; }
  
  	VALUE error_return;
--- 59,67 ----
  {
  public:
! 	static void *KeyCopyTempl(const KEY *key)				{ return new KEY(*key); }
! 	static void KeyFreeTempl(KEY *key)						{ delete key; }
! 	static bool KeyCmpTempl(const KEY *i1, const KEY *i2) 	{ return i1->Compare(i2); }
! 	static uint HashTempl(const KEY *key)					{ return key->Hash(); }
! 	static void FreeDataTempl(VALUE *val)					{ delete val; }
  
  	VALUE error_return;

Index: TVector.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/TVector.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TVector.h	28 Feb 2004 20:59:24 -0000	1.3
--- TVector.h	9 Mar 2004 17:01:27 -0000	1.4
***************
*** 49,54 ****
  {
  
- #if USE_TEMPLATES
- 
  template <class T>
  class TVector : public Vector
--- 49,52 ----
***************
*** 105,109 ****
  typedef TVector<int> IntVector;
  typedef TVector<RCHAR*> RCharVector;
- #endif // USE_TEMPLATES
  
  }; // namespace Rtk
--- 103,106 ----

Index: rtkdef.h
===================================================================
RCS file: /cvsroot/rtk/rtk/rtk/rtkdef.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** rtkdef.h	28 Feb 2004 07:39:44 -0000	1.9
--- rtkdef.h	9 Mar 2004 17:01:27 -0000	1.10
***************
*** 55,82 ****
  
  namespace Rtk {
- 	
- // RTK version definitions
- #define RTK_VER_MAJOR    0
- #define RTK_VER_MINOR    1
- #define RTK_VER_RELEASE  3
- #define RTK_VERSION (RTK_VER_MAJOR + \
-   RTK_VER_MINOR * 0.01f +            \
-   RTK_VER_RELEASE * 0.0001f)
- 
- ////////////////////////////////
- /// Common types
- 
- #if defined(_RTK_WIN32_) && !defined(_RTK_CC_GCC_)
-   typedef unsigned __int64      ulonglong;
-   typedef __int64               longlong;
- #else
-   typedef long long             longlong;
-   typedef unsigned long long    ulonglong;
- #endif
- 
- typedef unsigned char           uchar;
- typedef unsigned long           ulong;
- typedef unsigned int            uint;
- typedef unsigned short          ushort;
  
  #if defined(_RTK_WIN32_)
--- 55,58 ----
***************
*** 101,104 ****
--- 77,107 ----
  } // Rtk namespace
  
+ //////////////////////////////////
+ // These must not be in Rtk namespace:
+ 	
+ // RTK version definitions
+ #define RTK_VER_MAJOR    0
+ #define RTK_VER_MINOR    1
+ #define RTK_VER_RELEASE  3
+ #define RTK_VERSION		(RTK_VER_MAJOR + \
+ 						RTK_VER_MINOR * 0.01f + \
+ 						RTK_VER_RELEASE * 0.0001f)
+ 
+ ////////////////////////////////
+ /// Common types
+ 
+ #if defined(_RTK_WIN32_) && !defined(_RTK_CC_GCC_)
+   typedef unsigned __int64      ulonglong;
+   typedef __int64               longlong;
+ #else
+   typedef long long             longlong;
+   typedef unsigned long long    ulonglong;
+ #endif
+ 
+ typedef unsigned char           uchar;
+ typedef unsigned long           ulong;
+ typedef unsigned int            uint;
+ typedef unsigned short          ushort;
+ 
  #endif