X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FUIUCModel%2Fuiuc_2DdataFileReader.cpp;h=6faabfdce635566be33ad99cc066a0b9bc021673;hb=70b4f38ebccbafea664ed2310eaf990bd2b9edd8;hp=1d6fda805f624a97adcccc012f0df807b29b17b4;hpb=2717dba826bb83ab03cfd15f2a10bd96095f162c;p=flightgear.git diff --git a/src/FDM/UIUCModel/uiuc_2DdataFileReader.cpp b/src/FDM/UIUCModel/uiuc_2DdataFileReader.cpp index 1d6fda805..6faabfdce 100644 --- a/src/FDM/UIUCModel/uiuc_2DdataFileReader.cpp +++ b/src/FDM/UIUCModel/uiuc_2DdataFileReader.cpp @@ -20,6 +20,9 @@ HISTORY: 02/29/2000 initial release 10/25/2001 (RD) Modified so that it recognizes a blank line + 06/30/2003 (RD) replaced istrstream with istringstream + to get rid of the annoying warning about + using the strstream header ---------------------------------------------------------------------- @@ -68,8 +71,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA or view http://www.gnu.org/copyleft/gpl.html. + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. **********************************************************************/ @@ -101,8 +103,8 @@ void uiuc_2DdataFileReader( string file_name, linetoken1 = matrix -> getToken(*command_line, 1); // gettoken(string,tokenNo); linetoken2 = matrix -> getToken(*command_line, 2); // 2 represents token No 2 - istrstream token1(linetoken1.c_str()); - istrstream token2(linetoken2.c_str()); + istringstream token1(linetoken1.c_str()); + istringstream token2(linetoken2.c_str()); //reset token_value1 and token_value2 for first if statement token_value1 = -999; @@ -131,6 +133,7 @@ void uiuc_2DdataFileReader( string file_name, counter_x++; } } + delete matrix; return; }