Fix some compilation errors

 - add missing include for std::unique_ptr
 - fix global operator<< template to be specific to Json::Value
 - add missing include guards to header implementation files
 - include the template implementations in tests

Author: flatwhatson

include/json/reader.inl

@@ -3,6 +3,9 @@
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
+#ifndef CPPTL_JSON_READER_INL_INCLUDED
+#define CPPTL_JSON_READER_INL_INCLUDED
+
 #if !defined(JSON_IS_AMALGAMATION)
 #include "assertions.h"
 #include "reader.h"
@@ -2100,3 +2103,5 @@ std::istream& operator>>(std::istream& sin, _Value& root) {
 
 } // namespace detail
 } // namespace Json
+
+#endif // CPPTL_JSON_READER_INL_INCLUDED

include/json/value.h

@@ -9,6 +9,7 @@
 #if !defined(JSON_IS_AMALGAMATION)
 #include "forwards.h"
 #endif // if !defined(JSON_IS_AMALGAMATION)
+#include <memory>
 #include <string>
 #include <vector>
 #include <exception>
@@ -887,8 +888,7 @@ typedef detail::ValueIteratorBase<detail::Value<>> ValueIteratorBase; 	// class
 
 namespace std {
 /// Specialize std::swap() for Json::Value.
-template<class _Alloc = std::allocator<char>,
-  class _String = std::basic_string<char, std::char_traits<char>, std::allocator<char>>>
+template<class _Alloc, class _String>
 inline void swap(Json::detail::Value<_Alloc, _String>& a, Json::detail::Value<_Alloc, _String>& b) { a.swap(b); }
 }
 

include/json/value.inl

@@ -3,6 +3,9 @@
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
+#ifndef CPPTL_JSON_VALUE_INL_INCLUDED
+#define CPPTL_JSON_VALUE_INL_INCLUDED
+
 #if !defined(JSON_IS_AMALGAMATION)
 #include "assertions.h"
 #include "value.h"
@@ -1730,3 +1733,5 @@ _Value& Path<_Value>::make(_Value& root) const {
 
 } // namespace detail
 } // namespace Json
+
+#endif // CPPTL_JSON_VALUE_INL_INCLUDED

include/json/writer.inl

@@ -3,6 +3,9 @@
 // recognized in your jurisdiction.
 // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
 
+#ifndef JSON_WRITER_INL_INCLUDED
+#define JSON_WRITER_INL_INCLUDED
+
 #if !defined(JSON_IS_AMALGAMATION)
 #include <json/writer.h>
 #include "tool.h"
@@ -1249,19 +1252,21 @@ typedef std::auto_ptr<StreamWriter<_Value>>   StreamWriterPtr;
 
 /// \brief Output using the StyledStreamWriter.
 /// \see Json::operator>>()
-template<class _Value>
-std::ostream& operator<<(std::ostream& sout, _Value const& root) {
+template<class _Alloc, class _String>
+std::ostream& operator<<(std::ostream& sout, Value<_Alloc, _String> const& root) {
 #if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
-typedef std::unique_ptr<StreamWriter<_Value>> StreamWriterPtr;
+typedef std::unique_ptr<StreamWriter<Value<_Alloc, _String>>> StreamWriterPtr;
 #else
-typedef std::auto_ptr<StreamWriter<_Value>>   StreamWriterPtr;
+typedef std::auto_ptr<StreamWriter<Value<_Alloc, _String>>>   StreamWriterPtr;
 #endif
 
-  StreamWriterBuilder<_Value> builder;
+  StreamWriterBuilder<Value<_Alloc, _String>> builder;
   StreamWriterPtr const writer(builder.newStreamWriter());
   writer->write(root, &sout);
   return sout;
 }
 
 } // namespace detail
 } // namespace Json
+
+#endif // JSON_WRITER_INL_INCLUDED

src/test_lib_json/jsontest.h

@@ -7,8 +7,8 @@
 #define JSONTEST_H_INCLUDED
 
 #include <json/config.h>
-#include <json/value.h>
-#include <json/writer.h>
+#include <json/value.inl>
+#include <json/writer.inl>
 #include <stdio.h>
 #include <deque>
 #include <sstream>