Updated JSON and XMF language implementation specifications for C and CPP.

Mike Mathews
Showing 1 changed file with 2 additions and 4 deletions
Tensor/V1.0.0/Definitions.xid.xml
--- a/Tensor/V1.0.0/Definitions.xid.xml
View file @90fdd59
+++ b/Tensor/V1.0.0/Definitions.xid.xml
View file @90fdd59
@@ -199,17 +199,15 @@
        <type name="json">
          <comment>JSON formatted/encoded string</comment>
-          <tag name="TODO" value="Define json as a custom type.  Use string for now."/>
          <lang name="c" type="CXMFString" include="Tensor/CXMF/CXMFString.h"/>
-          <lang name="cpp" type="std::string" include="string"/>
+          <lang name="cpp" type="::Tensor::JSON::JSONObj" include="Tensor/JSON/TensorJSON.h"/>
          <lang name="java" type="XidString" include="com.comtechtel.tensor.xid.XidString"/>
          <lang name="node" type="XidString"/>
        </type>
        <type name="xmf">
            <comment>XMF formatted/encoded data, this is straight XMF in XMF formatted data, and base64 encoded binary XMF in JSON formatted data. </comment>
-            <!-- may change this type -->
+            <lang name="c" type="CAtom" include="Tensor/CXMF/GetPut.h"/>
-            <lang name="c" type="CXMFString" include="Tensor/CXMF/CXMFString.h"/>
            <lang name="cpp" type="::Tensor::XMF::Atom" include="Tensor/XMF/Atom.h"/>
            <lang name="java" type="Atom" include="com.comtechtel.tensor.xmf.Atom"/>
            <lang name="node" type="Atom"/>