Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: third_party/protobuf/src/google/protobuf/message.h

Issue 6737030: third_party/protobuf: update to upstream r371 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Protocol Buffers - Google's data interchange format 1 // Protocol Buffers - Google's data interchange format
2 // Copyright 2008 Google Inc. All rights reserved. 2 // Copyright 2008 Google Inc. All rights reserved.
3 // http://code.google.com/p/protobuf/ 3 // http://code.google.com/p/protobuf/
4 // 4 //
5 // Redistribution and use in source and binary forms, with or without 5 // Redistribution and use in source and binary forms, with or without
6 // modification, are permitted provided that the following conditions are 6 // modification, are permitted provided that the following conditions are
7 // met: 7 // met:
8 // 8 //
9 // * Redistributions of source code must retain the above copyright 9 // * Redistributions of source code must retain the above copyright
10 // notice, this list of conditions and the following disclaimer. 10 // notice, this list of conditions and the following disclaimer.
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 // HP C++'s iosfwd doesn't work. 116 // HP C++'s iosfwd doesn't work.
117 #include <iostream> 117 #include <iostream>
118 #else 118 #else
119 #include <iosfwd> 119 #include <iosfwd>
120 #endif 120 #endif
121 121
122 #include <google/protobuf/message_lite.h> 122 #include <google/protobuf/message_lite.h>
123 123
124 #include <google/protobuf/stubs/common.h> 124 #include <google/protobuf/stubs/common.h>
125 125
126
126 namespace google { 127 namespace google {
127 namespace protobuf { 128 namespace protobuf {
128 129
129 // Defined in this file. 130 // Defined in this file.
130 class Message; 131 class Message;
131 class Reflection; 132 class Reflection;
132 class MessageFactory; 133 class MessageFactory;
133 134
134 // Defined in other files. 135 // Defined in other files.
135 class Descriptor; // descriptor.h 136 class Descriptor; // descriptor.h
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 const Message* prototype); 683 const Message* prototype);
683 684
684 private: 685 private:
685 GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageFactory); 686 GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageFactory);
686 }; 687 };
687 688
688 } // namespace protobuf 689 } // namespace protobuf
689 690
690 } // namespace google 691 } // namespace google
691 #endif // GOOGLE_PROTOBUF_MESSAGE_H__ 692 #endif // GOOGLE_PROTOBUF_MESSAGE_H__
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698