check for self-assignment in operator=

[wxWidgets.git] / include / wx / unix / pipe.h

diff --git a/include/wx/unix/pipe.h b/include/wx/unix/pipe.h
index a3a8e6e7a376a9a968b19ba13d475ab4a86d869b..d59553d1544f52d7bcdb1ea2d920872ce31b5aa9 100644 (file)
--- a/include/wx/unix/pipe.h
+++ b/include/wx/unix/pipe.h
@@ -6,7 +6,7 @@
 // Created:     24.06.2003 (extracted from src/unix/utilsunx.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Created:     24.06.2003 (extracted from src/unix/utilsunx.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_PIPE_H_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIX_PIPE_H_


@@ -28,8 +28,7 @@ public:
     enum Direction
     {
         Read,
     enum Direction
     {
         Read,

-        Write,
-        Direction_Max
+        Write

     };
 
     enum
     };
 
     enum


@@ -75,7 +74,10 @@ public:
         for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ )
         {
             if ( m_fds[n] != INVALID_FD )
         for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ )
         {
             if ( m_fds[n] != INVALID_FD )

+            {

                 close(m_fds[n]);
                 close(m_fds[n]);

+                m_fds[n] = INVALID_FD;
+            }

         }
     }
 
         }
     }
 


@@ -83,10 +85,10 @@ public:
     ~wxPipe() { Close(); }
 
 private:
     ~wxPipe() { Close(); }
 
 private:

-    int m_fds[Direction_Max];
+    int m_fds[2];

 };
 
 };
 

-#if wxUSE_STREAMS
+#if wxUSE_STREAMS && wxUSE_FILE

 
 #include "wx/wfstream.h"
 
 
 #include "wx/wfstream.h"
 


@@ -106,7 +108,7 @@ public:
     virtual bool CanRead() const;
 };
 
     virtual bool CanRead() const;
 };
 

-#endif // wxUSE_STREAMS
+#endif // wxUSE_STREAMS && wxUSE_FILE

 
 #endif // _WX_UNIX_PIPE_H_
 
 
 #endif // _WX_UNIX_PIPE_H_