diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-01-19 15:18:20 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-01-19 15:18:20 +0200 |
| commit | 5785734a1947c6b3fb2081b7e33fe3d0bd125bbb (patch) | |
| tree | b33a58b5a8466d1bebf15b399d6c517c35d0bd9f /tools | |
| parent | 4a086fca7b0a77c20bc9f1c97507966e2861f3da (diff) | |
Don't use too modern C++
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/stream/strmunx.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index d2135fa58e34..850eedcc2931 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -710,13 +710,13 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode ) osl::FileStatus aStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_LinkTargetURL ); // FIXME: we really need to switch to a pure URL model ... - if ( osl::File::getFileURLFromSystemPath( aFilename, aFileURL ) != osl::FileBase::RC::E_None ) + if ( osl::File::getFileURLFromSystemPath( aFilename, aFileURL ) != osl::FileBase::E_None ) aFileURL = aFilename; - bool bStatValid = ( osl::DirectoryItem::get( aFileURL, aItem) != osl::FileBase::RC::E_None && - aItem.getFileStatus( aStatus ) != osl::FileBase::RC::E_None ); + bool bStatValid = ( osl::DirectoryItem::get( aFileURL, aItem) != osl::FileBase::E_None && + aItem.getFileStatus( aStatus ) != osl::FileBase::E_None ); // SvFileStream can't open a directory - if( bStatValid && aStatus.getFileType() == osl::FileStatus::Type::Directory ) + if( bStatValid && aStatus.getFileType() == osl::FileStatus::Directory ) { SetError( ::GetSvError( EISDIR ) ); return; @@ -742,11 +742,11 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode ) { if ( nOpenMode & STREAM_COPY_ON_SYMLINK ) { - if ( bStatValid && aStatus.getFileType() == osl::FileStatus::Type::Link && + if ( bStatValid && aStatus.getFileType() == osl::FileStatus::Link && aStatus.getLinkTargetURL().getLength() > 0 ) { // delete the symbolic link, and replace it with the contents of the link - if (osl::File::remove( aFileURL ) == osl::FileBase::RC::E_None ) + if (osl::File::remove( aFileURL ) == osl::FileBase::E_None ) { File::copy( aStatus.getLinkTargetURL(), aFileURL ); #if OSL_DEBUG_LEVEL > 0 |