Merge branch 'debian/jessie' into debian/experimental

[apt.git] / apt-pkg / cdrom.h

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 0ed4a6a73f34570a6eb6bc4a218341df8a822ab1..bd09021760e07b2f5020a2d535a5becaa6289af0 100644 (file)
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -1,6 +1,8 @@
 #ifndef PKGLIB_CDROM_H
 #define PKGLIB_CDROM_H
 
 #ifndef PKGLIB_CDROM_H
 #define PKGLIB_CDROM_H
 

+#include <apt-pkg/macros.h>
+

 #include<string>
 #include<vector>
 
 #include<string>
 #include<vector>
 


@@ -73,8 +75,9 @@ class pkgCdrom                                                                /*{{{*/
    bool Add(pkgCdromStatus *log);
 
  private:
    bool Add(pkgCdromStatus *log);
 
  private:

-   bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM,
+   APT_HIDDEN bool MountAndIdentCDROM(Configuration &Database, std::string &CDROM,

         std::string &ident, pkgCdromStatus * const log, bool const interactive);
         std::string &ident, pkgCdromStatus * const log, bool const interactive);

+   APT_HIDDEN bool UnmountCDROM(std::string const &CDROM, pkgCdromStatus * const log);

 };
                                                                        /*}}}*/
 
 };
                                                                        /*}}}*/