do not pollute namespace in the headers with using (Closes: #500198)

[apt.git] / apt-pkg / contrib / cdromutl.h

diff --git a/apt-pkg/contrib/cdromutl.h b/apt-pkg/contrib/cdromutl.h
index db140ec02d256e13c52aaf147c7380ddb33a1b18..2c6afac0fbe7f97841d941a8b56a41478b5bb9bf 100644 (file)
--- a/apt-pkg/contrib/cdromutl.h
+++ b/apt-pkg/contrib/cdromutl.h
@@ -12,15 +12,11 @@
 
 #include <string>
 
 
 #include <string>
 

-using std::string;
-
-#ifdef __GNUG__
-#pragma interface "apt-pkg/cdromutl.h"
-#endif 
-
-bool MountCdrom(string Path);
-bool UnmountCdrom(string Path);
-bool IdentCdrom(string CD,string &Res,unsigned int Version = 2);
-bool IsMounted(string &Path);
+// mount cdrom, DeviceName (e.g. /dev/sr0) is optional
+bool MountCdrom(std::string Path, std::string DeviceName="");
+bool UnmountCdrom(std::string Path);
+bool IdentCdrom(std::string CD,std::string &Res,unsigned int Version = 2);
+bool IsMounted(std::string &Path);
+std::string FindMountPointForDevice(const char *device);

 
 #endif
 
 #endif