1
1
forked from 0ad/0ad

fix/disable warnings.

there are too many W4 and "potentially uninitialized", so those are
disabled by 0ad_warning_disable.h.

the silly "int x = strlen" and very dangerous "int x = (void*)p" (and
vice versa) problems are fixed.

This was SVN commit r5526.
This commit is contained in:
janwas 2007-12-23 12:18:57 +00:00
parent 8667ea74c8
commit 5bf9bca9ef
91 changed files with 138 additions and 35 deletions

View File

@ -0,0 +1,6 @@
#pragma warning(push, 3)
// it's way too much work to check all of these (runtime invariants may
// ensure the code is safe but cannot automatically be proved by the
// compiler)
#pragma warning(disable:4701) // "potentially uninitialized variable"

View File

@ -2,6 +2,7 @@
//DJD: Abstract function definitions { //DJD: Abstract function definitions {
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
#include <math.h> #include <math.h>
#include <fstream> #include <fstream>

View File

@ -3,6 +3,7 @@
//DJD: definition of FunnelNode functions { //DJD: definition of FunnelNode functions {
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
#include "FunnelDeque.h" #include "FunnelDeque.h"
#include <float.h> #include <float.h>

View File

@ -1,6 +1,7 @@
//Location.cpp //Location.cpp
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
#include <cstdlib> #include <cstdlib>
#include <math.h> #include <math.h>

View File

@ -2,6 +2,7 @@
//DJD: Abstract space searching function definitions { //DJD: Abstract space searching function definitions {
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
#include "se_dcdt.h" #include "se_dcdt.h"

View File

@ -3,6 +3,7 @@
//DJD: Helper function definitions { //DJD: Helper function definitions {
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
#include <math.h> #include <math.h>

View File

@ -2,6 +2,7 @@
//DJD: Width function definitions { //DJD: Width function definitions {
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
#include "se_dcdt.h" #include "se_dcdt.h"
#include <math.h> #include <math.h>

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "se.h" # include "se.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <math.h> # include <math.h>
# include <stdlib.h> # include <stdlib.h>

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "se_dcdt.h" # include "se_dcdt.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_array.h" # include "sr_array.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_tree.h" # include "sr_tree.h"
# include "se_mesh_import.h" # include "se_mesh_import.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <string.h> # include <string.h>
# include "se_mesh.h" # include "se_mesh.h"
@ -8,7 +9,7 @@
//================================ IO ========================================= //================================ IO =========================================
# define ID(se) int(se->_edge) # define ID(se) intptr_t(se->_edge)
void SeMeshBase::_elemsave ( SrOutput& out, SeMeshBase::ElemType type, SeElement* first ) void SeMeshBase::_elemsave ( SrOutput& out, SeMeshBase::ElemType type, SeElement* first )
{ {
@ -44,7 +45,8 @@ bool SeMeshBase::save ( SrOutput& out )
{ {
SeBase *se; SeBase *se;
SeElement *el, *eli; SeElement *el, *eli;
int symedges, i, j; int symedges, j;
intptr_t i;
out << "SYMEDGE MESH DESCRIPTION\n\n"; out << "SYMEDGE MESH DESCRIPTION\n\n";
//fprintf ( f, "SYMEDGE MESH DESCRIPTION\n\n" ); //fprintf ( f, "SYMEDGE MESH DESCRIPTION\n\n" );
@ -159,7 +161,8 @@ void SeMeshBase::_elemload ( SrInput& inp, SrArray<SeElement*>& E,
bool SeMeshBase::load ( SrInput& inp ) bool SeMeshBase::load ( SrInput& inp )
{ {
//char buf[64]; //char buf[64];
int i, x; int i;
intptr_t x;
//fscanf ( f, "%s", buf ); if ( strcmp(buf,"SYMEDGE") ) return false; //fscanf ( f, "%s", buf ); if ( strcmp(buf,"SYMEDGE") ) return false;
//fscanf ( f, "%s", buf ); if ( strcmp(buf,"MESH") ) return false; //fscanf ( f, "%s", buf ); if ( strcmp(buf,"MESH") ) return false;
@ -197,11 +200,11 @@ bool SeMeshBase::load ( SrInput& inp )
// convert indices to pointers: // convert indices to pointers:
for ( i=0; i<S.size(); i++ ) for ( i=0; i<S.size(); i++ )
{ S[i]->_next = S[(int)(S[i]->_next)]; { S[i]->_next = S[(intptr_t)(S[i]->_next)];
S[i]->_rotate = S[(int)(S[i]->_rotate)]; S[i]->_rotate = S[(intptr_t)(S[i]->_rotate)];
S[i]->_vertex = V[(int)(S[i]->_vertex)]; S[i]->_vertex = V[(intptr_t)(S[i]->_vertex)];
S[i]->_edge = E[(int)(S[i]->_edge)]; S[i]->_edge = E[(intptr_t)(S[i]->_edge)];
S[i]->_face = F[(int)(S[i]->_face)]; S[i]->_face = F[(intptr_t)(S[i]->_face)];
} }
// adjust internal variables: // adjust internal variables:

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <stdlib.h> # include <stdlib.h>
# include "se_mesh.h" # include "se_mesh.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <math.h> # include <math.h>
# include <stdlib.h> # include <stdlib.h>

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <stdio.h> # include <stdio.h>
# include <string.h> # include <string.h>

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <math.h> # include <math.h>
# include "sr.h" # include "sr.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <stdlib.h> # include <stdlib.h>
# include <string.h> # include <string.h>

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_array_pt.h" # include "sr_array_pt.h"
//====================== SrArrayPtBase ========================== //====================== SrArrayPtBase ==========================
@ -134,7 +135,7 @@ static SrClassManagerBase* StaticManager = 0; // This is not thread safe...
static int fcmp ( const void* pt1, const void* pt2 ) static int fcmp ( const void* pt1, const void* pt2 )
{ {
typedef const int* cint; typedef const intptr_t* cint;
return StaticManager->compare( (const void*)*cint(pt1), (const void*)*cint(pt2) ); return StaticManager->compare( (const void*)*cint(pt1), (const void*)*cint(pt2) );
} }

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_box.h" # include "sr_box.h"
# include "sr_mat.h" # include "sr_mat.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <stdlib.h> # include <stdlib.h>
# include <string.h> # include <string.h>

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
/* Note: this code was adapted from the PQP library; /* Note: this code was adapted from the PQP library;
their copyright notice can be found at the end of this file. */ their copyright notice can be found at the end of this file. */

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_bv_coldet.h" # include "sr_bv_coldet.h"
//============================= SrBvColdet::Object =========================== //============================= SrBvColdet::Object ===========================

View File

@ -1,5 +1,6 @@
#include "precompiled.h"/* Note: this code was adapted from the PQP library; #include "precompiled.h"/* Note: this code was adapted from the PQP library;
their copyright notice can be found at the end of this file. */ their copyright notice can be found at the end of this file. */
#include "0ad_warning_disable.h"
# include <math.h> # include <math.h>
# include <stdio.h> # include <stdio.h>
@ -512,8 +513,10 @@ void SrBvMath::Meigen ( srbvmat vout, srbvvec dout, srbvmat a )
#ifdef _WIN32 #ifdef _WIN32
#include <float.h> #include <float.h>
#ifndef isnan
#define isnan _isnan #define isnan _isnan
#endif #endif
#endif
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SegPoints() // SegPoints()

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <math.h> # include <math.h>
# include "sr_bv_nbody.h" # include "sr_bv_nbody.h"
# include "sr_model.h" # include "sr_model.h"

View File

@ -1,5 +1,6 @@
#include "precompiled.h"/* Note: this code was adapted from the PQP library; #include "precompiled.h"/* Note: this code was adapted from the PQP library;
their copyright notice can be found at the end of this file. */ their copyright notice can be found at the end of this file. */
#include "0ad_warning_disable.h"
# include "sr_bv_tree.h" # include "sr_bv_tree.h"
# include "sr_model.h" # include "sr_model.h"

View File

@ -1,5 +1,6 @@
#include "precompiled.h"/* Note: this code was adapted from the PQP library; #include "precompiled.h"/* Note: this code was adapted from the PQP library;
their copyright notice can be found at the end of this file. */ their copyright notice can be found at the end of this file. */
#include "0ad_warning_disable.h"
# include "sr_bv_tree_query.h" # include "sr_bv_tree_query.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <math.h> # include <math.h>
# include "sr_box.h" # include "sr_box.h"
# include "sr_plane.h" # include "sr_plane.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_cfg_manager.h" # include "sr_cfg_manager.h"
//=========================== SrCfgManagerBase ======================================== //=========================== SrCfgManagerBase ========================================

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_cfg_path.h" # include "sr_cfg_path.h"
# include "sr_random.h" # include "sr_random.h"
@ -381,6 +382,7 @@ bool SrCfgPathBase::smooth_step ()
{ {
smooth_random ( _sprec, _slen ); smooth_random ( _sprec, _slen );
return false; return false;
#if 0
int i, imax=1; int i, imax=1;
int lasti = size()-2; int lasti = size()-2;
float d; float d;
@ -425,6 +427,7 @@ return false;
if ( _sbads>6 ) return true; // no more easy improvements if ( _sbads>6 ) return true; // no more easy improvements
return false; return false;
#endif
} }
SrOutput& operator<< ( SrOutput& o, const SrCfgPathBase& p ) SrOutput& operator<< ( SrOutput& o, const SrCfgPathBase& p )

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_cfg_planner.h" # include "sr_cfg_planner.h"
//# define SR_USE_TRACE1 // start //# define SR_USE_TRACE1 // start

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_cfg_planner.h" # include "sr_cfg_planner.h"
//# define SR_USE_TRACE1 // not used //# define SR_USE_TRACE1 // not used

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_cfg_tree.h" # include "sr_cfg_tree.h"
//# define SR_USE_TRACE1 // expand node //# define SR_USE_TRACE1 // expand node

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_color.h" # include "sr_color.h"
//========================================= static ======================================= //========================================= static =======================================

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_cylinder.h" # include "sr_cylinder.h"
# include "sr_box.h" # include "sr_box.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_euler.h" # include "sr_euler.h"
# include "sr_mat.h" # include "sr_mat.h"
# include <math.h> # include <math.h>

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_event.h" # include "sr_event.h"
//# define SR_USE_TRACE1 //# define SR_USE_TRACE1

View File

@ -1,4 +1,6 @@
#include "precompiled.h"//*************************************************************************** #include "precompiled.h"
#include "0ad_warning_disable.h"
//***************************************************************************
// //
// SrExpTABLE.H // SrExpTABLE.H
// By Marcelo Kallmann 08/98 - Brazil // By Marcelo Kallmann 08/98 - Brazil
@ -60,7 +62,7 @@ static srFunc func_code ( const char *st )
compfunc // compare function compfunc // compare function
); );
if (!result) return srFuncUndefined; if (!result) return srFuncUndefined;
return (srFunc) ( ((int)result-(int)Functions)/sizeof(int) ); return (srFunc) ( ((intptr_t)result-(intptr_t)Functions)/sizeof(int) );
} }
const char *SrExpTable::function_name ( int index ) const char *SrExpTable::function_name ( int index )

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <stdio.h> # include <stdio.h>
# include <math.h> # include <math.h>

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <stdlib.h> # include <stdlib.h>
# include "sr_graph.h" # include "sr_graph.h"
# include "sr_heap.h" # include "sr_heap.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_grid.h" # include "sr_grid.h"
//============================ SrGridBase ================================= //============================ SrGridBase =================================

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_hash_table.h" # include "sr_hash_table.h"
//================================ hash function ============================= //================================ hash function =============================

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <string.h> # include <string.h>
# include "sr_image.h" # include "sr_image.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <stdlib.h> # include <stdlib.h>
# include <string.h> # include <string.h>
# include <ctype.h> # include <ctype.h>
@ -58,7 +59,7 @@ SrInput::SrInput ( const char *buff, char com )
if ( buff ) if ( buff )
{ _cur.s = buff; { _cur.s = buff;
_ini.s = buff; _ini.s = buff;
_size = strlen ( buff ); _size = (int)strlen ( buff );
_curline = 1; _curline = 1;
_type = (srbyte) TypeString; _type = (srbyte) TypeString;
} }
@ -112,7 +113,7 @@ void SrInput::init ( const char *buff )
if ( buff ) if ( buff )
{ _cur.s = buff; { _cur.s = buff;
_ini.s = buff; _ini.s = buff;
_size = strlen ( buff ); _size = (int)strlen ( buff );
_curline = 1; _curline = 1;
_type = (srbyte) TypeString; _type = (srbyte) TypeString;
} }
@ -284,7 +285,7 @@ void SrInput::rewind ()
int SrInput::pos () int SrInput::pos ()
{ {
if ( ISFILE ) return ((int)ftell(_cur.f)) - _ini.f; if ( ISFILE ) return ((int)ftell(_cur.f)) - _ini.f;
else if ( ISSTRING ) return ((sruint)_cur.s) - ((sruint)_ini.s); else if ( ISSTRING ) return _cur.s - _ini.s;
else return 0; else return 0;
} }

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_light.h" # include "sr_light.h"
//===================================== SrLight ================================ //===================================== SrLight ================================

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <math.h> # include <math.h>
# include "sr_box.h" # include "sr_box.h"
# include "sr_line.h" # include "sr_line.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_box.h" # include "sr_box.h"
# include "sr_mat.h" # include "sr_mat.h"
# include "sr_vec2.h" # include "sr_vec2.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_list.h" # include "sr_list.h"
//============================ SrListBase ================================= //============================ SrListBase =================================

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_list_node.h" # include "sr_list_node.h"
//=============================== SrListNode ================================ //=============================== SrListNode ================================

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <math.h> # include <math.h>
# include "sr_mat.h" # include "sr_mat.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_material.h" # include "sr_material.h"
//# define SR_USE_TRACE1 //# define SR_USE_TRACE1

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <string.h> # include <string.h>
# include <math.h> # include <math.h>

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <stdlib.h> # include <stdlib.h>
# include <string.h> # include <string.h>
# include <ctype.h> # include <ctype.h>
@ -54,7 +55,7 @@ void *sr_mem_control_alloc ( const char* type, char* file, int line, int size, v
if ( !addr ) if ( !addr )
{ //lineout (); { //lineout ();
output<<"\nsr_control_malloc: Zero Pointer Allocated!\n" << output<<"\nsr_control_malloc: Zero Pointer Allocated!\n" <<
"File:"<<file<<" Line:"<<line<<" Elem Size:"<<size<<" Address:"<<(int)addr<<'\n'; "File:"<<file<<" Line:"<<line<<" Elem Size:"<<size<<" Address:"<<(intptr_t)addr<<'\n';
//lineout (); //lineout ();
} }
@ -64,7 +65,7 @@ void *sr_mem_control_alloc ( const char* type, char* file, int line, int size, v
} }
// the following is to get rid of the full path of files (in visualc++): // the following is to get rid of the full path of files (in visualc++):
int i = strlen(file); int i = (int)strlen(file);
file += (i-1); file += (i-1);
while ( i>0 && *file!='\\' && *file!='/' ) { file--; i--; } while ( i>0 && *file!='\\' && *file!='/' ) { file--; i--; }
if ( i>0 ) file++; if ( i>0 ) file++;
@ -110,7 +111,7 @@ void sr_memory_report ()
for ( int i=0; i<mem_data_size; i++ ) for ( int i=0; i<mem_data_size; i++ )
{ srMemData &m = mem_data[i]; { srMemData &m = mem_data[i];
output.putf ( "%3d: %-25s %-15s %-6d %-8d %d\n", i+1, m.file, m.type, m.line, m.size, (int)m.addr ); output.putf ( "%3d: %-25s %-15s %-6d %-8d %d\n", i+1, m.file, m.type, m.line, m.size, (intptr_t)m.addr );
} }
output << srnl; output << srnl;

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <stdlib.h> # include <stdlib.h>
# include "sr_model.h" # include "sr_model.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_model.h" # include "sr_model.h"
//# define SR_USE_TRACE1 // keyword tracking //# define SR_USE_TRACE1 // keyword tracking

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_string_array.h" # include "sr_string_array.h"
# include "sr_model.h" # include "sr_model.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <stdarg.h> # include <stdarg.h>
# include <stdlib.h> # include <stdlib.h>
# include <stdio.h> # include <stdio.h>

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_path_array.h" # include "sr_path_array.h"
//# define SR_USE_TRACE1 //# define SR_USE_TRACE1

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_plane.h" # include "sr_plane.h"
//============================== SrPlane ====================================== //============================== SrPlane ======================================

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_box.h" # include "sr_box.h"
# include "sr_vec2.h" # include "sr_vec2.h"
# include "sr_points.h" # include "sr_points.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <math.h> # include <math.h>
# include "sr_box.h" # include "sr_box.h"
# include "sr_geo2.h" # include "sr_geo2.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_box.h" # include "sr_box.h"
# include "sr_polygons.h" # include "sr_polygons.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_quat.h" # include "sr_quat.h"
# include "sr_vec.h" # include "sr_vec.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr.h" # include "sr.h"
# include "sr_random.h" # include "sr_random.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
//# include <stdlib.h> //# include <stdlib.h>
# include "sr_sa.h" # include "sr_sa.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
//# include <stdlib.h> //# include <stdlib.h>
# include "sr_sa_bbox.h" # include "sr_sa_bbox.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_sa_eps_export.h" # include "sr_sa_eps_export.h"
# include "sr_sa_bbox.h" # include "sr_sa_bbox.h"
# include "sr_sn_shape.h" # include "sr_sn_shape.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
//# include <stdlib.h> //# include <stdlib.h>
# include "sr_sn_editor.h" # include "sr_sn_editor.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_sa_model_export.h" # include "sr_sa_model_export.h"
# include "sr_model.h" # include "sr_model.h"
# include "sr_sn_shape.h" # include "sr_sn_shape.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
//# include <stdlib.h> //# include <stdlib.h>
# include "sr_sa_render_mode.h" # include "sr_sa_render_mode.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <stdlib.h> # include <stdlib.h>
# include "sr_set.h" # include "sr_set.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_sn.h" # include "sr_sn.h"
//# define SR_USE_TRACE1 // SrSn Const/Dest //# define SR_USE_TRACE1 // SrSn Const/Dest

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_sn_editor.h" # include "sr_sn_editor.h"
//# define SR_USE_TRACE1 // SrSn Const/Dest //# define SR_USE_TRACE1 // SrSn Const/Dest

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_sn_group.h" # include "sr_sn_group.h"
//# define SR_USE_TRACE1 // Const/Dest //# define SR_USE_TRACE1 // Const/Dest

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <math.h> # include <math.h>
# include "sr_sn_manipulator.h" # include "sr_sn_manipulator.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_sn_matrix.h" # include "sr_sn_matrix.h"
//# define SR_USE_TRACE1 // Const/Dest //# define SR_USE_TRACE1 // Const/Dest

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_sn_polygon_editor.h" # include "sr_sn_polygon_editor.h"
//============================ SrSnPolygonEditor ==================================== //============================ SrSnPolygonEditor ====================================

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_sn_shape.h" # include "sr_sn_shape.h"
//# define SR_USE_TRACE1 // Const/Dest //# define SR_USE_TRACE1 // Const/Dest

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_sphere.h" # include "sr_sphere.h"
# include "sr_box.h" # include "sr_box.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
//# include <math.h> //# include <math.h>
# include "sr_spline.h" # include "sr_spline.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <ctype.h> # include <ctype.h>
# include <string.h> # include <string.h>
# include <stdlib.h> # include <stdlib.h>
@ -77,7 +78,7 @@ SrString& SrString::set ( const char *st )
{ if ( _capacity ) _data[0]=0; { if ( _capacity ) _data[0]=0;
} }
else else
{ int size = strlen(st)+1; { int size = (int)strlen(st)+1;
if ( _capacity<size ) if ( _capacity<size )
{ if ( _data!=_empty ) delete[] _data; { if ( _data!=_empty ) delete[] _data;
_capacity = size; _capacity = size;
@ -140,7 +141,7 @@ void SrString::compress ()
{ {
if ( !_capacity ) return; if ( !_capacity ) return;
int len = strlen(_data); int len = (int)strlen(_data);
if ( len+1==_capacity ) return; // is compressed if ( len+1==_capacity ) return; // is compressed
@ -194,7 +195,7 @@ void SrString::bounds ( int &xi, int &xf ) const
void SrString::substring ( int inf, int sup ) void SrString::substring ( int inf, int sup )
{ {
int n=0; int n=0;
int max=strlen(_data)-1; int max=(int)strlen(_data)-1;
if ( max<0 ) return; if ( max<0 ) return;
if ( inf<0 ) inf=0; if ( inf<0 ) inf=0;
@ -206,21 +207,21 @@ void SrString::substring ( int inf, int sup )
char SrString::last_char () const char SrString::last_char () const
{ {
int len = strlen(_data); int len = (int)strlen(_data);
if ( len==0 ) return 0; if ( len==0 ) return 0;
return _data[len-1]; return _data[len-1];
} }
void SrString::last_char ( char c ) void SrString::last_char ( char c )
{ {
int len = strlen(_data); int len = (int)strlen(_data);
if ( len==0 ) return; if ( len==0 ) return;
_data[len-1] = c; _data[len-1] = c;
} }
void SrString::get_substring ( SrString& s, int inf, int sup ) const void SrString::get_substring ( SrString& s, int inf, int sup ) const
{ {
int max=strlen(_data)-1; int max=(int)strlen(_data)-1;
if ( max<0 ) return; if ( max<0 ) return;
if ( sup<0 || sup>max ) sup=max; if ( sup<0 || sup>max ) sup=max;
if ( inf<0 ) inf=0; if ( inf<0 ) inf=0;
@ -234,7 +235,7 @@ void SrString::get_substring ( SrString& s, int inf, int sup ) const
int SrString::get_next_string ( SrString& s, int i ) const int SrString::get_next_string ( SrString& s, int i ) const
{ {
int i1, i2; int i1, i2;
int max=strlen(_data)-1; int max=(int)strlen(_data)-1;
if ( max<0 ) return -1; if ( max<0 ) return -1;
if ( i<0 ) i=0; if ( i<0 ) i=0;
@ -267,7 +268,7 @@ void SrString::upper ()
int SrString::search ( char c ) const int SrString::search ( char c ) const
{ {
int len = strlen(_data); int len = (int)strlen(_data);
for ( int i=0; i<len; i++ ) if (_data[i]==c) return i; for ( int i=0; i<len; i++ ) if (_data[i]==c) return i;
return -1; return -1;
} }
@ -275,10 +276,10 @@ int SrString::search ( char c ) const
int SrString::search ( const char *st, bool ci ) const int SrString::search ( const char *st, bool ci ) const
{ {
int cmp; int cmp;
int len = strlen(st); int len = (int)strlen(st);
if ( len==0 ) return -1; if ( len==0 ) return -1;
int last_index = strlen(_data)-len; int last_index = (int)strlen(_data)-len;
for ( int i=0; i<=last_index; i++ ) for ( int i=0; i<=last_index; i++ )
{ cmp = ci? sr_compare ( _data+i, st, len ) : { cmp = ci? sr_compare ( _data+i, st, len ) :
sr_compare_cs ( _data+i, st, len ); sr_compare_cs ( _data+i, st, len );
@ -414,7 +415,7 @@ bool SrString::make_valid_string ( const char* s )
bool need_slash = false; bool need_slash = false;
int i; int i;
int len = strlen ( s ); int len = (int)strlen ( s );
if ( len==0 ) if ( len==0 )
need_quotes = true; need_quotes = true;
@ -471,7 +472,7 @@ void SrString::append ( const char* st )
char *tmp = 0; char *tmp = 0;
if ( st==_data ) { tmp=sr_string_new(st); st=tmp; } if ( st==_data ) { tmp=sr_string_new(st); st=tmp; }
int newlen = strlen(_data)+strlen(st); int newlen = (int)strlen(_data)+(int)strlen(st);
if ( newlen<_capacity ) if ( newlen<_capacity )
{ strcat(_data,st); { strcat(_data,st);
@ -491,10 +492,10 @@ void SrString::insert ( int i, const char *st )
if ( !st ) return; if ( !st ) return;
if ( i<0 ) i=0; if ( i<0 ) i=0;
int len = strlen(_data); int len = (int)strlen(_data);
if ( i>=len ) { append(st); return; } if ( i>=len ) { append(st); return; }
int dp = strlen ( st ); int dp = (int)strlen ( st );
if ( !dp ) return; if ( !dp ) return;
int ns = len+dp+1; int ns = len+dp+1;
@ -516,7 +517,7 @@ void SrString::insert ( int i, const char *st )
void SrString::remove ( int i, int dp ) void SrString::remove ( int i, int dp )
{ {
if ( _data==_empty || dp<=0 ) return; if ( _data==_empty || dp<=0 ) return;
int len = strlen(_data); int len = (int)strlen(_data);
if ( i>=len || i<0 ) return; if ( i>=len || i<0 ) return;
if ( i+dp>=len ) { _data[i]=0; return; } if ( i+dp>=len ) { _data[i]=0; return; }
@ -531,8 +532,8 @@ int SrString::replace ( const char* oldst, const char* newst, bool ci )
if ( i<0 ) return i; // not found if ( i<0 ) return i; // not found
int oldlen = strlen(oldst); int oldlen = (int)strlen(oldst);
int newlen = newst? strlen(newst):0; int newlen = newst? (int)strlen(newst):0;
if ( oldlen<newlen ) // open space if ( oldlen<newlen ) // open space
{ SrString dif ( ' ', newlen-oldlen ); { SrString dif ( ' ', newlen-oldlen );

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_string_array.h" # include "sr_string_array.h"
//# define SR_USE_TRACE1 //# define SR_USE_TRACE1

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_time.h" # include "sr_time.h"
# include "sr_string.h" # include "sr_string.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <math.h> # include <math.h>
# include "sr_trackball.h" # include "sr_trackball.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_tree.h" # include "sr_tree.h"
//# define SR_USE_TRACE1 //# define SR_USE_TRACE1

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
//# include <math.h> //# include <math.h>
# include "sr_triangle.h" # include "sr_triangle.h"
//# include "sr_vec2.h" //# include "sr_vec2.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include "sr_random.h" # include "sr_random.h"
# include "sr_geo2.h" # include "sr_geo2.h"
# include "sr_triangulation.h" # include "sr_triangulation.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <ctype.h> # include <ctype.h>
# include <string.h> # include <string.h>
# include <stdlib.h> # include <stdlib.h>
@ -378,7 +379,7 @@ SrOutput& operator<< ( SrOutput& o, const SrVar& v )
case 's': for ( i=0; i<s; i++ ) case 's': for ( i=0; i<s; i++ )
{ outs(o,i,v._data[i].s,buf); { outs(o,i,v._data[i].s,buf);
len += strlen(v._data[i].s); len += (int)strlen(v._data[i].s);
if (i<e) if (i<e)
{ if ( len>80 ) { o<<srnl<<srtab; len=0; } { if ( len>80 ) { o<<srnl<<srtab; len=0; }
else o<<srspc; else o<<srspc;

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <stdlib.h> # include <stdlib.h>
# include "sr_var_table.h" # include "sr_var_table.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <math.h> # include <math.h>
# include "sr_vec.h" # include "sr_vec.h"
# include "sr_vec2.h" # include "sr_vec2.h"

View File

@ -1,4 +1,5 @@
#include "precompiled.h" #include "precompiled.h"
#include "0ad_warning_disable.h"
# include <math.h> # include <math.h>
# include "sr_vec2.h" # include "sr_vec2.h"
# include "sr_geo2.h" # include "sr_geo2.h"