Skip to content

Commit

Permalink
Minor fixes to make it compile
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin York authored and Martin York committed May 7, 2012
1 parent a7a2010 commit dafef3b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
3 changes: 3 additions & 0 deletions Json/ParserInterface.cpp
Expand Up @@ -7,6 +7,9 @@


#include <string> #include <string>
#include <iterator> #include <iterator>

#include <stdint.h>

template<typename C> template<typename C>
struct TransformJsonStringIter: std::iterator<std::input_iterator_tag, char, ptrdiff_t, char*,char&> struct TransformJsonStringIter: std::iterator<std::input_iterator_tag, char, ptrdiff_t, char*,char&>
{ {
Expand Down
2 changes: 0 additions & 2 deletions README
@@ -1,6 +1,4 @@


Test:

Yet another JSON serialization library for C++ Yet another JSON serialization library for C++


Objective: Objective:
Expand Down
2 changes: 1 addition & 1 deletion Serialize/JsonSerializer.h
Expand Up @@ -59,7 +59,7 @@
* std::cin >> jsonImport(vec); * std::cin >> jsonImport(vec);
*/ */
#include "json/ScannerSax.h" #include "json/ScannerSax.h"
#include "json/ParserShiftReduce.tab.hpp" #include "json/ParserShiftReduce.h"
#include <boost/mpl/at.hpp> #include <boost/mpl/at.hpp>
#include <boost/mpl/pop_front.hpp> #include <boost/mpl/pop_front.hpp>
#include <boost/mpl/for_each.hpp> #include <boost/mpl/for_each.hpp>
Expand Down
12 changes: 10 additions & 2 deletions third/setup
Expand Up @@ -2,6 +2,14 @@


ROOT=`pwd` ROOT=`pwd`


# Need this to unpack some of the packages.
# sudo apt-get install unzip

#
# Need this for building
sudo apt-get install bison flex
sudo apt-get install libboost-dev libboost-doc

# #
# Change this as required to point at the root of ThorsAnvil code # Change this as required to point at the root of ThorsAnvil code
THORSANVIL_ROOT=`dirname ${ROOT}` THORSANVIL_ROOT=`dirname ${ROOT}`
Expand All @@ -11,7 +19,7 @@ THORSANVIL_ROOT=`dirname ${ROOT}`
# to the directory containing 'boost' If not set it will search for the # to the directory containing 'boost' If not set it will search for the
# boost tar.gz archive in the current directory and use that # boost tar.gz archive in the current directory and use that
# #
USE_INSTALLED_BOOST= USE_INSTALLED_BOOST=/usr/include




# #
Expand All @@ -23,7 +31,7 @@ BUILD_BOOST=0
# Set to 1 to build boost logging. # Set to 1 to build boost logging.
# Note: this implies building the boost lib # Note: this implies building the boost lib
# #
BOOST_LOG=1 BOOST_LOG=0


# #
# If you want to use the unit test automatically you need this # If you want to use the unit test automatically you need this
Expand Down

0 comments on commit dafef3b

Please sign in to comment.