committing patch from simon (compiles clean on win32, pathfinding still works)
see http://www.wildfiregames.com/forum/index.php?showtopic=11817&hl=# This was SVN commit r6120.
This commit is contained in:
parent
0994b71316
commit
ad15764e1b
@ -208,12 +208,13 @@ class SrArray : protected SrArrayBase
|
||||
|
||||
/*! Operator version of X& get(int i), but returning a non const reference.
|
||||
No checkings are done to ensure that i is valid. */
|
||||
X& operator[] ( int i ) { return ((X*)_data)[i]; }
|
||||
//X& operator[] ( int i ) { return ((X*)_data)[i]; }
|
||||
|
||||
/*! Returns a const pointer of the internal buffer. The internal buffer
|
||||
will always contain a contigous storage space of capacity() elements.
|
||||
See also take_data() and leave_data() methods. */
|
||||
operator const X* () const { return (X*)_data; }
|
||||
operator X* () { return (X*)_data; }
|
||||
|
||||
/*! Returns a reference to the last element, ie, with index size()-1.
|
||||
The array must not be empty when calling this method. */
|
||||
@ -339,3 +340,4 @@ class SrArray : protected SrArrayBase
|
||||
|
||||
#endif // SR_ARRAY_H
|
||||
|
||||
|
||||
|
@ -336,6 +336,7 @@ class SrInput
|
||||
/*! Operator to read an integer using method getn() and function atoi().
|
||||
Errors can be tracked using last_error(). */
|
||||
friend SrInput& operator>> ( SrInput& in, int& i );
|
||||
friend SrInput& operator>> ( SrInput& in, intptr_t& i );
|
||||
|
||||
/*! Operator to read an unsigned integer using method getn() and function atoi().
|
||||
Errors can be tracked using last_error(). */
|
||||
|
@ -178,6 +178,7 @@ class SrOutput
|
||||
|
||||
/*! Outputs an int using intfmt with the putf() method. */
|
||||
friend SrOutput& operator<< ( SrOutput& o, int i );
|
||||
friend SrOutput& operator<< ( SrOutput& o, intptr_t i);
|
||||
|
||||
/*! Outputs a bool as "true" or "false" with the put() method. */
|
||||
friend SrOutput& operator<< ( SrOutput& o, bool b );
|
||||
@ -204,3 +205,4 @@ extern SrOutput sr_out;
|
||||
|
||||
# endif // SR_OUTPUT_H
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user