From: Kim Nguyễn Date: Fri, 12 Oct 2012 20:50:26 +0000 (+0200) Subject: Formatting. X-Git-Url: http://git.nguyen.vg/gitweb/?p=SXSI%2FXMLTree.git;a=commitdiff_plain;h=53806b86f193e42bb2c26a86049db559e6063877 Formatting. --- diff --git a/xml-tree.cpp b/xml-tree.cpp index d31c1ce..e230d9b 100644 --- a/xml-tree.cpp +++ b/xml-tree.cpp @@ -95,14 +95,13 @@ xml_tree::xml_tree(std::vector *tags_, delete parbitmap; this->tag_ids = tag_ids; + tag_names = new std::vector(); tag_names->resize(tag_ids->size()); + std::unordered_map::iterator val; - //for(auto val : *(this->tag_ids)) - //(*this->tag_names)[val.second] = val.first; for(val = this->tag_ids->begin(); val != this->tag_ids->end(); ++val) - (*this->tag_names)[val->second] = val->first; - + (*tag_names)[val->second] = val->first; uint32_t max_tag = tag_names->size() - 1; bit_vector *tmp_bitmap = new bit_vector(npar, 1, 0); @@ -439,12 +438,10 @@ void xml_tree::uputc(const char c, int fd) const char * xml_tree::get_tag_name_by_ref(xml_tree::tag_t tagid) const { - - unsigned char *s; if (tagid < 0 || tagid >= tag_names->size()) return ""; - return (const char *) (*tag_names)[tagid].c_str(); + return (*tag_names)[tagid].c_str(); } xml_tree::tag_t xml_tree::register_tag(char *s)