third_party/re2/util/util.h - Issue 1096813007: third_party/re2: Remove remove-static-initializers.patch.

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/re2/util/util.h

Issue 1096813007: third_party/re2: Remove remove-static-initializers.patch. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rm the patch files and update the README file Created 5 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 side-by-side diff with in-line comments

Download patch

Index: third_party/re2/util/util.h

diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h

index 83504454b28c40c38dd8c4ac79f8d1782697904a..21439e9755e11cb0198fff254eaefa139a77fccc 100644

--- a/third_party/re2/util/util.h

+++ b/third_party/re2/util/util.h

@@ -46,8 +46,7 @@ using std::sort;

using std::swap;

using std::make_pair;

-#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(OS_ANDROID) && \

- !defined(_LIBCPP_ABI_VERSION)

+#if defined(__GNUC__) && !defined(USE_CXX0X) && !defined(_LIBCPP_ABI_VERSION) && !defined(OS_ANDROID)

Nico 2015/04/22 23:48:28 ugh, rsc merged this bit too? That doesn't make se

tfarina 2015/04/22 23:57:51 Yep, it is all there. :/ https://code.googlesourc

#include <tr1/unordered_set>

using std::tr1::unordered_set;

« no previous file with comments | « third_party/re2/re2/compile.cc ('k') | no next file » | no next file with comments »