generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2024-12-12 10:03:51 +01:00
Code Issues Projects Releases Wiki Activity

Added cstring for memcpy(), as suggested by sebastien.vincent@turnserver.org . This allows gcc-4 to compile. Removed doxygen from SConstruct, since it is now broken; I have been unable to get it to work with either scons 0.97 or scons 2.1; hopefully someone else can get that working again.

Browse Source
This commit is contained in:
Christopher Dunn 2009-05-11 20:04:10 +00:00
parent 230b1f675f
commit 8f5ddcfa8d
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@ -250,6 +250,6 @@ env.Alias( 'src-dist', srcdist_cmd )
buildProjectInDirectory( 'src/jsontestrunner' ) buildProjectInDirectory( 'src/jsontestrunner' )
buildProjectInDirectory( 'src/lib_json' ) buildProjectInDirectory( 'src/lib_json' )
buildProjectInDirectory( 'doc' ) #buildProjectInDirectory( 'doc' ) # THIS IS BROKEN.
#print env.Dump() #print env.Dump()

5
src/lib_json/json_reader.cpp
View File

@ -1,8 +1,9 @@
#include <json/reader.h> #include <json/reader.h>
#include <json/value.h> #include <json/value.h>
#include <utility> #include <utility>
#include <stdio.h> #include <cstdio>
#include <assert.h> #include <cassert>
#include <cstring>
#include <iostream> #include <iostream>
#include <stdexcept> #include <stdexcept>

5
src/lib_json/json_value.cpp
View File

@ -3,11 +3,12 @@
#include <json/writer.h> #include <json/writer.h>
#include <utility> #include <utility>
#include <stdexcept> #include <stdexcept>
#include "assert.h" #include <cstring>
#include <cassert>
#ifdef JSON_USE_CPPTL #ifdef JSON_USE_CPPTL
# include <cpptl/conststring.h> # include <cpptl/conststring.h>
#endif #endif
#include <stddef.h> // size_t #include <cstddef> // size_t
#ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR #ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
# include "json_batchallocator.h" # include "json_batchallocator.h"
#endif // #ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR #endif // #ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR