mcatan 2004/04/24 00:56:44
Modified: include/log4cxx/helpers tchar.h
Log:
cast pointer to char_type* in front of alloca
Revision Changes Path
1.29 +2 -2 logging-log4cxx/include/log4cxx/helpers/tchar.h
Index: tchar.h
===================================================================
RCS file: /home/cvs/logging-log4cxx/include/log4cxx/helpers/tchar.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- tchar.h 24 Apr 2004 06:55:01 -0000 1.28
+++ tchar.h 24 Apr 2004 07:56:44 -0000 1.29
@@ -222,7 +222,7 @@
char_type *b = pbase();
if (b == 0)
{
- char_type * p = al.allocate(_MinInc, 0);
+ char_type * p = (char_type
*)al.allocate(_MinInc, 0);
setp(p, p + _MinInc);
}
else
@@ -233,7 +233,7 @@
helpers::StrictMath::minimum(
(os * 2), _MaxInc),_MinInc)
+ 1; // incr�ment d'allocation
- char_type *p = al.allocate(os + is, 0);
+ char_type *p = (char_type *)al.allocate(os +
is, 0);
traits_type::copy(p, b, os);
al.deallocate(b, epptr() - b);
setp(p, p + os + is);