third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc - Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_bootstrap_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, 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/compiler/command_line_interface_unittest.cc ('k') | third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_enum.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc

diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc

index c3e9fe7448661eb209055dc77f0071c1b5bd22e6..77451ab1bff81b2377da93af2f661d98021e8630 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc

+++ b/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_bootstrap_unittest.cc

@@ -54,6 +54,7 @@

#include <google/protobuf/stubs/substitute.h>

#include <google/protobuf/testing/file.h>

+#include <google/protobuf/testing/file.h>

#include <google/protobuf/testing/googletest.h>

#include <gtest/gtest.h>

@@ -107,7 +108,7 @@ class MockGeneratorContext : public GeneratorContext {

virtual io::ZeroCopyOutputStream* Open(const string& filename) {

string** map_slot = &files_[filename];

- if (*map_slot != NULL) delete *map_slot;

+ delete *map_slot;

*map_slot = new string;

return new io::StringOutputStream(*map_slot);