diff options
| author | Michael Vogt <mvo@debian.org> | 2014-06-18 08:32:47 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-06-18 08:32:47 +0200 |
| commit | aa0bd601ea3db281187275bbbece760d85ff29d9 (patch) | |
| tree | c84bebb3966255cdae36562024592c6b4eb6a2f2 /apt-pkg/edsp.h | |
| parent | 80624be7c54aec6ed98ee254366155024fca1a71 (diff) | |
| parent | 6074bc9ba4ecdd08674a828bdb46323b5d8bf957 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
debian/changelog
Diffstat (limited to 'apt-pkg/edsp.h')
| -rw-r--r-- | apt-pkg/edsp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h index f3092d3c6..9e833556a 100644 --- a/apt-pkg/edsp.h +++ b/apt-pkg/edsp.h @@ -205,10 +205,10 @@ public: * \param[out] solver_in will be the stdin of the solver * \param[out] solver_out will be the stdout of the solver * - * \return true if the solver could be started and the pipes - * are set up correctly, otherwise false and the pipes are invalid + * \return PID of the started solver or 0 if failure occurred */ - bool static ExecuteSolver(const char* const solver, int *solver_in, int *solver_out); + pid_t static ExecuteSolver(const char* const solver, int * const solver_in, int * const solver_out, bool /*overload*/); + APT_DEPRECATED bool static ExecuteSolver(const char* const solver, int *solver_in, int *solver_out); /** \brief call an external resolver to handle the request * |