From 90bb4246c34580eb6c8a5a41a4e19fcd5f334f09 Mon Sep 17 00:00:00 2001
From: Josh Haberman <haberman@google.com>
Date: Sat, 25 May 2013 10:26:59 -0700
Subject: Synced with Google-internal development.

C++ handlers are now type-safe; SinkFrame is gone.
Various other changes.
---
 upb/google/bridge.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'upb/google/bridge.cc')

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));
-- 
cgit v1.2.3