projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert D5714883: [Folly] Shrink MicroSpinLock.h transitive includes and inline methods
[folly.git]
/
folly
/
Merge.h
diff --git
a/folly/Merge.h
b/folly/Merge.h
index f8d1fc1ea7d86549cb6bf373a7e92d24e8bfee75..1979ae716098ef4aa002d748adbc112d667e24d1 100644
(file)
--- a/
folly/Merge.h
+++ b/
folly/Merge.h
@@
-42,7
+42,7
@@
namespace folly {
namespace folly {
-template<class InputIt1, class InputIt2, class OutputIt, class Compare>
+template
<class InputIt1, class InputIt2, class OutputIt, class Compare>
OutputIt merge(InputIt1 first1, InputIt1 last1,
InputIt2 first2, InputIt2 last2,
OutputIt d_first, Compare comp) {
OutputIt merge(InputIt1 first1, InputIt1 last1,
InputIt2 first2, InputIt2 last2,
OutputIt d_first, Compare comp) {
@@
-61,7
+61,7
@@
OutputIt merge(InputIt1 first1, InputIt1 last1,
return std::copy(first2, last2, d_first);
}
return std::copy(first2, last2, d_first);
}
-template<class InputIt1, class InputIt2, class OutputIt>
+template
<class InputIt1, class InputIt2, class OutputIt>
OutputIt merge(InputIt1 first1, InputIt1 last1,
InputIt2 first2, InputIt2 last2,
OutputIt d_first) {
OutputIt merge(InputIt1 first1, InputIt1 last1,
InputIt2 first2, InputIt2 last2,
OutputIt d_first) {