From 5d43dade0c5a17cd55ac010981ef894d35bbad28 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Mon, 16 Jun 2008 12:57:07 +0000 Subject: INTEGRATION: CWS hr51 (1.11.16); FILE MERGED 2008/06/06 14:13:38 hr 1.11.16.1: #i88947#: includes; namespaces --- tools/source/fsys/tdir.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx index 0f1d11dc160e..303afbb18426 100644 --- a/tools/source/fsys/tdir.cxx +++ b/tools/source/fsys/tdir.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tdir.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -428,7 +428,7 @@ Dir::Dir( const DirEntry& rDirEntry, DirEntryKind nKindFlags, FSysSort nSort, .. Construct( nKindFlags ); - va_list pArgs; + std::va_list pArgs; va_start( pArgs, nSort ); ImpSetSort( pArgs, nSort ); @@ -549,7 +549,7 @@ Dir::~Dir() |* *************************************************************************/ -FSysError Dir::ImpSetSort( va_list pArgs, int nFirstSort ) +FSysError Dir::ImpSetSort( std::va_list pArgs, int nFirstSort ) { BOOL bLast; FSysSort *pSort; @@ -680,7 +680,7 @@ FSysError Dir::ImpSetSort( va_list pArgs, int nFirstSort ) FSysError Dir::SetSort( FSysSort nSort, ... ) { - va_list pArgs; + std::va_list pArgs; va_start( pArgs, nSort ); return ImpSetSort( pArgs, nSort ); } -- cgit v1.2.3