Update Makefile.am for RPC.

c++/Makefile.am

@@ -92,6 +92,7 @@ public_capnpc_inputs =                                         \
 
 capnpc_inputs =                                                \
   $(public_capnpc_inputs)                                      \
+  src/capnp/rpc.capnp                                          \
   src/capnp/compiler/lexer.capnp                               \
   src/capnp/compiler/grammar.capnp
 
@@ -100,6 +101,8 @@ capnpc_outputs =                                               \
   src/capnp/c++.capnp.h                                        \
   src/capnp/schema.capnp.c++                                   \
   src/capnp/schema.capnp.h                                     \
+  src/capnp/rpc.capnp.c++                                      \
+  src/capnp/rpc.capnp.h                                        \
   src/capnp/compiler/lexer.capnp.c++                           \
   src/capnp/compiler/lexer.capnp.h                             \
   src/capnp/compiler/grammar.capnp.c++                         \
@@ -157,7 +160,8 @@ includecapnp_HEADERS =                                         \
   src/capnp/serialize.h                                        \
   src/capnp/serialize-packed.h                                 \
   src/capnp/pointer-helpers.h                                  \
-  src/capnp/generated-header-support.h
+  src/capnp/generated-header-support.h                         \
+  src/capnp/rpc.h
 
 lib_LTLIBRARIES = libkj.la libcapnp.la libcapnpc.la
 
@@ -202,7 +206,10 @@ libcapnp_la_SOURCES=                                           \
   src/capnp/dynamic.c++                                        \
   src/capnp/stringify.c++                                      \
   src/capnp/serialize.c++                                      \
-  src/capnp/serialize-packed.c++
+  src/capnp/serialize-packed.c++                               \
+  src/capnp/rpc.c++                                            \
+  src/capnp/rpc.capnp.c++                                      \
+  src/capnp/rpc.capnp.h
 
 # -lpthread is here to work around https://bugzilla.redhat.com/show_bug.cgi?id=661333
 libcapnpc_la_LIBADD = libcapnp.la libkj.la $(PTHREAD_LIBS) -lpthread
@@ -329,6 +336,7 @@ capnp_test_SOURCES =                                           \
   src/capnp/orphan-test.c++                                    \
   src/capnp/serialize-test.c++                                 \
   src/capnp/serialize-packed-test.c++                          \
+  src/capnp/rpc-test.c++                                       \
   src/capnp/test-util.c++                                      \
   src/capnp/test-util.h                                        \
   src/capnp/compiler/lexer-test.c++                            \

c++/regenerate-bootstraps.sh

@@ -6,4 +6,5 @@ export PATH=$PWD/bin:$PWD:$PATH
 
 capnp compile -Isrc --no-standard-import --src-prefix=src -oc++:src \
     src/capnp/c++.capnp src/capnp/schema.capnp \
-    src/capnp/compiler/lexer.capnp src/capnp/compiler/grammar.capnp
+    src/capnp/compiler/lexer.capnp src/capnp/compiler/grammar.capnp \
+    src/capnp/rpc.capnp

c++/src/capnp/capnpc.ekam-rule

@@ -35,7 +35,7 @@ INPUT=$1
 case "$INPUT" in
     *capnp/c++.capnp | \
     *capnp/schema.capnp | \
-    *capnp/schema2.capnp | \
+    *capnp/rpc.capnp | \
     *capnp/compiler/lexer.capnp | \
     *capnp/compiler/grammar.capnp )
         exit 0

c++/src/capnp/object.h

@@ -263,7 +263,7 @@ public:
   template <typename T>
   inline Orphan(Orphan<T>&& other): builder(kj::mv(other.builder)) {}
   template <typename T>
-  inline Orphan& operator=(Orphan<T>&& other) { builder = kj::mv(other.builder); }
+  inline Orphan& operator=(Orphan<T>&& other) { builder = kj::mv(other.builder); return *this; }
   // Cast from typed orphan.
 
   // It's not possible to get an ObjectPointer::{Reader,Builder} directly since there is no

c++/src/capnp/rpc.c++

@@ -241,7 +241,7 @@ struct Answer {
   kj::Maybe<kj::Own<const PipelineHook>> pipeline;
   // Send pipelined calls here.  Becomes null as soon as a `Finish` is received.
 
-  kj::Promise<void> asyncOp = nullptr;
+  kj::Promise<void> asyncOp = kj::Promise<void>(nullptr);
   // Delete this promise to cancel the call.
 
   kj::Maybe<const CallContext&> callContext;