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

Side by Side Diff: third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h

Issue 2590803003: Revert "third_party/protobuf: Update to HEAD (83d681ee2c)" (Closed)
Patch Set: Created 4 years 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 // https://developers.google.com/protocol-buffers/ 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.
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 #include <memory> 47 #include <memory>
48 #ifndef _SHARED_PTR_H 48 #ifndef _SHARED_PTR_H
49 #include <google/protobuf/stubs/shared_ptr.h> 49 #include <google/protobuf/stubs/shared_ptr.h>
50 #endif 50 #endif
51 #include <string> 51 #include <string>
52 #include <iosfwd> 52 #include <iosfwd>
53 #include <google/protobuf/io/zero_copy_stream.h> 53 #include <google/protobuf/io/zero_copy_stream.h>
54 #include <google/protobuf/stubs/callback.h> 54 #include <google/protobuf/stubs/callback.h>
55 #include <google/protobuf/stubs/common.h> 55 #include <google/protobuf/stubs/common.h>
56 #include <google/protobuf/stubs/scoped_ptr.h>
56 #include <google/protobuf/stubs/stl_util.h> 57 #include <google/protobuf/stubs/stl_util.h>
57 58
58 59
59 namespace google { 60 namespace google {
60 namespace protobuf { 61 namespace protobuf {
61 namespace io { 62 namespace io {
62 63
63 // =================================================================== 64 // ===================================================================
64 65
65 // A ZeroCopyInputStream backed by an in-memory array of bytes. 66 // A ZeroCopyInputStream backed by an in-memory array of bytes.
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 #else 402 #else
402 return make_pair(p, p != NULL); 403 return make_pair(p, p != NULL);
403 #endif 404 #endif
404 } 405 }
405 406
406 } // namespace io 407 } // namespace io
407 } // namespace protobuf 408 } // namespace protobuf
408 409
409 } // namespace google 410 } // namespace google
410 #endif // GOOGLE_PROTOBUF_IO_ZERO_COPY_STREAM_IMPL_LITE_H__ 411 #endif // GOOGLE_PROTOBUF_IO_ZERO_COPY_STREAM_IMPL_LITE_H__
OLDNEW
« no previous file with comments | « third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h ('k') | third_party/protobuf/src/google/protobuf/map.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698