projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix warnings about calling an inline function before it is defined inline
[wxWidgets.git]
/
include
/
wx
/
unix
/
pipe.h
diff --git
a/include/wx/unix/pipe.h
b/include/wx/unix/pipe.h
index 972113ae368efe33a96e401e42dee6dccd9319d0..d59553d1544f52d7bcdb1ea2d920872ce31b5aa9 100644
(file)
--- a/
include/wx/unix/pipe.h
+++ b/
include/wx/unix/pipe.h
@@
-5,7
+5,7
@@
// Modified by:
// Created: 24.06.2003 (extracted from src/unix/utilsunx.cpp)
// RCS-ID: $Id$
// Modified by:
// Created: 24.06.2003 (extracted from src/unix/utilsunx.cpp)
// RCS-ID: $Id$
-// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwi
ndow
s.org>
+// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwi
dget
s.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@
-56,21
+56,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;
@@
-83,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;
+ }
}
}
}
}
@@
-94,7
+88,7
@@
private:
int m_fds[2];
};
int m_fds[2];
};
-#if wxUSE_STREAMS
+#if wxUSE_STREAMS
&& wxUSE_FILE
#include "wx/wfstream.h"
#include "wx/wfstream.h"
@@
-114,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_