mirror of
				https://github.com/paboyle/Grid.git
				synced 2025-11-04 14:04:32 +00:00 
			
		
		
		
	post-merge fix
This commit is contained in:
		@@ -95,22 +95,6 @@ std::string XmlWriter::string(void)
 | 
				
			|||||||
  return oss.str();
 | 
					  return oss.str();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
XmlReader::XmlReader(const char *xmlstring,std::string toplev) : fileName_("")
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
  pugi::xml_parse_result result;
 | 
					 | 
				
			||||||
  result = doc_.load_string(xmlstring);
 | 
					 | 
				
			||||||
  if ( !result ) {
 | 
					 | 
				
			||||||
    std::cerr << "XML error description (from char *): " << result.description() << "\nXML\n"<< xmlstring << "\n";
 | 
					 | 
				
			||||||
    std::cerr << "XML error offset      (from char *) " << result.offset         << "\nXML\n"<< xmlstring <<"\n";
 | 
					 | 
				
			||||||
    abort();
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
  if ( toplev == std::string("") ) {
 | 
					 | 
				
			||||||
    node_ = doc_;
 | 
					 | 
				
			||||||
  } else { 
 | 
					 | 
				
			||||||
    node_ = doc_.child(toplev.c_str());
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
// Reader implementation ///////////////////////////////////////////////////////
 | 
					// Reader implementation ///////////////////////////////////////////////////////
 | 
				
			||||||
XmlReader::XmlReader(const std::string &s,  const bool isBuffer, 
 | 
					XmlReader::XmlReader(const std::string &s,  const bool isBuffer, 
 | 
				
			||||||
                     std::string toplev) 
 | 
					                     std::string toplev) 
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user