From c8cbdd5fc46433e75cde2076b1db9a2e2bf003d2 Mon Sep 17 00:00:00 2001 From: Bob Haarman Date: Mon, 5 Aug 2013 16:06:50 -0700 Subject: [PATCH] removed superfluous declarations from header files Summary: Clang doesn't like the same member of a class being defined more than once, or default argument values being defined more than once. This diff removes some instances. @override-unit-failures Test Plan: Compiled the code with Clang and GCC Reviewed By: andrewjcg@fb.com FB internal diff: D913226 --- folly/Range.h | 16 ++++------------ folly/dynamic.h | 1 - 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/folly/Range.h b/folly/Range.h index 107bdb00..94a3d825 100644 --- a/folly/Range.h +++ b/folly/Range.h @@ -43,17 +43,6 @@ namespace folly { template class Range; -/** - * Finds the first occurrence of needle in haystack. The algorithm is on - * average faster than O(haystack.size() * needle.size()) but not as fast - * as Boyer-Moore. On the upside, it does not do any upfront - * preprocessing and does not allocate memory. - */ -template ::value_type>> -inline size_t qfind(const Range & haystack, - const Range & needle, - Comp eq = Comp()); - /** * Finds the first occurrence of needle in haystack. The result is the * offset reported to the beginning of haystack, or string::npos if @@ -565,7 +554,10 @@ struct StringPieceHash { }; /** - * Finds substrings faster than brute force by borrowing from Boyer-Moore + * Finds the first occurrence of needle in haystack. The algorithm is on + * average faster than O(haystack.size() * needle.size()) but not as fast + * as Boyer-Moore. On the upside, it does not do any upfront + * preprocessing and does not allocate memory. */ template size_t qfind(const Range& haystack, diff --git a/folly/dynamic.h b/folly/dynamic.h index 6ab5ca1b..6334cf2a 100644 --- a/folly/dynamic.h +++ b/folly/dynamic.h @@ -443,7 +443,6 @@ public: private: friend struct TypeError; struct ObjectImpl; - struct ObjectMaker; template struct TypeInfo; template struct CompareOp; template struct GetAddrImpl; -- 2.34.1