summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaichi Shinozaki2017-03-23 07:09:34 +0000
committerDaichi Shinozaki2017-03-23 07:09:34 +0000
commit7eb41c3630a0057f620cca8f954027fe6c99a999 (patch)
tree9901e63eae32e61f3405767a6cfbceb1101a4b72
parent18ead199c1895cbedbd5f83b3e25f43f22292208 (diff)
downloadaur-7eb41c3630a0057f620cca8f954027fe6c99a999.tar.gz
Remove obsolete patch files
-rw-r--r--BinaryProtocol.h.patch11
-rw-r--r--CompactProtocol.h.patch10
-rw-r--r--GeneratedCodeHelper.h.patch11
-rw-r--r--Krb5CredentialsCacheManager.cpp.patch10
-rw-r--r--Serializer.h.patch10
-rw-r--r--t_rb_generator.cc.patch28
6 files changed, 0 insertions, 80 deletions
diff --git a/BinaryProtocol.h.patch b/BinaryProtocol.h.patch
deleted file mode 100644
index 1ee230e90ce5..000000000000
--- a/BinaryProtocol.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fbthrift-0.24.0/thrift/lib/cpp2/protocol/BinaryProtocol.h 2015-03-27 07:17:13.000000000 +0900
-+++ fbthrift.patched/src/fbthrift-0.24.0/thrift/lib/cpp2/protocol/BinaryProtocol.h 2015-03-29 22:35:47.387552550 +0900
-@@ -22,7 +22,7 @@
- #include <folly/io/Cursor.h>
- #include <thrift/lib/cpp/protocol/TProtocol.h>
- #include <thrift/lib/cpp2/protocol/Protocol.h>
--
-+#include <gflags/gflags.h>
- DECLARE_int32(thrift_cpp2_protocol_reader_string_limit);
- DECLARE_int32(thrift_cpp2_protocol_reader_container_limit);
-
diff --git a/CompactProtocol.h.patch b/CompactProtocol.h.patch
deleted file mode 100644
index 97059f16dfef..000000000000
--- a/CompactProtocol.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- fbthrift-0.24.0/thrift/lib/cpp2/protocol/CompactProtocol.h 2015-03-27 07:17:13.000000000 +0900
-+++ fbthrift.patched/src/fbthrift-0.24.0/thrift/lib/cpp2/protocol/CompactProtocol.h 2015-03-29 22:45:56.748745569 +0900
-@@ -22,6 +22,7 @@
- #include <folly/io/Cursor.h>
- #include <thrift/lib/cpp2/protocol/Protocol.h>
- #include <thrift/lib/cpp/protocol/TProtocol.h>
-+#include <gflags/gflags.h>
-
- #include <stack>
-
diff --git a/GeneratedCodeHelper.h.patch b/GeneratedCodeHelper.h.patch
deleted file mode 100644
index 33161ddbdb04..000000000000
--- a/GeneratedCodeHelper.h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- GeneratedCodeHelper.h~ 2015-08-24 21:47:32.000000000 +0100
-+++ GeneratedCodeHelper.h 2015-12-27 20:36:06.330000000 +0000
-@@ -921,7 +921,7 @@
- void process_pmap(
- Processor* proc,
- const typename GeneratedAsyncProcessor::ProcessMap<
-- typename GeneratedAsyncProcessor::ProcessFunc<
-+ GeneratedAsyncProcessor::ProcessFunc<
- Processor, ProtocolReader>>& pmap,
- std::unique_ptr<ResponseChannel::Request> req,
- std::unique_ptr<folly::IOBuf> buf,
diff --git a/Krb5CredentialsCacheManager.cpp.patch b/Krb5CredentialsCacheManager.cpp.patch
deleted file mode 100644
index 58b79ce819af..000000000000
--- a/Krb5CredentialsCacheManager.cpp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- fbthrift-0.24.0/thrift/lib/cpp/util/kerberos/Krb5CredentialsCacheManager.cpp.orig 2015-03-27 07:17:13.000000000 +0900
-+++ fbthrift-0.24.0/thrift/lib/cpp/util/kerberos/Krb5CredentialsCacheManager.cpp 2015-03-30 09:29:29.768341389 +0900
-@@ -26,6 +26,7 @@
- #include <folly/Memory.h>
- #include <folly/ScopeGuard.h>
- #include <folly/String.h>
-+#include <gflags/gflags.h>
-
- // DO NOT modify this flag from your application
- #ifndef NO_LIB_GFLAGS
diff --git a/Serializer.h.patch b/Serializer.h.patch
deleted file mode 100644
index d18ceb05bbc7..000000000000
--- a/Serializer.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- fbthrift-0.24.0/thrift/lib/cpp2/protocol/Serializer.h 2015-03-27 07:17:13.000000000 +0900
-+++ fbthrift.patched/src/fbthrift-0.24.0/thrift/lib/cpp2/protocol/Serializer.h 2015-03-29 22:42:05.330745866 +0900
-@@ -26,6 +26,7 @@
- #include <thrift/lib/cpp2/protocol/SimpleJSONProtocol.h>
- #include <thrift/lib/cpp/TApplicationException.h>
- #include <folly/io/IOBuf.h>
-+#include <gflags/gflags.h>
-
- namespace apache { namespace thrift {
-
diff --git a/t_rb_generator.cc.patch b/t_rb_generator.cc.patch
deleted file mode 100644
index f332866d045c..000000000000
--- a/t_rb_generator.cc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/thrift/compiler/generate/t_rb_generator.cc 2015-10-13 08:22:03.487661748 +0100
-+++ b/thrift/compiler/generate/t_rb_generator.cc 2015-10-13 08:25:54.874327793 +0100
-@@ -312,7 +312,11 @@
- //Populate the hash
- int32_t value = (*c_iter)->get_value();
-
-- first ? first = false : f_types_ << ", ";
-+ //first ? first = false : f_types_ << ", ";
-+ if (first)
-+ first = false;
-+ else
-+ f_types_ << ", ";
- f_types_ << value << " => \"" << capitalize((*c_iter)->get_name()) << "\"";
-
- }
-@@ -323,7 +327,11 @@
- first = true;
- for (c_iter = constants.begin(); c_iter != constants.end(); ++c_iter) {
- // Populate the set
-- first ? first = false: f_types_ << ", ";
-+ //first ? first = false: f_types_ << ", ";
-+ if (first)
-+ first = false;
-+ else
-+ f_types_ << ", ";
- f_types_ << capitalize((*c_iter)->get_name());
- }
- f_types_ << "]).freeze" << endl;