[Cppunit-cvs] cppunit2/src/cpptl json_reader.cpp, 1.3, 1.4 json_value.cpp, 1.3, 1.4 json_writer.cpp, 1.3, 1.4

[Baptiste L. <bl...@us...>]

Update of /cvsroot/cppunit/cppunit2/src/cpptl
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22940/src/cpptl

Modified Files:
	json_reader.cpp json_value.cpp json_writer.cpp 
Log Message:
- synchronized with lastest jsoncpp.

Index: json_value.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpptl/json_value.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** json_value.cpp	5 Jun 2006 13:22:58 -0000	1.3
--- json_value.cpp	1 Sep 2006 19:48:11 -0000	1.4
***************
*** 5,11 ****
  #ifdef JSON_USE_CPPTL
  # include <cpptl/conststring.h>
- # include <cpptl/enumerator.h>
  #endif
  #include <stddef.h>    // size_t
  
  #define JSON_ASSERT_UNREACHABLE assert( false )
--- 5,13 ----
  #ifdef JSON_USE_CPPTL
  # include <cpptl/conststring.h>
[...1090 lines suppressed...]
+       if ( value_.map_ )
+       {
+          ValueInternalMap::IteratorState it;
+          value_.map_->makeEndIterator( it );
+          return iterator( it );
+       }
+       break;
+ #else
     case arrayValue:
     case objectValue:
        if ( value_.map_ )
           return iterator( value_.map_->end() );
!       break;
! #endif
     default:
!       break;
     }
+    return iterator();
  }
  

Index: json_reader.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpptl/json_reader.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** json_reader.cpp	5 Jun 2006 13:22:58 -0000	1.3
--- json_reader.cpp	1 Sep 2006 19:48:11 -0000	1.4
***************
*** 584,588 ****
        Char c = *current++;
        unicode *= 16;
!       if ( c >=0  &&  c <= 9 )
           unicode += c - '0';
        else if ( c >= 'a'  &&  c <= 'f' )
--- 584,588 ----
        Char c = *current++;
        unicode *= 16;
!       if ( c >= '0'  &&  c <= '9' )
           unicode += c - '0';
        else if ( c >= 'a'  &&  c <= 'f' )

Index: json_writer.cpp
===================================================================
RCS file: /cvsroot/cppunit/cppunit2/src/cpptl/json_writer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** json_writer.cpp	3 Mar 2006 07:54:55 -0000	1.3
--- json_writer.cpp	1 Sep 2006 19:48:11 -0000	1.4
***************
*** 14,18 ****
  {
     *--current = 0;
-    char *end = current;
     do
     {
--- 14,17 ----