diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2013-05-11 17:56:13 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2013-05-11 17:56:13 -0700 |
| commit | 70293f5faabe08fc9bdef26ad0b1d6afe19e8f79 (patch) | |
| tree | 7637c83b45a4b1334ccec34462d4b80f1e39bcc9 /upb/google | |
| parent | cfdb9907cb87d15eaab72ceefbfa42fd7a4c3127 (diff) | |
Open source fixes: builds on OS X again.
Diffstat (limited to 'upb/google')
| -rw-r--r-- | upb/google/bridge.cc | 2 | ||||
| -rw-r--r-- | upb/google/proto2.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/upb/google/bridge.cc b/upb/google/bridge.cc index f5b664c..93e5c27 100644 --- a/upb/google/bridge.cc +++ b/upb/google/bridge.cc @@ -208,7 +208,7 @@ static upb::MessageDef* NewMessageDef(const goog::Message& m, const void* owner, // Must do this before processing submessages to prevent infinite recursion. defs->AddMessage(&m, md); - vector<const goog::FieldDescriptor*> fields; + std::vector<const goog::FieldDescriptor*> fields; d->file()->pool()->FindAllExtensions(d, &fields); for (int i = 0; i < d->field_count(); i++) { fields.push_back(d->field(i)); diff --git a/upb/google/proto2.cc b/upb/google/proto2.cc index d7ad919..8f9bcd8 100644 --- a/upb/google/proto2.cc +++ b/upb/google/proto2.cc @@ -409,7 +409,7 @@ case goog::FieldDescriptor::cpptype: \ static_cast<const EnumHandlerData*>(frame->handler_data()); if (data->IsValidValue(val)) { goog::RepeatedField<int32_t>* r = - data->GetFieldPointer<goog::RepeatedField<int32_t>>(m); + data->GetFieldPointer<goog::RepeatedField<int32_t> >(m); r->Add(val); } else { data->mutable_unknown_fields(m)->AddVarint(data->field_number(), val); @@ -487,7 +487,7 @@ case goog::FieldDescriptor::cpptype: \ } else { StringHandlerData<T>* data = new StringHandlerData<T>(proto2_f, r); h->SetStartStringHandler(f, &StartString<T>, data, - &upb::DeletePointer<StringHandlerData<T>>); + &upb::DeletePointer<StringHandlerData<T> >); } } |