#
# patch "Makefile.am"
# from [c580427f04e6c7e40ed14b6a239f725f21c84c02]
# to [594039be90d24ac4ad583f281a211e68f6eb98e8]
#
# patch "netxx_pipe.cc"
# from [211a5abf7b199f8f8fc401bf2a885da81dab84c0]
# to [b240094ad56b06c79b67a17cfd0f09947f127043]
#
# patch "netxx_pipe.hh"
# from [6a72e14557bee75bdb2508cbdf9c693a6b9d6898]
# to [40b953e9eb7c750cda3b8d7241e895900c776aa5]
#
===============================================
--- Makefile.am c580427f04e6c7e40ed14b6a239f725f21c84c02
+++ Makefile.am 594039be90d24ac4ad583f281a211e68f6eb98e8
@@ -62,7 +62,7 @@
netxx/address.h netxx/datagram.h netxx/datagramserver.h \
netxx/netbuf.h netxx/netxx.h netxx/peer.h netxx/probe.h \
netxx/probeinfo.h netxx/sockopt.h netxx/stream.h netxx/streambase.h \
- netxx/streamserver.h netxx/timeout.h netxx/types.h
+ netxx/streamserver.h netxx/timeout.h netxx/types.h netxx_pipe.cc
CRYPTOPP_SOURCES = \
===============================================
--- netxx_pipe.cc 211a5abf7b199f8f8fc401bf2a885da81dab84c0
+++ netxx_pipe.cc b240094ad56b06c79b67a17cfd0f09947f127043
@@ -1,10 +1,10 @@
// -*- mode: C++; c-file-style: "gnu"; indent-tabs-mode: nil -*-
// copyright (C) 2005 Christof Petig
// all rights reserved.
// licensed to the public under the terms of the GNU GPL (>= 2)
// see the file COPYING for details
-#include
+#include
Netxx::PipeStream::PipeStream(int _readfd, int _writefd)
: readfd(_readfd), writefd(_writefd)
@@ -12,11 +12,11 @@
pi_.add_socket(writefd);
}
-Netxx::PipeStream::signed_size_type Netxx::PipeStream::read (void *buffer, size_type length)
+Netxx::signed_size_type Netxx::PipeStream::read (void *buffer, size_type length)
{ return ::read(readfd,buffer,length);
}
-Netxx::PipeStream::signed_size_type Netxx::PipeStream::write(const void *buffer, size_type length)
+Netxx::signed_size_type Netxx::PipeStream::write(const void *buffer, size_type length)
{ return ::write(writefd,buffer,length);
}
@@ -29,6 +29,7 @@
{ return Netxx::socket_type(-1);
}
+#if 0
namespace {
class PipeProbe : public Netxx::ProbeInfo
{public:
@@ -36,6 +37,7 @@
virtual pending_type check_pending (socket_type, pending_type) const;
};
}
+#endif
const Netxx::ProbeInfo* Netxx::PipeStream::get_probe_info (void) const
{ return &pi_;
===============================================
--- netxx_pipe.hh 6a72e14557bee75bdb2508cbdf9c693a6b9d6898
+++ netxx_pipe.hh 40b953e9eb7c750cda3b8d7241e895900c776aa5
@@ -5,11 +5,12 @@
// see the file COPYING for details
#include
+#include
namespace Netxx {
-class PipeStream : public StreamBase {
- int readfd, writefd;
+class PipeStream : public StreamBase
+{ int readfd, writefd;
ProbeInfo pi_;
public:
explicit PipeStream (int readfd, int writefd);