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

Side by Side Diff: third_party/protobuf/src/google/protobuf/io/zero_copy_stream_unittest.cc

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: owners Created 4 years, 6 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 // 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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include <sys/types.h> 56 #include <sys/types.h>
57 #include <sys/stat.h> 57 #include <sys/stat.h>
58 #include <fcntl.h> 58 #include <fcntl.h>
59 #include <errno.h> 59 #include <errno.h>
60 #include <memory> 60 #include <memory>
61 #ifndef _SHARED_PTR_H 61 #ifndef _SHARED_PTR_H
62 #include <google/protobuf/stubs/shared_ptr.h> 62 #include <google/protobuf/stubs/shared_ptr.h>
63 #endif 63 #endif
64 #include <sstream> 64 #include <sstream>
65 65
66 #include <google/protobuf/testing/file.h>
67 #include <google/protobuf/io/coded_stream.h>
66 #include <google/protobuf/io/zero_copy_stream_impl.h> 68 #include <google/protobuf/io/zero_copy_stream_impl.h>
67 #include <google/protobuf/io/coded_stream.h>
68 69
69 #if HAVE_ZLIB 70 #if HAVE_ZLIB
70 #include <google/protobuf/io/gzip_stream.h> 71 #include <google/protobuf/io/gzip_stream.h>
71 #endif 72 #endif
72 73
73 #include <google/protobuf/stubs/common.h> 74 #include <google/protobuf/stubs/common.h>
74 #include <google/protobuf/stubs/logging.h> 75 #include <google/protobuf/stubs/logging.h>
75 #include <google/protobuf/stubs/scoped_ptr.h>
76 #include <google/protobuf/testing/googletest.h> 76 #include <google/protobuf/testing/googletest.h>
77 #include <google/protobuf/testing/file.h> 77 #include <google/protobuf/testing/file.h>
78 #include <gtest/gtest.h> 78 #include <gtest/gtest.h>
79 79
80 namespace google { 80 namespace google {
81 namespace protobuf { 81 namespace protobuf {
82 namespace io { 82 namespace io {
83 namespace { 83 namespace {
84 84
85 #ifdef _WIN32 85 #ifdef _WIN32
(...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after
998 ArrayOutputStream output(NULL, 0); 998 ArrayOutputStream output(NULL, 0);
999 void* data; 999 void* data;
1000 int size; 1000 int size;
1001 EXPECT_FALSE(output.Next(&data, &size)); 1001 EXPECT_FALSE(output.Next(&data, &size));
1002 } 1002 }
1003 1003
1004 } // namespace 1004 } // namespace
1005 } // namespace io 1005 } // namespace io
1006 } // namespace protobuf 1006 } // namespace protobuf
1007 } // namespace google 1007 } // namespace google
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698