Update of /cvsroot/jsoncpp/jsoncpp/src/lib_json
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3848/src/lib_json
Modified Files:
json_reader.cpp json_writer.cpp
Log Message:
Fixed compilation issues with Visual C++ 6.0
Index: json_reader.cpp
===================================================================
RCS file: /cvsroot/jsoncpp/jsoncpp/src/lib_json/json_reader.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** json_reader.cpp 30 Jul 2005 17:40:59 -0000 1.3
--- json_reader.cpp 11 Feb 2006 21:17:48 -0000 1.4
***************
*** 50,55 ****
lastValueEnd_ = 0;
lastValue_ = 0;
! commentsBefore_.clear();
! errors_.clear();
while ( !nodes_.empty() )
nodes_.pop();
--- 50,55 ----
lastValueEnd_ = 0;
lastValue_ = 0;
! commentsBefore_.resize(0);
! errors_.resize(0);
while ( !nodes_.empty() )
nodes_.pop();
***************
*** 75,79 ****
{
currentValue().setComment( commentsBefore_, commentBefore );
! commentsBefore_.clear();
}
--- 75,79 ----
{
currentValue().setComment( commentsBefore_, commentBefore );
! commentsBefore_.resize(0);
}
***************
*** 361,365 ****
break;
! name.clear();
if ( !decodeString( tokenName, name ) )
return recoverFromError( tokenObjectEnd );
--- 361,365 ----
break;
! name.resize(0);
if ( !decodeString( tokenName, name ) )
return recoverFromError( tokenObjectEnd );
Index: json_writer.cpp
===================================================================
RCS file: /cvsroot/jsoncpp/jsoncpp/src/lib_json/json_writer.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** json_writer.cpp 30 Jul 2005 17:40:59 -0000 1.5
--- json_writer.cpp 11 Feb 2006 21:17:48 -0000 1.6
***************
*** 68,72 ****
FastWriter::write( const Value &root )
{
! document_.clear();
writeValue( root );
document_ += "\n";
--- 68,72 ----
FastWriter::write( const Value &root )
{
! document_.resize(0);
writeValue( root );
document_ += "\n";
***************
*** 146,152 ****
StyledWriter::write( const Value &root )
{
! document_.clear();
addChildValues_ = false;
! indentString_.clear();
writeCommentBeforeValue( root );
writeValue( root );
--- 146,152 ----
StyledWriter::write( const Value &root )
{
! document_.resize(0);
addChildValues_ = false;
! indentString_.resize(0);
writeCommentBeforeValue( root );
writeValue( root );
|