SOURCES: msession-gcc4.patch (NEW) - build fixes.

[pluto]

Author: pluto                        Date: Fri Dec 30 11:56:19 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- build fixes.

---- Files affected:
SOURCES:
   msession-gcc4.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/msession-gcc4.patch
diff -u /dev/null SOURCES/msession-gcc4.patch:1.1
--- /dev/null	Fri Dec 30 12:56:19 2005
+++ SOURCES/msession-gcc4.patch	Fri Dec 30 12:56:14 2005
@@ -0,0 +1,125 @@
+diff -uNrp phoenix.orig/src/mavl.h phoenix/src/mavl.h
+--- phoenix.orig/src/mavl.h	2003-01-17 20:12:04.000000000 +0100
++++ phoenix/src/mavl.h	2005-12-30 12:29:01.258445750 +0100
+@@ -36,7 +36,7 @@ class MAVL : public MNode, public MNodeH
+ 	static MNode *	Insert(MNode *top, MNode *insert);
+ 
+ 	/** Internal: Insert a node (known to be a string) into the tree */
+-	static MNode *MAVL::InsertStr(MNode *cnT, MNode *insert);
++	static MNode *InsertStr(MNode *cnT, MNode *insert);
+ 	/** Internal: for traversing the tree */
+ 	Boolean	TreeWalkUp(MNode *, EnumFn fn, void *p1, void *p2);
+ 	/** Internal: for traversing the tree */
+@@ -94,7 +94,7 @@ class MAVL : public MNode, public MNodeH
+ 		}
+ 		return NULL;
+ 	}
+-	inline MNode *MAVL::FindInt(int key)
++	inline MNode *FindInt(int key)
+ 	{
+ 		if(m_last && key == (int)m_last->m_key)
+ 			return m_last;
+diff -uNrp phoenix.orig/src/mbitmap.cpp phoenix/src/mbitmap.cpp
+--- phoenix.orig/src/mbitmap.cpp	2002-06-23 17:24:07.000000000 +0200
++++ phoenix/src/mbitmap.cpp	2005-12-30 12:45:18.651529000 +0100
+@@ -47,7 +47,11 @@
+ {       register unsigned long *d = (unsigned long *)bm->m_data;	\
+        	register unsigned long *s = (unsigned long *)this->m_data;	\
+ 	register int count = MIN(bm->m_clongs, m_clongs);		\
+-       	while(count--) *d++ = *d OP *s++;                              	\
++       	while(count--)							\
++	{								\
++		*d = *d OP *s++;                              		\
++		d++;							\
++	}								\
+ }  
+ 
+ int calclongs(int cbits)
+@@ -432,7 +436,10 @@ void MBitmapBits::NOT(void)
+ 	unsigned long *d = (unsigned long *)m_data;
+ 	int count = m_clongs;
+ 	while(count--)
+-		*d++ = ~*d;
++	{
++		*d = ~*d;
++		d++;
++	}
+ }
+ 
+ int MBitmapBits::count(void)
+diff -uNrp phoenix.orig/src/memheap.h phoenix/src/memheap.h
+--- phoenix.orig/src/memheap.h	2001-08-25 16:41:24.000000000 +0200
++++ phoenix/src/memheap.h	2005-12-30 12:33:50.016492000 +0100
+@@ -83,7 +83,7 @@ class MemHeap
+ 	void *memdup(int cb, void *mem);
+ 	void clear();
+ 
+-	inline void *MemHeap::operator [] (int handle)
++	inline void *operator [] (int handle)
+ 	{ 
+ 		return (handle == -1) ? NULL : (void *)&m_memheap[ m_offsets [ handle ].offset ]; 
+ 	}
+diff -uNrp phoenix.orig/src/mmutex.h phoenix/src/mmutex.h
+--- phoenix.orig/src/mmutex.h	2003-01-17 20:12:04.000000000 +0100
++++ phoenix/src/mmutex.h	2005-12-30 12:28:24.272134250 +0100
+@@ -75,12 +75,12 @@ class MMutex
+ 	int stat(void) { return m_stat; }
+ 	void wait(int sec=1, int usec=0);
+ 	void signal(void);
+-	inline void MMutex::lock(void)
++	inline void lock(void)
+ 	{
+ 		MutexLock(&m_mutex);
+ 		m_stat++;
+ 	}
+-	inline void MMutex::unlock(void)
++	inline void unlock(void)
+ 	{
+ 		m_stat--;
+ 		MutexUnlock(&m_mutex);
+diff -uNrp phoenix.orig/src/mplist.h phoenix/src/mplist.h
+--- phoenix.orig/src/mplist.h	2002-08-13 19:29:54.000000000 +0200
++++ phoenix/src/mplist.h	2005-12-30 12:34:52.664407250 +0100
+@@ -147,7 +147,7 @@ template <class TYPE> class MT##CNAME##S
+ 			pt = ( TYPE * )mn->DataGet();			\
+ 		return (*pt);						\
+ 	}								\
+-	void DeleteAll(void) { m_cnt.DeleteAll(); }			\
++	void DeleteAll(void) { this->m_cnt.DeleteAll(); }		\
+ }
+ 
+ CONTAINER_SPARSE_ARRAY ( MHash );
+diff -uNrp phoenix.orig/src/mstrops.h phoenix/src/mstrops.h
+--- phoenix.orig/src/mstrops.h	2002-06-23 18:42:06.000000000 +0200
++++ phoenix/src/mstrops.h	2005-12-30 12:42:21.156436250 +0100
+@@ -140,7 +140,10 @@ STRDECL char *stripnl2lo(char *str)
+ 		if(*szT==0x0A || *szT==0x0D)
+ 			*szT--=0;
+ 		else
+-                	*szT++ = g_tolower_tbl[*szT];
++		{
++                	*szT = g_tolower_tbl[static_cast<int>(*szT)];
++			szT++;
++		}
+ 	}
+ 	*szT++=0;
+         return str;                                                          
+diff -uNrp phoenix.orig/src/unixgcc.mak phoenix/src/unixgcc.mak
+--- phoenix.orig/src/unixgcc.mak	2002-12-16 04:02:13.000000000 +0100
++++ phoenix/src/unixgcc.mak	2005-12-30 12:43:37.741222500 +0100
+@@ -76,12 +76,12 @@ DINCDIR=$(MOHAWK_INC) $(PGSQL_INC) $(EXT
+ DLIBDIR=$(MOHAWK_LIB) $(PGSQL_LIB) $(EXTRA_LIB)
+ 
+ ifdef TRACE
+-CARGS=-g $(CCOPT) -Wall -DTRACE_DEBUG
++CARGS=-g $(CCOPT) -Wall -Wno-non-virtual-dtor -DTRACE_DEBUG
+ else
+ ifndef NDEBUG
+-CARGS=-g $(CCOPT) -Wall 
++CARGS=-g $(CCOPT) -Wall -Wno-non-virtual-dtor
+ else
+-CARGS=$(CCOPT) -Wall 
++CARGS=$(CCOPT) -Wall -Wno-non-virtual-dtor
+ endif
+ endif
+ 
================================================================