Attachment #41197 for bug #65742

View | Details | Raw Unified | Return to bug 65742
Collapse All | Expand All




#define FALSE false
#endif

typedef bool           BOOL;
typedef unsigned char  BYTE;
typedef unsigned int   UINT;
typedef unsigned short WORD;
typedef unsigned long  DWORD;

typedef char * LPSTR;
typedef const char * LPCSTR;


typedef void* LPVOID;

typedef DWORD HANDLE;
typedef HANDLE* LPHANDLE;

#ifndef MIN

// debugging macros
#ifdef _DEBUG

#include <assert.h>
#define ASSERT(cond) assert(cond)
#define VERIFY(cond) assert(cond)
#define TRACE1(message) cout << message << endl << flush

Lines 23-28 Link Here

(-)mutella-0.4.3.orig/mutella/tstring.cpp (+6 lines)
23	#endif	23	#endif
24		24
25	//#include <iostream.h>	25	//#include <iostream.h>
		26	#ifdef TSTRING_DEBUG
		27	#include "mutella.h"
		28	#endif //TSTRING_DEBUG
		29
		30	#include "defines.h"
		31
26	#include "tstring.h"	32	#include "tstring.h"
27	#include "string.h"	33	#include "string.h"
28	#include <stdio.h>	34	#include <stdio.h>





#endif // TSTRING_DEBUG


template<class T> class TString;

template <class T> bool operator== (const TString<T>& lhs, const TString<T>& rhs);
template <class T> bool operator== (const TString<T>& lhs, typename TString<T>::LPCT pszRhs);
template <class T> bool operator== (typename TString<T>::LPCT pszLhs, const TString<T>& rhs);
template <class T> bool operator== (const TString<T>& lhs,T cRhs);
template <class T> bool operator== (T cLhs,const TString<T>& rhs);
template <class T> bool operator!= (const TString<T>& lhs, const TString<T>& rhs);
template <class T> bool operator!= (const TString<T>& lhs, typename TString<T>::LPCT pszRhs);
template <class T> bool operator!= (typename TString<T>::LPCT pszLhs, const TString<T>& rhs);
template <class T> bool operator!= (const TString<T>& lhs,T cRhs);
template <class T> bool operator!= (T cLhs,const TString<T>& rhs);
template <class T> bool operator> (const TString<T>& lhs, const TString<T>& rhs);
template <class T> bool operator> (const TString<T>& lhs, typename TString<T>::LPCT pszRhs);
template <class T> bool operator> (typename TString<T>::LPCT pszLhs, const TString<T>& rhs);
template <class T> bool operator> (const TString<T>& lhs,T cRhs);
template <class T> bool operator> (T cLhs,const TString<T>& rhs);
template <class T> bool operator< (const TString<T>& lhs, const TString<T>& rhs);
template <class T> bool operator< (const TString<T>& lhs, typename TString<T>::LPCT pszRhs);
template <class T> bool operator< (typename TString<T>::LPCT pszLhs, const TString<T>& rhs);
template <class T> bool operator< (const TString<T>& lhs,T cRhs);
template <class T> bool operator< (T cLhs,const TString<T>& rhs);
template <class T> TString<T> operator+ (const TString<T>& lhs, const TString<T>& rhs);
template <class T> TString<T> operator+ (const TString<T>& lhs,typename TString<T>::LPCT pszRhs);
template <class T> TString<T> operator+ (typename TString<T>::LPCT pszLhs, const TString<T>& rhs);
template <class T> TString<T> operator+ (const TString<T>& lhs, T cRhs);
template <class T> TString<T> operator+ (T cLhs, const TString<T>& rhs);
template <class T> std::ostream& operator<< (std::ostream& os, const TString<T>& st);
template <class T> std::istream& operator>> (std::istream& is, const TString<T>& st);

 template<class T>
 class TString{
public:
	typedef T* LPT;
	typedef const T* LPCT;

template<class T>
bool operator>(const TString<T>& lhs, T cRhs) { if (!lhs.m_pBuffer) return true; return lhs.m_pBuffer[0] < cRhs; }
template<class T>
bool operator>(T cLhs, const TString<T>& rhs) { if (!rhs.m_pBuffer) return true; return cLhs > rhs.m_pBuffer[0]; }

template<class T>
bool operator<(const TString<T>& lhs, const TString<T>& rhs) { return 0 > TString<T>::_strcmp(lhs.m_pBuffer, rhs.m_pBuffer); }

template<class T>
bool operator<(const TString<T>& lhs, T cRhs) { if (!lhs.m_pBuffer) return false; return lhs.m_pBuffer[0] > cRhs; }
template<class T>
bool operator<(T cLhs, const TString<T>& rhs) { if (!rhs.m_pBuffer) return true; return cLhs > rhs.m_pBuffer[0]; }

template<class T>
TString<T> operator+(const TString<T>& lhs, const TString<T>& rhs) {

Return to bug 65742

Lines 36-43 Link Here

(-)mutella-0.4.3.orig/mutella/tstring.h (-4 / +35 lines)
36		36
37	#endif // TSTRING_DEBUG	37	#endif // TSTRING_DEBUG
38		38
39	template<class T>	39
40	class TString{	40	template<class T> class TString;
		41
		42	template <class T> bool operator== (const TString<T>& lhs, const TString<T>& rhs);
		43	template <class T> bool operator== (const TString<T>& lhs, typename TString<T>::LPCT pszRhs);
		44	template <class T> bool operator== (typename TString<T>::LPCT pszLhs, const TString<T>& rhs);
		45	template <class T> bool operator== (const TString<T>& lhs,T cRhs);
		46	template <class T> bool operator== (T cLhs,const TString<T>& rhs);
		47	template <class T> bool operator!= (const TString<T>& lhs, const TString<T>& rhs);
		48	template <class T> bool operator!= (const TString<T>& lhs, typename TString<T>::LPCT pszRhs);
		49	template <class T> bool operator!= (typename TString<T>::LPCT pszLhs, const TString<T>& rhs);
		50	template <class T> bool operator!= (const TString<T>& lhs,T cRhs);
		51	template <class T> bool operator!= (T cLhs,const TString<T>& rhs);
		52	template <class T> bool operator> (const TString<T>& lhs, const TString<T>& rhs);
		53	template <class T> bool operator> (const TString<T>& lhs, typename TString<T>::LPCT pszRhs);
		54	template <class T> bool operator> (typename TString<T>::LPCT pszLhs, const TString<T>& rhs);
		55	template <class T> bool operator> (const TString<T>& lhs,T cRhs);
		56	template <class T> bool operator> (T cLhs,const TString<T>& rhs);
		57	template <class T> bool operator< (const TString<T>& lhs, const TString<T>& rhs);
		58	template <class T> bool operator< (const TString<T>& lhs, typename TString<T>::LPCT pszRhs);
		59	template <class T> bool operator< (typename TString<T>::LPCT pszLhs, const TString<T>& rhs);
		60	template <class T> bool operator< (const TString<T>& lhs,T cRhs);
		61	template <class T> bool operator< (T cLhs,const TString<T>& rhs);
		62	template <class T> TString<T> operator+ (const TString<T>& lhs, const TString<T>& rhs);
		63	template <class T> TString<T> operator+ (const TString<T>& lhs,typename TString<T>::LPCT pszRhs);
		64	template <class T> TString<T> operator+ (typename TString<T>::LPCT pszLhs, const TString<T>& rhs);
		65	template <class T> TString<T> operator+ (const TString<T>& lhs, T cRhs);
		66	template <class T> TString<T> operator+ (T cLhs, const TString<T>& rhs);
		67	template <class T> std::ostream& operator<< (std::ostream& os, const TString<T>& st);
		68	template <class T> std::istream& operator>> (std::istream& is, const TString<T>& st);
		69
		70	template<class T>
		71	class TString{
41	public:	72	public:
42	typedef T* LPT;	73	typedef T* LPT;
43	typedef const T* LPCT;	74	typedef const T* LPCT;
Lines 629-635 Link Here
629	template<class T>	660	template<class T>
630	bool operator>(const TString<T>& lhs, T cRhs) { if (!lhs.m_pBuffer) return true; return lhs.m_pBuffer[0] < cRhs; }	661	bool operator>(const TString<T>& lhs, T cRhs) { if (!lhs.m_pBuffer) return true; return lhs.m_pBuffer[0] < cRhs; }
631	template<class T>	662	template<class T>
632	bool operator>(T CLhs, const TString<T>& rhs) { if (!rhs.m_pBuffer) return false; return cLhs < rhs.m_pBuffer[0]; }	663	bool operator>(T cLhs, const TString<T>& rhs) { if (!rhs.m_pBuffer) return true; return cLhs > rhs.m_pBuffer[0]; }
633		664
634	template<class T>	665	template<class T>
635	bool operator<(const TString<T>& lhs, const TString<T>& rhs) { return 0 > TString<T>::_strcmp(lhs.m_pBuffer, rhs.m_pBuffer); }	666	bool operator<(const TString<T>& lhs, const TString<T>& rhs) { return 0 > TString<T>::_strcmp(lhs.m_pBuffer, rhs.m_pBuffer); }
Lines 640-646 Link Here
640	template<class T>	671	template<class T>
641	bool operator<(const TString<T>& lhs, T cRhs) { if (!lhs.m_pBuffer) return false; return lhs.m_pBuffer[0] > cRhs; }	672	bool operator<(const TString<T>& lhs, T cRhs) { if (!lhs.m_pBuffer) return false; return lhs.m_pBuffer[0] > cRhs; }
642	template<class T>	673	template<class T>
643	bool operator<(T CLhs, const TString<T>& rhs) { if (!rhs.m_pBuffer) return true; return cLhs > rhs.m_pBuffer[0]; }	674	bool operator<(T cLhs, const TString<T>& rhs) { if (!rhs.m_pBuffer) return true; return cLhs > rhs.m_pBuffer[0]; }
644		675
645	template<class T>	676	template<class T>
646	TString<T> operator+(const TString<T>& lhs, const TString<T>& rhs) {	677	TString<T> operator+(const TString<T>& lhs, const TString<T>& rhs) {

Lines 28-38 Link Here

(-)mutella-0.4.3.orig/mutella/defines.h (-6 / +7 lines)
28	#define FALSE false	28	#define FALSE false
29	#endif	29	#endif
30		30
31	#define BOOL bool	31	typedef bool BOOL;
32	#define BYTE u_char	32	typedef unsigned char BYTE;
33	#define UINT u_int	33	typedef unsigned int UINT;
34	#define WORD u_short	34	typedef unsigned short WORD;
35	#define DWORD u_long	35	typedef unsigned long DWORD;
36		36
37	typedef char * LPSTR;	37	typedef char * LPSTR;
38	typedef const char * LPCSTR;	38	typedef const char * LPCSTR;
Lines 45-51 Link Here
45		45
46	typedef void* LPVOID;	46	typedef void* LPVOID;
47		47
48	#define HANDLE DWORD	48	typedef DWORD HANDLE;
49	typedef HANDLE* LPHANDLE;	49	typedef HANDLE* LPHANDLE;
50		50
51	#ifndef MIN	51	#ifndef MIN
Lines 66-71 Link Here
66	// debugging macros	66	// debugging macros
67	#ifdef _DEBUG	67	#ifdef _DEBUG
68		68
		69	#include <assert.h>
69	#define ASSERT(cond) assert(cond)	70	#define ASSERT(cond) assert(cond)
70	#define VERIFY(cond) assert(cond)	71	#define VERIFY(cond) assert(cond)
71	#define TRACE1(message) cout << message << endl << flush	72	#define TRACE1(message) cout << message << endl << flush