Fix multiple includes

Summary:
Add nolint comments to appropriate multiply-included files.
Removed raw duplicates from StlVectorTest.

Test Plan:
fbconfig -r folly && fbmake runtests

Ran arc lint, see no "included multiple times" messages

Reviewed By: robbert@fb.com

Subscribers: sdwilsh, njormrod, folly-diffs@

FB internal diff: D1644144

Tasks: 5486739

Signature: t1:1644144:1414599280:1e403ea3675d2173b249c4ce6db0dad621a139bc

diff --git a/folly/FBString.h b/folly/FBString.h
index e80eba5914434885ffb28a82f37ca0d8baa339ff..3e7e292b1fdfe0da1bc31f6c7fcd430c1b39833b 100644 (file)
--- a/folly/FBString.h
+++ b/folly/FBString.h
@@ -36,9 +36,9 @@
 // either before or after this inclusion.
 #ifdef FOLLY_MALLOC_H_
 #undef FOLLY_MALLOC_H_
-#include "basic_fbstring_malloc.h"
+#include "basic_fbstring_malloc.h" // nolint
 #else
-#include "basic_fbstring_malloc.h"
+#include "basic_fbstring_malloc.h" // nolint
 #undef FOLLY_MALLOC_H_
 #endif
 

diff --git a/folly/test/FBStringBenchmark.cpp b/folly/test/FBStringBenchmark.cpp
index 9539effe6eac236b907bdf6e1bf56cc66710adaf..d6800b8710a74bc85e9f78351d44498dcbcf428d 100644 (file)
--- a/folly/test/FBStringBenchmark.cpp
+++ b/folly/test/FBStringBenchmark.cpp
@@ -86,10 +86,10 @@ std::list<char> RandomList(unsigned int maxSize) {
 #define BENCHFUN(F) CONCAT(CONCAT(BM_, F), CONCAT(_, STRING))
 
 #define STRING string
-#include <folly/test/FBStringTestBenchmarks.cpp.h>
+#include <folly/test/FBStringTestBenchmarks.cpp.h> // nolint
 #undef STRING
 #define STRING fbstring
-#include <folly/test/FBStringTestBenchmarks.cpp.h>
+#include <folly/test/FBStringTestBenchmarks.cpp.h> // nolint
 #undef STRING
 
 int main(int argc, char** argv) {

diff --git a/folly/test/FBVectorBenchmark.cpp b/folly/test/FBVectorBenchmark.cpp
index 2e20e39f0be72309a187f60b2ec28d85e5b272c8..c5123f80637d2fe98d923c858e1c2f918c876b01 100644 (file)
--- a/folly/test/FBVectorBenchmark.cpp
+++ b/folly/test/FBVectorBenchmark.cpp
@@ -93,16 +93,16 @@ typedef vector<folly::fbstring> FBStringVector;
 typedef fbvector<folly::fbstring> FBStringFBVector;
 
 #define VECTOR IntVector
-#include <folly/test/FBVectorTestBenchmarks.cpp.h>
+#include <folly/test/FBVectorTestBenchmarks.cpp.h> // nolint
 #undef VECTOR
 #define VECTOR IntFBVector
-#include <folly/test/FBVectorTestBenchmarks.cpp.h>
+#include <folly/test/FBVectorTestBenchmarks.cpp.h> // nolint
 #undef VECTOR
 #define VECTOR FBStringVector
-#include <folly/test/FBVectorTestBenchmarks.cpp.h>
+#include <folly/test/FBVectorTestBenchmarks.cpp.h> // nolint
 #undef VECTOR
 #define VECTOR FBStringFBVector
-#include <folly/test/FBVectorTestBenchmarks.cpp.h>
+#include <folly/test/FBVectorTestBenchmarks.cpp.h> // nolint
 #undef VECTOR
 
 int main(int argc, char** argv) {

diff --git a/folly/test/stl_tests/StlVectorTest.cpp b/folly/test/stl_tests/StlVectorTest.cpp
index 6f68ec9eab12636f8125e7a2df90560d92ed8061..c3cbd7c6fc55b14d63e9276bd315e8b6fdaa94da 100644 (file)
--- a/folly/test/stl_tests/StlVectorTest.cpp
+++ b/folly/test/stl_tests/StlVectorTest.cpp
@@ -2729,9 +2729,6 @@ int main(int argc, char** argv) {
 
 #else // GCC 4.7 guard
 
-#include <gflags/gflags.h>
-#include <gtest/gtest.h>
-
 // do nothing
 TEST(placeholder, gccversion) {}