]> git.saurik.com Git - wxWidgets.git/commitdiff
(blind) fix for gcc 3.4 warning for an always true comparison in an assert
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 9 May 2004 18:35:36 +0000 (18:35 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 9 May 2004 18:35:36 +0000 (18:35 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/unix/pipe.h

index 972113ae368efe33a96e401e42dee6dccd9319d0..aa0f59f4bc45ed9d1a48cf374ec8c1da62d500e3 100644 (file)
@@ -28,7 +28,8 @@ public:
     enum Direction
     {
         Read,
     enum Direction
     {
         Read,
-        Write
+        Write,
+        Direction_Max
     };
 
     enum
     };
 
     enum
@@ -56,21 +57,12 @@ public:
     bool IsOk() const { return m_fds[Read] != INVALID_FD; }
 
     // return the descriptor for one of the pipe ends
     bool IsOk() const { return m_fds[Read] != INVALID_FD; }
 
     // return the descriptor for one of the pipe ends
-    int operator[](Direction which) const
-    {
-        wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds),
-                      _T("invalid pipe index") );
-
-        return m_fds[which];
-    }
+    int operator[](Direction which) const { return m_fds[which]; }
 
     // detach a descriptor, meaning that the pipe dtor won't close it, and
     // return it
     int Detach(Direction which)
     {
 
     // detach a descriptor, meaning that the pipe dtor won't close it, and
     // return it
     int Detach(Direction which)
     {
-        wxASSERT_MSG( which >= 0 && (size_t)which < WXSIZEOF(m_fds),
-                      _T("invalid pipe index") );
-
         int fd = m_fds[which];
         m_fds[which] = INVALID_FD;
 
         int fd = m_fds[which];
         m_fds[which] = INVALID_FD;
 
@@ -91,7 +83,7 @@ public:
     ~wxPipe() { Close(); }
 
 private:
     ~wxPipe() { Close(); }
 
 private:
-    int m_fds[2];
+    int m_fds[Direction_Max];
 };
 
 #if wxUSE_STREAMS
 };
 
 #if wxUSE_STREAMS