diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules.Darwin | 6 | ||||
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin index ffaa2c1a816..0d3ef24dcad 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -11,8 +11,8 @@ # This file is included by Make.rules when uname is Darwin. # -CXX = c++ -#CXX = clang++ +CXX = clang++ +#CXX = g++ CXXFLAGS = -Wall -D_REENTRANT @@ -43,7 +43,7 @@ ifneq ($(embedded_runpath_prefix),) endif endif -ifeq ($(CXX),c++) +ifeq ($(CXX),g++) LDPLATFORMFLAGS += -rdynamic endif diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 94dbfc72e85..2c796c4f619 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -1247,7 +1247,7 @@ Slice::JavaVisitor::writeConstantValue(Output& out, const TypePtr& type, const S { BuiltinPtr bp; EnumPtr ep; - if(bp = BuiltinPtr::dynamicCast(type)) + if((bp = BuiltinPtr::dynamicCast(type))) { switch(bp->kind()) { @@ -1350,7 +1350,7 @@ Slice::JavaVisitor::writeConstantValue(Output& out, const TypePtr& type, const S } } - else if(ep = EnumPtr::dynamicCast(type)) + else if((ep = EnumPtr::dynamicCast(type))) { string val = value; string::size_type pos = val.rfind(':'); |