|
Line 0
Link Here
|
|
|
1 |
--- src/core/hashtable.h.orig Fri Oct 8 10:37:06 2004 |
| 2 |
+++ src/core/hashtable.h Fri Oct 8 10:37:16 2004 |
| 3 |
@@ -2,7 +2,7 @@ |
| 4 |
* hashtable.h: Hashtable class definition |
| 5 |
*------------------------------------------------------------------------------- |
| 6 |
* (c)1999-2001 VideoLAN |
| 7 |
-* $Id: hashtable.h,v 1.1 2001/10/06 21:23:36 bozo Exp $ |
| 8 |
+* $Id$ |
| 9 |
* |
| 10 |
* Authors: Benoit Steiner <benny@via.ecp.fr> |
| 11 |
* |
| 12 |
@@ -63,7 +63,7 @@ |
| 13 |
}; |
| 14 |
|
| 15 |
|
| 16 |
-class C_HashMethod<u32> |
| 17 |
+template <> class C_HashMethod<u32> |
| 18 |
{ |
| 19 |
public: |
| 20 |
inline C_HashMethod(u32 uiMaxHash); |
| 21 |
@@ -76,7 +76,7 @@ |
| 22 |
}; |
| 23 |
|
| 24 |
|
| 25 |
-class C_HashMethod<u16> |
| 26 |
+template <> class C_HashMethod<u16> |
| 27 |
{ |
| 28 |
public: |
| 29 |
inline C_HashMethod(u32 uiMaxHash); |
| 30 |
@@ -89,7 +89,7 @@ |
| 31 |
}; |
| 32 |
|
| 33 |
|
| 34 |
-class C_HashMethod<handle> |
| 35 |
+template <> class C_HashMethod<handle> |
| 36 |
{ |
| 37 |
public: |
| 38 |
inline C_HashMethod(u32 uiMaxHash); |
| 39 |
--- src/core/library.cpp.orig Fri Oct 8 10:49:59 2004 |
| 40 |
+++ src/core/library.cpp Fri Oct 8 10:51:20 2004 |
| 41 |
@@ -34,6 +34,7 @@ |
| 42 |
// use the template: look at vector.h for further explanation |
| 43 |
|
| 44 |
|
| 45 |
+#define DL_LAZY 1 |
| 46 |
|
| 47 |
//****************************************************************************** |
| 48 |
// class C_Library |
| 49 |
--- src/core/stream.cpp.orig Fri Oct 8 11:03:00 2004 |
| 50 |
+++ src/core/stream.cpp Fri Oct 8 11:04:48 2004 |
| 51 |
@@ -2,7 +2,7 @@ |
| 52 |
* stream.cpp: Stream class |
| 53 |
*------------------------------------------------------------------------------- |
| 54 |
* (c)1999-2001 VideoLAN |
| 55 |
-* $Id: stream.cpp,v 1.3 2002/09/04 10:56:34 jpsaman Exp $ |
| 56 |
+* $Id$ |
| 57 |
* |
| 58 |
* Authors: Benoit Steiner <benny@via.ecp.fr> |
| 59 |
* |
| 60 |
@@ -319,7 +319,7 @@ |
| 61 |
{ |
| 62 |
try |
| 63 |
{ |
| 64 |
- u32 iByteCount = cSerializer.NextBytesCount(); |
| 65 |
+ u32 iByteCount = this->cSerializer.NextBytesCount(); |
| 66 |
while(iByteCount > 0) |
| 67 |
{ |
| 68 |
const byte aBytes[iByteCount]; |
| 69 |
@@ -332,13 +332,13 @@ |
| 70 |
ASSERT(iRc >= 0 || iRc == FILE_EOF); |
| 71 |
iOffset += iRc; |
| 72 |
} |
| 73 |
- while(iByteCount > 0 && iRc != FILE_EOF); |
| 74 |
+ while(iByteCount > 0 && this->iRc != FILE_EOF); |
| 75 |
|
| 76 |
// Deserialize them |
| 77 |
- cSerializer.SetNextBytes(&aBytes); |
| 78 |
+ this->cSerializer.SetNextBytes(&aBytes); |
| 79 |
|
| 80 |
// Next iteration |
| 81 |
- iByteCount = cSerializer.NextBytesCount(); |
| 82 |
+ iByteCount = this->cSerializer.NextBytesCount(); |
| 83 |
} |
| 84 |
} |
| 85 |
catch(E_Exception e) |