Author: mwiegand
Date: 2008-10-21 20:01:39 +0200 (Tue, 21 Oct 2008)
New Revision: 1597
Modified:
trunk/sladinstaller/ChangeLog
trunk/sladinstaller/gtk.cpp
trunk/sladinstaller/tools.cpp
Log:
Improved 64bit compatibility.
* gtk.cpp (sladradio): Fixed cast that broke compilation on AMD64.
* tools.cpp (getfilename, installonclient): Changed to use
std::string::size_type instead of int to prevent issues with different
sizes of int on 64bit vs. 32bit.
Modified: trunk/sladinstaller/ChangeLog
===================================================================
--- trunk/sladinstaller/ChangeLog 2008-10-21 14:25:40 UTC (rev 1596)
+++ trunk/sladinstaller/ChangeLog 2008-10-21 18:01:39 UTC (rev 1597)
@@ -1,5 +1,15 @@
2008-10-21 Michael Wiegand <[EMAIL PROTECTED]>
+ Improved 64bit compatibility.
+
+ * gtk.cpp (sladradio): Fixed cast that broke compilation on AMD64.
+
+ * tools.cpp (getfilename, installonclient): Changed to use
+ std::string::size_type instead of int to prevent issues with different
+ sizes of int on 64bit vs. 32bit.
+
+2008-10-21 Michael Wiegand <[EMAIL PROTECTED]>
+
Post release version bump.
* VERSION: Set to 1.1.2.SVN.
Modified: trunk/sladinstaller/gtk.cpp
===================================================================
--- trunk/sladinstaller/gtk.cpp 2008-10-21 14:25:40 UTC (rev 1596)
+++ trunk/sladinstaller/gtk.cpp 2008-10-21 18:01:39 UTC (rev 1597)
@@ -76,7 +76,7 @@
static void sladradio(GtkToggleButton *togglebutton, gpointer user_data)
{
if(gtk_toggle_button_get_active(togglebutton))
- SladRadioButton=SladRadioButton_t(int(user_data));
+ SladRadioButton=SladRadioButton_t(long(user_data));
}
#define AUTOSTR "(autogenerated)"
Modified: trunk/sladinstaller/tools.cpp
===================================================================
--- trunk/sladinstaller/tools.cpp 2008-10-21 14:25:40 UTC (rev 1596)
+++ trunk/sladinstaller/tools.cpp 2008-10-21 18:01:39 UTC (rev 1597)
@@ -170,7 +170,7 @@
static std::string getfilename(const std::string& path)
{
std::string filename=path;
- unsigned pos=filename.find_last_of('/');
+ std::string::size_type pos=filename.find_last_of('/');
if(pos!=std::string::npos)
filename.erase(0, pos+1);
return filename;
@@ -393,9 +393,9 @@
// prepare some variables
std::string filename=pkg;
#ifdef CYGWIN
- unsigned pos=filename.find_last_of('\\');
+ std::string::size_type pos=filename.find_last_of('\\');
#else
- unsigned pos=filename.find_last_of('/');
+ std::string::size_type pos=filename.find_last_of('/');
#endif
if(pos!=std::string::npos)
filename.erase(0, pos+1);
_______________________________________________
Openvas-commits mailing list
[email protected]
http://lists.wald.intevation.org/mailman/listinfo/openvas-commits
