Remove unnecessary CAPNPROTO_PRIVATEs.

c++/src/capnproto/benchmark/capnproto-common.h

@@ -24,7 +24,6 @@
 #ifndef CAPNPROTO_BENCHMARK_CAPNPROTO_COMMON_H_
 #define CAPNPROTO_BENCHMARK_CAPNPROTO_COMMON_H_
 
-#define CAPNPROTO_PRIVATE
 #include "common.h"
 #include <capnproto/serialize.h>
 #include <capnproto/serialize-packed.h>

c++/src/capnproto/compiler/capnpc-capnp.c++

@@ -24,8 +24,6 @@
 // This program is a code generator plugin for capnpc which writes the schema back to stdout in
 // roughly capnpc format.
 
-#define CAPNPROTO_PRIVATE
-
 #include "../schema.capnp.h"
 #include "../serialize.h"
 #include <kj/debug.h>

c++/src/capnproto/dynamic-test.c++

@@ -44,7 +44,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#define CAPNPROTO_PRIVATE
 #include "dynamic.h"
 #include "message.h"
 #include <kj/debug.h>

c++/src/capnproto/dynamic.c++

@@ -21,7 +21,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#define CAPNPROTO_PRIVATE
 #include "dynamic.h"
 #include <kj/debug.h>
 

c++/src/capnproto/encoding-test.c++

@@ -21,7 +21,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#define CAPNPROTO_PRIVATE
 #include "test-import.capnp.h"
 #include "message.h"
 #include <kj/debug.h>

c++/src/capnproto/generated-header-support.h

@@ -108,8 +108,6 @@ struct PointerHelpers<T, Kind::BLOB> {
   }
 };
 
-#if defined(CAPNPROTO_PRIVATE) || defined(__CDT_PARSER__)
-
 struct UncheckedMessage {
   typedef const word* Reader;
 };
@@ -125,8 +123,6 @@ struct PointerHelpers<UncheckedMessage> {
   }
 };
 
-#endif
-
 struct RawSchema {
   // The generated code defines a constant RawSchema for every compiled declaration.
   //

c++/src/capnproto/schema-loader-test.c++

@@ -21,7 +21,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#define CAPNPROTO_PRIVATE
 #include "schema-loader.h"
 #include <gtest/gtest.h>
 #include "test-util.h"

c++/src/capnproto/schema.c++

@@ -21,7 +21,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#define CAPNPROTO_PRIVATE
 #include "schema.h"
 #include "message.h"
 #include <kj/debug.h>

c++/src/capnproto/serialize-packed-test.c++

@@ -21,7 +21,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#define CAPNPROTO_PRIVATE
 #include "serialize-packed.h"
 #include "test.capnp.h"
 #include <kj/debug.h>

c++/src/capnproto/serialize-packed.c++

@@ -21,7 +21,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#define CAPNPROTO_PRIVATE
 #include "serialize-packed.h"
 #include <kj/debug.h>
 #include "layout.h"

c++/src/capnproto/serialize-snappy-test.c++

@@ -21,7 +21,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#define CAPNPROTO_PRIVATE
 #include "serialize-snappy.h"
 #include <kj/debug.h>
 #include "test.capnp.h"

c++/src/capnproto/serialize-snappy.c++

@@ -21,7 +21,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#define CAPNPROTO_PRIVATE
 #include "serialize-snappy.h"
 #include <kj/debug.h>
 #include "layout.h"

c++/src/capnproto/serialize-test.c++

@@ -21,7 +21,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#define CAPNPROTO_PRIVATE
 #include "serialize.h"
 #include <kj/debug.h>
 #include "test.capnp.h"

c++/src/capnproto/serialize.c++

@@ -21,7 +21,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#define CAPNPROTO_PRIVATE
 #include "serialize.h"
 #include "layout.h"
 #include <kj/debug.h>

c++/src/capnproto/stringify-test.c++

@@ -44,7 +44,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#define CAPNPROTO_PRIVATE
 #include "message.h"
 #include "dynamic.h"
 #include <kj/debug.h>

c++/src/capnproto/stringify.c++

@@ -21,7 +21,6 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#define CAPNPROTO_PRIVATE
 #include "dynamic.h"
 #include <kj/debug.h>
 #include <sstream>