From bbf8b288ba385b0fb119c67c8f0450bbf9e8ee6a Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Thu, 3 Sep 2015 20:54:26 +0000 Subject: [PATCH] Correction to r3925. --- samples/exiv2json.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/samples/exiv2json.cpp b/samples/exiv2json.cpp index 834736f0..3619284a 100644 --- a/samples/exiv2json.cpp +++ b/samples/exiv2json.cpp @@ -44,10 +44,9 @@ struct Token { int i; // index (indexed from 1) eg History[1]/stEvt:action }; typedef std::vector Tokens; -typedef std::set Namespaces; // "XMP.xmp.MP.RegionInfo/MPRI:Regions[1]/MPReg:Rectangle" -bool getToken(std::string& in,Token& token,Namespaces* pNS=NULL) +bool getToken(std::string& in,Token& token,Exiv2::StringSet* pNS=NULL) { bool result = false; bool ns = false; @@ -102,7 +101,7 @@ Jzon::Node& recursivelyBuildTree(Jzon::Node& root,Tokens& tokens,size_t k) } // build the json tree for this key. return location and discover the name -Jzon::Node& objectForKey(const std::string Key,Jzon::Object& root,std::string& name,Namespaces* pNS=NULL) +Jzon::Node& objectForKey(const std::string Key,Jzon::Object& root,std::string& name,Exiv2::StringSet* pNS=NULL) { // Parse the key Tokens tokens ;