From 225bf198b05e5d85642346f99152c1bdaf9274f8 Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Sun, 11 Oct 2020 17:57:47 +0800
Subject: [PATCH] add Get????Version function of expat/jsoncpp

---
 3rdpty/expat                 | 2 +-
 3rdpty/jsoncpp               | 2 +-
 inc/hgl/util/json/JsonTool.h | 2 ++
 inc/hgl/util/xml/XMLParse.h  | 2 ++
 src/json/JsonTool.cpp        | 5 +++++
 src/xml/XMLParseClass.cpp    | 9 +++++++++
 6 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/3rdpty/expat b/3rdpty/expat
index ed34842..0d9b081 160000
--- a/3rdpty/expat
+++ b/3rdpty/expat
@@ -1 +1 @@
-Subproject commit ed3484270fe45140e2d8858426472404b1f0ae6a
+Subproject commit 0d9b08127853c82305b4bf110f08bc3a4fbdbfa5
diff --git a/3rdpty/jsoncpp b/3rdpty/jsoncpp
index a3c8642..5f4e104 160000
--- a/3rdpty/jsoncpp
+++ b/3rdpty/jsoncpp
@@ -1 +1 @@
-Subproject commit a3c8642886b348d4f8fcb5384266c3a94ffe66b3
+Subproject commit 5f4e10462fecdc9598fdcf20aad9558843abc212
diff --git a/inc/hgl/util/json/JsonTool.h b/inc/hgl/util/json/JsonTool.h
index 4bc8e4d..364f323 100644
--- a/inc/hgl/util/json/JsonTool.h
+++ b/inc/hgl/util/json/JsonTool.h
@@ -4,6 +4,8 @@
 
 namespace hgl
 {
+    const UTF8String GetJsoncppVersion();
+
     /**
      * 转换Json数据类型到普通UTF8字符串
      */
diff --git a/inc/hgl/util/xml/XMLParse.h b/inc/hgl/util/xml/XMLParse.h
index 7b2ea94..01dd65f 100644
--- a/inc/hgl/util/xml/XMLParse.h
+++ b/inc/hgl/util/xml/XMLParse.h
@@ -25,6 +25,8 @@ namespace hgl
 
     namespace xml
     {
+        const UTF8String GetExpatVersion();
+
         constexpr int XML_PARSE_BUFFER_SIZE=HGL_SIZE_1KB*128;       ///<XML解析缓冲区大小
 
         /**
diff --git a/src/json/JsonTool.cpp b/src/json/JsonTool.cpp
index 285d75b..de55242 100644
--- a/src/json/JsonTool.cpp
+++ b/src/json/JsonTool.cpp
@@ -9,6 +9,11 @@ using namespace std;
 
 namespace hgl
 {
+    const UTF8String GetJsoncppVersion()
+    {
+        return UTF8String(JSONCPP_VERSION_STRING);
+    }
+
     bool JsonToString(const Json::Value &jv_root,UTF8String &str,OSString &error_info)
     {
         Json::StreamWriterBuilder builder;
diff --git a/src/xml/XMLParseClass.cpp b/src/xml/XMLParseClass.cpp
index bb3e24e..a79a327 100644
--- a/src/xml/XMLParseClass.cpp
+++ b/src/xml/XMLParseClass.cpp
@@ -9,6 +9,15 @@ namespace hgl
 {
     namespace xml
     {
+        const UTF8String GetExpatVersion()
+        {
+            return( UTF8String::valueOf(XML_MAJOR_VERSION)+
+                    UTF8String(U8_TEXT("."))+
+                    UTF8String::valueOf(XML_MINOR_VERSION)+
+                    UTF8String(U8_TEXT("."))+
+                    UTF8String::valueOf(XML_MICRO_VERSION));
+        }
+
         namespace
         {
             void XMLStartElement(ElementParse *ep,const XML_Char *name,const XML_Char **atts)