Thread: [Jahshaka-cvs] openlibraries/src/openpluginlib/py py_vc71.vcproj, 1.5, 1.6 python.hpp, 1.1, 1.2 str
Status: Beta
Brought to you by:
jahshaka
From: Goncalo N. M. de C. <gl...@us...> - 2006-08-30 15:17:34
|
Update of /cvsroot/openlibraries/openlibraries/src/openpluginlib/py In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23978/src/openpluginlib/py Modified Files: py_vc71.vcproj python.hpp string.cpp Log Message: + warning cleanup + memory leak fixes Index: string.cpp =================================================================== RCS file: /cvsroot/openlibraries/openlibraries/src/openpluginlib/py/string.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- string.cpp 24 Jul 2006 10:13:11 -0000 1.5 +++ string.cpp 30 Aug 2006 15:17:30 -0000 1.6 @@ -94,15 +94,15 @@ { static PyObject* convert( const opl::string_list& l ) { - PyObject* list = PyList_New( l.size() ); + PyObject* list = PyList_New( static_cast<int>( l.size() ) ); if ( !list ) py::throw_error_already_set(); opl::string_list::const_iterator I = l.begin(); - for ( int i=0; i<l.size(); ++i, ++I ) + for ( size_t i=0; i<l.size(); ++i, ++I ) { #if defined( HAVE_FLEX_STRING ) - PyList_SetItem( list, i, flex_string_to_python_str::convert( *I ) ); + PyList_SetItem( list, static_cast<int>( i ), flex_string_to_python_str::convert( *I ) ); #else PyList_SetItem( list, i, PyString_FromString( I->c_str() ) ); #endif @@ -147,15 +147,15 @@ { static PyObject* convert( const opl::wstring_list& l ) { - PyObject* list = PyList_New( l.size() ); + PyObject* list = PyList_New( static_cast<int>( l.size() ) ); if ( !list ) py::throw_error_already_set(); opl::wstring_list::const_iterator I = l.begin(); - for ( int i=0; i<l.size(); ++i, ++I ) + for ( size_t i=0; i<l.size(); ++i, ++I ) { #if defined( HAVE_FLEX_STRING ) - PyList_SetItem( list, i, flex_wstring_to_python_str::convert( *I ) ); + PyList_SetItem( list, static_cast<int>( i ), flex_wstring_to_python_str::convert( *I ) ); #else PyList_SetItem( list, i, PyString_FromString( opl::to_string( *I ).c_str() ) ); #endif Index: python.hpp =================================================================== RCS file: /cvsroot/openlibraries/openlibraries/src/openpluginlib/py/python.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- python.hpp 19 May 2006 14:51:51 -0000 1.1 +++ python.hpp 30 Aug 2006 15:17:30 -0000 1.2 @@ -9,13 +9,15 @@ #define PYTHON_INC_ #ifdef _MSC_VER -#pragma warning ( disable: 4100 4121 4511 4512 4244 4267 ) +#pragma warning ( push ) +#pragma warning ( disable: 4100 4121 4503 4511 4512 4244 4267 ) #endif #include <boost/python.hpp> #ifdef _MSC_VER -#pragma warning ( default: 4100 4121 4511 4512 4244 4267 ) +#pragma warning ( default: 4100 4121 4503 4511 4512 4244 4267 ) +#pragma warning ( pop ) #endif #endif Index: py_vc71.vcproj =================================================================== RCS file: /cvsroot/openlibraries/openlibraries/src/openpluginlib/py/py_vc71.vcproj,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- py_vc71.vcproj 6 Jul 2006 12:44:19 -0000 1.5 +++ py_vc71.vcproj 30 Aug 2006 15:17:30 -0000 1.6 @@ -31,7 +31,8 @@ UsePrecompiledHeader="0" WarningLevel="4" Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="4"/> + DebugInformationFormat="4" + DisableSpecificWarnings="4503"/> <Tool Name="VCCustomBuildTool"/> <Tool @@ -86,7 +87,8 @@ UsePrecompiledHeader="0" WarningLevel="4" Detect64BitPortabilityProblems="TRUE" - DebugInformationFormat="3"/> + DebugInformationFormat="3" + DisableSpecificWarnings="4503"/> <Tool Name="VCCustomBuildTool"/> <Tool |