From 948f74d804927caacc73680bdd7a29365cd02a86 Mon Sep 17 00:00:00 2001 From: Jason Paryani Date: Thu, 22 Aug 2013 17:47:44 -0700 Subject: [PATCH 1/3] Updated capnp schema to conform with new union rules --- examples/addressbook.capnp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/addressbook.capnp b/examples/addressbook.capnp index 140beec..02e626a 100644 --- a/examples/addressbook.capnp +++ b/examples/addressbook.capnp @@ -17,11 +17,11 @@ struct Person { } } - employment @4 union { - unemployed @5 :Void; - employer @6 :Text; - school @7 :Text; - selfEmployed @8 :Void; + employment :union { + unemployed @4 :Void; + employer @5 :Text; + school @6 :Text; + selfEmployed @7 :Void; # We assume that a person is only one of these. } } From 59279ee31165e0964231bb5508e804313f1868a7 Mon Sep 17 00:00:00 2001 From: Jason Paryani Date: Thu, 22 Aug 2013 17:48:02 -0700 Subject: [PATCH 2/3] Fix Void namespace change --- capnp/capnp_cpp.pxd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capnp/capnp_cpp.pxd b/capnp/capnp_cpp.pxd index 8200265..6ef4d98 100644 --- a/capnp/capnp_cpp.pxd +++ b/capnp/capnp_cpp.pxd @@ -9,7 +9,7 @@ ctypedef unsigned int uint cdef extern from "capnp/common.h" namespace " ::capnp": enum Void: - VOID " ::capnp::Void::VOID" + VOID " ::capnp::VOID" cdef extern from "kj/string.h" namespace " ::kj": cdef cppclass StringPtr: From 90248f6bfafd0935bf367680ac81ab5e5ff471c0 Mon Sep 17 00:00:00 2001 From: Jason Paryani Date: Thu, 22 Aug 2013 17:48:39 -0700 Subject: [PATCH 3/3] Bump version for v0.3.4 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 936d804..30473ac 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ import os MAJOR = 0 MINOR = 3 -MICRO = 3 +MICRO = 4 VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)