From 369c919f2be8d2c93b990a97436b41ba4ae1ff29 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 17 Aug 2011 12:06:37 +0200
Subject: move the interactive helper to a subdirectory of test

---
 test/interactive-helper/test_udevcdrom.cc | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 test/interactive-helper/test_udevcdrom.cc

(limited to 'test/interactive-helper/test_udevcdrom.cc')

diff --git a/test/interactive-helper/test_udevcdrom.cc b/test/interactive-helper/test_udevcdrom.cc
new file mode 100644
index 000000000..577e2d013
--- /dev/null
+++ b/test/interactive-helper/test_udevcdrom.cc
@@ -0,0 +1,19 @@
+#include <apt-pkg/cdrom.h>
+#include <stdio.h>
+#include <assert.h>
+
+int main()
+{
+   int i;
+   pkgUdevCdromDevices c;
+   assert(c.Dlopen());
+
+   vector<CdromDevice> l;
+   l = c.Scan();
+   assert(l.empty() == false);
+   for (i=0;i<l.size();i++)
+      std::cerr << l[i].DeviceName << " " 
+		<< l[i].Mounted << " " 
+		<< l[i].MountPath << std::endl;
+   
+}
-- 
cgit v1.2.3


From 59f9dcbdf23ae430c2f5fa4bc85596347e73526f Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 17 Aug 2011 14:41:02 +0200
Subject: fix 'comparison between signed and unsigned integer expressions'
 warning in the udevcdrom testcase

---
 test/interactive-helper/test_udevcdrom.cc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'test/interactive-helper/test_udevcdrom.cc')

diff --git a/test/interactive-helper/test_udevcdrom.cc b/test/interactive-helper/test_udevcdrom.cc
index 577e2d013..dc25ab357 100644
--- a/test/interactive-helper/test_udevcdrom.cc
+++ b/test/interactive-helper/test_udevcdrom.cc
@@ -4,14 +4,13 @@
 
 int main()
 {
-   int i;
    pkgUdevCdromDevices c;
    assert(c.Dlopen());
 
    vector<CdromDevice> l;
    l = c.Scan();
    assert(l.empty() == false);
-   for (i=0;i<l.size();i++)
+   for (size_t i = 0; i < l.size(); ++i)
       std::cerr << l[i].DeviceName << " " 
 		<< l[i].Mounted << " " 
 		<< l[i].MountPath << std::endl;
-- 
cgit v1.2.3


From 8f3ba4e8708cb72be19dacc2af4f601ee5fea292 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 19 Sep 2011 13:31:29 +0200
Subject: do not pollute namespace in the headers with using (Closes: #500198)

---
 test/interactive-helper/test_udevcdrom.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'test/interactive-helper/test_udevcdrom.cc')

diff --git a/test/interactive-helper/test_udevcdrom.cc b/test/interactive-helper/test_udevcdrom.cc
index dc25ab357..bbedc0ab5 100644
--- a/test/interactive-helper/test_udevcdrom.cc
+++ b/test/interactive-helper/test_udevcdrom.cc
@@ -2,12 +2,14 @@
 #include <stdio.h>
 #include <assert.h>
 
+#include <vector>
+
 int main()
 {
    pkgUdevCdromDevices c;
    assert(c.Dlopen());
 
-   vector<CdromDevice> l;
+   std::vector<CdromDevice> l;
    l = c.Scan();
    assert(l.empty() == false);
    for (size_t i = 0; i < l.size(); ++i)
-- 
cgit v1.2.3


From 472ff00ef2e48383805d281c6364ec27839e3f4d Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 19 Sep 2011 19:14:19 +0200
Subject: use forward declaration in headers if possible instead of includes

---
 test/interactive-helper/test_udevcdrom.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'test/interactive-helper/test_udevcdrom.cc')

diff --git a/test/interactive-helper/test_udevcdrom.cc b/test/interactive-helper/test_udevcdrom.cc
index bbedc0ab5..88f5f0153 100644
--- a/test/interactive-helper/test_udevcdrom.cc
+++ b/test/interactive-helper/test_udevcdrom.cc
@@ -3,6 +3,7 @@
 #include <assert.h>
 
 #include <vector>
+#include <iostream>
 
 int main()
 {
-- 
cgit v1.2.3