[patch] GCC 4.3 compatibility

retroshare-0.4.09b_gcc43.patch (text/plain), 5.43 KB, created by Nikolay Orlyuk on 2009-03-06 20:56:06 UTC

--- retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/tcponudp/tcpstream.cc.orig	2008-07-10 20:53:43.000000000 +0300
+++ retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/tcponudp/tcpstream.cc	2009-03-06 22:03:17.000000000 +0200
@@ -29,6 +29,7 @@
  
 #include "tcpstream.h"
 #include <iostream>
+#include <climits>
 #include <assert.h>
 #include <errno.h>
 #include <math.h>
--- retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/dbase/findex.cc.orig	2008-07-10 20:53:43.000000000 +0300
+++ retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/dbase/findex.cc	2009-03-06 22:15:03.000000000 +0200
@@ -30,6 +30,8 @@
 #include <sstream>
 #include <iomanip>
 #include <fstream>
+#include <algorithm>
+#include <cstdlib>
 
 #include <openssl/sha.h>
 
--- retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/dbase/rsexpr.cc.orig	2008-07-10 20:53:07.000000000 +0300
+++ retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/dbase/rsexpr.cc	2009-03-06 22:18:35.000000000 +0200
@@ -27,6 +27,7 @@
 #include "dbase/findex.h"
 #include "rsiface/rsexpr.h"
 #include <functional>
+#include <algorithm>
 
 
 /******************************************************************************************
--- retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/pqi/pqinetwork.h.orig	2008-07-10 20:53:04.000000000 +0300
+++ retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/pqi/pqinetwork.h	2009-03-06 22:11:24.000000000 +0200
@@ -105,7 +105,7 @@
 
 std::string socket_errorType(int err);
 int sockaddr_cmp(struct sockaddr_in &addr1, struct sockaddr_in &addr2 );
-int inaddr_cmp(struct sockaddr_in addr1, struct sockaddr_in addr1 );
+int inaddr_cmp(struct sockaddr_in addr1, struct sockaddr_in addr2 );
 int inaddr_cmp(struct sockaddr_in addr1, unsigned long);
 
 struct in_addr getPreferredInterface(); // returns best addr.
--- retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/pqi/pqisecurity.cc.orig	2008-07-10 20:53:04.000000000 +0300
+++ retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/libretroshare/src/pqi/pqisecurity.cc	2009-03-06 22:10:37.000000000 +0200
@@ -24,7 +24,7 @@
  */
 
 
-
+#include <stdlib.h>
 
 #include "pqi/pqisecurity.h"
 
--- retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/gui/BlogDialog.cpp.orig	2008-07-10 20:53:42.000000000 +0300
+++ retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/gui/BlogDialog.cpp	2009-03-06 22:29:54.000000000 +0200
@@ -20,6 +20,8 @@
  ****************************************************************/
 #include <QtGui>
 
+#include <algorithm>
+
 #include "BlogDialog.h"
 
 #include "rsiface/rsQblog.h"
--- retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/gui/ForumsDialog.cpp.orig	2009-03-06 22:31:21.000000000 +0200
+++ retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/gui/ForumsDialog.cpp	2009-03-06 22:31:53.000000000 +0200
@@ -29,6 +29,7 @@
 #include "rsiface/rsmsgs.h"
 #include "rsiface/rsforums.h"
 #include <sstream>
+#include <algorithm>
 
 #include <QContextMenuEvent>
 #include <QMenu>
@@ -400,7 +401,7 @@
 	uint32_t i = 0;
 	uint32_t popLimit = 0;
 	std::multimap<uint32_t, std::string>::reverse_iterator rit;
-	for(rit = popMap.rbegin(); ((rit != popMap.rend()) && (i < popCount)); rit++, i++);
+	for(rit = popMap.rbegin(); ((rit != popMap.rend()) && (i < popCount)); rit++, i++) ;
 	if (rit != popMap.rend())
 	{
 		popLimit = rit->first;
--- retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/gui/NetworkView.cpp.orig	2009-03-06 22:32:20.000000000 +0200
+++ retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/gui/NetworkView.cpp	2009-03-06 22:32:29.000000000 +0200
@@ -28,6 +28,7 @@
 #include <QGraphicsItem>
 
 #include <iostream>
+#include <algorithm>
 
 /** Constructor */
 NetworkView::NetworkView(QWidget *parent)
--- retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/gui/TransfersDialog.cpp.orig	2009-03-06 22:30:16.000000000 +0200
+++ retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/gui/TransfersDialog.cpp	2009-03-06 22:30:31.000000000 +0200
@@ -36,6 +36,7 @@
 #include <QStandardItemModel>
 
 #include <sstream>
+#include <algorithm>
 #include "rsiface/rsiface.h"
 
 /* Images for context menu icons */
--- retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/rsiface/RemoteDirModel.cpp.orig	2008-07-10 20:53:42.000000000 +0300
+++ retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/rsiface/RemoteDirModel.cpp	2009-03-06 22:28:41.000000000 +0200
@@ -6,6 +6,7 @@
 
 #include <iostream>
 #include <sstream>
+#include <algorithm>
 #include <math.h>
 
 
@@ -403,7 +404,7 @@
 	std::list<DirStub>::iterator it;
 	int i = 0;
 	for(it = details.children.begin();
-		(i < row) && (it != details.children.end()); it++, i++);
+		(i < row) && (it != details.children.end()); it++, i++) ;
 
 	if (it == details.children.end()) 
 	{ 
--- retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/util/MouseEventFilter.cpp.orig	2009-03-06 22:33:11.000000000 +0200
+++ retroshare-package-v0.4.09b/src/retroshare-v0.4.09b/retroshare-gui/src/util/MouseEventFilter.cpp	2009-03-06 22:43:06.000000000 +0200
@@ -25,6 +25,7 @@
 #include <QtGui/QMouseEvent>
 
 #include <exception>
+#include <typeinfo>
 
 MouseMoveEventFilter::MouseMoveEventFilter(QObject * receiver, const char * member)
 	: EventFilter(receiver, member) {