diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 16:17:08 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-05-22 16:17:08 +0200 |
| commit | 0f3150e7040f45565b459a1390606bc2f714f6a8 (patch) | |
| tree | 200b65a080c246b09e6bcdcd81ea82c824272600 /apt-pkg/contrib | |
| parent | 314b47542c57d0a12c55dd1dd334cf233a33fcfb (diff) | |
| parent | 4694e07d450baa13fa04482752ca369a5797c640 (diff) | |
Merge remote-tracking branch 'upstream/debian/jessie' into debian/sid
Conflicts:
apt-pkg/deb/dpkgpm.cc
Diffstat (limited to 'apt-pkg/contrib')
| -rw-r--r-- | apt-pkg/contrib/strutl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 185cdc3fc..f4f80834b 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -79,7 +79,7 @@ bool TokSplitString(char Tok,char *Input,char **List, unsigned long ListMax); // split a given string by a char -std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) APT_CONST; +std::vector<std::string> VectorizeString(std::string const &haystack, char const &split) APT_PURE; /* \brief Return a vector of strings from string "input" where "sep" * is used as the delimiter string. |