projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix copyright line in folly/synchronization/test/ParkingLotBenchmark.cpp
[folly.git]
/
folly
/
MacAddress.h
diff --git
a/folly/MacAddress.h
b/folly/MacAddress.h
index 739bb226461c4f5114c745908ecd0639b913c3f9..884a2db81a086f58496e43e65a65e4002b385f9b 100644
(file)
--- a/
folly/MacAddress.h
+++ b/
folly/MacAddress.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 201
7
Facebook, Inc.
+ * Copyright 201
4-present
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.
@@
-18,8
+18,8
@@
#include <iosfwd>
#include <iosfwd>
-#include <folly/Bits.h>
#include <folly/Range.h>
#include <folly/Range.h>
+#include <folly/lang/Bits.h>
namespace folly {
namespace folly {
@@
-222,11
+222,12
@@
class MacAddress {
/* Define toAppend() so to<string> will work */
template <class Tgt>
/* Define toAppend() so to<string> will work */
template <class Tgt>
-typename std::enable_if<IsSomeString<Tgt>::value>::type
-toAppend(MacAddress address, Tgt* result) {
+typename std::enable_if<IsSomeString<Tgt>::value>::type toAppend(
+ MacAddress address,
+ Tgt* result) {
toAppend(address.toString(), result);
}
std::ostream& operator<<(std::ostream& os, MacAddress address);
toAppend(address.toString(), result);
}
std::ostream& operator<<(std::ostream& os, MacAddress address);
-}
//
folly
+}
// namespace
folly