tree 5bfe9b2b33058e2786de5a75ae0c3f9c3226cf62
parent 7a967b3d4468ab56bf1b75ebd4d7bf9e6798761b
author Elliott Hughes <enh@google.com> 1332881384 -0700
committer Elliott Hughes <enh@google.com> 1332987719 -0700

Fix the C++ compilation part of the Mac build.

(cherry picked from commit b755f82c7096aa31d5d11b124bcf5fe14ab35a47)

Change-Id: Icf352a57e6c99409a3153b4163d7cc6d01bd18f0