Merge commit 'adae78ea9940f4d44382967d1296e7db0b54a4de' into leveldb-squashed

2013-07-01 08:36:32 -07:00
parent 28bcf3b7ef adae78ea99
commit fb1da62318
18 changed files with 190 additions and 59 deletions
--- a/src/leveldb/db/filename_test.cc
+++ b/src/leveldb/db/filename_test.cc
@@ -70,7 +70,7 @@ TEST(FileNameTest, Parse) {
  for (int i = 0; i < sizeof(errors) / sizeof(errors[0]); i++) {
    std::string f = errors[i];
    ASSERT_TRUE(!ParseFileName(f, &number, &type)) << f;
-  };
+  }
 }

 TEST(FileNameTest, Construction) {