Rationalized include-directory schema
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664747 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/cpp/src/protocol/TBinaryProtocol.cc b/lib/cpp/src/protocol/TBinaryProtocol.cc
index fef8ab4..624965b 100644
--- a/lib/cpp/src/protocol/TBinaryProtocol.cc
+++ b/lib/cpp/src/protocol/TBinaryProtocol.cc
@@ -1,4 +1,5 @@
-#include "protocol/TBinaryProtocol.h"
+#include "TBinaryProtocol.h"
+
using std::string;
namespace facebook { namespace thrift { namespace protocol {
diff --git a/lib/cpp/src/protocol/TBinaryProtocol.h b/lib/cpp/src/protocol/TBinaryProtocol.h
index 3456abf..db7960f 100644
--- a/lib/cpp/src/protocol/TBinaryProtocol.h
+++ b/lib/cpp/src/protocol/TBinaryProtocol.h
@@ -1,7 +1,7 @@
#ifndef T_BINARY_PROTOCOL_H
#define T_BINARY_PROTOCOL_H
-#include <protocol/TProtocol.h>
+#include "TProtocol.h"
#include <boost/shared_ptr.hpp>
diff --git a/lib/cpp/src/protocol/TProtocol.h b/lib/cpp/src/protocol/TProtocol.h
index 33a6eb7..aa67e9c 100644
--- a/lib/cpp/src/protocol/TProtocol.h
+++ b/lib/cpp/src/protocol/TProtocol.h
@@ -29,8 +29,10 @@
* the end of a sequence of fields.
*/
enum TType {
- T_STOP = 1,
+ T_STOP = 0,
+ T_BOOL = 1,
T_BYTE = 2,
+ T_U08 = 2,
T_U16 = 3,
T_I16 = 4,
T_U32 = 5,
@@ -38,10 +40,13 @@
T_U64 = 7,
T_I64 = 8,
T_STRING = 9,
+ T_UTF7 = 9,
T_STRUCT = 10,
T_MAP = 11,
T_SET = 12,
- T_LIST = 13
+ T_LIST = 13,
+ T_UTF8 = 14,
+ T_UTF16 = 15
};
/**