AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Update upb namespace in friendship declaration.

Browse Source
This commit is contained in:
liujisi@google.com 2013-01-10 21:05:26 +00:00
parent cb77c4c381
commit 98080e8598
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/google/protobuf/generated_message_reflection.h
View File

@ -50,9 +50,9 @@
namespace google { namespace google {
namespace upb { namespace upb {
namespace proto2_bridge_opensource { namespace google_opensource {
class FieldAccessor; class GMR_Handlers;
} // namespace protobuf_bridge_google3 } // namespace google_opensource
} // namespace upb } // namespace upb
namespace protobuf { namespace protobuf {
@ -287,9 +287,9 @@ class LIBPROTOBUF_EXPORT GeneratedMessageReflection : public Reflection {
private: private:
friend class GeneratedMessage; friend class GeneratedMessage;
// To parse directly into a proto2 generated class, FieldAccessor needs // To parse directly into a proto2 generated class, the class GMR_Handlers
// access to member offsets and hasbits. // needs access to member offsets and hasbits.
friend class LIBPROTOBUF_EXPORT upb::proto2_bridge_opensource::FieldAccessor; friend class LIBPROTOBUF_EXPORT upb::google_opensource::GMR_Handlers;
const Descriptor* descriptor_; const Descriptor* descriptor_;
const Message* default_instance_; const Message* default_instance_;

10
src/google/protobuf/repeated_field.h
View File

@ -57,9 +57,9 @@
namespace google { namespace google {
namespace upb { namespace upb {
namespace proto2_bridge_opensource { namespace google_opensource {
class FieldAccessor; class GMR_Handlers;
} // namespace protobuf_bridge_opensource } // namespace google_opensource
} // namespace upb } // namespace upb
namespace protobuf { namespace protobuf {
@ -235,9 +235,9 @@ class LIBPROTOBUF_EXPORT RepeatedPtrFieldBase {
// use of AddFromCleared(), which is not part of the public interface. // use of AddFromCleared(), which is not part of the public interface.
friend class ExtensionSet; friend class ExtensionSet;
// To parse directly into a proto2 generated class, the upb FieldAccessor // To parse directly into a proto2 generated class, the upb class GMR_Handlers
// needs to be able to modify a RepeatedPtrFieldBase directly. // needs to be able to modify a RepeatedPtrFieldBase directly.
friend class LIBPROTOBUF_EXPORT upb::proto2_bridge_opensource::FieldAccessor; friend class LIBPROTOBUF_EXPORT upb::google_opensource::GMR_Handlers;
RepeatedPtrFieldBase(); RepeatedPtrFieldBase();