diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-14 18:33:38 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-16 13:38:10 -0800 |
| commit | a0cecfd31a091ba6b95f4dfffe191c0aa033a54f (patch) | |
| tree | c32ef76b91938e14a1c55f71a07df103ed260957 /conformance/conformance_test.h | |
| parent | 13e1279d8674c71a5704d04e46a1d469efad7180 (diff) | |
| download | protobuf-a0cecfd31a091ba6b95f4dfffe191c0aa033a54f.tar.gz protobuf-a0cecfd31a091ba6b95f4dfffe191c0aa033a54f.tar.bz2 protobuf-a0cecfd31a091ba6b95f4dfffe191c0aa033a54f.zip | |
Make conformance tests build for C++ and Java.
Change-Id: Ibb3fe6f919cc7ca0df91da5e1697ba33d259e433
Diffstat (limited to 'conformance/conformance_test.h')
| -rw-r--r-- | conformance/conformance_test.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/conformance/conformance_test.h b/conformance/conformance_test.h index b89d3700..75fc97bc 100644 --- a/conformance/conformance_test.h +++ b/conformance/conformance_test.h @@ -44,8 +44,7 @@ #include <google/protobuf/util/type_resolver.h> #include <google/protobuf/wire_format_lite.h> -#include "third_party/jsoncpp/value.h" -#include "third_party/jsoncpp/reader.h" +#include "third_party/jsoncpp/json.h" namespace conformance { class ConformanceRequest; |