diff options
author | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 13:28:46 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-13 20:31:42 +0100 |
commit | da307f47614d485aa241a9d7fa13d06aa248aeac (patch) | |
tree | 1119ed3ba4e179a416298506f82406e619963d03 /io | |
parent | 4787e5b770f08693c4c065c3b37338a1b56f3120 (diff) |
rename IFIFO due to AIX conflict
Diffstat (limited to 'io')
-rw-r--r-- | io/source/stm/streamhelper.cxx | 16 | ||||
-rw-r--r-- | io/source/stm/streamhelper.hxx | 28 |
2 files changed, 22 insertions, 22 deletions
diff --git a/io/source/stm/streamhelper.cxx b/io/source/stm/streamhelper.cxx index acd687df6..143dd1dc8 100644 --- a/io/source/stm/streamhelper.cxx +++ b/io/source/stm/streamhelper.cxx @@ -43,8 +43,8 @@ using namespace ::com::sun::star::uno; namespace io_stm { void MemFIFO::write( const Sequence< sal_Int8 > &seq ) - throw ( IFIFO_OutOfMemoryException, - IFIFO_OutOfBoundsException ) + throw ( I_FIFO_OutOfMemoryException, + I_FIFO_OutOfBoundsException ) { try { @@ -52,15 +52,15 @@ void MemFIFO::write( const Sequence< sal_Int8 > &seq ) } catch( IRingBuffer_OutOfMemoryException & ) { - throw IFIFO_OutOfMemoryException(); + throw I_FIFO_OutOfMemoryException(); } catch( IRingBuffer_OutOfBoundsException & ) { - throw IFIFO_OutOfBoundsException(); + throw I_FIFO_OutOfBoundsException(); } } -void MemFIFO::read( Sequence<sal_Int8> &seq , sal_Int32 nBufferLen ) throw (IFIFO_OutOfBoundsException) +void MemFIFO::read( Sequence<sal_Int8> &seq , sal_Int32 nBufferLen ) throw (I_FIFO_OutOfBoundsException) { try { @@ -69,11 +69,11 @@ void MemFIFO::read( Sequence<sal_Int8> &seq , sal_Int32 nBufferLen ) throw (IFIF } catch ( IRingBuffer_OutOfBoundsException & ) { - throw IFIFO_OutOfBoundsException(); + throw I_FIFO_OutOfBoundsException(); } } -void MemFIFO::skip( sal_Int32 nBytesToSkip ) throw ( IFIFO_OutOfBoundsException ) +void MemFIFO::skip( sal_Int32 nBytesToSkip ) throw ( I_FIFO_OutOfBoundsException ) { try { @@ -81,7 +81,7 @@ void MemFIFO::skip( sal_Int32 nBytesToSkip ) throw ( IFIFO_OutOfBoundsException } catch( IRingBuffer_OutOfBoundsException & ) { - throw IFIFO_OutOfBoundsException(); + throw I_FIFO_OutOfBoundsException(); } } diff --git a/io/source/stm/streamhelper.hxx b/io/source/stm/streamhelper.hxx index 62576982a..32a1509af 100644 --- a/io/source/stm/streamhelper.hxx +++ b/io/source/stm/streamhelper.hxx @@ -41,30 +41,30 @@ namespace io_stm { -class IFIFO_OutOfBoundsException : +class I_FIFO_OutOfBoundsException : public Exception {}; -class IFIFO_OutOfMemoryException : +class I_FIFO_OutOfMemoryException : public Exception {}; -class IFIFO +class I_FIFO { public: - virtual void write( const Sequence<sal_Int8> &) throw( IFIFO_OutOfMemoryException, - IFIFO_OutOfBoundsException )=0; + virtual void write( const Sequence<sal_Int8> &) throw( I_FIFO_OutOfMemoryException, + I_FIFO_OutOfBoundsException )=0; virtual void read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) - throw( IFIFO_OutOfBoundsException )=0; + throw( I_FIFO_OutOfBoundsException )=0; virtual void skip( sal_Int32 nBytesToSkip ) - throw( IFIFO_OutOfBoundsException )=0; + throw( I_FIFO_OutOfBoundsException )=0; virtual sal_Int32 getSize() const throw( ) =0; virtual void shrink() throw() = 0; - virtual ~IFIFO() {}; + virtual ~I_FIFO() {}; }; @@ -136,15 +136,15 @@ private: class MemFIFO : - public IFIFO, - private MemRingBuffer + public I_FIFO, + private MemRingBuffer { public: - virtual void write( const Sequence<sal_Int8> &) throw( IFIFO_OutOfMemoryException, - IFIFO_OutOfBoundsException ); + virtual void write( const Sequence<sal_Int8> &) throw( I_FIFO_OutOfMemoryException, + I_FIFO_OutOfBoundsException ); virtual void read( Sequence<sal_Int8> & , sal_Int32 nBytesToRead ) - throw( IFIFO_OutOfBoundsException ); - virtual void skip( sal_Int32 nBytesToSkip ) throw( IFIFO_OutOfBoundsException ); + throw( I_FIFO_OutOfBoundsException ); + virtual void skip( sal_Int32 nBytesToSkip ) throw( I_FIFO_OutOfBoundsException ); virtual sal_Int32 getSize() const throw( ) { return MemRingBuffer::getSize(); } virtual void shrink() throw() |