Restructuring

.gitignore

@@ -14,9 +14,9 @@
 
 out.txt
 ptr.txt
-test
 test.txt
 unittests
 boost_serialize
 arr.txt
 performance
+sandbox

Makefile

@@ -1,15 +1,17 @@
-all: test.cpp
-	g++ -std=c++0x test.cpp -o test -ljsoncpp -I./..
+CPPFLAGS=-std=c++11 -I./include
+CC=g++
+
+all: unittests sandbox performance
+
+sandbox: sandbox.cpp
+	${CC} sandbox.cpp -o sandbox ${CPPFLAGS}
 
 unittests: unittests.cpp
-	clang++ -std=c++0x unittests.cpp -o unittests -lboost_unit_test_framework -I./..
+	${CC} unittests.cpp -o unittests -lboost_unit_test_framework ${CPPFLAGS}
 	./unittests --show_progress
 
 performance: performance.cpp
-	clang++ -std=c++11 performance.cpp -o performance -lboost_serialization -I./.. -O3
-
-boost_serialize: boost_serialize.cpp
-	g++ -std=c++11 boost_serialize.cpp -o boost_serialize -lboost_serialization -I./..
+	${CC} performance.cpp -o performance -lboost_serialization ${CPPFLAGS} -O3
 
 clean:
-	rm test; rm unittests;
+	rm sandbox; rm unittests; rm performance;

boost_serialize.cpp

@@ -1,34 +0,0 @@
-#include <boost/serialization/serialization.hpp>
-#include <boost/archive/text_oarchive.hpp>
-#include <boost/archive/text_iarchive.hpp>
-#include <boost/serialization/vector.hpp>
-#include <boost/config.hpp>
-#include <vector>
-#include <iostream>
-
-struct myStruct
-{
-  myStruct() : x(0) {}
-  int x;
-
-
-  template<class Archive>
-  void serialize(Archive & ar, const unsigned int version)
-  {
-    ar & x;
-  }
-};
-
-
-int main()
-{
-  boost::archive::text_oarchive oa(std::cout);
-
-  const myStruct v;
-
-  oa & v;
-
-  std::cout << BOOST_NO_FUNCTION_TEMPLATE_ORDERING << std::endl;
-
-  return 0;
-}

json_archive/json_archive.hpp

@@ -1,127 +0,0 @@
-/*
-  Copyright (c) 2013, Randolph Voorhies, Shane Grant
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-      * Redistributions of source code must retain the above copyright
-        notice, this list of conditions and the following disclaimer.
-      * Redistributions in binary form must reproduce the above copyright
-        notice, this list of conditions and the following disclaimer in the
-        documentation and/or other materials provided with the distribution.
-      * Neither the name of cereal nor the
-        names of its contributors may be used to endorse or promote products
-        derived from this software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef CEREAL_JSON_ARCHIVE_JSON_ARCHIVE_HPP_
-#define CEREAL_JSON_ARCHIVE_JSON_ARCHIVE_HPP_
-
-#include <cereal/cereal.hpp>
-#include <cassert>
-#include <jsoncpp/json/json.h>
-
-namespace cereal
-{
-  // ######################################################################
-  class JSONOutputArchive : public OutputArchive<JSONOutputArchive>
-  {
-    public:
-      JSONOutputArchive(std::ostream & stream) :
-        OutputArchive<JSONOutputArchive>(this),
-        itsStream(stream)
-    { }
-
-      Json::StyledStreamWriter & writer() { return itsWriter; }
-      std::ostream & stream() {return itsStream; }
-
-    private:
-      std::ostream & itsStream;
-      Json::StyledStreamWriter itsWriter;
-  };
-
-  // ######################################################################
-  class JSONInputArchive : public InputArchive<JSONInputArchive>
-  {
-    public:
-      JSONInputArchive(std::istream & stream) :
-        InputArchive<JSONInputArchive>(this),
-        itsStream(stream)
-    { }
-
-      std::istream & stream() {return itsStream; }
-
-    private:
-      std::istream & itsStream;
-  };
-
-  //! Saving for POD types to json
-  template<class T>
-    typename std::enable_if<std::is_arithmetic<T>::value, void>::type
-    save(JSONOutputArchive & ar, T const & t)
-    {
-      //ar.stream() << t;
-    }
-
-  //! Loading for POD types from json
-  template<class T>
-    typename std::enable_if<std::is_arithmetic<T>::value, void>::type
-    load(JSONInputArchive & ar, T & t)
-    {
-      //ar.stream() >> t;
-    }
-
-  //! Saving for NVP types to json
-  template<class T>
-    void save(JSONOutputArchive & ar, NameValuePair<T> const & t)
-    {
-      //ar.stream() << t.name << " : ";
-      //
-      //ar & t.value;
-
-      //ar.stream() << "\n";
-      Json::Value v;
-      v[t.name] = t.value;
-      ar.writer().write(ar.stream(), v);
-
-      //ar.writer().write(ar.stream(), Json::Value(t.name));
-      //ar.writer().write(ar.stream(), Json::Value(t.value));
-    }
-
-  //! Loading for NVP types from json
-  template<class T>
-    void load(JSONInputArchive & ar, NameValuePair<T> t)
-    {
-      ar & t.value;
-    }
-
-  //! Serialization for basic_string types to json
-  template<class CharT, class Traits, class Alloc>
-    void save(JSONOutputArchive & ar, std::basic_string<CharT, Traits, Alloc> const & str)
-    {
-      //ar.stream() << "\"" << str << "\"";
-    }
-
-  //! Serialization for basic_string types from json
-  template<class CharT, class Traits, class Alloc>
-    void load(JSONInputArchive & ar, std::basic_string<CharT, Traits, Alloc> & str)
-    {
-      //size_t size;
-      //ar & size;
-      //str.resize(size);
-      //ar.load_json(const_cast<CharT*>(str.data()), size * sizeof(CharT));
-      //std::cout << "Loading string: " << str << std::endl;
-    }
-}
-
-#endif // CEREAL_JSON_ARCHIVE_JSON_ARCHIVE_HPP_

sandbox.cpp

@@ -29,7 +29,6 @@
 #include <cereal/binary_archive/binary_archive.hpp>
 #include <cereal/binary_archive/string.hpp>
 #include <cereal/binary_archive/utility.hpp>
-#include <cereal/json_archive/json_archive.hpp>
 #include <cereal/binary_archive/memory.hpp>
 #include <cereal/binary_archive/complex.hpp>