projects
/
folly.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bae9c76
)
fix folly build on OSX with gcc 4.8
author
Sean Cannella
<seanc@fb.com>
Thu, 29 Aug 2013 16:16:54 +0000
(09:16 -0700)
committer
Sara Golemon
<sgolemon@fb.com>
Thu, 29 Aug 2013 16:54:26 +0000
(09:54 -0700)
Summary:
- gcc 4.8 + boost 1.53 do not like the Oxford comma in template
arguments
Test Plan: compiled on OSX with gcc 4.8 and boost 1.53
Reviewed By: andrei.alexandrescu@fb.com
FB internal diff:
D949373
folly/Synchronized.h
patch
|
blob
|
history
diff --git
a/folly/Synchronized.h
b/folly/Synchronized.h
index d632a772c5e8ba140f2341d78298eaf06c57ce5b..b5a3c5ba0ffa1c8af805a45eb0eeab678d2ebf2c 100644
(file)
--- a/
folly/Synchronized.h
+++ b/
folly/Synchronized.h
@@
-48,9
+48,9
@@
template <class T>
struct HasLockUnlock {
enum { value = IsOneOf<T,
std::mutex, std::recursive_mutex,
- boost::mutex, boost::recursive_mutex, boost::shared_mutex
,
+ boost::mutex, boost::recursive_mutex, boost::shared_mutex
#ifndef __APPLE__ // OSX doesn't have timed mutexes
-
std::timed_mutex, std::recursive_timed_mutex,
+
,
std::timed_mutex, std::recursive_timed_mutex,
boost::timed_mutex, boost::recursive_timed_mutex
#endif
>::value };