Rename sender to questioner.

LSS1990 · Apr 2, 2011 · 1bc126a · 1bc126a
1 parent ec3e1b4
commit 1bc126a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/protobuf/codec_test.cc b/protobuf/codec_test.cc
@@ -19,7 +19,7 @@ void testQuery()
 {
   muduo::Query query;
   query.set_id(1);
-  query.set_sender("Chen Shuo");
+  query.set_questioner("Chen Shuo");
   query.add_question("Running?");
 
   std::string transport = encode(query);
@@ -65,7 +65,7 @@ void testAnswer()
 {
   muduo::Answer answer;
   answer.set_id(1);
-  answer.set_sender("Chen Shuo");
+  answer.set_questioner("Chen Shuo");
   answer.set_answerer("blog.csdn.net/Solstice");
   answer.add_solution("Jump!");
   answer.add_solution("Win!");

diff --git a/protobuf/descriptor_test.cc b/protobuf/descriptor_test.cc
@@ -34,6 +34,7 @@ void testDescriptor()
   T* new_obj = dynamic_cast<T*>(prototype->New());
   assert(new_obj != NULL);
   assert(new_obj != prototype);
+  assert(typeid(*new_obj) == typeid(T::default_instance()));
   cout << "prototype->New() = " << new_obj << endl;
   cout << endl;
   delete new_obj;

diff --git a/protobuf/query.proto b/protobuf/query.proto
@@ -2,14 +2,14 @@ package muduo;
 
 message Query {
   required int64 id = 1;
-  required string sender = 2;
+  required string questioner = 2;
 
   repeated string question = 3;
 }
 
 message Answer {
   required int64 id = 1;
-  required string sender = 2;
+  required string questioner = 2;
   required string answerer = 3;
 
   repeated string solution = 4;