Browse Source

avoid (implicit) multi-defining initial_messages, etc.

git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1370 e5f2f494-b856-4b98-b285-d166d9295462
JINMEI Tatuya 15 years ago
parent
commit
698ee48ca0
2 changed files with 6 additions and 3 deletions
  1. 3 0
      src/lib/config/tests/fake_session.cc
  2. 3 3
      src/lib/config/tests/fake_session.h

+ 3 - 0
src/lib/config/tests/fake_session.cc

@@ -51,6 +51,9 @@ using boost::asio::ip::tcp;
 #include <sys/socket.h>
 #include <netinet/in.h>
 
+isc::data::ElementPtr initial_messages;
+isc::data::ElementPtr subscriptions;
+isc::data::ElementPtr msg_queue;
 
 // ok i want these in cc/data 
 static bool

+ 3 - 3
src/lib/config/tests/fake_session.h

@@ -38,9 +38,9 @@ class io_service;
 // if initial_messages contains a list of messages,
 // these are sent when recv_msg or group_recvmsg is called
 // instead of whatever is in the msg queue
-isc::data::ElementPtr initial_messages;
-isc::data::ElementPtr subscriptions;
-isc::data::ElementPtr msg_queue;
+extern isc::data::ElementPtr initial_messages;
+extern isc::data::ElementPtr subscriptions;
+extern isc::data::ElementPtr msg_queue;
 
 bool haveSubscription(const std::string& group, const std::string& instance);
 bool haveSubscription(const isc::data::ElementPtr group, const isc::data::ElementPtr instance);