diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2016-04-06 16:49:18 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2016-04-06 16:49:18 -0700 |
| commit | 458077ccb4f7eddc94549528c3a9809745982352 (patch) | |
| tree | 39cb7c59737895b757c0a830b166d6ed69e83027 /tests/pb | |
| parent | d0b9d0a9b782e46a483d4d72515f9ab4f72e402a (diff) | |
| parent | 8823fa6069452c86325b4d5a6065a0d4fd67f1a2 (diff) | |
Merge pull request #53 from haberman/filedef
Added upb::FileDef, which represents the file defs are declared in.
Diffstat (limited to 'tests/pb')
| -rw-r--r-- | tests/pb/test_encoder.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/pb/test_encoder.cc b/tests/pb/test_encoder.cc index 8a222f4..6219e08 100644 --- a/tests/pb/test_encoder.cc +++ b/tests/pb/test_encoder.cc @@ -1,7 +1,8 @@ +#include "tests/test_util.h" #include "tests/upb_test.h" #include "upb/bindings/stdc++/string.h" -#include "upb/descriptor/descriptor.upb.h" +#include "upb/descriptor/descriptor.upbdefs.h" #include "upb/pb/decoder.h" #include "upb/pb/encoder.h" #include "upb/pb/glue.h" @@ -18,7 +19,7 @@ std::string read_string(const char *filename) { void test_pb_roundtrip() { upb::reffed_ptr<const upb::MessageDef> md( - upbdefs::google::protobuf::FileDescriptorSet::MessageDef()); + upbdefs::google::protobuf::FileDescriptorSet::get()); upb::reffed_ptr<const upb::Handlers> encoder_handlers( upb::pb::Encoder::NewHandlers(md.get())); upb::reffed_ptr<const upb::pb::DecoderMethod> method( |