[Nel] Pending patches (except AI)

[Loic Dachary]

        Hi,

        Except for the AI module all the patches previously sent were applied,
with the following exception:

--- nel-0.3.20020821.orig/include/nel/net/message_recorder.h
+++ nel-0.3.20020821/include/nel/net/message_recorder.h
@@ -66,7 +66,7 @@
 
        /// Alt. constructor
        TMessageRecord( TNetworkEvent event, TSockId sockid, CMessage& msg, 
sint64 updatecounter ) :
-               Event(event), SockId(sockid), Message(msg), 
UpdateCounter(updatecounter) {}
+               UpdateCounter(updatecounter), Event(event), SockId(sockid), 
Message(msg) {}
 
        /// Serial to string stream
        void serial( NLMISC::CMemStream& stream )
--- nel-0.3.20020821.orig/include/nel/net/naming_client.h
+++ nel-0.3.20020821/include/nel/net/naming_client.h
@@ -60,7 +60,7 @@
 public:
        struct CServiceEntry
        {
-               CServiceEntry (std::string n, TServiceId s, CInetAddress a) : 
Addr(a), Name(n), SId (s) { }
+               CServiceEntry (std::string n, TServiceId s, CInetAddress a) : 
Name(n), SId (s), Addr(a) { }
 
                // name of the service
                std::string             Name;
--- nel-0.3.20020821.orig/include/nel/net/service.h
+++ nel-0.3.20020821/include/nel/net/service.h
@@ -168,7 +168,7 @@
 
 
 //
-// Variables
+// Variables provided to application and unused in the NeL library itself.
 //
 
 static TUnifiedCallbackItem EmptyCallbackArray[] = { { "", NULL } };
--- nel-0.3.20020821.orig/include/nel/net/transport_class.h
+++ nel-0.3.20020821/include/nel/net/transport_class.h
@@ -71,7 +71,7 @@
 class CTransportClass
 {
 public:
-
+       virtual ~CTransportClass() {}
        /** Different types that we can use in a Transport class
         * warning: if you add/change a prop, change also in 
CTransportClass::init()
         * warning: PropUKN must be the last value (used to resize a vector)
@@ -232,6 +232,8 @@
        struct CRegisteredBaseProp
        {
                CRegisteredBaseProp () : Type(PropUKN) { }
+               virtual ~CRegisteredBaseProp() {}
+
 
                CRegisteredBaseProp (const std::string &name, TProp type) : 
Name(name), Type(type) { }
                
--- nel-0.3.20020821.orig/include/nel/net/unified_network.h
+++ nel-0.3.20020821/include/nel/net/unified_network.h
@@ -315,7 +315,7 @@
        bool                                                                    
                                        _Initialised;
 
        //
-       CUnifiedNetwork() : _ExtSId(256), _LastRetry(0), 
_MThreadId(0xFFFFFFFF), _MutexCount(0), _CbServer(NULL), _NextUpdateTime(0), 
_Initialised(false)
+       CUnifiedNetwork() : _CbServer(NULL), _ExtSId(256), _LastRetry(0), 
_NextUpdateTime(0), _MThreadId(0xFFFFFFFF), _MutexCount(0), _Initialised(false)
        {
        }
 
--- nel-0.3.20020821.orig/include/nel/misc/eval_num_expr.h
+++ nel-0.3.20020821/include/nel/misc/eval_num_expr.h
@@ -37,7 +37,7 @@
 class CEvalNumExpr
 {
 public:
-       virtual ~CEvalNumExpr();
+       virtual ~CEvalNumExpr() {} 
        /// Eval return error.
        enum TReturnState
        {
--- nel-0.3.20020821.orig/src/net/inet_address.cpp
+++ nel-0.3.20020821/src/net/inet_address.cpp
@@ -191,7 +191,7 @@
  */
 void CInetAddress::setNameAndPort( const std::string& hostNameAndPort )
 {
-       int pos = hostNameAndPort.find_first_of (':');
+       uint32 pos = hostNameAndPort.find_first_of (':');
        if (pos != string::npos)
        {
                setPort( atoi(hostNameAndPort.substr(pos + 1).c_str()) );
--- nel-0.3.20020821.orig/src/net/service.cpp
+++ nel-0.3.20020821/src/net/service.cpp
@@ -305,7 +305,15 @@
 
 // Ctor
 IService::IService() :
-       _Initialized(false), WindowDisplayer(NULL), _UpdateTimeout(100), 
_Port(0), _RecordingState(CCallbackNetBase::Off), _SId(0), _Status(0), 
_IsService5(false), _ResetMeasures(false)
+       WindowDisplayer(NULL),
+       _Port(0),
+       _RecordingState(CCallbackNetBase::Off),
+       _UpdateTimeout(100),
+       _SId(0),
+       _Status(0),
+       _Initialized(false),
+       _IsService5(false),
+       _ResetMeasures(false)
 {
        // Singleton
        nlassert( _Instance == NULL );
@@ -351,7 +359,7 @@
        _Args.push_back ("<ProgramName>");
 
        string sargs (args);
-       sint pos1 = 0, pos2 = 0;
+       uint32 pos1 = 0, pos2 = 0;
 
        do
        {
@@ -1130,7 +1138,7 @@
 
                                        string dispName = 
displayedVariables[i].first;
                                        string varName = dispName;
-                                       sint pos = dispName.find("|");
+                                       uint32 pos = dispName.find("|");
                                        if (pos != string::npos)
                                        {
                                                varName = 
displayedVariables[i].first.substr(pos+1);
@@ -1147,10 +1155,10 @@
                                        const std::deque<std::string>   &strs = 
md.lockStrings();
                                        if (strs.size()>0)
                                        {
-                                               sint pos = strs[0].find("=");
-                                               if(pos != string::npos && pos + 
2 < (sint)strs[0].size())
+                                               uint32 pos = strs[0].find("=");
+                                               if(pos != string::npos && pos + 
2 < strs[0].size())
                                                {
-                                                       sint pos2 = 
string::npos;
+                                                       uint32 pos2 = 
string::npos;
                                                        
if(strs[0][strs[0].size()-1] == '\n')
                                                                pos2 = 
strs[0].size() - pos - 2 - 1;
 
--- nel-0.3.20020821.orig/src/net/unified_network.cpp
+++ nel-0.3.20020821/src/net/unified_network.cpp
@@ -478,7 +478,6 @@
 
                // connects to the registered services
                list<CNamingClient::CServiceEntry>::const_iterator      its;
-               TNameMappedCallback::iterator                                   
        itcb;
 
                // don't connect to itself
                for (its = services.begin(); its != services.end(); ++its)
--- nel-0.3.20020821.orig/src/3d/mini_col.cpp
+++ nel-0.3.20020821/src/3d/mini_col.cpp
@@ -244,7 +244,7 @@
 {
        CVector b1,b2;
        bool    found=false;
-       float   height;
+       float   height=0.0;
 
 
        // Select quad nodes which contains pos.
--- nel-0.3.20020821.orig/src/3d/driver/opengl/driver_opengl.cpp
+++ nel-0.3.20020821/src/3d/driver/opengl/driver_opengl.cpp
@@ -1360,7 +1360,9 @@
 {
        // Get viewport
        float x= scissor.X;
+#ifdef NL_OS_WINDOWS
        float y= scissor.Y;
+#endif // NL_OS_WINDOWS
        float width= scissor.Width;
        float height= scissor.Height;

-- 
Loic   Dachary         http://www.dachary.org/  address@hidden
12 bd  Magenta         http://www.senga.org/      address@hidden
75010    Paris         T: 33 1 42 45 07 97          address@hidden
        GPG Public Key: http://www.dachary.org/loic/gpg.txt