Fix folly/Makefile.am

[folly.git] / folly / gen / ParallelMap-inl.h

diff --git a/folly/gen/ParallelMap-inl.h b/folly/gen/ParallelMap-inl.h
index 7cc0321bd33ceab8b63b92465c89189452e9fd4f..47fd9bcbc654a860eda479cb086ff4db3872d323 100644 (file)
--- a/folly/gen/ParallelMap-inl.h
+++ b/folly/gen/ParallelMap-inl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef FOLLY_GEN_PARALLELMAP_H
+#ifndef FOLLY_GEN_PARALLELMAP_H_
 #error This file may only be included from folly/gen/ParallelMap.h
 #endif
 
@@ -25,8 +25,8 @@
 #include <utility>
 #include <vector>
 
-#include "folly/MPMCPipeline.h"
-#include "folly/experimental/EventCount.h"
+#include <folly/MPMCPipeline.h>
+#include <folly/experimental/EventCount.h>
 
 namespace folly { namespace gen { namespace detail {
 
@@ -38,14 +38,14 @@ namespace folly { namespace gen { namespace detail {
  *
  * This type is usually used through the 'pmap' helper function:
  *
- *   auto squares = seq(1, 10) | pmap(4, fibonacci) | sum;
+ *   auto squares = seq(1, 10) | pmap(fibonacci, 4) | sum;
  */
 template<class Predicate>
 class PMap : public Operator<PMap<Predicate>> {
   Predicate pred_;
   size_t nThreads_;
  public:
-  PMap() {}
+  PMap() = default;
 
   PMap(Predicate pred, size_t nThreads)
     : pred_(std::move(pred)),
@@ -75,7 +75,7 @@ class PMap : public Operator<PMap<Predicate>> {
         : pred_(pred),
           pipeline_(nThreads, nThreads) {
         workers_.reserve(nThreads);
-        for (int i = 0; i < nThreads; i++) {
+        for (size_t i = 0; i < nThreads; i++) {
           workers_.push_back(std::thread([this] { this->predApplier(); }));
         }
       }
@@ -148,7 +148,7 @@ class PMap : public Operator<PMap<Predicate>> {
     Generator(Source source, const Predicate& pred, size_t nThreads)
       : source_(std::move(source)),
         pred_(pred),
-        nThreads_(nThreads ?: sysconf(_SC_NPROCESSORS_ONLN)) {
+        nThreads_(nThreads ? nThreads : sysconf(_SC_NPROCESSORS_ONLN)) {
     }
 
     template<class Body>