(blind) fix for gcc 3.4 warning for an always true comparison in an assert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -28,7 +28,8 @@ public:
|
|||||||
enum Direction
|
enum Direction
|
||||||
{
|
{
|
||||||
Read,
|
Read,
|
||||||
Write
|
Write,
|
||||||
|
Direction_Max
|
||||||
};
|
};
|
||||||
|
|
||||||
enum
|
enum
|
||||||
@@ -56,21 +57,12 @@ public:
|
|||||||
bool IsOk() const { return m_fds[Read] != INVALID_FD; }
|
bool IsOk() const { return m_fds[Read] != INVALID_FD; }
|
||||||
|
|
||||||
// return the descriptor for one of the pipe ends
|
// return the descriptor for one of the pipe ends
|
||||||
int operator[](Direction which) const
|
int operator[](Direction which) const { return m_fds[which]; }
|
||||||
{
|
|
||||||
wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds),
|
|
||||||
_T("invalid pipe index") );
|
|
||||||
|
|
||||||
return m_fds[which];
|
|
||||||
}
|
|
||||||
|
|
||||||
// detach a descriptor, meaning that the pipe dtor won't close it, and
|
// detach a descriptor, meaning that the pipe dtor won't close it, and
|
||||||
// return it
|
// return it
|
||||||
int Detach(Direction which)
|
int Detach(Direction which)
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds),
|
|
||||||
_T("invalid pipe index") );
|
|
||||||
|
|
||||||
int fd = m_fds[which];
|
int fd = m_fds[which];
|
||||||
m_fds[which] = INVALID_FD;
|
m_fds[which] = INVALID_FD;
|
||||||
|
|
||||||
@@ -91,7 +83,7 @@ public:
|
|||||||
~wxPipe() { Close(); }
|
~wxPipe() { Close(); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int m_fds[2];
|
int m_fds[Direction_Max];
|
||||||
};
|
};
|
||||||
|
|
||||||
#if wxUSE_STREAMS
|
#if wxUSE_STREAMS
|
||||||
|
Reference in New Issue
Block a user