From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 14 Oct 2005 11:19:14 +0000 (+0000)
Subject: Added default constructor for Package class
X-Git-Tag: YP2.0.0.2~212
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=d50228aa34df04bcef967019f584437d058368d2;p=metaproxy-moved-to-github.git

Added default constructor for Package class
---

diff --git a/src/package.hpp b/src/package.hpp
index 808a23b..0b5288e 100644
--- a/src/package.hpp
+++ b/src/package.hpp
@@ -26,6 +26,8 @@ namespace yp2 {
     
     class Package {
     public:
+        Package() 
+           :  m_filter(0), m_router(0), m_data(0)  {}
         
         Package(yp2::Session &session, yp2::Origin &origin) 
             : m_session(session), m_origin(origin),
diff --git a/src/test_filter_frontend_net.cpp b/src/test_filter_frontend_net.cpp
index abba95b..1c9b8c2 100644
--- a/src/test_filter_frontend_net.cpp
+++ b/src/test_filter_frontend_net.cpp
@@ -65,9 +65,7 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_2 )
 	    router.rule(tf);
 
             // Create package with Z39.50 init request in it
-            yp2::Session session;
-            yp2::Origin origin;
-	    yp2::Package pack(session, origin);
+	    yp2::Package pack;
 
             ODR odr = odr_createmem(ODR_ENCODE);
             Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
@@ -105,16 +103,14 @@ BOOST_AUTO_TEST_CASE( test_filter_frontend_net_3 )
             // put in frontend first
             yp2::FilterFrontendNet filter_front;
             filter_front.listen_address() = "unix:socket";
-            filter_front.listen_duration() = 2;  // listen a short time only
+            filter_front.listen_duration() = 1;  // listen a short time only
 	    router.rule(filter_front);
 
             // put in a backend
             FilterInit filter_init;
 	    router.rule(filter_init);
 
-            yp2::Session session;
-            yp2::Origin origin;
-	    yp2::Package pack(session, origin);
+	    yp2::Package pack;
 	    
 	    pack.router(router).move(); 
         }
diff --git a/src/test_package1.cpp b/src/test_package1.cpp
index ba652ea..df11356 100644
--- a/src/test_package1.cpp
+++ b/src/test_package1.cpp
@@ -13,10 +13,10 @@ using namespace boost::unit_test;
 BOOST_AUTO_TEST_CASE( test_package1_1 )
 {
     try {
+        yp2::Package package1;
+
         yp2::Origin origin;
         yp2::Session session;
-        yp2::Package package1(session, origin);
-
         yp2::Package package2(package1.session(), origin);
 
         BOOST_CHECK_EQUAL(package1.session().id(), package2.session().id());
diff --git a/src/test_session1.cpp b/src/test_session1.cpp
index 02e681a..4377ad7 100644
--- a/src/test_session1.cpp
+++ b/src/test_session1.cpp
@@ -19,11 +19,11 @@ BOOST_AUTO_TEST_CASE( testsession1 )
         yp2::Session session4;
         yp2::Session session5;
 
-        BOOST_CHECK_EQUAL (session5.id(), 5);
+        BOOST_CHECK_EQUAL (session5.id(), (unsigned long) 5);
 
         yp2::Session session = session3;
 
-        BOOST_CHECK_EQUAL (session.id(), 3);
+        BOOST_CHECK_EQUAL (session.id(), (unsigned long) 3);
     }
     catch (std::exception &e) {
         std::cout << e.what() << "\n";