diff options
| author |  Gil <mcg@google.com> | 2017-12-19 07:44:28 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-12-19 07:44:28 -0800 |
| commit | ea3369c192c998d947a2fb6caed7df336f028d98 (patch) | |
| tree | a70764a5d38f9dd3073fabaa31d83b9456a636bd | |
| parent | 683985168ea46b8516a8c3dedd9cc9f14e5e1011 (diff) | |
Use angle brackets for nonlocal #includes in Firestore (#580)
5 files changed, 8 insertions, 6 deletions
diff --git a/Firestore/Example/Firestore.xcodeproj/project.pbxproj b/Firestore/Example/Firestore.xcodeproj/project.pbxproj index 437b661..6823ab1 100644 --- a/Firestore/Example/Firestore.xcodeproj/project.pbxproj +++ b/Firestore/Example/Firestore.xcodeproj/project.pbxproj @@ -1451,6 +1451,7 @@ "$(inherited)", "\"${PODS_ROOT}/../../..\"", "\"${PODS_ROOT}/leveldb-library/include\"", + "\"${PODS_ROOT}/GoogleTest/googletest/include\"", ); INFOPLIST_FILE = "Tests/Tests-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; @@ -1482,6 +1483,7 @@ "$(inherited)", "\"${PODS_ROOT}/../../..\"", "\"${PODS_ROOT}/leveldb-library/include\"", + "\"${PODS_ROOT}/GoogleTest/googletest/include\"", ); INFOPLIST_FILE = "Tests/Tests-Info.plist"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.${PRODUCT_NAME:rfc1034identifier}"; diff --git a/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm b/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm index 4fc77ed..18dfaf3 100644 --- a/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm +++ b/Firestore/Example/Tests/GoogleTest/FSTGoogleTestTests.mm @@ -17,8 +17,9 @@ #import <XCTest/XCTest.h> #import <objc/runtime.h> +#include <gtest/gtest.h> + #include "Firestore/Source/Util/FSTAssert.h" -#include "gtest/gtest.h" /** * An XCTest test case that finds C++ test cases written in the GoogleTest framework, runs them, and diff --git a/Firestore/Port/string_util_test.cc b/Firestore/Port/string_util_test.cc index ac8ce56..331f96e 100644 --- a/Firestore/Port/string_util_test.cc +++ b/Firestore/Port/string_util_test.cc @@ -16,9 +16,8 @@ #include "Firestore/Port/string_util.h" -#include "leveldb/db.h" - -#include "gtest/gtest.h" +#include <gtest/gtest.h> +#include <leveldb/db.h> using Firestore::PrefixSuccessor; using Firestore::ImmediateSuccessor; diff --git a/Firestore/core/test/firebase/firestore/util/autoid_test.cc b/Firestore/core/test/firebase/firestore/util/autoid_test.cc index 730c683..e55a8e9 100644 --- a/Firestore/core/test/firebase/firestore/util/autoid_test.cc +++ b/Firestore/core/test/firebase/firestore/util/autoid_test.cc @@ -18,7 +18,7 @@ #include <ctype.h> -#include "gtest/gtest.h" +#include <gtest/gtest.h> using firebase::firestore::util::CreateAutoId; diff --git a/Firestore/core/test/firebase/firestore/util/secure_random_test.cc b/Firestore/core/test/firebase/firestore/util/secure_random_test.cc index f96f3de..ee2ae00 100644 --- a/Firestore/core/test/firebase/firestore/util/secure_random_test.cc +++ b/Firestore/core/test/firebase/firestore/util/secure_random_test.cc @@ -16,7 +16,7 @@ #include "Firestore/core/src/firebase/firestore/util/secure_random.h" -#include "gtest/gtest.h" +#include <gtest/gtest.h> using firebase::firestore::util::SecureRandom; |