diff --git a/v2/build.sh b/v2/build.sh index efcd77f..51c612d 100755 --- a/v2/build.sh +++ b/v2/build.sh @@ -29,5 +29,3 @@ find $DIR/go $DIR/python $DIR/js $DIR/cpp -type f -delete protoc --proto_path="$DIR/proto" --python_out="$DIR/python" --go_out="$DIR/go" --js_out="import_style=commonjs,binary:$DIR/js" --cpp_out="$DIR/cpp" $DIR/proto/*.proto - -ls "$DIR"/go/*.pb.go | xargs -n1 -IX bash -c "sed -e 's/,omitempty//' X > X.tmp && mv X{.tmp,}" diff --git a/v2/cpp/claim.pb.cc b/v2/cpp/claim.pb.cc index d36caad..a5fc5ce 100644 --- a/v2/cpp/claim.pb.cc +++ b/v2/cpp/claim.pb.cc @@ -6,93 +6,87 @@ #include #include +#include +#include #include -#include #include #include #include #include #include +// This is a temporary google only hack +#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS +#include "third_party/protobuf/version.h" +#endif // @@protoc_insertion_point(includes) -#include - -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Audio_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_ClaimReference_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Fee_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Image_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Language_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Location_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Software_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Source_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_ClaimList_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_Video_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_Channel_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::google::protobuf::internal::SCCInfo<6> scc_info_Stream_claim_2eproto; namespace pb { class ClaimDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed + _instance; const ::pb::Stream* stream_; const ::pb::Channel* channel_; - const ::pb::ClaimList* collection_; - const ::pb::ClaimReference* repost_; } _Claim_default_instance_; +class ChannelDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed + _instance; +} _Channel_default_instance_; class StreamDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed + _instance; const ::pb::Image* image_; const ::pb::Video* video_; const ::pb::Audio* audio_; - const ::pb::Software* software_; } _Stream_default_instance_; -class ChannelDefaultTypeInternal { - public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; -} _Channel_default_instance_; -class ClaimReferenceDefaultTypeInternal { - public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; -} _ClaimReference_default_instance_; -class ClaimListDefaultTypeInternal { - public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; -} _ClaimList_default_instance_; -class SourceDefaultTypeInternal { - public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; -} _Source_default_instance_; class FeeDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed + _instance; } _Fee_default_instance_; +class FileDefaultTypeInternal { + public: + ::google::protobuf::internal::ExplicitlyConstructed + _instance; +} _File_default_instance_; class ImageDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed _instance; + ::google::protobuf::internal::ExplicitlyConstructed + _instance; } _Image_default_instance_; class VideoDefaultTypeInternal { public: - ::google::protobuf::internal::ExplicitlyConstructed