]>
Commit | Line | Data |
---|---|---|
3c79aa25 | 1 | --- autodoc/source/tools/filecoll.cxx.~1.8.~ 2005-09-07 21:12:43.000000000 +0200 |
2 | +++ autodoc/source/tools/filecoll.cxx 2005-12-24 20:50:22.000000000 +0100 | |
3 | @@ -41,6 +41,9 @@ | |
4 | #include <cosv/ploc_dir.hxx> | |
5 | ||
6 | ||
7 | +#include <stdio.h> | |
8 | + | |
9 | + | |
10 | FileCollector::FileCollector( uintt i_nRoughNrOfFiles ) | |
11 | // : aFoundFiles | |
12 | { | |
13 | --- sal/inc/internal/allocator.hxx.~1.4.~ 2005-09-08 16:25:55.000000000 +0200 | |
14 | +++ sal/inc/internal/allocator.hxx 2005-12-24 21:09:16.000000000 +0100 | |
15 | @@ -175,7 +175,7 @@ | |
16 | /* REQUIRED BY STLPort (see stlport '_alloc.h'): | |
17 | Hack for compilers that do not support member | |
18 | template classes (e.g. MSVC 6) */ | |
19 | -namespace _STL | |
20 | +namespace stlp_std | |
21 | { | |
22 | template<class T, class U> | |
23 | inline sal::Allocator<U> & __stl_alloc_rebind (sal::Allocator<T> & a, U const *) |