diff options
author | Konrad Grochowski <hcorg@apache.org> | 2014-11-18 11:33:31 +0100 |
---|---|---|
committer | Konrad Grochowski <hcorg@apache.org> | 2014-11-18 11:33:31 +0100 |
commit | 240120c8434b49d1f76d207aff4e3530d3ada14b (patch) | |
tree | 98cdcc1834ff0d96ef40fe4e927aa607af5c578e /tutorial/cpp | |
parent | 74260aa9099c3bb209bc8e524b0e8ba603f62c41 (diff) | |
download | thrift-240120c8434b49d1f76d207aff4e3530d3ada14b.tar.gz |
Revert "THRIFT-2729: C++ - .clang-format created and applied"
This reverts commit 74260aa9099c3bb209bc8e524b0e8ba603f62c41.
Diffstat (limited to 'tutorial/cpp')
-rw-r--r-- | tutorial/cpp/CppClient.cpp | 1 | ||||
-rw-r--r-- | tutorial/cpp/CppServer.cpp | 19 | ||||
-rwxr-xr-x | tutorial/cpp/Makefile.am | 3 |
3 files changed, 15 insertions, 8 deletions
diff --git a/tutorial/cpp/CppClient.cpp b/tutorial/cpp/CppClient.cpp index 258cbd66d..44753383d 100644 --- a/tutorial/cpp/CppClient.cpp +++ b/tutorial/cpp/CppClient.cpp @@ -76,4 +76,5 @@ int main() { } catch (TException& tx) { cout << "ERROR: " << tx.what() << endl; } + } diff --git a/tutorial/cpp/CppServer.cpp b/tutorial/cpp/CppServer.cpp index 84b79d420..133d75d44 100644 --- a/tutorial/cpp/CppServer.cpp +++ b/tutorial/cpp/CppServer.cpp @@ -44,10 +44,12 @@ using namespace tutorial; using namespace shared; class CalculatorHandler : public CalculatorIf { -public: + public: CalculatorHandler() {} - void ping() { cout << "ping()" << endl; } + void ping() { + cout << "ping()" << endl; + } int32_t add(const int32_t n1, const int32_t n2) { cout << "add(" << n1 << ", " << n2 << ")" << endl; @@ -93,15 +95,18 @@ public: return val; } - void getStruct(SharedStruct& ret, const int32_t logid) { + void getStruct(SharedStruct &ret, const int32_t logid) { cout << "getStruct(" << logid << ")" << endl; ret = log[logid]; } - void zip() { cout << "zip()" << endl; } + void zip() { + cout << "zip()" << endl; + } protected: map<int32_t, SharedStruct> log; + }; int main() { @@ -111,7 +116,11 @@ int main() { boost::shared_ptr<TServerTransport> serverTransport(new TServerSocket(9090)); boost::shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory()); - TSimpleServer server(processor, serverTransport, transportFactory, protocolFactory); + TSimpleServer server(processor, + serverTransport, + transportFactory, + protocolFactory); + /** * Or you could do one of these diff --git a/tutorial/cpp/Makefile.am b/tutorial/cpp/Makefile.am index 3b382403c..9768c5189 100755 --- a/tutorial/cpp/Makefile.am +++ b/tutorial/cpp/Makefile.am @@ -76,9 +76,6 @@ tutorialserver: all tutorialclient: all ./TutorialClient -style-local: - $(CPPSTYLE_CMD) - EXTRA_DIST = \ CppClient.cpp \ CppServer.cpp |