projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deflake some AsyncSSLSocket tests.
[folly.git]
/
folly
/
Padded.h
diff --git
a/folly/Padded.h
b/folly/Padded.h
index d474b850da5e73be0185f767d0c735b1cb337479..88282d9d12c80a7f04eb0cbd9ec4d6bde2e1dd68 100644
(file)
--- a/
folly/Padded.h
+++ b/
folly/Padded.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
6
Facebook, Inc.
+ * Copyright 201
7
Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-27,8
+27,8
@@
#include <boost/iterator/iterator_adaptor.hpp>
#include <boost/iterator/iterator_adaptor.hpp>
-#include <folly/Portability.h>
#include <folly/ContainerTraits.h>
#include <folly/ContainerTraits.h>
+#include <folly/Portability.h>
/**
* Code that aids in storing data aligned on block (possibly cache-line)
/**
* Code that aids in storing data aligned on block (possibly cache-line)
@@
-67,7
+67,7
@@
struct NodeValid<T, NS,
NS % alignof(T) == 0)>::type> {
typedef void type;
};
NS % alignof(T) == 0)>::type> {
typedef void type;
};
-}
// namespace detail
+} // namespace detail
template <class T, size_t NS>
class Node<T, NS, typename detail::NodeValid<T,NS>::type> {
template <class T, size_t NS>
class Node<T, NS, typename detail::NodeValid<T,NS>::type> {
@@
-190,7
+190,7
@@
struct IteratorBase {
> type;
};
> type;
};
-}
// namespace detail
+} // namespace detail
/**
* Wrapper around iterators to Node to return iterators to the underlying
/**
* Wrapper around iterators to Node to return iterators to the underlying
@@
-345,8
+345,9
@@
class Adaptor {
lastCount_(lastCount) {
}
explicit Adaptor(size_t n, const value_type& value = value_type())
lastCount_(lastCount) {
}
explicit Adaptor(size_t n, const value_type& value = value_type())
- : c_(Node::nodeCount(n), fullNode(value)),
- lastCount_(n % Node::kElementCount ?: Node::kElementCount) {
+ : c_(Node::nodeCount(n), fullNode(value)) {
+ const auto count = n % Node::kElementCount;
+ lastCount_ = count != 0 ? count : Node::kElementCount;
}
Adaptor(const Adaptor&) = default;
}
Adaptor(const Adaptor&) = default;
@@
-384,7
+385,7
@@
class Adaptor {
iterator end() {
auto it = iterator(c_.end());
if (lastCount_ != Node::kElementCount) {
iterator end() {
auto it = iterator(c_.end());
if (lastCount_ != Node::kElementCount) {
- it -= (Node::kElementCount - lastCount_);
+ it -=
difference_type
(Node::kElementCount - lastCount_);
}
return it;
}
}
return it;
}
@@
-509,5
+510,5
@@
class Adaptor {
size_t lastCount_; // number of elements in last Node
};
size_t lastCount_; // number of elements in last Node
};
-}
// namespace padded
-}
// namespace folly
+} // namespace padded
+} // namespace folly