Merge branch 'master' of https://github.com/sogou/workflow into nossl

src/protocol/KafkaMessage.cc

@@ -35,6 +35,7 @@
 #include <snappy.h>
 #include <snappy-sinksource.h>
 #include "crc32c.h"
+#include "EncodeStream.h"
 #include "KafkaMessage.h"
 
 namespace protocol

src/protocol/KafkaMessage.h

@@ -25,7 +25,6 @@
 #include <vector>
 #include <map>
 #include <functional>
-#include "EncodeStream.h"
 #include "kafka_parser.h"
 #include "ProtocolMessage.h"
 #include "KafkaDataTypes.h"
@@ -185,7 +184,7 @@ protected:
 	using parse_func = std::function<int (void **buf, size_t *size)>;
 	std::map<int, parse_func> parse_func_map;
 
-	EncodeStream *stream;
+	class EncodeStream *stream;
 	std::string msgbuf;
 	std::string headbuf;
 

src/protocol/RedisMessage.cc

@@ -21,6 +21,7 @@
 #include <string.h>
 #include <sstream>
 #include <utility>
+#include "EncodeStream.h"
 #include "RedisMessage.h"
 
 namespace protocol

src/protocol/RedisMessage.h

@@ -23,7 +23,6 @@
 #include <stdint.h>
 #include <string>
 #include <vector>
-#include "EncodeStream.h"
 #include "ProtocolMessage.h"
 #include "redis_parser.h"
 
@@ -141,7 +140,7 @@ protected:
 	virtual int append(const void *buf, size_t *size);
 	bool encode_reply(redis_reply_t *reply);
 
-	EncodeStream *stream_;
+	class EncodeStream *stream_;
 
 private:
 	size_t cur_size_;