From: Sean Cannella <seanc@fb.com>
Date: Thu, 29 Aug 2013 16:16:54 +0000 (-0700)
Subject: fix folly build on OSX with gcc 4.8
X-Git-Tag: v0.22.0~888
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=879dfa05e550443698a3e9af7e0a86e6e1359ec0;p=folly.git

fix folly build on OSX with gcc 4.8

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
---

diff --git a/folly/Synchronized.h b/folly/Synchronized.h
index d632a772..b5a3c5ba 100644
--- 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 };