Revert "THRIFT-2729: C++ - .clang-format created and applied"
This reverts commit 74260aa9099c3bb209bc8e524b0e8ba603f62c41.
diff --git a/tutorial/cpp/CppClient.cpp b/tutorial/cpp/CppClient.cpp
index 258cbd6..4475338 100644
--- a/tutorial/cpp/CppClient.cpp
+++ b/tutorial/cpp/CppClient.cpp
@@ -76,4 +76,5 @@
} catch (TException& tx) {
cout << "ERROR: " << tx.what() << endl;
}
+
}
diff --git a/tutorial/cpp/CppServer.cpp b/tutorial/cpp/CppServer.cpp
index 84b79d4..133d75d 100644
--- a/tutorial/cpp/CppServer.cpp
+++ b/tutorial/cpp/CppServer.cpp
@@ -44,10 +44,12 @@
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 @@
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 @@
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 3b38240..9768c51 100755
--- a/tutorial/cpp/Makefile.am
+++ b/tutorial/cpp/Makefile.am
@@ -76,9 +76,6 @@
tutorialclient: all
./TutorialClient
-style-local:
- $(CPPSTYLE_CMD)
-
EXTRA_DIST = \
CppClient.cpp \
CppServer.cpp