Small tweaks to clang-format.

Now not joining keywords with '::' and not putting a space between
a pointer pointer.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@169594 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index c8416cb..d00da7f 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -277,6 +277,8 @@
 TEST_F(FormatTest, FormatsDerivedClass) {
   verifyFormat("class A : public B {\n"
                "};");
+  verifyFormat("class A : public ::B {\n"
+               "};");
 }
 
 TEST_F(FormatTest, FormatsEnum) {
@@ -474,6 +476,9 @@
   verifyFormat("int a = *b;");
   verifyFormat("int a = *b * c;");
   verifyFormat("int a = b * *c;");
+  verifyFormat("int main(int argc, char **argv) {\n}");
+
+  verifyGoogleFormat("int main(int argc, char** argv) {\n}");
 }
 
 TEST_F(FormatTest, LineStartsWithSpecialCharacter) {