summaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-10-13 13:28:46 +0100
committerCaolán McNamara <caolanm@redhat.com>2010-10-13 20:31:42 +0100
commitc6a807a443b75bcaba2eaedac3fe38be0aae6bb5 (patch)
tree2c74cbccac74faaed4e0981a7a0fcfc116dba395 /io
parent27cd61a173c892cd625f1752bea2920c605b3bcb (diff)
rename IFIFO due to AIX conflict
Diffstat (limited to 'io')
-rw-r--r--io/source/stm/streamhelper.cxx16
-rw-r--r--io/source/stm/streamhelper.hxx28
2 files changed, 22 insertions, 22 deletions
diff --git a/io/source/stm/streamhelper.cxx b/io/source/stm/streamhelper.cxx
index 408581f6667d..ae255d8b3250 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 6143c30f9eae..d42702791278 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()