diff options
| author | Michael Vogt <egon@debian-devbox> | 2012-04-16 19:24:07 +0200 |
|---|---|---|
| committer | Michael Vogt <egon@debian-devbox> | 2012-04-16 19:24:07 +0200 |
| commit | 443f5e8a3205162ec6933529c5ca0c95ad3f6941 (patch) | |
| tree | 3e2da22dcecc8eeaabc1ac5ceac0407a8e3cc25f /apt-pkg/deb/debversion.cc | |
| parent | 96273866174c54bdb25813633891f29668d43848 (diff) | |
| parent | f352743312edeebf666e1c8304cdc4baf457469f (diff) | |
merge from the expermental2 branch
Diffstat (limited to 'apt-pkg/deb/debversion.cc')
| -rw-r--r-- | apt-pkg/deb/debversion.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc index 340403721..a02699a44 100644 --- a/apt-pkg/deb/debversion.cc +++ b/apt-pkg/deb/debversion.cc @@ -10,7 +10,7 @@ ##################################################################### */ /*}}}*/ // Include Files /*{{{*/ -#define APT_COMPATIBILITY 986 +#include <config.h> #include <apt-pkg/debversion.h> #include <apt-pkg/pkgcache.h> @@ -257,7 +257,7 @@ bool debVersioningSystem::CheckDep(const char *PkgVer, // debVS::UpstreamVersion - Return the upstream version string /*{{{*/ // --------------------------------------------------------------------- /* This strips all the debian specific information from the version number */ -string debVersioningSystem::UpstreamVersion(const char *Ver) +std::string debVersioningSystem::UpstreamVersion(const char *Ver) { // Strip off the bit before the first colon const char *I = Ver; @@ -272,6 +272,6 @@ string debVersioningSystem::UpstreamVersion(const char *Ver) if (*I == '-') Last = I - Ver; - return string(Ver,Last); + return std::string(Ver,Last); } /*}}}*/ |