|
|
|
@ -1,11 +1,11 @@ |
|
|
|
--- nxcomp/Types.h.orig Wed Sep 1 21:18:18 2004
|
|
|
|
+++ nxcomp/Types.h Wed Sep 1 21:21:41 2004
|
|
|
|
@@ -74,11 +74,11 @@
|
|
|
|
--- nxcomp/Types.h.orig 2004-08-10 10:47:11.000000000 +0200
|
|
|
|
+++ nxcomp/Types.h 2004-09-16 02:19:01.364333008 +0200
|
|
|
|
@@ -74,22 +74,26 @@
|
|
|
|
|
|
|
|
void clear() |
|
|
|
{ |
|
|
|
- #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
|
|
|
|
+ #if defined(__STL_USE_STD_ALLOCATORS) || defined(_VECTOR_H)
|
|
|
|
+ #if defined(_VECTOR_H) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
|
|
|
|
|
|
|
|
- #if defined(__GLIBCPP_INTERNAL_VECTOR_H)
|
|
|
|
+ #if defined(_VECTOR_H)
|
|
|
|
@ -13,26 +13,32 @@ |
|
|
|
- _Destroy(_M_start, _M_finish);
|
|
|
|
+ _Destroy(_M_impl._M_start, _M_impl._M_finish);
|
|
|
|
|
|
|
|
#else |
|
|
|
- #else
|
|
|
|
+ _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start);
|
|
|
|
|
|
|
|
@@ -86,9 +86,9 @@
|
|
|
|
- destroy(_M_start, _M_finish);
|
|
|
|
+ _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0;
|
|
|
|
|
|
|
|
#endif |
|
|
|
- #endif
|
|
|
|
+ #else
|
|
|
|
|
|
|
|
- _M_deallocate(_M_start, _M_end_of_storage - _M_start);
|
|
|
|
+ _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start);
|
|
|
|
_M_deallocate(_M_start, _M_end_of_storage - _M_start); |
|
|
|
|
|
|
|
- _M_start = _M_finish = _M_end_of_storage = 0;
|
|
|
|
+ _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0;
|
|
|
|
_M_start = _M_finish = _M_end_of_storage = 0; |
|
|
|
|
|
|
|
+ _Destroy(_M_start, _M_finish);
|
|
|
|
+
|
|
|
|
+ #endif
|
|
|
|
+
|
|
|
|
#else |
|
|
|
|
|
|
|
@@ -108,21 +108,21 @@
|
|
|
|
destroy(start, finish); |
|
|
|
@@ -108,22 +112,28 @@
|
|
|
|
|
|
|
|
void clear() |
|
|
|
{ |
|
|
|
- #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
|
|
|
|
+ #if defined(__STL_USE_STD_ALLOCATORS) || defined(_VECTOR_H)
|
|
|
|
+ #if defined(_VECTOR_H) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
|
|
|
|
|
|
|
|
- #if defined(__GLIBCPP_INTERNAL_VECTOR_H)
|
|
|
|
+ #if defined(_VECTOR_H)
|
|
|
|
@ -40,22 +46,28 @@ |
|
|
|
- _Destroy(_M_start, _M_finish);
|
|
|
|
+ _Destroy(_M_impl._M_start, _M_impl._M_finish);
|
|
|
|
|
|
|
|
#else |
|
|
|
- #else
|
|
|
|
+ _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start);
|
|
|
|
|
|
|
|
- destroy(_M_start, _M_finish);
|
|
|
|
+ destroy(_M_impl._M_start, _M_impl._M_finish);
|
|
|
|
+ _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0;
|
|
|
|
|
|
|
|
#endif |
|
|
|
- #endif
|
|
|
|
+ #else
|
|
|
|
|
|
|
|
- _M_deallocate(_M_start, _M_end_of_storage - _M_start);
|
|
|
|
+ _M_deallocate(_M_impl._M_start, _M_impl._M_end_of_storage - _M_impl._M_start);
|
|
|
|
_M_deallocate(_M_start, _M_end_of_storage - _M_start); |
|
|
|
|
|
|
|
- _M_start = _M_finish = _M_end_of_storage = 0;
|
|
|
|
+ _M_impl._M_start = _M_impl._M_finish = _M_impl._M_end_of_storage = 0;
|
|
|
|
_M_start = _M_finish = _M_end_of_storage = 0; |
|
|
|
|
|
|
|
+ _Destroy(_M_start, _M_finish);
|
|
|
|
+
|
|
|
|
+ #endif
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
#else |
|
|
|
|
|
|
|
|
|
|
|
destroy(start, finish); |
|
|
|
--- nxcomp/Jpeg.cpp.orig 2004-09-13 03:41:49.905274168 +0200
|
|
|
|
+++ nxcomp/Jpeg.cpp 2004-09-13 03:43:06.886571232 +0200
|
|
|
|
@@ -452,7 +452,7 @@
|
|
|
|
|
fake
20 years ago