Added cstring for memcpy(), as suggested by sebastien.vincent@turnser…

…ver.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.
luoluo · May 11, 2009 · 8f5ddcf · 8f5ddcf
1 parent 230b1f6
commit 8f5ddcf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/SConstruct b/SConstruct
@@ -250,6 +250,6 @@ env.Alias( 'src-dist', srcdist_cmd )
 
 buildProjectInDirectory( 'src/jsontestrunner' )
 buildProjectInDirectory( 'src/lib_json' )
-buildProjectInDirectory( 'doc' )
+#buildProjectInDirectory( 'doc' ) # THIS IS BROKEN.
 #print env.Dump()
 
diff --git a/src/lib_json/json_reader.cpp b/src/lib_json/json_reader.cpp
@@ -1,8 +1,9 @@
 #include <json/reader.h>
 #include <json/value.h>
 #include <utility>
-#include <stdio.h>
-#include <assert.h>
+#include <cstdio>
+#include <cassert>
+#include <cstring>
 #include <iostream>
 #include <stdexcept>
 

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