Ver código fonte

修正编译错误,MessageField类FieldDescriptor* field应该为const

tanghai 14 anos atrás
pai
commit
5e53d815e6

+ 2 - 3
Cpp/Platform/Orm/DbHelper.cc

@@ -5,10 +5,9 @@
 
 
 namespace Egametang {
 namespace Egametang {
 
 
-DbHelper::DbHelper(std::string url, std::string username, std::string password):
-		driver(NULL)
+DbHelper::DbHelper(std::string url, std::string username, std::string password)
 {
 {
-	driver = get_driver_instance();
+	sql::Driver* driver = get_driver_instance();
 	connection.reset(driver->connect(url, username, password));
 	connection.reset(driver->connect(url, username, password));
 }
 }
 
 

+ 0 - 1
Cpp/Platform/Orm/DbHelper.h

@@ -18,7 +18,6 @@ namespace Egametang {
 class DbHelper
 class DbHelper
 {
 {
 private:
 private:
-	sql::Driver* driver;
 	boost::scoped_ptr<sql::Connection> connection;
 	boost::scoped_ptr<sql::Connection> connection;
 
 
 public:
 public:

+ 2 - 3
Cpp/Platform/Orm/MessageField.cc

@@ -10,9 +10,8 @@
 
 
 namespace Egametang {
 namespace Egametang {
 
 
-MessageField::MessageField(
-		google::protobuf::Message& message,
-		google::protobuf::FieldDescriptor* field):
+MessageField::MessageField(google::protobuf::Message& message,
+		const google::protobuf::FieldDescriptor* field):
 	message(message), field(field)
 	message(message), field(field)
 {
 {
 }
 }

+ 2 - 2
Cpp/Platform/Orm/MessageField.h

@@ -11,7 +11,7 @@ class MessageField
 {
 {
 private:
 private:
 	google::protobuf::Message& message;
 	google::protobuf::Message& message;
-	google::protobuf::FieldDescriptor* field;
+	const google::protobuf::FieldDescriptor* field;
 
 
 	std::string GetRepeatedField();
 	std::string GetRepeatedField();
 	std::string GetOptionalField();
 	std::string GetOptionalField();
@@ -21,7 +21,7 @@ private:
 
 
 public:
 public:
 	MessageField(google::protobuf::Message& message,
 	MessageField(google::protobuf::Message& message,
-			google::protobuf::FieldDescriptor* field);
+			const google::protobuf::FieldDescriptor* field);
 	~MessageField();
 	~MessageField();
 
 
 	std::string GetField();
 	std::string GetField();