projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'debian/jessie' into debian/experimental
[apt.git]
/
apt-pkg
/
upgrade.h
diff --git
a/apt-pkg/upgrade.h
b/apt-pkg/upgrade.h
index a3f693d86e4356978a070fd4b26469ca4a48c8f2..18b6aac7b03fedf7a25864c7538f3fc29b3545da 100644
(file)
--- a/
apt-pkg/upgrade.h
+++ b/
apt-pkg/upgrade.h
@@
-20,17
+20,22
@@
namespace APT {
namespace Upgrade {
// FIXME: make this "enum class UpgradeMode {" once we enable c++11
enum UpgradeMode {
namespace Upgrade {
// FIXME: make this "enum class UpgradeMode {" once we enable c++11
enum UpgradeMode {
- ALLOW_EVERYTHING = 0,
FORBID_REMOVE_PACKAGES = 1,
FORBID_REMOVE_PACKAGES = 1,
- FORBID_INSTALL_NEW_PACKAGES = 2
+ FORBID_INSTALL_NEW_PACKAGES = 2,
+ ALLOW_EVERYTHING = 0
};
};
+#if APT_PKG_ABI >= 413
bool Upgrade(pkgDepCache &Cache, int UpgradeMode, OpProgress * const Progress = NULL);
bool Upgrade(pkgDepCache &Cache, int UpgradeMode, OpProgress * const Progress = NULL);
+#else
+ bool Upgrade(pkgDepCache &Cache, int UpgradeMode);
+ bool Upgrade(pkgDepCache &Cache, int UpgradeMode, OpProgress * const Progress);
+#endif
}
}
// please use APT::Upgrade::Upgrade() instead
}
}
// please use APT::Upgrade::Upgrade() instead
-APT_DEPRECATED bool pkgDistUpgrade(pkgDepCache &Cache
, OpProgress * const Progress = NULL
);
-APT_DEPRECATED bool pkgAllUpgrade(pkgDepCache &Cache
, OpProgress * const Progress = NULL
);
+APT_DEPRECATED bool pkgDistUpgrade(pkgDepCache &Cache);
+APT_DEPRECATED bool pkgAllUpgrade(pkgDepCache &Cache);
bool pkgMinimizeUpgrade(pkgDepCache &Cache);
#endif
bool pkgMinimizeUpgrade(pkgDepCache &Cache);
#endif