Commit 19b982dc authored by Nicholas Ormrod's avatar Nicholas Ormrod Committed by dcsommer

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
parent 9a88e5b5
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
// either before or after this inclusion. // either before or after this inclusion.
#ifdef FOLLY_MALLOC_H_ #ifdef FOLLY_MALLOC_H_
#undef FOLLY_MALLOC_H_ #undef FOLLY_MALLOC_H_
#include "basic_fbstring_malloc.h" #include "basic_fbstring_malloc.h" // nolint
#else #else
#include "basic_fbstring_malloc.h" #include "basic_fbstring_malloc.h" // nolint
#undef FOLLY_MALLOC_H_ #undef FOLLY_MALLOC_H_
#endif #endif
......
...@@ -86,10 +86,10 @@ std::list<char> RandomList(unsigned int maxSize) { ...@@ -86,10 +86,10 @@ std::list<char> RandomList(unsigned int maxSize) {
#define BENCHFUN(F) CONCAT(CONCAT(BM_, F), CONCAT(_, STRING)) #define BENCHFUN(F) CONCAT(CONCAT(BM_, F), CONCAT(_, STRING))
#define STRING string #define STRING string
#include <folly/test/FBStringTestBenchmarks.cpp.h> #include <folly/test/FBStringTestBenchmarks.cpp.h> // nolint
#undef STRING #undef STRING
#define STRING fbstring #define STRING fbstring
#include <folly/test/FBStringTestBenchmarks.cpp.h> #include <folly/test/FBStringTestBenchmarks.cpp.h> // nolint
#undef STRING #undef STRING
int main(int argc, char** argv) { int main(int argc, char** argv) {
......
...@@ -93,16 +93,16 @@ typedef vector<folly::fbstring> FBStringVector; ...@@ -93,16 +93,16 @@ typedef vector<folly::fbstring> FBStringVector;
typedef fbvector<folly::fbstring> FBStringFBVector; typedef fbvector<folly::fbstring> FBStringFBVector;
#define VECTOR IntVector #define VECTOR IntVector
#include <folly/test/FBVectorTestBenchmarks.cpp.h> #include <folly/test/FBVectorTestBenchmarks.cpp.h> // nolint
#undef VECTOR #undef VECTOR
#define VECTOR IntFBVector #define VECTOR IntFBVector
#include <folly/test/FBVectorTestBenchmarks.cpp.h> #include <folly/test/FBVectorTestBenchmarks.cpp.h> // nolint
#undef VECTOR #undef VECTOR
#define VECTOR FBStringVector #define VECTOR FBStringVector
#include <folly/test/FBVectorTestBenchmarks.cpp.h> #include <folly/test/FBVectorTestBenchmarks.cpp.h> // nolint
#undef VECTOR #undef VECTOR
#define VECTOR FBStringFBVector #define VECTOR FBStringFBVector
#include <folly/test/FBVectorTestBenchmarks.cpp.h> #include <folly/test/FBVectorTestBenchmarks.cpp.h> // nolint
#undef VECTOR #undef VECTOR
int main(int argc, char** argv) { int main(int argc, char** argv) {
......
...@@ -2729,9 +2729,6 @@ int main(int argc, char** argv) { ...@@ -2729,9 +2729,6 @@ int main(int argc, char** argv) {
#else // GCC 4.7 guard #else // GCC 4.7 guard
#include <gflags/gflags.h>
#include <gtest/gtest.h>
// do nothing // do nothing
TEST(placeholder, gccversion) {} TEST(placeholder, gccversion) {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment