summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrsyuki <frsyuki@users.sourceforge.jp>2009-08-07 11:28:23 +0900
committerfrsyuki <frsyuki@users.sourceforge.jp>2009-08-07 11:28:23 +0900
commitb4cb5e23c0a235d61d4a63acf4624f96f20f620b (patch)
tree7b1f39bc796eaf54e49663117f2e73596469e47a
parent1375732c805264cf43baa112a5a45e4c0c43b8e6 (diff)
downloadmsgpack-python-b4cb5e23c0a235d61d4a63acf4624f96f20f620b.tar.gz
fix Makefile.am
-rw-r--r--cpp/Makefile.am2
-rw-r--r--example/stream.cc10
2 files changed, 7 insertions, 5 deletions
diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index 5efac3f..f630832 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -39,10 +39,12 @@ msgpack/zone.hpp: msgpack/zone.hpp.erb
MOSTLYCLEANFILES = \
msgpack/type/tuple.hpp \
+ msgpack/type/define.hpp \
msgpack/zone.hpp
EXTRA_DIST = \
msgpack/type/tuple.hpp.erb \
+ msgpack/type/define.hpp.erb \
msgpack/zone.hpp.erb
libmsgpack_la_LIBADD = -L../c -lmsgpackc
diff --git a/example/stream.cc b/example/stream.cc
index 1e2e733..2241935 100644
--- a/example/stream.cc
+++ b/example/stream.cc
@@ -22,14 +22,14 @@ public:
ssize_t count =
read(m_sock, m_pac.buffer(), m_pac.buffer_capacity());
- if(count < 0) {
+ if(count <= 0) {
+ if(count == 0) {
+ throw std::runtime_error("connection closed");
+ }
if(errno == EAGAIN || errno == EINTR) {
return;
- } else {
- throw std::runtime_error(strerror(errno));
}
- } else if(count == 0) {
- throw std::runtime_error("connection closed");
+ throw std::runtime_error(strerror(errno));
}
m_pac.buffer_consumed(count);