Updates to docs

danielaparker · danielaparker · commit fe888bf09e3a · 2016-05-09T12:29:26.000-04:00
diff --git a/Changelog.html b/Changelog.html
@@ -468,6 +468,13 @@
 </style>
 </head>
 <body>
+<h2>0.99.1</h2>
+
+<ul>
+<li>Fix to json_filter class</li>
+<li>Fix to readme_examples</li>
+</ul>
+
 <h2>0.99</h2>
 
 <ul>
diff --git a/README.html b/README.html
@@ -490,7 +490,6 @@ <h1>jsoncons: a C++ library for json construction</h1>
 <li>Supports reading a sequence of JSON texts from a stream</li>
 <li>Supports optional escaping of non-ascii UTF-8 octets</li>
 <li>Allows extensions to the types accepted by the json class accessors and modifiers</li>
-<li>Supports storing "any" values in a json object or array, with specialized serialization</li>
 <li>Supports reading (writing) JSON values from (to) CSV files</li>
 <li>Passes all tests from <a href="http://www.json.org/JSON_checker/">JSON_checker</a> except <code>fail1.json</code>, which is allowed in <a href="http://www.ietf.org/rfc/rfc7159.txt">RFC7159</a>
 </li>
@@ -893,7 +892,7 @@ <h3>wjson construction</h3>
 </pre></div>
 
 <div class="highlight highlight-source-c++"><pre>    <span class="pl-c">// Serialize the booklist to a file</span>
-    std::wofstream <span class="pl-en">os</span>(L<span class="pl-s"><span class="pl-pds">"</span>booklist2.json<span class="pl-pds">"</span></span>);
+    std::wofstream <span class="pl-en">os</span>(<span class="pl-s"><span class="pl-pds">"</span>booklist2.json<span class="pl-pds">"</span></span>);
     os &lt;&lt; pretty_print(booklist);</pre></div>
 
 <h3>wjson query</h3>
diff --git a/README.md b/README.md
@@ -19,7 +19,6 @@ The library has a number of features, which are listed below:
 - Supports reading a sequence of JSON texts from a stream
 - Supports optional escaping of non-ascii UTF-8 octets
 - Allows extensions to the types accepted by the json class accessors and modifiers
-- Supports storing "any" values in a json object or array, with specialized serialization
 - Supports reading (writing) JSON values from (to) CSV files
 - Passes all tests from [JSON_checker](http://www.json.org/JSON_checker/) except `fail1.json`, which is allowed in [RFC7159](http://www.ietf.org/rfc/rfc7159.txt)
 - Handles JSON texts of arbitrarily large depth of nesting, a limit can be set if desired
@@ -425,7 +424,7 @@ Result:
 ```
 ```c++
     // Serialize the booklist to a file
-    std::wofstream os(L"booklist2.json");
+    std::wofstream os("booklist2.json");
     os << pretty_print(booklist);
 ```
 ### wjson query
diff --git a/acknowledgements.txt b/acknowledgements.txt
@@ -1,6 +1,6 @@
 A big thanks to the following individuals for contributing:
 
-Andrew Hutko (early code review) 	
+Andrew Hutko (early code review)        
 
 Marc Chevrier (contributed clang port, build files, json is<T> and as<T> methods, 
 and make_array template implementation.)
@@ -23,3 +23,4 @@ Milan Burda for fix for clang build error
 Peter Tissen, for reporting and suggesting a fix for get(name,default_val)
 
 Tom Bass for assistance with clang build errors
+
diff --git a/doc/html/Home.html b/doc/html/Home.html
@@ -468,7 +468,7 @@
 </style>
 </head>
 <body>
-<p>All core jsoncons classes and functions are in namespace <code>jsoncons</code>. Extensions are in namespace <code>jsoncons_ext</code>. It is distributed under the <a href="http://www.boost.org/users/license.html">Boost Software License</a>.</p>
+<p>All core jsoncons classes and functions are in namespace <code>jsoncons</code>. Extensions are in namespace <code>jsoncons_ext</code>. </p>
 
 <h3>Roadmap</h3>
 
@@ -486,8 +486,6 @@ <h3>Tutorial</h3>
 
 <p><a href="Type%20Extensibility">Type Extensibility</a></p>
 
-<p><a href="Using%20json%20any">Using json any</a></p>
-
 <p><a href="Transforming%20JSON%20with%20filters">Transforming JSON with filters</a></p>
 
 <h3>Classes</h3>
diff --git a/doc/html/jsoncons.html b/doc/html/jsoncons.html
@@ -923,7 +923,7 @@ <h3>Type extensibility</h3>
     <span class="pl-k">class</span> <span class="pl-en">json_type_traits</span>
     {
     <span class="pl-k">public:</span>
-        <span class="pl-k">static</span> <span class="pl-k">bool</span> <span class="pl-en">is</span>(<span class="pl-k">const</span> JsonT&amp; rhs) noexcept;
+        <span class="pl-k">static</span> <span class="pl-k">bool</span> <span class="pl-en">is</span>(<span class="pl-k">const</span> JsonT&amp; rhs) <span class="pl-k">noexcept</span>;
         <span class="pl-k">static</span> T <span class="pl-en">as</span>(<span class="pl-k">const</span> JsonT&amp; rhs);
         <span class="pl-k">static</span> <span class="pl-k">void</span> <span class="pl-en">assign</span>(JsonT&amp; lhs, T rhs);
     };</pre></div>
@@ -949,50 +949,6 @@ <h3>Type extensibility</h3>
         <span class="pl-s"><span class="pl-pds">"</span>observation_dates<span class="pl-pds">"</span></span>:
         [<span class="pl-s"><span class="pl-pds">"</span>2013-10-21<span class="pl-pds">"</span></span>,<span class="pl-s"><span class="pl-pds">"</span>2013-10-28<span class="pl-pds">"</span></span>]
     }</pre></div>
-
-<h3>json any</h3>
-
-<p>jsoncons provides a class <code>json::any</code> that can contain a value of any type as long as that type supports copy construction and <br>
-assignment. This allows you to, for example, insert a boost matrix into a <code>json</code> object, and to retrieve it back cast to the appropriate type. You can do so by wrapping it in<br>
-a <code>json::any</code> value, like this:</p>
-
-<div class="highlight highlight-source-c++"><pre>    #<span class="pl-k">include</span> <span class="pl-s"><span class="pl-pds">&lt;</span>boost/numeric/ublas/matrix.hpp<span class="pl-pds">&gt;</span></span>
-
-    <span class="pl-k">using</span> boost::numeric::ublas::matrix;
-
-    json val;
-
-    matrix&lt;<span class="pl-k">double</span>&gt; <span class="pl-en">A</span>(<span class="pl-c1">2</span>,<span class="pl-c1">2</span>);
-    <span class="pl-en">A</span>(<span class="pl-c1">0</span>,<span class="pl-c1">0</span>) = 1;
-    <span class="pl-en">A</span>(<span class="pl-c1">0</span>,<span class="pl-c1">1</span>) = 2;
-    <span class="pl-en">A</span>(<span class="pl-c1">1</span>,<span class="pl-c1">0</span>) = 3;
-    <span class="pl-en">A</span>(<span class="pl-c1">1</span>,<span class="pl-c1">1</span>) = 4;
-
-    val.set(<span class="pl-s"><span class="pl-pds">"</span>A<span class="pl-pds">"</span></span>,json::any(A));
-
-    matrix&lt;<span class="pl-k">double</span>&gt;&amp; B = val[<span class="pl-s"><span class="pl-pds">"</span>A<span class="pl-pds">"</span></span>].any_cast&lt;matrix&lt;<span class="pl-k">double</span>&gt;&gt;();</pre></div>
-
-<p>By default, if you print <code>val</code> on a stream, </p>
-
-<div class="highlight highlight-source-c++"><pre>    std::cout &lt;&lt; pretty_print(val) &lt;&lt; std::endl;</pre></div>
-
-<p>the template function</p>
-
-<div class="highlight highlight-source-c++"><pre>    <span class="pl-k">template </span>&lt;<span class="pl-k">typename</span> CharT,<span class="pl-k">class</span> <span class="pl-en">T</span>&gt; <span class="pl-k">inline</span>
-    <span class="pl-k">void</span> <span class="pl-en">serialize</span>(basic_json_output_handler&lt;CharT&gt;&amp; os, <span class="pl-k">const</span> T&amp;)
-    {
-        os.<span class="pl-c1">value</span>(<span class="pl-c1">null_type</span>());
-    }</pre></div>
-
-<p>gets called, and produces a <code>null</code> value for the matrix. You can however introduce a specialization of <code>serialize</code> for <code>boost::numeric::ublas::matrix</code> in the <code>jsoncons</code> namespace, to produce the output </p>
-
-<div class="highlight highlight-source-c++"><pre>    {
-        <span class="pl-s"><span class="pl-pds">"</span>A<span class="pl-pds">"</span></span>:
-        [
-            [<span class="pl-c1">1</span>,<span class="pl-c1">2</span>],
-            [<span class="pl-c1">3</span>,<span class="pl-c1">4</span>]
-        ]
-    }</pre></div>
 </body>
 </html>
 <!-- This document was created with MarkdownPad, the Markdown editor for Windows (http://markdownpad.com) -->
diff --git a/doc/md/Changelog.md b/doc/md/Changelog.md
@@ -1,3 +1,9 @@
+0.99.1
+------
+
+- Fix to json_filter class
+- Fix to readme_examples
+
 0.99
 ----
 
diff --git a/doc/md/Home.md b/doc/md/Home.md
@@ -16,8 +16,6 @@ All core jsoncons classes and functions are in namespace `jsoncons`. Extensions
 
 [Type Extensibility](Type%20Extensibility)
 
-[Using json any](Using%20json%20any)
-
 [Transforming JSON with filters](Transforming%20JSON%20with%20filters)
 
 ### Classes
diff --git a/doc/md/Pages/jsoncons.md b/doc/md/Pages/jsoncons.md
@@ -470,47 +470,4 @@ producing
         ["2013-10-21","2013-10-28"]
     }
 ```
-### json any
 
-jsoncons provides a class `json::any` that can contain a value of any type as long as that type supports copy construction and 
-assignment. This allows you to, for example, insert a boost matrix into a `json` object, and to retrieve it back cast to the appropriate type. You can do so by wrapping it in
-a `json::any` value, like this:
-```c++
-    #include <boost/numeric/ublas/matrix.hpp>
-
-    using boost::numeric::ublas::matrix;
-
-    json val;
-
-    matrix<double> A(2,2);
-    A(0,0) = 1;
-    A(0,1) = 2;
-    A(1,0) = 3;
-    A(1,1) = 4;
-
-    val.set("A",json::any(A));
-
-    matrix<double>& B = val["A"].any_cast<matrix<double>>();
-```
-By default, if you print `val` on a stream, 
-```c++
-    std::cout << pretty_print(val) << std::endl;
-```
-the template function
-```c++
-    template <typename CharT,class T> inline
-    void serialize(basic_json_output_handler<CharT>& os, const T&)
-    {
-        os.value(null_type());
-    }
-```
-gets called, and produces a `null` value for the matrix. You can however introduce a specialization of `serialize` for `boost::numeric::ublas::matrix` in the `jsoncons` namespace, to produce the output 
-```c++
-    {
-        "A":
-        [
-            [1,2],
-            [3,4]
-        ]
-    }
-```

-Original file line number
+Diff line change
@@ @@ -1,3 +1,9 @@ @@
 +0.99.1
 +------
++
 +- Fix to json_filter class
 +- Fix to readme_examples
++
 .99
 ----