Fix CRLF

18 files changed, 993 insertions, 993 deletions

diff --git a/lib/jsoncpp/jsoncpp/include/json/features.h b/lib/jsoncpp/jsoncpp/include/json/features.h
index f1404f6204..5a9adec118 100644
--- a/lib/jsoncpp/jsoncpp/include/json/features.h
+++ b/lib/jsoncpp/jsoncpp/include/json/features.h
@@ -1,42 +1,42 @@
-#ifndef CPPTL_JSON_FEATURES_H_INCLUDED

-# define CPPTL_JSON_FEATURES_H_INCLUDED

-

-# include "forwards.h"

-

-namespace Json {

-

-   /** \brief Configuration passed to reader and writer.

-    * This configuration object can be used to force the Reader or Writer

-    * to behave in a standard conforming way.

-    */

-   class JSON_API Features

-   {

-   public:

-      /** \brief A configuration that allows all features and assumes all strings are UTF-8.

-       * - C & C++ comments are allowed

-       * - Root object can be any JSON value

-       * - Assumes Value strings are encoded in UTF-8

-       */

-      static Features all();

-

-      /** \brief A configuration that is strictly compatible with the JSON specification.

-       * - Comments are forbidden.

-       * - Root object must be either an array or an object value.

-       * - Assumes Value strings are encoded in UTF-8

-       */

-      static Features strictMode();

-

-      /** \brief Initialize the configuration like JsonConfig::allFeatures;

-       */

-      Features();

-

-      /// \c true if comments are allowed. Default: \c true.

-      bool allowComments_;

-

-      /// \c true if root must be either an array or an object value. Default: \c false.

-      bool strictRoot_;

-   };

-

-} // namespace Json

-

-#endif // CPPTL_JSON_FEATURES_H_INCLUDED

+#ifndef CPPTL_JSON_FEATURES_H_INCLUDED
+# define CPPTL_JSON_FEATURES_H_INCLUDED
+
+# include "forwards.h"
+
+namespace Json {
+
+   /** \brief Configuration passed to reader and writer.
+    * This configuration object can be used to force the Reader or Writer
+    * to behave in a standard conforming way.
+    */
+   class JSON_API Features
+   {
+   public:
+      /** \brief A configuration that allows all features and assumes all strings are UTF-8.
+       * - C & C++ comments are allowed
+       * - Root object can be any JSON value
+       * - Assumes Value strings are encoded in UTF-8
+       */
+      static Features all();
+
+      /** \brief A configuration that is strictly compatible with the JSON specification.
+       * - Comments are forbidden.
+       * - Root object must be either an array or an object value.
+       * - Assumes Value strings are encoded in UTF-8
+       */
+      static Features strictMode();
+
+      /** \brief Initialize the configuration like JsonConfig::allFeatures;
+       */
+      Features();
+
+      /// \c true if comments are allowed. Default: \c true.
+      bool allowComments_;
+
+      /// \c true if root must be either an array or an object value. Default: \c false.
+      bool strictRoot_;
+   };
+
+} // namespace Json
+
+#endif // CPPTL_JSON_FEATURES_H_INCLUDED
diff --git a/lib/jsoncpp/jsoncpp/makefiles/vs71/jsoncpp.sln b/lib/jsoncpp/jsoncpp/makefiles/vs71/jsoncpp.sln
index 5bfa366547..dd2f91b442 100644
--- a/lib/jsoncpp/jsoncpp/makefiles/vs71/jsoncpp.sln
+++ b/lib/jsoncpp/jsoncpp/makefiles/vs71/jsoncpp.sln
@@ -1,46 +1,46 @@
-Microsoft Visual Studio Solution File, Format Version 8.00

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_json", "lib_json.vcproj", "{B84F7231-16CE-41D8-8C08-7B523FF4225B}"

-	ProjectSection(ProjectDependencies) = postProject

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsontest", "jsontest.vcproj", "{25AF2DD2-D396-4668-B188-488C33B8E620}"

-	ProjectSection(ProjectDependencies) = postProject

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_lib_json", "test_lib_json.vcproj", "{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}"

-	ProjectSection(ProjectDependencies) = postProject

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B}

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfiguration) = preSolution

-		Debug = Debug

-		dummy = dummy

-		Release = Release

-	EndGlobalSection

-	GlobalSection(ProjectConfiguration) = postSolution

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.ActiveCfg = Debug|Win32

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.Build.0 = Debug|Win32

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.ActiveCfg = dummy|Win32

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.Build.0 = dummy|Win32

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.ActiveCfg = Release|Win32

-		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.Build.0 = Release|Win32

-		{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.ActiveCfg = Debug|Win32

-		{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.Build.0 = Debug|Win32

-		{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.ActiveCfg = Debug|Win32

-		{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.Build.0 = Debug|Win32

-		{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.ActiveCfg = Release|Win32

-		{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.Build.0 = Release|Win32

-		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.ActiveCfg = Debug|Win32

-		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.Build.0 = Debug|Win32

-		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.ActiveCfg = Debug|Win32

-		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.Build.0 = Debug|Win32

-		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.ActiveCfg = Release|Win32

-		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ExtensibilityGlobals) = postSolution

-	EndGlobalSection

-	GlobalSection(ExtensibilityAddIns) = postSolution

-	EndGlobalSection

-EndGlobal

+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_json", "lib_json.vcproj", "{B84F7231-16CE-41D8-8C08-7B523FF4225B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsontest", "jsontest.vcproj", "{25AF2DD2-D396-4668-B188-488C33B8E620}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_lib_json", "test_lib_json.vcproj", "{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		dummy = dummy
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.ActiveCfg = Debug|Win32
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.Build.0 = Debug|Win32
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.ActiveCfg = dummy|Win32
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.Build.0 = dummy|Win32
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.ActiveCfg = Release|Win32
+		{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.Build.0 = Release|Win32
+		{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.ActiveCfg = Debug|Win32
+		{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.Build.0 = Debug|Win32
+		{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.ActiveCfg = Debug|Win32
+		{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.Build.0 = Debug|Win32
+		{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.ActiveCfg = Release|Win32
+		{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.Build.0 = Release|Win32
+		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.ActiveCfg = Debug|Win32
+		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.Build.0 = Debug|Win32
+		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.ActiveCfg = Debug|Win32
+		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.Build.0 = Debug|Win32
+		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.ActiveCfg = Release|Win32
+		{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/lib/jsoncpp/jsoncpp/makefiles/vs71/jsontest.vcproj b/lib/jsoncpp/jsoncpp/makefiles/vs71/jsontest.vcproj
index 99a4dd6971..562c71f61a 100644
--- a/lib/jsoncpp/jsoncpp/makefiles/vs71/jsontest.vcproj
+++ b/lib/jsoncpp/jsoncpp/makefiles/vs71/jsontest.vcproj
@@ -1,119 +1,119 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="jsontest"

-	ProjectGUID="{25AF2DD2-D396-4668-B188-488C33B8E620}"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="../../build/vs71/debug/jsontest"

-			IntermediateDirectory="../../build/vs71/debug/jsontest"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/jsontest.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/jsontest.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="../../build/vs71/release/jsontest"

-			IntermediateDirectory="../../build/vs71/release/jsontest"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/jsontest.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\src\jsontestrunner\main.cpp">

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="jsontest"
+	ProjectGUID="{25AF2DD2-D396-4668-B188-488C33B8E620}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../../build/vs71/debug/jsontest"
+			IntermediateDirectory="../../build/vs71/debug/jsontest"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/jsontest.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/jsontest.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="../../build/vs71/release/jsontest"
+			IntermediateDirectory="../../build/vs71/release/jsontest"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/jsontest.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\src\jsontestrunner\main.cpp">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/lib/jsoncpp/jsoncpp/makefiles/vs71/test_lib_json.vcproj b/lib/jsoncpp/jsoncpp/makefiles/vs71/test_lib_json.vcproj
index df36700bdc..9ebb986a66 100644
--- a/lib/jsoncpp/jsoncpp/makefiles/vs71/test_lib_json.vcproj
+++ b/lib/jsoncpp/jsoncpp/makefiles/vs71/test_lib_json.vcproj
@@ -1,130 +1,130 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="7.10"

-	Name="test_lib_json"

-	ProjectGUID="{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}"

-	RootNamespace="test_lib_json"

-	Keyword="Win32Proj">

-	<Platforms>

-		<Platform

-			Name="Win32"/>

-	</Platforms>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="../../build/vs71/debug/test_lib_json"

-			IntermediateDirectory="../../build/vs71/debug/test_lib_json"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				Optimization="0"

-				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"

-				MinimalRebuild="TRUE"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="4"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/test_lib_json.exe"

-				LinkIncremental="2"

-				GenerateDebugInformation="TRUE"

-				ProgramDatabaseFile="$(OutDir)/test_lib_json.pdb"

-				SubSystem="1"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				Description="Running all unit tests"

-				CommandLine="$(TargetPath)"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-		<Configuration

-			Name="Release|Win32"

-			OutputDirectory="../../build/vs71/release/test_lib_json"

-			IntermediateDirectory="../../build/vs71/release/test_lib_json"

-			ConfigurationType="1"

-			CharacterSet="2">

-			<Tool

-				Name="VCCLCompilerTool"

-				AdditionalIncludeDirectories="../../include"

-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"

-				RuntimeLibrary="0"

-				UsePrecompiledHeader="0"

-				WarningLevel="3"

-				Detect64BitPortabilityProblems="TRUE"

-				DebugInformationFormat="3"/>

-			<Tool

-				Name="VCCustomBuildTool"/>

-			<Tool

-				Name="VCLinkerTool"

-				OutputFile="$(OutDir)/test_lib_json.exe"

-				LinkIncremental="1"

-				GenerateDebugInformation="TRUE"

-				SubSystem="1"

-				OptimizeReferences="2"

-				EnableCOMDATFolding="2"

-				TargetMachine="1"/>

-			<Tool

-				Name="VCMIDLTool"/>

-			<Tool

-				Name="VCPostBuildEventTool"

-				Description="Running all unit tests"

-				CommandLine="$(TargetPath)"/>

-			<Tool

-				Name="VCPreBuildEventTool"/>

-			<Tool

-				Name="VCPreLinkEventTool"/>

-			<Tool

-				Name="VCResourceCompilerTool"/>

-			<Tool

-				Name="VCWebServiceProxyGeneratorTool"/>

-			<Tool

-				Name="VCXMLDataGeneratorTool"/>

-			<Tool

-				Name="VCWebDeploymentTool"/>

-			<Tool

-				Name="VCManagedWrapperGeneratorTool"/>

-			<Tool

-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<File

-			RelativePath="..\..\src\test_lib_json\jsontest.cpp">

-		</File>

-		<File

-			RelativePath="..\..\src\test_lib_json\jsontest.h">

-		</File>

-		<File

-			RelativePath="..\..\src\test_lib_json\main.cpp">

-		</File>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="test_lib_json"
+	ProjectGUID="{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}"
+	RootNamespace="test_lib_json"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="../../build/vs71/debug/test_lib_json"
+			IntermediateDirectory="../../build/vs71/debug/test_lib_json"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/test_lib_json.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/test_lib_json.pdb"
+				SubSystem="1"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Running all unit tests"
+				CommandLine="$(TargetPath)"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="../../build/vs71/release/test_lib_json"
+			IntermediateDirectory="../../build/vs71/release/test_lib_json"
+			ConfigurationType="1"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../../include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/test_lib_json.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Running all unit tests"
+				CommandLine="$(TargetPath)"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<File
+			RelativePath="..\..\src\test_lib_json\jsontest.cpp">
+		</File>
+		<File
+			RelativePath="..\..\src\test_lib_json\jsontest.h">
+		</File>
+		<File
+			RelativePath="..\..\src\test_lib_json\main.cpp">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/lib/jsoncpp/jsoncpp/scons-tools/globtool.py b/lib/jsoncpp/jsoncpp/scons-tools/globtool.py
index 8ee3cbb0b6..811140e8aa 100644
--- a/lib/jsoncpp/jsoncpp/scons-tools/globtool.py
+++ b/lib/jsoncpp/jsoncpp/scons-tools/globtool.py
@@ -1,53 +1,53 @@
-import fnmatch

-import os

-

-def generate( env ): 

-   def Glob( env, includes = None, excludes = None, dir = '.' ):

-      """Adds Glob( includes = Split( '*' ), excludes = None, dir = '.')

-       helper function to environment.

-

-       Glob both the file-system files.

-

-       includes: list of file name pattern included in the return list when matched.

-       excludes: list of file name pattern exluced from the return list.

-

-       Example:

-       sources = env.Glob( ("*.cpp", '*.h'), "~*.cpp", "#src" )

-      """

-      def filterFilename(path):

-         abs_path = os.path.join( dir, path )

-         if not os.path.isfile(abs_path):

-            return 0

-         fn = os.path.basename(path)

-         match = 0

-         for include in includes:

-            if fnmatch.fnmatchcase( fn, include ):

-               match = 1

-               break

-         if match == 1 and not excludes is None:

-            for exclude in excludes:

-               if fnmatch.fnmatchcase( fn, exclude ):

-                  match = 0

-                  break

-         return match

-      if includes is None:

-         includes = ('*',)

-      elif type(includes) in ( type(''), type(u'') ):

-         includes = (includes,)

-      if type(excludes) in ( type(''), type(u'') ):

-         excludes = (excludes,)

-      dir = env.Dir(dir).abspath

-      paths = os.listdir( dir )

-      def makeAbsFileNode( path ):

-         return env.File( os.path.join( dir, path ) )

-      nodes = filter( filterFilename, paths )

-      return map( makeAbsFileNode, nodes )

-

-   from SCons.Script import Environment

+import fnmatch
+import os
+
+def generate( env ): 
+   def Glob( env, includes = None, excludes = None, dir = '.' ):
+      """Adds Glob( includes = Split( '*' ), excludes = None, dir = '.')
+       helper function to environment.
+
+       Glob both the file-system files.
+
+       includes: list of file name pattern included in the return list when matched.
+       excludes: list of file name pattern exluced from the return list.
+
+       Example:
+       sources = env.Glob( ("*.cpp", '*.h'), "~*.cpp", "#src" )
+      """
+      def filterFilename(path):
+         abs_path = os.path.join( dir, path )
+         if not os.path.isfile(abs_path):
+            return 0
+         fn = os.path.basename(path)
+         match = 0
+         for include in includes:
+            if fnmatch.fnmatchcase( fn, include ):
+               match = 1
+               break
+         if match == 1 and not excludes is None:
+            for exclude in excludes:
+               if fnmatch.fnmatchcase( fn, exclude ):
+                  match = 0
+                  break
+         return match
+      if includes is None:
+         includes = ('*',)
+      elif type(includes) in ( type(''), type(u'') ):
+         includes = (includes,)
+      if type(excludes) in ( type(''), type(u'') ):
+         excludes = (excludes,)
+      dir = env.Dir(dir).abspath
+      paths = os.listdir( dir )
+      def makeAbsFileNode( path ):
+         return env.File( os.path.join( dir, path ) )
+      nodes = filter( filterFilename, paths )
+      return map( makeAbsFileNode, nodes )
+
+   from SCons.Script import Environment
    Environment.Glob = Glob
-

-def exists(env):

-    """

-    Tool always exists.

-    """

-    return True

+
+def exists(env):
+    """
+    Tool always exists.
+    """
+    return True
diff --git a/lib/jsoncpp/jsoncpp/src/test_lib_json/jsontest.h b/lib/jsoncpp/jsoncpp/src/test_lib_json/jsontest.h
index 7abba56cb4..b2553baea1 100644
--- a/lib/jsoncpp/jsoncpp/src/test_lib_json/jsontest.h
+++ b/lib/jsoncpp/jsoncpp/src/test_lib_json/jsontest.h
@@ -1,252 +1,252 @@
-#ifndef JSONTEST_H_INCLUDED

-# define JSONTEST_H_INCLUDED

-

-# include <json/config.h>

-# include <stdio.h>

-# include <deque>

-# include <string>

-

-// //////////////////////////////////////////////////////////////////

-// //////////////////////////////////////////////////////////////////

-// Mini Unit Testing framework

-// //////////////////////////////////////////////////////////////////

-// //////////////////////////////////////////////////////////////////

-

-

-

-/** \brief Unit testing framework.

- * \warning: all assertions are non-aborting, test case execution will continue

- *           even if an assertion namespace.

- *           This constraint is for portability: the framework needs to compile

- *           on Visual Studio 6 and must not require exception usage.

- */

-namespace JsonTest {

-

-

-   class Failure

-   {

-   public:

-      const char *file_;

-      unsigned int line_;

-      std::string expr_;

-      std::string message_;

-      unsigned int nestingLevel_;

-   };

-

-

-   /// Context used to create the assertion callstack on failure.

-   /// Must be a POD to allow inline initialisation without stepping 

-   /// into the debugger.

-   struct PredicateContext

-   {

-      typedef unsigned int Id;

-      Id id_;

-      const char *file_;

-      unsigned int line_;

-      const char *expr_;

-      PredicateContext *next_;

-      /// Related Failure, set when the PredicateContext is converted

-      /// into a Failure.

-      Failure *failure_;

-   };

-

-   class TestResult

-   {

-   public:

-      TestResult();

-

-      /// \internal Implementation detail for assertion macros

-      /// Not encapsulated to prevent step into when debugging failed assertions

-      /// Incremented by one on assertion predicate entry, decreased by one

-      /// by addPredicateContext().

-      PredicateContext::Id predicateId_;

-

-      /// \internal Implementation detail for predicate macros

-      PredicateContext *predicateStackTail_;

-

-      void setTestName( const std::string &name );

-

-      /// Adds an assertion failure.

-      TestResult &addFailure( const char *file, unsigned int line,

-                              const char *expr = 0 );

-

-      /// Removes the last PredicateContext added to the predicate stack

-      /// chained list.

-      /// Next messages will be targed at the PredicateContext that was removed.

-      TestResult &popPredicateContext();

-

-      bool failed() const;

-

-      void printFailure( bool printTestName ) const;

-

-      TestResult &operator << ( bool value );

-      TestResult &operator << ( int value );

-      TestResult &operator << ( unsigned int value );

-      TestResult &operator << ( double value );

-      TestResult &operator << ( const char *value );

-      TestResult &operator << ( const std::string &value );

-

-   private:

-      TestResult &addToLastFailure( const std::string &message );

-      unsigned int getAssertionNestingLevel() const;

-      /// Adds a failure or a predicate context

-      void addFailureInfo( const char *file, unsigned int line,

-                           const char *expr, unsigned int nestingLevel  );

-      static std::string indentText( const std::string &text, 

-                                     const std::string &indent );

-

-      typedef std::deque<Failure> Failures;

-      Failures failures_;

-      std::string name_;

-      PredicateContext rootPredicateNode_;

-      PredicateContext::Id lastUsedPredicateId_;

-      /// Failure which is the target of the messages added using operator <<

-      Failure *messageTarget_;

-   };

-

-

-   class TestCase

-   {

-   public:

-      TestCase();

-

-      void run( TestResult &result );

-

-      virtual const char *testName() const = 0;

-

-   protected:

-      TestResult *result_;

-

-   private:

-      virtual void runTestCase() = 0;

-   };

-

-   /// Function pointer type for TestCase factory

-   typedef TestCase *(*TestCaseFactory)();

-

-   class Runner

-   {

-   public:

-      Runner();

-

-      /// Adds a test to the suite

-      Runner &add( TestCaseFactory factory );

-

-      /// Runs test as specified on the command-line

-      /// If no command-line arguments are provided, run all tests.

-      /// If --list-tests is provided, then print the list of all test cases

-      /// If --test <testname> is provided, then run test testname.

-      int runCommandLine( int argc, const char *argv[] ) const;

-

-      /// Runs all the test cases

-      bool runAllTest( bool printSummary ) const;

-

-      /// Returns the number of test case in the suite

-      unsigned int testCount() const;

-

-      /// Returns the name of the test case at the specified index

-      std::string testNameAt( unsigned int index ) const;

-

-      /// Runs the test case at the specified index using the specified TestResult

-      void runTestAt( unsigned int index, TestResult &result ) const;

-

-      static void printUsage( const char *appName );

-

-   private: // prevents copy construction and assignment

-      Runner( const Runner &other );

-      Runner &operator =( const Runner &other );

-

-   private:

-      void listTests() const;

-      bool testIndex( const std::string &testName, unsigned int &index ) const;

-      static void preventDialogOnCrash();

-

-   private:

-      typedef std::deque<TestCaseFactory> Factories;

-      Factories tests_;

-   };

-

-   template<typename T>

-   TestResult &

-   checkEqual( TestResult &result, const T &expected, const T &actual, 

-               const char *file, unsigned int line, const char *expr )

-   {

-      if ( expected != actual )

-      {

-         result.addFailure( file, line, expr );

-         result << "Expected: " << expected << "\n";

-         result << "Actual  : " << actual;

-      }

-      return result;

-   }

-

-   TestResult &

-   checkStringEqual( TestResult &result, 

-                     const std::string &expected, const std::string &actual,

-                     const char *file, unsigned int line, const char *expr );

-

-} // namespace JsonTest

-

-

-/// \brief Asserts that the given expression is true.

-/// JSONTEST_ASSERT( x == y ) << "x=" << x << ", y=" << y;

-/// JSONTEST_ASSERT( x == y );

-#define JSONTEST_ASSERT( expr )                                               \

-   if ( condition )                                                           \

-   {                                                                          \

-   }                                                                          \

-   else                                                                       \

-      result_->addFailure( __FILE__, __LINE__, #expr )

-

-/// \brief Asserts that the given predicate is true.

-/// The predicate may do other assertions and be a member function of the fixture.

-#define JSONTEST_ASSERT_PRED( expr )                                    \

-   {                                                                    \

-      JsonTest::PredicateContext _minitest_Context = {                  \

-         result_->predicateId_, __FILE__, __LINE__, #expr };            \

-      result_->predicateStackTail_->next_ = &_minitest_Context;         \

-      result_->predicateId_ += 1;                                       \

-      result_->predicateStackTail_ = &_minitest_Context;                \

-      (expr);                                                           \

-      result_->popPredicateContext();                                   \

-   }                                                                    \

-   *result_

-

-/// \brief Asserts that two values are equals.

-#define JSONTEST_ASSERT_EQUAL( expected, actual )          \

-   JsonTest::checkEqual( *result_, expected, actual,       \

-                         __FILE__, __LINE__,               \

-                         #expected " == " #actual )

-

-/// \brief Asserts that two values are equals.

-#define JSONTEST_ASSERT_STRING_EQUAL( expected, actual ) \

-   JsonTest::checkStringEqual( *result_,                 \

-      std::string(expected), std::string(actual),        \

-      #expected " == " #actual )

-

-/// \brief Begin a fixture test case.

-#define JSONTEST_FIXTURE( FixtureType, name )                  \

-   class Test##FixtureType##name : public FixtureType          \

-   {                                                           \

-   public:                                                     \

-      static JsonTest::TestCase *factory()                     \

-      {                                                        \

-         return new Test##FixtureType##name();                 \

-      }                                                        \

-   public: /* overidden from TestCase */                       \

-      virtual const char *testName() const                     \

-      {                                                        \

-         return #FixtureType "/" #name;                        \

-      }                                                        \

-      virtual void runTestCase();                              \

-   };                                                          \

-                                                               \

-   void Test##FixtureType##name::runTestCase()

-

-#define JSONTEST_FIXTURE_FACTORY( FixtureType, name ) \

-   &Test##FixtureType##name::factory

-

-#define JSONTEST_REGISTER_FIXTURE( runner, FixtureType, name ) \

-   (runner).add( JSONTEST_FIXTURE_FACTORY( FixtureType, name ) )

-

-#endif // ifndef JSONTEST_H_INCLUDED

+#ifndef JSONTEST_H_INCLUDED
+# define JSONTEST_H_INCLUDED
+
+# include <json/config.h>
+# include <stdio.h>
+# include <deque>
+# include <string>
+
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+// Mini Unit Testing framework
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+
+
+
+/** \brief Unit testing framework.
+ * \warning: all assertions are non-aborting, test case execution will continue
+ *           even if an assertion namespace.
+ *           This constraint is for portability: the framework needs to compile
+ *           on Visual Studio 6 and must not require exception usage.
+ */
+namespace JsonTest {
+
+
+   class Failure
+   {
+   public:
+      const char *file_;
+      unsigned int line_;
+      std::string expr_;
+      std::string message_;
+      unsigned int nestingLevel_;
+   };
+
+
+   /// Context used to create the assertion callstack on failure.
+   /// Must be a POD to allow inline initialisation without stepping 
+   /// into the debugger.
+   struct PredicateContext
+   {
+      typedef unsigned int Id;
+      Id id_;
+      const char *file_;
+      unsigned int line_;
+      const char *expr_;
+      PredicateContext *next_;
+      /// Related Failure, set when the PredicateContext is converted
+      /// into a Failure.
+      Failure *failure_;
+   };
+
+   class TestResult
+   {
+   public:
+      TestResult();
+
+      /// \internal Implementation detail for assertion macros
+      /// Not encapsulated to prevent step into when debugging failed assertions
+      /// Incremented by one on assertion predicate entry, decreased by one
+      /// by addPredicateContext().
+      PredicateContext::Id predicateId_;
+
+      /// \internal Implementation detail for predicate macros
+      PredicateContext *predicateStackTail_;
+
+      void setTestName( const std::string &name );
+
+      /// Adds an assertion failure.
+      TestResult &addFailure( const char *file, unsigned int line,
+                              const char *expr = 0 );
+
+      /// Removes the last PredicateContext added to the predicate stack
+      /// chained list.
+      /// Next messages will be targed at the PredicateContext that was removed.
+      TestResult &popPredicateContext();
+
+      bool failed() const;
+
+      void printFailure( bool printTestName ) const;
+
+      TestResult &operator << ( bool value );
+      TestResult &operator << ( int value );
+      TestResult &operator << ( unsigned int value );
+      TestResult &operator << ( double value );
+      TestResult &operator << ( const char *value );
+      TestResult &operator << ( const std::string &value );
+
+   private:
+      TestResult &addToLastFailure( const std::string &message );
+      unsigned int getAssertionNestingLevel() const;
+      /// Adds a failure or a predicate context
+      void addFailureInfo( const char *file, unsigned int line,
+                           const char *expr, unsigned int nestingLevel  );
+      static std::string indentText( const std::string &text, 
+                                     const std::string &indent );
+
+      typedef std::deque<Failure> Failures;
+      Failures failures_;
+      std::string name_;
+      PredicateContext rootPredicateNode_;
+      PredicateContext::Id lastUsedPredicateId_;
+      /// Failure which is the target of the messages added using operator <<
+      Failure *messageTarget_;
+   };
+
+
+   class TestCase
+   {
+   public:
+      TestCase();
+
+      void run( TestResult &result );
+
+      virtual const char *testName() const = 0;
+
+   protected:
+      TestResult *result_;
+
+   private:
+      virtual void runTestCase() = 0;
+   };
+
+   /// Function pointer type for TestCase factory
+   typedef TestCase *(*TestCaseFactory)();
+
+   class Runner
+   {
+   public:
+      Runner();
+
+      /// Adds a test to the suite
+      Runner &add( TestCaseFactory factory );
+
+      /// Runs test as specified on the command-line
+      /// If no command-line arguments are provided, run all tests.
+      /// If --list-tests is provided, then print the list of all test cases
+      /// If --test <testname> is provided, then run test testname.
+      int runCommandLine( int argc, const char *argv[] ) const;
+
+      /// Runs all the test cases
+      bool runAllTest( bool printSummary ) const;
+
+      /// Returns the number of test case in the suite
+      unsigned int testCount() const;
+
+      /// Returns the name of the test case at the specified index
+      std::string testNameAt( unsigned int index ) const;
+
+      /// Runs the test case at the specified index using the specified TestResult
+      void runTestAt( unsigned int index, TestResult &result ) const;
+
+      static void printUsage( const char *appName );
+
+   private: // prevents copy construction and assignment
+      Runner( const Runner &other );
+      Runner &operator =( const Runner &other );
+
+   private:
+      void listTests() const;
+      bool testIndex( const std::string &testName, unsigned int &index ) const;
+      static void preventDialogOnCrash();
+
+   private:
+      typedef std::deque<TestCaseFactory> Factories;
+      Factories tests_;
+   };
+
+   template<typename T>
+   TestResult &
+   checkEqual( TestResult &result, const T &expected, const T &actual, 
+               const char *file, unsigned int line, const char *expr )
+   {
+      if ( expected != actual )
+      {
+         result.addFailure( file, line, expr );
+         result << "Expected: " << expected << "\n";
+         result << "Actual  : " << actual;
+      }
+      return result;
+   }
+
+   TestResult &
+   checkStringEqual( TestResult &result, 
+                     const std::string &expected, const std::string &actual,
+                     const char *file, unsigned int line, const char *expr );
+
+} // namespace JsonTest
+
+
+/// \brief Asserts that the given expression is true.
+/// JSONTEST_ASSERT( x == y ) << "x=" << x << ", y=" << y;
+/// JSONTEST_ASSERT( x == y );
+#define JSONTEST_ASSERT( expr )                                               \
+   if ( condition )                                                           \
+   {                                                                          \
+   }                                                                          \
+   else                                                                       \
+      result_->addFailure( __FILE__, __LINE__, #expr )
+
+/// \brief Asserts that the given predicate is true.
+/// The predicate may do other assertions and be a member function of the fixture.
+#define JSONTEST_ASSERT_PRED( expr )                                    \
+   {                                                                    \
+      JsonTest::PredicateContext _minitest_Context = {                  \
+         result_->predicateId_, __FILE__, __LINE__, #expr };            \
+      result_->predicateStackTail_->next_ = &_minitest_Context;         \
+      result_->predicateId_ += 1;                                       \
+      result_->predicateStackTail_ = &_minitest_Context;                \
+      (expr);                                                           \
+      result_->popPredicateContext();                                   \
+   }                                                                    \
+   *result_
+
+/// \brief Asserts that two values are equals.
+#define JSONTEST_ASSERT_EQUAL( expected, actual )          \
+   JsonTest::checkEqual( *result_, expected, actual,       \
+                         __FILE__, __LINE__,               \
+                         #expected " == " #actual )
+
+/// \brief Asserts that two values are equals.
+#define JSONTEST_ASSERT_STRING_EQUAL( expected, actual ) \
+   JsonTest::checkStringEqual( *result_,                 \
+      std::string(expected), std::string(actual),        \
+      #expected " == " #actual )
+
+/// \brief Begin a fixture test case.
+#define JSONTEST_FIXTURE( FixtureType, name )                  \
+   class Test##FixtureType##name : public FixtureType          \
+   {                                                           \
+   public:                                                     \
+      static JsonTest::TestCase *factory()                     \
+      {                                                        \
+         return new Test##FixtureType##name();                 \
+      }                                                        \
+   public: /* overidden from TestCase */                       \
+      virtual const char *testName() const                     \
+      {                                                        \
+         return #FixtureType "/" #name;                        \
+      }                                                        \
+      virtual void runTestCase();                              \
+   };                                                          \
+                                                               \
+   void Test##FixtureType##name::runTestCase()
+
+#define JSONTEST_FIXTURE_FACTORY( FixtureType, name ) \
+   &Test##FixtureType##name::factory
+
+#define JSONTEST_REGISTER_FIXTURE( runner, FixtureType, name ) \
+   (runner).add( JSONTEST_FIXTURE_FACTORY( FixtureType, name ) )
+
+#endif // ifndef JSONTEST_H_INCLUDED
diff --git a/lib/jsoncpp/jsoncpp/src/test_lib_json/main.cpp b/lib/jsoncpp/jsoncpp/src/test_lib_json/main.cpp
index 9864178f66..b80776d630 100644
--- a/lib/jsoncpp/jsoncpp/src/test_lib_json/main.cpp
+++ b/lib/jsoncpp/jsoncpp/src/test_lib_json/main.cpp
@@ -1,244 +1,244 @@
-#include <json/json.h>

-#include "jsontest.h"

-

-

-// TODO:

-// - boolean value returns that they are integral. Should not be.

-// - unsigned integer in integer range are not considered to be valid integer. Should check range.

-

-

-// //////////////////////////////////////////////////////////////////

-// //////////////////////////////////////////////////////////////////

-// Json Library test cases

-// //////////////////////////////////////////////////////////////////

-// //////////////////////////////////////////////////////////////////

-

-

-struct ValueTest : JsonTest::TestCase

-{

-   Json::Value null_;

-   Json::Value emptyArray_;

-   Json::Value emptyObject_;

-   Json::Value integer_;

-   Json::Value unsignedInteger_;

-   Json::Value smallUnsignedInteger_;

-   Json::Value real_;

-   Json::Value array1_;

-   Json::Value object1_;

-   Json::Value emptyString_;

-   Json::Value string1_;

-   Json::Value string_;

-   Json::Value true_;

-   Json::Value false_;

-

-   ValueTest()

-      : emptyArray_( Json::arrayValue )

-      , emptyObject_( Json::objectValue )

-      , integer_( 123456789 )

-      , smallUnsignedInteger_( Json::Value::UInt( Json::Value::maxInt ) )

-      , unsignedInteger_( 34567890u )

-      , real_( 1234.56789 )

-      , emptyString_( "" )

-      , string1_( "a" )

-      , string_( "sometext with space" )

-      , true_( true )

-      , false_( false )

-   {

-      array1_.append( 1234 );

-      object1_["id"] = 1234;

-   }

-

-   struct IsCheck

-   {

-      /// Initialize all checks to \c false by default.

-      IsCheck();

-

-      bool isObject_;

-      bool isArray_;

-      bool isBool_;

-      bool isDouble_;

-      bool isInt_;

-      bool isUInt_;

-      bool isIntegral_;

-      bool isNumeric_;

-      bool isString_;

-      bool isNull_;

-   };

-

-   void checkConstMemberCount( const Json::Value &value, unsigned int expectedCount );

-

-   void checkMemberCount( Json::Value &value, unsigned int expectedCount );

-

-   void checkIs( const Json::Value &value, const IsCheck &check );

-};

-

-

-JSONTEST_FIXTURE( ValueTest, size )

-{

-   JSONTEST_ASSERT_PRED( checkMemberCount(emptyArray_, 0) );

-   JSONTEST_ASSERT_PRED( checkMemberCount(emptyObject_, 0) );

-   JSONTEST_ASSERT_PRED( checkMemberCount(array1_, 1) );

-   JSONTEST_ASSERT_PRED( checkMemberCount(object1_, 1) );

-   JSONTEST_ASSERT_PRED( checkMemberCount(null_, 0) );

-   JSONTEST_ASSERT_PRED( checkMemberCount(integer_, 0) );

-   JSONTEST_ASSERT_PRED( checkMemberCount(real_, 0) );

-   JSONTEST_ASSERT_PRED( checkMemberCount(emptyString_, 0) );

-   JSONTEST_ASSERT_PRED( checkMemberCount(string_, 0) );

-   JSONTEST_ASSERT_PRED( checkMemberCount(true_, 0) );

-}

-

-

-JSONTEST_FIXTURE( ValueTest, isObject )

-{

-   IsCheck checks;

-   checks.isObject_ = true;

-   JSONTEST_ASSERT_PRED( checkIs( emptyObject_, checks ) );

-   JSONTEST_ASSERT_PRED( checkIs( object1_, checks ) );

-}

-

-

-JSONTEST_FIXTURE( ValueTest, isArray )

-{

-   IsCheck checks;

-   checks.isArray_ = true;

-   JSONTEST_ASSERT_PRED( checkIs( emptyArray_, checks ) );

-   JSONTEST_ASSERT_PRED( checkIs( array1_, checks ) );

-}

-

-

-JSONTEST_FIXTURE( ValueTest, isNull )

-{

-   IsCheck checks;

-   checks.isNull_ = true;

-   checks.isObject_ = true;

-   checks.isArray_ = true;

-   JSONTEST_ASSERT_PRED( checkIs( null_, checks ) );

-}

-

-

-JSONTEST_FIXTURE( ValueTest, isString )

-{

-   IsCheck checks;

-   checks.isString_ = true;

-   JSONTEST_ASSERT_PRED( checkIs( emptyString_, checks ) );

-   JSONTEST_ASSERT_PRED( checkIs( string_, checks ) );

-   JSONTEST_ASSERT_PRED( checkIs( string1_, checks ) );

-}

-

-

-JSONTEST_FIXTURE( ValueTest, isBool )

-{

-   IsCheck checks;

-   checks.isBool_ = true;

-   checks.isIntegral_ = true;

-   checks.isNumeric_ = true;

-   JSONTEST_ASSERT_PRED( checkIs( false_, checks ) );

-   JSONTEST_ASSERT_PRED( checkIs( true_, checks ) );

-}

-

-

-JSONTEST_FIXTURE( ValueTest, isDouble )

-{

-   IsCheck checks;

-   checks.isDouble_ = true;

-   checks.isNumeric_ = true;

-   JSONTEST_ASSERT_PRED( checkIs( real_, checks ) );

-}

-

-

-JSONTEST_FIXTURE( ValueTest, isInt )

-{

-   IsCheck checks;

-   checks.isInt_ = true;

-   checks.isNumeric_ = true;

-   checks.isIntegral_ = true;

-   JSONTEST_ASSERT_PRED( checkIs( integer_, checks ) );

-}

-

-

-JSONTEST_FIXTURE( ValueTest, isUInt )

-{

-   IsCheck checks;

-   checks.isUInt_ = true;

-   checks.isNumeric_ = true;

-   checks.isIntegral_ = true;

-   JSONTEST_ASSERT_PRED( checkIs( unsignedInteger_, checks ) );

-   JSONTEST_ASSERT_PRED( checkIs( smallUnsignedInteger_, checks ) );

-}

-

-

-void

-ValueTest::checkConstMemberCount( const Json::Value &value, unsigned int expectedCount )

-{

-   unsigned int count = 0;

-   Json::Value::const_iterator itEnd = value.end();

-   for ( Json::Value::const_iterator it = value.begin(); it != itEnd; ++it )

-   {

-      ++count;

-   }

-   JSONTEST_ASSERT_EQUAL( expectedCount, count ) << "Json::Value::const_iterator";

-}

-

-void

-ValueTest::checkMemberCount( Json::Value &value, unsigned int expectedCount )

-{

-   JSONTEST_ASSERT_EQUAL( expectedCount, value.size() );

-

-   unsigned int count = 0;

-   Json::Value::iterator itEnd = value.end();

-   for ( Json::Value::iterator it = value.begin(); it != itEnd; ++it )

-   {

-      ++count;

-   }

-   JSONTEST_ASSERT_EQUAL( expectedCount, count ) << "Json::Value::iterator";

-

-   JSONTEST_ASSERT_PRED( checkConstMemberCount(value, expectedCount) );

-}

-

-

-ValueTest::IsCheck::IsCheck()

-   : isObject_( false )

-   , isArray_( false )

-   , isBool_( false )

-   , isDouble_( false )

-   , isInt_( false )

-   , isUInt_( false )

-   , isIntegral_( false )

-   , isNumeric_( false )

-   , isString_( false )

-   , isNull_( false )

-{

-}

-

-

-void 

-ValueTest::checkIs( const Json::Value &value, const IsCheck &check )

-{

-   JSONTEST_ASSERT_EQUAL( check.isObject_, value.isObject() );

-   JSONTEST_ASSERT_EQUAL( check.isArray_, value.isArray() );

-   JSONTEST_ASSERT_EQUAL( check.isBool_, value.isBool() );

-   JSONTEST_ASSERT_EQUAL( check.isDouble_, value.isDouble() );

-   JSONTEST_ASSERT_EQUAL( check.isInt_, value.isInt() );

-   JSONTEST_ASSERT_EQUAL( check.isUInt_, value.isUInt() );

-   JSONTEST_ASSERT_EQUAL( check.isIntegral_, value.isIntegral() );

-   JSONTEST_ASSERT_EQUAL( check.isNumeric_, value.isNumeric() );

-   JSONTEST_ASSERT_EQUAL( check.isString_, value.isString() );

-   JSONTEST_ASSERT_EQUAL( check.isNull_, value.isNull() );

-}

-

-

-

-int main( int argc, const char *argv[] )

-{

-   JsonTest::Runner runner;

-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, size );

-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isObject );

-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isArray );

-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isBool );

-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isInt );

-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isUInt );

-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isDouble );

-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isString );

-   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isNull );

-   return runner.runCommandLine( argc, argv );

-}

+#include <json/json.h>
+#include "jsontest.h"
+
+
+// TODO:
+// - boolean value returns that they are integral. Should not be.
+// - unsigned integer in integer range are not considered to be valid integer. Should check range.
+
+
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+// Json Library test cases
+// //////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////
+
+
+struct ValueTest : JsonTest::TestCase
+{
+   Json::Value null_;
+   Json::Value emptyArray_;
+   Json::Value emptyObject_;
+   Json::Value integer_;
+   Json::Value unsignedInteger_;
+   Json::Value smallUnsignedInteger_;
+   Json::Value real_;
+   Json::Value array1_;
+   Json::Value object1_;
+   Json::Value emptyString_;
+   Json::Value string1_;
+   Json::Value string_;
+   Json::Value true_;
+   Json::Value false_;
+
+   ValueTest()
+      : emptyArray_( Json::arrayValue )
+      , emptyObject_( Json::objectValue )
+      , integer_( 123456789 )
+      , smallUnsignedInteger_( Json::Value::UInt( Json::Value::maxInt ) )
+      , unsignedInteger_( 34567890u )
+      , real_( 1234.56789 )
+      , emptyString_( "" )
+      , string1_( "a" )
+      , string_( "sometext with space" )
+      , true_( true )
+      , false_( false )
+   {
+      array1_.append( 1234 );
+      object1_["id"] = 1234;
+   }
+
+   struct IsCheck
+   {
+      /// Initialize all checks to \c false by default.
+      IsCheck();
+
+      bool isObject_;
+      bool isArray_;
+      bool isBool_;
+      bool isDouble_;
+      bool isInt_;
+      bool isUInt_;
+      bool isIntegral_;
+      bool isNumeric_;
+      bool isString_;
+      bool isNull_;
+   };
+
+   void checkConstMemberCount( const Json::Value &value, unsigned int expectedCount );
+
+   void checkMemberCount( Json::Value &value, unsigned int expectedCount );
+
+   void checkIs( const Json::Value &value, const IsCheck &check );
+};
+
+
+JSONTEST_FIXTURE( ValueTest, size )
+{
+   JSONTEST_ASSERT_PRED( checkMemberCount(emptyArray_, 0) );
+   JSONTEST_ASSERT_PRED( checkMemberCount(emptyObject_, 0) );
+   JSONTEST_ASSERT_PRED( checkMemberCount(array1_, 1) );
+   JSONTEST_ASSERT_PRED( checkMemberCount(object1_, 1) );
+   JSONTEST_ASSERT_PRED( checkMemberCount(null_, 0) );
+   JSONTEST_ASSERT_PRED( checkMemberCount(integer_, 0) );
+   JSONTEST_ASSERT_PRED( checkMemberCount(real_, 0) );
+   JSONTEST_ASSERT_PRED( checkMemberCount(emptyString_, 0) );
+   JSONTEST_ASSERT_PRED( checkMemberCount(string_, 0) );
+   JSONTEST_ASSERT_PRED( checkMemberCount(true_, 0) );
+}
+
+
+JSONTEST_FIXTURE( ValueTest, isObject )
+{
+   IsCheck checks;
+   checks.isObject_ = true;
+   JSONTEST_ASSERT_PRED( checkIs( emptyObject_, checks ) );
+   JSONTEST_ASSERT_PRED( checkIs( object1_, checks ) );
+}
+
+
+JSONTEST_FIXTURE( ValueTest, isArray )
+{
+   IsCheck checks;
+   checks.isArray_ = true;
+   JSONTEST_ASSERT_PRED( checkIs( emptyArray_, checks ) );
+   JSONTEST_ASSERT_PRED( checkIs( array1_, checks ) );
+}
+
+
+JSONTEST_FIXTURE( ValueTest, isNull )
+{
+   IsCheck checks;
+   checks.isNull_ = true;
+   checks.isObject_ = true;
+   checks.isArray_ = true;
+   JSONTEST_ASSERT_PRED( checkIs( null_, checks ) );
+}
+
+
+JSONTEST_FIXTURE( ValueTest, isString )
+{
+   IsCheck checks;
+   checks.isString_ = true;
+   JSONTEST_ASSERT_PRED( checkIs( emptyString_, checks ) );
+   JSONTEST_ASSERT_PRED( checkIs( string_, checks ) );
+   JSONTEST_ASSERT_PRED( checkIs( string1_, checks ) );
+}
+
+
+JSONTEST_FIXTURE( ValueTest, isBool )
+{
+   IsCheck checks;
+   checks.isBool_ = true;
+   checks.isIntegral_ = true;
+   checks.isNumeric_ = true;
+   JSONTEST_ASSERT_PRED( checkIs( false_, checks ) );
+   JSONTEST_ASSERT_PRED( checkIs( true_, checks ) );
+}
+
+
+JSONTEST_FIXTURE( ValueTest, isDouble )
+{
+   IsCheck checks;
+   checks.isDouble_ = true;
+   checks.isNumeric_ = true;
+   JSONTEST_ASSERT_PRED( checkIs( real_, checks ) );
+}
+
+
+JSONTEST_FIXTURE( ValueTest, isInt )
+{
+   IsCheck checks;
+   checks.isInt_ = true;
+   checks.isNumeric_ = true;
+   checks.isIntegral_ = true;
+   JSONTEST_ASSERT_PRED( checkIs( integer_, checks ) );
+}
+
+
+JSONTEST_FIXTURE( ValueTest, isUInt )
+{
+   IsCheck checks;
+   checks.isUInt_ = true;
+   checks.isNumeric_ = true;
+   checks.isIntegral_ = true;
+   JSONTEST_ASSERT_PRED( checkIs( unsignedInteger_, checks ) );
+   JSONTEST_ASSERT_PRED( checkIs( smallUnsignedInteger_, checks ) );
+}
+
+
+void
+ValueTest::checkConstMemberCount( const Json::Value &value, unsigned int expectedCount )
+{
+   unsigned int count = 0;
+   Json::Value::const_iterator itEnd = value.end();
+   for ( Json::Value::const_iterator it = value.begin(); it != itEnd; ++it )
+   {
+      ++count;
+   }
+   JSONTEST_ASSERT_EQUAL( expectedCount, count ) << "Json::Value::const_iterator";
+}
+
+void
+ValueTest::checkMemberCount( Json::Value &value, unsigned int expectedCount )
+{
+   JSONTEST_ASSERT_EQUAL( expectedCount, value.size() );
+
+   unsigned int count = 0;
+   Json::Value::iterator itEnd = value.end();
+   for ( Json::Value::iterator it = value.begin(); it != itEnd; ++it )
+   {
+      ++count;
+   }
+   JSONTEST_ASSERT_EQUAL( expectedCount, count ) << "Json::Value::iterator";
+
+   JSONTEST_ASSERT_PRED( checkConstMemberCount(value, expectedCount) );
+}
+
+
+ValueTest::IsCheck::IsCheck()
+   : isObject_( false )
+   , isArray_( false )
+   , isBool_( false )
+   , isDouble_( false )
+   , isInt_( false )
+   , isUInt_( false )
+   , isIntegral_( false )
+   , isNumeric_( false )
+   , isString_( false )
+   , isNull_( false )
+{
+}
+
+
+void 
+ValueTest::checkIs( const Json::Value &value, const IsCheck &check )
+{
+   JSONTEST_ASSERT_EQUAL( check.isObject_, value.isObject() );
+   JSONTEST_ASSERT_EQUAL( check.isArray_, value.isArray() );
+   JSONTEST_ASSERT_EQUAL( check.isBool_, value.isBool() );
+   JSONTEST_ASSERT_EQUAL( check.isDouble_, value.isDouble() );
+   JSONTEST_ASSERT_EQUAL( check.isInt_, value.isInt() );
+   JSONTEST_ASSERT_EQUAL( check.isUInt_, value.isUInt() );
+   JSONTEST_ASSERT_EQUAL( check.isIntegral_, value.isIntegral() );
+   JSONTEST_ASSERT_EQUAL( check.isNumeric_, value.isNumeric() );
+   JSONTEST_ASSERT_EQUAL( check.isString_, value.isString() );
+   JSONTEST_ASSERT_EQUAL( check.isNull_, value.isNull() );
+}
+
+
+
+int main( int argc, const char *argv[] )
+{
+   JsonTest::Runner runner;
+   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, size );
+   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isObject );
+   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isArray );
+   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isBool );
+   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isInt );
+   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isUInt );
+   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isDouble );
+   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isString );
+   JSONTEST_REGISTER_FIXTURE( runner, ValueTest, isNull );
+   return runner.runCommandLine( argc, argv );
+}
diff --git a/lib/jsoncpp/jsoncpp/src/test_lib_json/sconscript b/lib/jsoncpp/jsoncpp/src/test_lib_json/sconscript
index 84f56b6a02..915fd01c0a 100644
--- a/lib/jsoncpp/jsoncpp/src/test_lib_json/sconscript
+++ b/lib/jsoncpp/jsoncpp/src/test_lib_json/sconscript
@@ -1,10 +1,10 @@
-Import( 'env_testing buildUnitTests' )

-

-buildUnitTests( env_testing, Split( """

-    main.cpp

-    jsontest.cpp

-     """ ),

-    'test_lib_json' )

-

-# For 'check' to work, 'libs' must be built first.

-env_testing.Depends('test_lib_json', '#libs')

+Import( 'env_testing buildUnitTests' )
+
+buildUnitTests( env_testing, Split( """
+    main.cpp
+    jsontest.cpp
+     """ ),
+    'test_lib_json' )
+
+# For 'check' to work, 'libs' must be built first.
+env_testing.Depends('test_lib_json', '#libs')
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_comment_01.expected b/lib/jsoncpp/jsoncpp/test/data/test_comment_01.expected
index 0b8f42d504..2a7f00c450 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_comment_01.expected
+++ b/lib/jsoncpp/jsoncpp/test/data/test_comment_01.expected
@@ -1,8 +1,8 @@
-.={}

-.test=[]

-.test[0]={}

-.test[0].a="aaa"

-.test[1]={}

-.test[1].b="bbb"

-.test[2]={}

-.test[2].c="ccc"

+.={}
+.test=[]
+.test[0]={}
+.test[0].a="aaa"
+.test[1]={}
+.test[1].b="bbb"
+.test[2]={}
+.test[2].c="ccc"
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_comment_01.json b/lib/jsoncpp/jsoncpp/test/data/test_comment_01.json
index 0de8f9cf73..7363490a91 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_comment_01.json
+++ b/lib/jsoncpp/jsoncpp/test/data/test_comment_01.json
@@ -1,8 +1,8 @@
-{

-    "test":

-    [

-       { "a" : "aaa" }, // Comment for a

-       { "b" : "bbb" }, // Comment for b

-       { "c" : "ccc" } // Comment for c

-    ]

-}

+{
+    "test":
+    [
+       { "a" : "aaa" }, // Comment for a
+       { "b" : "bbb" }, // Comment for b
+       { "c" : "ccc" } // Comment for c
+    ]
+}
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_01.json b/lib/jsoncpp/jsoncpp/test/data/test_string_01.json
index c8c059ba5e..6cd0db44df 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_01.json
+++ b/lib/jsoncpp/jsoncpp/test/data/test_string_01.json
@@ -1 +1 @@
-"!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"

+"!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_02.json b/lib/jsoncpp/jsoncpp/test/data/test_string_02.json
index f0fe56a650..9a7e5dcad4 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_02.json
+++ b/lib/jsoncpp/jsoncpp/test/data/test_string_02.json
@@ -1 +1 @@
-"!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"

+"!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_01.expected b/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_01.expected
index 447f85a30f..1f3be7fb68 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_01.expected
+++ b/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_01.expected
@@ -1 +1 @@
-.="a"

+.="a"
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_02.expected b/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_02.expected
index c0b3b43ba3..1388f53943 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_02.expected
+++ b/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_02.expected
@@ -1 +1 @@
-.="¢"

+.="¢"
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_03.expected b/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_03.expected
index 7289743ecf..9b80b2719f 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_03.expected
+++ b/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_03.expected
@@ -1 +1 @@
-.="€"

+.="€"
diff --git a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_04.expected b/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_04.expected
index 868fbc3309..b9e7fe3b7d 100644
--- a/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_04.expected
+++ b/lib/jsoncpp/jsoncpp/test/data/test_string_unicode_04.expected
@@ -1 +1 @@
-.="𝄞"

+.="𝄞"
diff --git a/lib/jsoncpp/jsoncpp/test/jsonchecker/readme.txt b/lib/jsoncpp/jsoncpp/test/jsonchecker/readme.txt
index 0efc2a4477..321d89d998 100644
--- a/lib/jsoncpp/jsoncpp/test/jsonchecker/readme.txt
+++ b/lib/jsoncpp/jsoncpp/test/jsonchecker/readme.txt
@@ -1,3 +1,3 @@
-Test suite from http://json.org/JSON_checker/.

-

-If the JSON_checker is working correctly, it must accept all of the pass*.json files and reject all of the fail*.json files.

+Test suite from http://json.org/JSON_checker/.
+
+If the JSON_checker is working correctly, it must accept all of the pass*.json files and reject all of the fail*.json files.
diff --git a/lib/jsoncpp/jsoncpp/test/rununittests.py b/lib/jsoncpp/jsoncpp/test/rununittests.py
index ccc54e45a3..366184cfb5 100644
--- a/lib/jsoncpp/jsoncpp/test/rununittests.py
+++ b/lib/jsoncpp/jsoncpp/test/rununittests.py
@@ -1,73 +1,73 @@
-import sys

-import os

-import os.path

-import subprocess

-from glob import glob

-import optparse

-

-VALGRIND_CMD = 'valgrind --tool=memcheck --leak-check=yes --undef-value-errors=yes'

-

-class TestProxy(object):

-    def __init__( self, test_exe_path, use_valgrind=False ):

-        self.test_exe_path = os.path.normpath( os.path.abspath( test_exe_path ) )

-        self.use_valgrind = use_valgrind

-

-    def run( self, options ):

-        if self.use_valgrind:

-            cmd = VALGRIND_CMD.split()

-        else:

-            cmd = []

-        cmd.extend( [self.test_exe_path, '--test-auto'] + options )

-        process = subprocess.Popen( cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT )

-        stdout = process.communicate()[0]

-        if process.returncode:

-            return False, stdout

-        return True, stdout

-

-def runAllTests( exe_path, use_valgrind=False ):

-    test_proxy = TestProxy( exe_path, use_valgrind=use_valgrind )

-    status, test_names = test_proxy.run( ['--list-tests'] )

-    if not status:

-        print >> sys.stderr, "Failed to obtain unit tests list:\n" + test_names

-        return 1

-    test_names = [name.strip() for name in test_names.strip().split('\n')]

-    failures = []

-    for name in test_names:

-        print 'TESTING %s:' % name,

-        succeed, result = test_proxy.run( ['--test', name] )

-        if succeed:

-            print 'OK'

-        else:

-            failures.append( (name, result) )

-            print 'FAILED'

-    failed_count = len(failures)

-    pass_count = len(test_names) - failed_count

-    if failed_count:

-        print

-        for name, result in failures:

-            print result

-        print '%d/%d tests passed (%d failure(s))' % (

-            pass_count, len(test_names), failed_count)

-        return 1

-    else:

-        print 'All %d tests passed' % len(test_names)

-        return 0

-

-def main():

-    from optparse import OptionParser

-    parser = OptionParser( usage="%prog [options] <path to test_lib_json.exe>" )

-    parser.add_option("--valgrind",

-                  action="store_true", dest="valgrind", default=False,

-                  help="run all the tests using valgrind to detect memory leaks")

-    parser.enable_interspersed_args()

-    options, args = parser.parse_args()

-

-    if len(args) != 1:

-        parser.error( 'Must provides at least path to test_lib_json executable.' )

-        sys.exit( 1 )

-

-    exit_code = runAllTests( args[0], use_valgrind=options.valgrind )

-    sys.exit( exit_code )

-

-if __name__ == '__main__':

-    main()

+import sys
+import os
+import os.path
+import subprocess
+from glob import glob
+import optparse
+
+VALGRIND_CMD = 'valgrind --tool=memcheck --leak-check=yes --undef-value-errors=yes'
+
+class TestProxy(object):
+    def __init__( self, test_exe_path, use_valgrind=False ):
+        self.test_exe_path = os.path.normpath( os.path.abspath( test_exe_path ) )
+        self.use_valgrind = use_valgrind
+
+    def run( self, options ):
+        if self.use_valgrind:
+            cmd = VALGRIND_CMD.split()
+        else:
+            cmd = []
+        cmd.extend( [self.test_exe_path, '--test-auto'] + options )
+        process = subprocess.Popen( cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT )
+        stdout = process.communicate()[0]
+        if process.returncode:
+            return False, stdout
+        return True, stdout
+
+def runAllTests( exe_path, use_valgrind=False ):
+    test_proxy = TestProxy( exe_path, use_valgrind=use_valgrind )
+    status, test_names = test_proxy.run( ['--list-tests'] )
+    if not status:
+        print >> sys.stderr, "Failed to obtain unit tests list:\n" + test_names
+        return 1
+    test_names = [name.strip() for name in test_names.strip().split('\n')]
+    failures = []
+    for name in test_names:
+        print 'TESTING %s:' % name,
+        succeed, result = test_proxy.run( ['--test', name] )
+        if succeed:
+            print 'OK'
+        else:
+            failures.append( (name, result) )
+            print 'FAILED'
+    failed_count = len(failures)
+    pass_count = len(test_names) - failed_count
+    if failed_count:
+        print
+        for name, result in failures:
+            print result
+        print '%d/%d tests passed (%d failure(s))' % (
+            pass_count, len(test_names), failed_count)
+        return 1
+    else:
+        print 'All %d tests passed' % len(test_names)
+        return 0
+
+def main():
+    from optparse import OptionParser
+    parser = OptionParser( usage="%prog [options] <path to test_lib_json.exe>" )
+    parser.add_option("--valgrind",
+                  action="store_true", dest="valgrind", default=False,
+                  help="run all the tests using valgrind to detect memory leaks")
+    parser.enable_interspersed_args()
+    options, args = parser.parse_args()
+
+    if len(args) != 1:
+        parser.error( 'Must provides at least path to test_lib_json executable.' )
+        sys.exit( 1 )
+
+    exit_code = runAllTests( args[0], use_valgrind=options.valgrind )
+    sys.exit( exit_code )
+
+if __name__ == '__main__':
+    main()