89 lines
3.7 KiB
Diff
89 lines
3.7 KiB
Diff
|
THRIFT-2229 thrift failed to build on OSX 10.9 GM
|
||
|
|
|
||
|
|
---
|
||
|
|
compiler/cpp/src/thrifty.yy | 4 ++--
|
||
|
|
tutorial/cpp/CppClient.cpp | 6 +++---
|
||
|
|
tutorial/cpp/CppServer.cpp | 16 ++++++++--------
|
||
|
|
3 files changed, 13 insertions(+), 13 deletions(-)
|
||
|
|
mode change 100644 => 100755 compiler/cpp/src/thrifty.yy
|
||
|
|
|
||
|
|
diff --git a/compiler/cpp/src/thrifty.yy b/compiler/cpp/src/thrifty.yy
|
||
|
|
old mode 100644
|
||
|
|
new mode 100755
|
||
|
|
index b543552..8814332
|
||
|
|
--- a/compiler/cpp/src/thrifty.yy
|
||
|
|
+++ b/compiler/cpp/src/thrifty.yy
|
||
|
|
@@ -675,7 +675,7 @@ ConstValue:
|
||
|
|
$$ = new t_const_value();
|
||
|
|
$$->set_integer($1);
|
||
|
|
if (!g_allow_64bit_consts && ($1 < INT32_MIN || $1 > INT32_MAX)) {
|
||
|
|
- pwarning(1, "64-bit constant \"%"PRIi64"\" may not work in all languages.\n", $1);
|
||
|
|
+ pwarning(1, "64-bit constant \"%" PRIi64"\" may not work in all languages.\n", $1);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
| tok_dub_constant
|
||
|
|
@@ -987,7 +987,7 @@ FieldIdentifier:
|
||
|
|
* warn if the user-specified negative value isn't what
|
||
|
|
* thrift would have auto-assigned.
|
||
|
|
*/
|
||
|
|
- pwarning(1, "Nonpositive field key (%"PRIi64") differs from what would be "
|
||
|
|
+ pwarning(1, "Nonpositive field key (%" PRIi64") differs from what would be "
|
||
|
|
"auto-assigned by thrift (%d).\n", $1, y_field_val);
|
||
|
|
}
|
||
|
|
/*
|
||
|
|
diff --git a/tutorial/cpp/CppClient.cpp b/tutorial/cpp/CppClient.cpp
|
||
|
|
index ba71caa..b91df2e 100644
|
||
|
|
--- a/tutorial/cpp/CppClient.cpp
|
||
|
|
+++ b/tutorial/cpp/CppClient.cpp
|
||
|
|
@@ -38,9 +38,9 @@ using namespace shared;
|
||
|
|
using namespace boost;
|
||
|
|
|
||
|
|
int main(int argc, char** argv) {
|
||
|
|
- shared_ptr<TTransport> socket(new TSocket("localhost", 9090));
|
||
|
|
- shared_ptr<TTransport> transport(new TBufferedTransport(socket));
|
||
|
|
- shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
|
||
|
|
+ boost::shared_ptr<TTransport> socket(new TSocket("localhost", 9090));
|
||
|
|
+ boost::shared_ptr<TTransport> transport(new TBufferedTransport(socket));
|
||
|
|
+ boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
|
||
|
|
CalculatorClient client(protocol);
|
||
|
|
|
||
|
|
try {
|
||
|
|
diff --git a/tutorial/cpp/CppServer.cpp b/tutorial/cpp/CppServer.cpp
|
||
|
|
index d0dbad9..f19258c 100644
|
||
|
|
--- a/tutorial/cpp/CppServer.cpp
|
||
|
|
+++ b/tutorial/cpp/CppServer.cpp
|
||
|
|
@@ -113,11 +113,11 @@ protected:
|
||
|
|
|
||
|
|
int main(int argc, char **argv) {
|
||
|
|
|
||
|
|
- shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
|
||
|
|
- shared_ptr<CalculatorHandler> handler(new CalculatorHandler());
|
||
|
|
- shared_ptr<TProcessor> processor(new CalculatorProcessor(handler));
|
||
|
|
- shared_ptr<TServerTransport> serverTransport(new TServerSocket(9090));
|
||
|
|
- shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory());
|
||
|
|
+ boost::shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
|
||
|
|
+ boost::shared_ptr<CalculatorHandler> handler(new CalculatorHandler());
|
||
|
|
+ boost::shared_ptr<TProcessor> processor(new CalculatorProcessor(handler));
|
||
|
|
+ boost::shared_ptr<TServerTransport> serverTransport(new TServerSocket(9090));
|
||
|
|
+ boost::shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory());
|
||
|
|
|
||
|
|
TSimpleServer server(processor,
|
||
|
|
serverTransport,
|
||
|
|
@@ -128,10 +128,10 @@ int main(int argc, char **argv) {
|
||
|
|
/**
|
||
|
|
* Or you could do one of these
|
||
|
|
|
||
|
|
- shared_ptr<ThreadManager> threadManager =
|
||
|
|
+ boost::shared_ptr<ThreadManager> threadManager =
|
||
|
|
ThreadManager::newSimpleThreadManager(workerCount);
|
||
|
|
- shared_ptr<PosixThreadFactory> threadFactory =
|
||
|
|
- shared_ptr<PosixThreadFactory>(new PosixThreadFactory());
|
||
|
|
+ boost::shared_ptr<PosixThreadFactory> threadFactory =
|
||
|
|
+ boost::shared_ptr<PosixThreadFactory>(new PosixThreadFactory());
|
||
|
|
threadManager->threadFactory(threadFactory);
|
||
|
|
threadManager->start();
|
||
|
|
TThreadPoolServer server(processor,
|
||
|
|
--
|
||
|
|
1.8.5.3
|
||
|
|
|