testing/gtest_mac.h - Issue 2856383002: Roll googletest to 1.7.0+.

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: testing/gtest_mac.h

Issue 2856383002: Roll googletest to 1.7.0+. (Closed)

Patch Set: Rebase to get past http://crrev.com/2789433004 Created 3 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:

Index: testing/gtest_mac.h

diff --git a/testing/gtest_mac.h b/testing/gtest_mac.h

index 0a9af4323af5fc630e69b82e7241cc240ee4b9ea..b9f668a7d1e841314fa5a5b6f43bd193c204d449 100644

--- a/testing/gtest_mac.h

+++ b/testing/gtest_mac.h

@@ -5,8 +5,8 @@

#ifndef TESTING_GTEST_MAC_H_

#define TESTING_GTEST_MAC_H_

-#include <gtest/internal/gtest-port.h>

-#include <gtest/gtest.h>

+#include "testing/gtest/include/gtest/gtest.h"

+#include "third_party/googletest/src/googletest/include/gtest/internal/gtest-port.h"

#ifdef GTEST_OS_MAC

« no previous file with comments | « testing/gtest/include/gtest/gtest_prod.h ('k') | testing/gtest_mac.mm » ('j') | no next file with comments »