Re-order virally misplaced namespace comments.
Noticed these were out of place when I tried to copy a file to use as a
template for a new file.
namespace android {
namespace aidl {
...
} // namespace android
} // namespace aidl
=>
namespace android {
namespace aidl {
...
} // namespace aidl
} // namespace android
Bug: N/A
Test: clang-format upload hook is happy
Change-Id: I2893b088c2a0e6b8fd2d09f0a11af5a0877599f1
diff --git a/aidl.cpp b/aidl.cpp
index 7c838a5..650de31 100644
--- a/aidl.cpp
+++ b/aidl.cpp
@@ -859,5 +859,5 @@
return true;
}
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/aidl.h b/aidl.h
index 7b5628f..5b5799c 100644
--- a/aidl.h
+++ b/aidl.h
@@ -65,5 +65,5 @@
} // namespace internals
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/generate_java.cpp b/generate_java.cpp
index 26c8f15..4e7be9c 100644
--- a/generate_java.cpp
+++ b/generate_java.cpp
@@ -269,5 +269,5 @@
}
} // namespace java
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/generate_java.h b/generate_java.h
index 4216cb0..abeee1b 100644
--- a/generate_java.h
+++ b/generate_java.h
@@ -41,5 +41,5 @@
std::vector<std::string> generate_java_annotations(const AidlAnnotatable& a);
} // namespace java
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/generate_java_binder.cpp b/generate_java_binder.cpp
index af5f83e..af1452b 100644
--- a/generate_java_binder.cpp
+++ b/generate_java_binder.cpp
@@ -1051,5 +1051,5 @@
}
} // namespace java
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/import_resolver.cpp b/import_resolver.cpp
index 864f5a9..0500cf8 100644
--- a/import_resolver.cpp
+++ b/import_resolver.cpp
@@ -92,5 +92,5 @@
}
}
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/import_resolver.h b/import_resolver.h
index 569c94f..0a34e05 100644
--- a/import_resolver.h
+++ b/import_resolver.h
@@ -47,5 +47,5 @@
DISALLOW_COPY_AND_ASSIGN(ImportResolver);
};
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/io_delegate.h b/io_delegate.h
index 70556ad..a53bb8f 100644
--- a/io_delegate.h
+++ b/io_delegate.h
@@ -65,5 +65,5 @@
DISALLOW_COPY_AND_ASSIGN(IoDelegate);
}; // class IoDelegate
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/io_delegate_unittest.cpp b/io_delegate_unittest.cpp
index 5227d0b..39982bc 100644
--- a/io_delegate_unittest.cpp
+++ b/io_delegate_unittest.cpp
@@ -42,5 +42,5 @@
EXPECT_EQ(absolute_path[0], '/');
}
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/line_reader.cpp b/line_reader.cpp
index 5e076d8..66446c0 100644
--- a/line_reader.cpp
+++ b/line_reader.cpp
@@ -87,5 +87,5 @@
return unique_ptr<LineReader>(new MemoryLineReader(contents));
}
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/line_reader.h b/line_reader.h
index baf9c06..5883af4 100644
--- a/line_reader.h
+++ b/line_reader.h
@@ -39,5 +39,5 @@
DISALLOW_COPY_AND_ASSIGN(LineReader);
}; // class LineReader
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/options.cpp b/options.cpp
index 68cac57..86c5e14 100644
--- a/options.cpp
+++ b/options.cpp
@@ -443,5 +443,5 @@
CHECK(output_header_dir_.empty() || output_header_dir_.back() == OS_PATH_SEPARATOR);
}
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/options.h b/options.h
index 7f80823..95463a3 100644
--- a/options.h
+++ b/options.h
@@ -160,5 +160,5 @@
ErrorMessage error_message_;
};
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/options_unittest.cpp b/options_unittest.cpp
index 9c24e24..97b4c0c 100644
--- a/options_unittest.cpp
+++ b/options_unittest.cpp
@@ -314,5 +314,5 @@
EXPECT_EQ(false, GetOptions(arg_with_no_header_dir)->Ok());
}
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/tests/end_to_end_tests.cpp b/tests/end_to_end_tests.cpp
index 7602a86..601c76f 100644
--- a/tests/end_to_end_tests.cpp
+++ b/tests/end_to_end_tests.cpp
@@ -325,5 +325,5 @@
CheckFileContents(kJavaOutputPath, kExpectedJavaOutputWithVersion);
}
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/tests/fake_io_delegate.cpp b/tests/fake_io_delegate.cpp
index b63e1e3..682ea57 100644
--- a/tests/fake_io_delegate.cpp
+++ b/tests/fake_io_delegate.cpp
@@ -169,5 +169,5 @@
}
} // namespace test
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/tests/fake_io_delegate.h b/tests/fake_io_delegate.h
index 32ef2ed..68a9626 100644
--- a/tests/fake_io_delegate.h
+++ b/tests/fake_io_delegate.h
@@ -82,7 +82,7 @@
}; // class FakeIoDelegate
} // namespace test
-} // namespace android
} // namespace aidl
+} // namespace android
#endif // AIDL_TESTS_FAKE_IO_DELEGATE_H_
diff --git a/tests/test_util.cpp b/tests/test_util.cpp
index 9cb52f3..6d4750a 100644
--- a/tests/test_util.cpp
+++ b/tests/test_util.cpp
@@ -164,5 +164,5 @@
}
} // namespace test
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/tests/test_util.h b/tests/test_util.h
index 34b9e5d..6c4389c 100644
--- a/tests/test_util.h
+++ b/tests/test_util.h
@@ -34,7 +34,7 @@
void PrintDiff(const std::string& a, const std::string& b);
} // namespace test
-} // namespace android
} // namespace aidl
+} // namespace android
#endif // AIDL_TESTS_TEST_UTIL_H_
diff --git a/type_cpp_unittest.cpp b/type_cpp_unittest.cpp
index 79b47a9..b098086 100644
--- a/type_cpp_unittest.cpp
+++ b/type_cpp_unittest.cpp
@@ -67,5 +67,5 @@
}
} // namespace cpp
-} // namespace android
} // namespace aidl
+} // namespace android
diff --git a/type_java_unittest.cpp b/type_java_unittest.cpp
index 098a7a5..0a5c94b 100644
--- a/type_java_unittest.cpp
+++ b/type_java_unittest.cpp
@@ -63,5 +63,5 @@
}
} // namespace java
-} // namespace android
} // namespace aidl
+} // namespace android