Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/5d9a72a2 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/5d9a72a2 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/5d9a72a2 Branch: refs/heads/master Commit: 5d9a72a28c4c082a4c155d539a20cf27d7440562 Parents: 7570b84 cd54ec6 Author: henrique <[email protected]> Authored: Thu Aug 29 18:06:45 2013 +0200 Committer: henrique <[email protected]> Committed: Thu Aug 29 18:06:45 2013 +0200 ---------------------------------------------------------------------- lib/cpp/src/thrift/Thrift.h | 2 +- lib/cpp/src/thrift/concurrency/BoostMutex.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
