acquire-method.h   acquire-method.h 
skipping to change at line 107 skipping to change at line 107
void Status(const char *Format,...); void Status(const char *Format,...);
void Redirect(const std::string &NewURI); void Redirect(const std::string &NewURI);
int Run(bool Single = false); int Run(bool Single = false);
inline void SetFailReason(std::string Msg) {FailReason = Msg;}; inline void SetFailReason(std::string Msg) {FailReason = Msg;};
inline void SetIP(std::string aIP) {IP = aIP;}; inline void SetIP(std::string aIP) {IP = aIP;};
pkgAcqMethod(const char *Ver,unsigned long Flags = 0); pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
virtual ~pkgAcqMethod() {}; virtual ~pkgAcqMethod() {};
private:
void Dequeue();
}; };
/** @} */ /** @} */
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 algorithms.h   algorithms.h 
skipping to change at line 80 skipping to change at line 80
virtual bool Configure(PkgIterator Pkg); virtual bool Configure(PkgIterator Pkg);
virtual bool Remove(PkgIterator Pkg,bool Purge); virtual bool Remove(PkgIterator Pkg,bool Purge);
private: private:
void ShortBreaks(); void ShortBreaks();
void Describe(PkgIterator iPkg,std::ostream &out,bool Current,bool Candi date); void Describe(PkgIterator iPkg,std::ostream &out,bool Current,bool Candi date);
public: public:
pkgSimulate(pkgDepCache *Cache); pkgSimulate(pkgDepCache *Cache);
~pkgSimulate();
}; };
/*}} }*/ /*}} }*/
class pkgProblemResolver /*{{ {*/ class pkgProblemResolver /*{{ {*/
{ {
/** \brief dpointer placeholder (for later in case we need it) */ /** \brief dpointer placeholder (for later in case we need it) */
void *d; void *d;
pkgDepCache &Cache; pkgDepCache &Cache;
typedef pkgCache::PkgIterator PkgIterator; typedef pkgCache::PkgIterator PkgIterator;
typedef pkgCache::VerIterator VerIterator; typedef pkgCache::VerIterator VerIterator;
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 assert.h   assert.h 
#include <iostream> #include <iostream>
#define equals(x,y) assertEquals(y, x, __LINE__) #define equals(x,y) assertEquals(y, x, __LINE__)
#define equalsNot(x,y) assertEqualsNot(y, x, __LINE__)
template < typename X, typename Y > template < typename X, typename Y >
void OutputAssertEqual(X expect, char const* compare, Y get, unsigned long const &line) { void OutputAssertEqual(X expect, char const* compare, Y get, unsigned long const &line) {
std::cerr << "Test FAILED: »" << expect << "« " << compare << " » " << get << "« at line " << line << std::endl; std::cerr << "Test FAILED: »" << expect << "« " << compare << " » " << get << "« at line " << line << std::endl;
} }
template < typename X, typename Y > template < typename X, typename Y >
void assertEquals(X expect, Y get, unsigned long const &line) { void assertEquals(X expect, Y get, unsigned long const &line) {
if (expect == get) if (expect == get)
return; return;
OutputAssertEqual(expect, "==", get, line); OutputAssertEqual(expect, "==", get, line);
} }
template < typename X, typename Y >
void assertEqualsNot(X expect, Y get, unsigned long const &line) {
if (expect != get)
return;
OutputAssertEqual(expect, "!=", get, line);
}
void assertEquals(unsigned int const &expect, int const &get, unsigned long const &line) { void assertEquals(unsigned int const &expect, int const &get, unsigned long const &line) {
if (get < 0) if (get < 0)
OutputAssertEqual(expect, "==", get, line); OutputAssertEqual(expect, "==", get, line);
assertEquals<unsigned int const&, unsigned int const&>(expect, get, line); assertEquals<unsigned int const&, unsigned int const&>(expect, get, line);
} }
void assertEquals(int const &expect, unsigned int const &get, unsigned long const &line) { void assertEquals(int const &expect, unsigned int const &get, unsigned long const &line) {
if (expect < 0) if (expect < 0)
OutputAssertEqual(expect, "==", get, line); OutputAssertEqual(expect, "==", get, line);
assertEquals<unsigned int const&, unsigned int const&>(expect, get, line); assertEquals<unsigned int const&, unsigned int const&>(expect, get, line);
skipping to change at line 81 skipping to change at line 89
std::cerr << "Test FAILED: »" << expect1 << "« or »" << expect2 < < "« or »" << expect3 << "« " << compare << " »" << get << "« at line " << line << std::endl; std::cerr << "Test FAILED: »" << expect1 << "« or »" << expect2 < < "« or »" << expect3 << "« " << compare << " »" << get << "« at line " << line << std::endl;
} }
template < typename X, typename Y > template < typename X, typename Y >
void assertEqualsOr3(X expect1, X expect2, X expect3, Y get, unsigned long const &line) { void assertEqualsOr3(X expect1, X expect2, X expect3, Y get, unsigned long const &line) {
if (expect1 == get || expect2 == get || expect3 == get) if (expect1 == get || expect2 == get || expect3 == get)
return; return;
OutputAssertEqualOr3(expect1, expect2, expect3, "==", get, line); OutputAssertEqualOr3(expect1, expect2, expect3, "==", get, line);
} }
#define equalsOr4(v,w,x,y,z) assertEqualsOr4(w, x, y, z, v, __LINE__)
template < typename X, typename Y >
void OutputAssertEqualOr4(X expect1, X expect2, X expect3, X expect4, char
const* compare, Y get, unsigned long const &line) {
std::cerr << "Test FAILED: »" << expect1 << "« or »" << expect2 <
< "« or »" << expect3 << "« or »" << expect4 << "« " << compare << " Â
»" << get << "« at line " << line << std::endl;
}
template < typename X, typename Y >
void assertEqualsOr4(X expect1, X expect2, X expect3, X expect4, Y get, uns
igned long const &line) {
if (expect1 == get || expect2 == get || expect3 == get || expect4 ==
get)
return;
OutputAssertEqualOr4(expect1, expect2, expect3, expect4, "==", get,
line);
}
// simple helper to quickly output a vectors // simple helper to quickly output a vectors
template < typename X > template < typename X >
void dumpVector(X vec) { void dumpVector(X vec) {
for (typename X::const_iterator v = vec.begin(); for (typename X::const_iterator v = vec.begin();
v != vec.end(); ++v) v != vec.end(); ++v)
std::cout << *v << std::endl; std::cout << *v << std::endl;
} }
 End of changes. 3 change blocks. 
0 lines changed or deleted 28 lines changed or added


 config.h   config.h 
skipping to change at line 53 skipping to change at line 53
/* Define to the size of the filesize containing structures */ /* Define to the size of the filesize containing structures */
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
/* Define the arch name string */ /* Define the arch name string */
#define COMMON_ARCH "i386" #define COMMON_ARCH "i386"
/* The package name string */ /* The package name string */
#define PACKAGE "apt" #define PACKAGE "apt"
/* The version number string */ /* The version number string */
#define PACKAGE_VERSION "1.5" #define PACKAGE_VERSION "0.9.4"
#define APT_8_CLEANER_HEADERS #define APT_8_CLEANER_HEADERS
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 srcrecords.h   srcrecords.h 
skipping to change at line 73 skipping to change at line 73
virtual bool Jump(unsigned long const &Off) = 0; virtual bool Jump(unsigned long const &Off) = 0;
virtual unsigned long Offset() = 0; virtual unsigned long Offset() = 0;
virtual std::string AsStr() = 0; virtual std::string AsStr() = 0;
virtual std::string Package() const = 0; virtual std::string Package() const = 0;
virtual std::string Version() const = 0; virtual std::string Version() const = 0;
virtual std::string Maintainer() const = 0; virtual std::string Maintainer() const = 0;
virtual std::string Section() const = 0; virtual std::string Section() const = 0;
virtual const char **Binaries() = 0; // Ownership does not transfer virtual const char **Binaries() = 0; // Ownership does not transfer
//FIXME: Add a parameter to specify which architecture to use for [wi ldcard] matching
virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool c onst &ArchOnly, bool const &StripMultiArch = true) = 0; virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool c onst &ArchOnly, bool const &StripMultiArch = true) = 0;
static const char *BuildDepType(unsigned char const &Type); static const char *BuildDepType(unsigned char const &Type);
virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0; virtual bool Files(std::vector<pkgSrcRecords::File> &F) = 0;
Parser(const pkgIndexFile *Index) : iIndex(Index) {}; Parser(const pkgIndexFile *Index) : iIndex(Index) {};
virtual ~Parser() {}; virtual ~Parser() {};
}; };
private: private:
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/