linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2180
committer: poy <poy@xxxxxxxxxx>
branch nick: repo
timestamp: Sat 2010-07-10 17:49:05 +0200
message:
  fixes for VS
modified:
  dcpp/SettingsManager.cpp
  dcpp/Socket.cpp
  dcpp/Socket.h
  dwt/include/dwt/Dispatcher.h
  dwt/include/dwt/Widget.h
  dwt/include/dwt/WindowsHeaders.h
  dwt/include/dwt/forward.h
  dwt/include/dwt/widgets/Menu.h
  dwt/src/widgets/ToolTip.cpp
  win32/QueueFrame.h


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dcpp/SettingsManager.cpp'
--- dcpp/SettingsManager.cpp	2010-07-03 08:37:49 +0000
+++ dcpp/SettingsManager.cpp	2010-07-10 15:49:05 +0000
@@ -536,7 +536,7 @@
 void SettingsManager::setSearchTypeDefaults() {
 	searchTypes.clear();
 
-	// @todo simplify this as searchTypes['0' + SearchManager::TYPE_AUDIO] = { "mp3", "etc" } when we'll have C++0x
+	// @todo simplify this as searchTypes[string(1, '0' + SearchManager::TYPE_AUDIO)] = { "mp3", "etc" } when VC++ supports initializer lists
 
 	// @todo the default extension list contains some depreciated formats they kept to get all the NMDC-built subset of results for both type 
 	// of hubs. Some of these may worth to be dropped along with NMDC support...

=== modified file 'dcpp/Socket.cpp'
--- dcpp/Socket.cpp	2010-06-06 12:08:16 +0000
+++ dcpp/Socket.cpp	2010-07-10 15:49:05 +0000
@@ -24,6 +24,13 @@
 #include "SettingsManager.h"
 #include "TimerManager.h"
 
+/// @todo remove when MinGW has this
+#ifdef __MINGW32__
+#ifndef EADDRNOTAVAIL
+#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
+#endif
+#endif
+
 namespace dcpp {
 
 string Socket::udpServer;

=== modified file 'dcpp/Socket.h'
--- dcpp/Socket.h	2010-02-11 21:44:13 +0000
+++ dcpp/Socket.h	2010-07-10 15:49:05 +0000
@@ -25,8 +25,6 @@
 #include <errno.h>
 
 #ifdef _WIN32
-// Berkely constants converted to the windows equivs...
-#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
 
 typedef int socklen_t;
 typedef SOCKET socket_t;

=== modified file 'dwt/include/dwt/Dispatcher.h'
--- dwt/include/dwt/Dispatcher.h	2010-07-10 14:36:48 +0000
+++ dwt/include/dwt/Dispatcher.h	2010-07-10 15:49:05 +0000
@@ -36,7 +36,6 @@
 #include "tstring.h"
 #include <dwt/resources/Icon.h>
 #include <typeinfo>
-#include <memory>
 
 namespace dwt {
 

=== modified file 'dwt/include/dwt/Widget.h'
--- dwt/include/dwt/Widget.h	2010-07-10 14:36:48 +0000
+++ dwt/include/dwt/Widget.h	2010-07-10 15:49:05 +0000
@@ -36,8 +36,8 @@
 #ifndef DWT_Widget_h
 #define DWT_Widget_h
 
+#include "Application.h"
 #include "forward.h"
-#include "Application.h"
 #include "Rectangle.h"
 #include "Point.h"
 #include "Message.h"

=== modified file 'dwt/include/dwt/WindowsHeaders.h'
--- dwt/include/dwt/WindowsHeaders.h	2010-02-11 21:44:13 +0000
+++ dwt/include/dwt/WindowsHeaders.h	2010-07-10 15:49:05 +0000
@@ -75,6 +75,7 @@
 #include <assert.h>
 
 // Standard headers that most classes need
+#include <memory>
 #include <vector>
 #include <list>
 #include <boost/noncopyable.hpp>

=== modified file 'dwt/include/dwt/forward.h'
--- dwt/include/dwt/forward.h	2010-07-10 14:36:48 +0000
+++ dwt/include/dwt/forward.h	2010-07-10 15:49:05 +0000
@@ -33,10 +33,6 @@
 #ifndef DWT_FORWARD_H_
 #define DWT_FORWARD_H_
 
-namespace std {
-template<class T> class shared_ptr;
-}
-
 namespace dwt {
 
 template< class WidgetType >

=== modified file 'dwt/include/dwt/widgets/Menu.h'
--- dwt/include/dwt/widgets/Menu.h	2010-07-10 14:36:48 +0000
+++ dwt/include/dwt/widgets/Menu.h	2010-07-10 15:49:05 +0000
@@ -41,9 +41,6 @@
 #include "../Dispatchers.h"
 #include <dwt/Themed.h>
 
-#include <memory>
-#include <vector>
-
 namespace dwt {
 
 /// Menu class

=== modified file 'dwt/src/widgets/ToolTip.cpp'
--- dwt/src/widgets/ToolTip.cpp	2010-07-10 14:36:48 +0000
+++ dwt/src/widgets/ToolTip.cpp	2010-07-10 15:49:05 +0000
@@ -30,7 +30,6 @@
 */
 
 #include <dwt/widgets/ToolTip.h>
-#include <memory>
 
 namespace dwt {
 

=== modified file 'win32/QueueFrame.h'
--- win32/QueueFrame.h	2010-07-10 14:36:48 +0000
+++ win32/QueueFrame.h	2010-07-10 15:49:05 +0000
@@ -115,7 +115,7 @@
 			path(Util::getFilePath(aQI.getTarget())),
 			size(aQI.getSize()), downloadedBytes(aQI.getDownloadedBytes()),
 			added(aQI.getAdded()), priority(aQI.getPriority()), status(getStatus(aQI)), tth(aQI.getTTH()),
-			sources(aQI.getSources()), badSources(aQI.getBadSources()), updateMask((uint32_t)-1), display(0)
+			sources(aQI.getSources()), badSources(aQI.getBadSources()), updateMask((uint32_t)-1)
 		{
 		}