summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNAKAMURA Takumi <geek4civic@gmail.com>2014-06-25 04:34:00 +0000
committerNAKAMURA Takumi <geek4civic@gmail.com>2014-06-25 04:34:00 +0000
commitfd7d4660dc69a4dfba2bf474a8bd93844b7e8220 (patch)
tree4919b62f3403da1294a6e65515e94ff2a70350e5
parent14984f0ad030521d71c9c60d1439728c6ea94f17 (diff)
downloadclang-fd7d4660dc69a4dfba2bf474a8bd93844b7e8220.tar.gz
clang-fd7d4660dc69a4dfba2bf474a8bd93844b7e8220.tar.bz2
clang-fd7d4660dc69a4dfba2bf474a8bd93844b7e8220.tar.xz
Reformat.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@211661 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Driver/Tools.cpp6
-rw-r--r--unittests/Basic/VirtualFileSystemTest.cpp19
2 files changed, 12 insertions, 13 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 1488dc6955..11e1e614e4 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -6963,9 +6963,9 @@ static StringRef getLinuxDynamicLinker(const ArgList &Args,
return "/lib/ld-linux-mipsn8.so.1";
return "/lib/ld.so.1";
} else if (ToolChain.getArch() == llvm::Triple::mips64 ||
- ToolChain.getArch() == llvm::Triple::mips64el) {
- std::string LinkerFile = mips::isNaN2008(Args) ? "ld-linux-mipsn8.so.1"
- : "ld.so.1";
+ ToolChain.getArch() == llvm::Triple::mips64el) {
+ std::string LinkerFile =
+ mips::isNaN2008(Args) ? "ld-linux-mipsn8.so.1" : "ld.so.1";
if (mips::hasMipsAbiArg(Args, "n32"))
return "/lib32/" + LinkerFile;
return "/lib64/" + LinkerFile;
diff --git a/unittests/Basic/VirtualFileSystemTest.cpp b/unittests/Basic/VirtualFileSystemTest.cpp
index b0b3f87660..f9666b2156 100644
--- a/unittests/Basic/VirtualFileSystemTest.cpp
+++ b/unittests/Basic/VirtualFileSystemTest.cpp
@@ -334,7 +334,7 @@ TEST(VirtualFileSystemTest, OverlayIteration) {
Upper->addRegularFile("/file2");
{
- std::vector<std::string> Contents = { "/file2", "/file1" };
+ std::vector<std::string> Contents = {"/file2", "/file1"};
checkContents(O->dir_begin("/", EC), Contents);
}
@@ -344,7 +344,7 @@ TEST(VirtualFileSystemTest, OverlayIteration) {
Upper->addRegularFile("/dir2/foo");
checkContents(O->dir_begin("/dir2", EC), ArrayRef<std::string>("/dir2/foo"));
{
- std::vector<std::string> Contents = { "/dir2", "/file2", "/dir1", "/file1" };
+ std::vector<std::string> Contents = {"/dir2", "/file2", "/dir1", "/file1"};
checkContents(O->dir_begin("/", EC), Contents);
}
}
@@ -367,7 +367,7 @@ TEST(VirtualFileSystemTest, ThreeLevelIteration) {
Lower->addRegularFile("/file1");
Upper->addRegularFile("/file3");
{
- std::vector<std::string> Contents = { "/file3", "/file2", "/file1" };
+ std::vector<std::string> Contents = {"/file3", "/file2", "/file1"};
checkContents(O->dir_begin("/", EC), Contents);
}
}
@@ -391,8 +391,8 @@ TEST(VirtualFileSystemTest, HiddenInIteration) {
Upper->addRegularFile("/onlyInUp", sys::fs::owner_all);
Upper->addRegularFile("/hiddenByUp", sys::fs::owner_all);
{
- std::vector<std::string> Contents = { "/hiddenByUp", "/onlyInUp",
- "/hiddenByMid", "/onlyInMid", "/onlyInLow" };
+ std::vector<std::string> Contents = {
+ "/hiddenByUp", "/onlyInUp", "/hiddenByMid", "/onlyInMid", "/onlyInLow"};
checkContents(O->dir_begin("/", EC), Contents);
}
@@ -817,15 +817,14 @@ TEST_F(VFSFromYAMLTest, DirectoryIteration) {
std::error_code EC;
{
- std::vector<std::string> Contents = { "//root/file1", "//root/file2",
- "//root/file3", "//root/foo" };
+ std::vector<std::string> Contents = {"//root/file1", "//root/file2",
+ "//root/file3", "//root/foo"};
checkContents(O->dir_begin("//root/", EC), Contents);
}
{
- std::vector<std::string> Contents = {
- "//root/foo/bar/a", "//root/foo/bar/b" };
+ std::vector<std::string> Contents = {"//root/foo/bar/a",
+ "//root/foo/bar/b"};
checkContents(O->dir_begin("//root/foo/bar", EC), Contents);
}
}
-