Merge pull request #896 from vlovich/fix-kj-iterator

Add std-iterator.h to build files

Merge pull request #896 from vlovich/fix-kj-iterator
Add std-iterator.h to build files
379a8444 · Kenton Varda · GitHub · b301982c · 26e7fc20 · 379a8444
Unverified Commit 379a8444 authored Oct 15, 2019 by Kenton Varda Committed by GitHub Oct 15, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Makefile.am c++/Makefile.am +2 -1

CMakeLists.txt c++/src/capnp/CMakeLists.txt +1 -0

No files found.
--- a/c++/Makefile.am
+++ b/c++/Makefile.am
@@ -225,7 +225,8 @@ includecapnp_HEADERS =                                         \

 includecapnpcompat_HEADERS =                                   \
  src/capnp/compat/json.h                                      \
-  src/capnp/compat/json.capnp.h
+  src/capnp/compat/json.capnp.h                                \
+  src/capnp/compat/std-iterator.h

 if BUILD_KJ_TLS
 MAYBE_KJ_TLS_LA=libkj-tls.la

--- a/c++/src/capnp/CMakeLists.txt
+++ b/c++/src/capnp/CMakeLists.txt
@@ -29,6 +29,7 @@ endif()
 set(capnp_headers
  c++.capnp.h
  common.h
+  compat/std-iterator.h
  blob.h
  endian.h
  layout.h