Print

Please login or register.
1 Hour 1 Day 1 Week 1 Month Forever
Login with username, password and session length

[GonoszTopi]

http://www.amule.org/amule/thread.php?threadid=4133&sid=

[OldFrog]

Sorry for the double post  :] ;(

[Jacobo221]

no problem but it's not fixed yet in CVS (20041114), it will be in TONIGHT's cvs
Greetings!

[OldFrog]

Trouble compiling CVS of 20041115

In file included from alcc.cpp:49:
alcc.h:73: warning: missing initializer for member `wxCmdLineEntryDesc::shortName'
alcc.h:73: warning: missing initializer for member `wxCmdLineEntryDesc::longName'
alcc.h:73: warning: missing initializer for member `wxCmdLineEntryDesc::description'
alcc.h:73: warning: missing initializer for member `wxCmdLineEntryDesc::type'
alcc.h:73: warning: missing initializer for member `wxCmdLineEntryDesc::flags'
In file included from ListenSocket.cpp:26:
server.h: In member function `const wxString CServer::GetListName() const':
server.h:61: error: cannot convert `const wxString' to `const char*' for argument `1' to `const wxWCharBuffer char2unicode(const char*)'
server.h: In member function `const wxString CServer::GetAddress() const':
server.h:66: error: cannot convert `const wxString' to `const char*' for argument `1' to `const wxWCharBuffer char2unicode(const char*)'
server.h: In member function `const wxString CServer::GetDescription() const':
server.h:79: error: cannot convert `const wxString' to `const char*' for argument `1' to `const wxWCharBuffer char2unicode(const char*)'
server.h: In member function `const wxString CServer::GetVersion() const':
server.h:105: error: cannot convert `const wxString' to `const char*' for argument `1' to `const wxWCharBuffer char2unicode(const char*)'
ListenSocket.cpp:111:18: warning: #warning check closing method to change order and get rid of this
ListenSocket.cpp:819:50: warning: #warning Here should be the IDHybrid, but we don't use it yet and I'm afraid it willbreak a lot
ListenSocket.cpp:825:42: warning: #warning Here should be the IDHybrid, but we don't use it yet and I'm afraid it willbreak a lot
ListenSocket.cpp:1165:42: warning: #warning We need a new ProcessSharedFileList that can handle dirs. ___UNICODE___
make[4]: *** [amule-ListenSocket.o] Erreur 1
make[3]: *** [all-recursive] Erreur 1
make[2]: *** [all] Erreur 2
make[1]: *** [all-recursive] Erreur 1
make: *** [all] Erreur 2

[volpol]

the fixes to the above compilation problems are trivial. the real problem is that this version (cvs-20041115) also exposes the behavior described in the earlier posts. also starting from cvs-20041104 amule messes up ipfiler.dat
if anyone wants to compile 20041115 here is the patch:

Code: [Select]

diff -Naur amule-cvs-20041115/src/server.h amule-cvs-20041115.fixed/src/server.h
--- amule-cvs-20041115/src/server.h     2004-11-14 18:29:05.000000000 +0100
+++ amule-cvs-20041115.fixed/src/server.h       2004-11-15 19:19:26.000000000 +0100
@@ -58,12 +58,12 @@
        CServer(CServer* pOld);
        ~CServer();
        void    AddTag(CTag* in_tag)                                    {taglist->Append(in_tag);}
-       const wxString  GetListName()   const           {return char2unicode(listname);}
+       const wxString  GetListName()   const           {return listname;}
        const wxString& GetFullIP()             const           {return ipfull;}
 
        const wxString GetAddress() const {
                if (!dynip.IsEmpty()) {
-                       return char2unicode(dynip);
+                       return dynip;
                } else {
                        return ipfull;
                }
@@ -76,7 +76,7 @@
        uint32  GetIP()         const                   {return ip;}
        uint32  GetFiles()      const                   {return files;}
        uint32  GetUsers()      const                   {return users;}
-       const wxString  GetDescription()        const   {return char2unicode(description);}  
+       const wxString  GetDescription()        const   {return description;}  
        uint32  GetPing()                       const   {return ping;}
        uint32  GetPreferences()        const   {return preferences;}
        uint32  GetMaxUsers()           const   {return maxusers;}
@@ -102,7 +102,7 @@
        void    SetSoftFiles(uint32 in_softfiles)                       {softfiles = in_softfiles;}
        uint32  GetHardFiles()          const           {return hardfiles;}
        void    SetHardFiles(uint32 in_hardfiles)                       {hardfiles = in_hardfiles;}
-       const   wxString GetVersion() const                             {return char2unicode(m_strVersion);}
+       const   wxString GetVersion() const                             {return m_strVersion;}
        void    SetVersion(wxString pszVersion)                         {m_strVersion = pszVersion;}
        void    SetTCPFlags(uint32 uFlags)                              {m_uTCPFlags = uFlags;}
        uint32  GetTCPFlags() const                                     {return m_uTCPFlags;}
diff -Naur amule-cvs-20041115/src/ServerListCtrl.cpp amule-cvs-20041115.fixed/src/ServerListCtrl.cpp
--- amule-cvs-20041115/src/ServerListCtrl.cpp   2004-11-14 11:59:51.000000000 +0100
+++ amule-cvs-20041115.fixed/src/ServerListCtrl.cpp     2004-11-15 19:19:53.000000000 +0100
@@ -200,7 +200,7 @@
 
        SetItem( itemnr, COLUMN_SERVER_NAME, server->GetListName() );
        SetItem( itemnr, COLUMN_SERVER_ADDR, server->GetAddress() );
-       SetItem( itemnr, COLUMN_SERVER_PORT, wxString::Format("%i", server->GetPort()) );
+       SetItem( itemnr, COLUMN_SERVER_PORT, wxString::Format( wxT("%i"), server->GetPort()) );
        SetItem( itemnr, COLUMN_SERVER_DESC, server->GetDescription() );
 
        if ( server->GetPing() ) {


[Kry]

Yo, I should compile cvs on unicode too

Thaks for the patch.

[volpol]

the unicode bug is finally fixed! thank you. i noticed that change from macro to inline (20041104 was it?) during that massive migration of code from otherfunctions.h to StringFunctions and etc, but what i thought to myself was "no, that can't be the cause!" =) by the way unless you meant someone else i am volpol not "volpop"

[Jacobo221]

vulipop

[volpol]

well...if you insist =)