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

Side by Side Diff: third_party/protobuf/python/google/protobuf/pyext/python_protobuf.h

Issue 1291903002: Pull new version of protobuf sources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
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 // https://developers.google.com/protocol-buffers/
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.
11 // * Redistributions in binary form must reproduce the above 11 // * Redistributions in binary form must reproduce the above
12 // copyright notice, this list of conditions and the following disclaimer 12 // copyright notice, this list of conditions and the following disclaimer
13 // in the documentation and/or other materials provided with the 13 // in the documentation and/or other materials provided with the
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 // Return the pointer to the C proto inside the given Python proto, 48 // Return the pointer to the C proto inside the given Python proto,
49 // or NULL when this is not a Python proto implemented with a C proto. 49 // or NULL when this is not a Python proto implemented with a C proto.
50 const Message* GetCProtoInsidePyProto(PyObject* msg); 50 const Message* GetCProtoInsidePyProto(PyObject* msg);
51 Message* MutableCProtoInsidePyProto(PyObject* msg); 51 Message* MutableCProtoInsidePyProto(PyObject* msg);
52 52
53 } // namespace python 53 } // namespace python
54 } // namespace protobuf 54 } // namespace protobuf
55 55
56 } // namespace google 56 } // namespace google
57 #endif // GOOGLE_PROTOBUF_PYTHON_PYTHON_PROTOBUF_H__ 57 #endif // GOOGLE_PROTOBUF_PYTHON_PYTHON_PROTOBUF_H__
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698