[adobe-source-commits] sandbox/adobe-source/adobe/source xstr.cpp,1.1,1.2

[Foster B. <fos...@us...>]

Update of /cvsroot/adobe-source/sandbox/adobe-source/adobe/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26117

Modified Files:
	xstr.cpp 
Log Message:
xstr bug fixes

Index: xstr.cpp
===================================================================
RCS file: /cvsroot/adobe-source/sandbox/adobe-source/adobe/source/xstr.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xstr.cpp	7 Apr 2005 00:53:25 -0000	1.1
--- xstr.cpp	7 Apr 2005 23:35:15 -0000	1.2
***************
*** 212,216 ****
  	typedef std::vector<attribute_t>				attribute_set_t;
  
! 	void attribute_value(const adobe::name_t attribute, adobe::name_t& value) const;
  
  	attribute_set_t	attribute_set_m;
--- 212,216 ----
  	typedef std::vector<attribute_t>				attribute_set_t;
  
! 	void attribute_value(const adobe::name_t& attribute, adobe::name_t& value) const;
  
  	attribute_set_t	attribute_set_m;
***************
*** 308,317 ****
  /*************************************************************************************************/
  
! void node_t::attribute_value(const adobe::name_t attribute, adobe::name_t& value) const
  {
  	attribute_set_t::const_iterator result =
  		adobe::lower_bound(	attribute_set_m,
! 							std::make_pair(value, adobe::name_t()),
! 							adobe::compare_members(&attribute_set_t::value_type::first));
  
  	if (result != attribute_set_m.end() && result->first == attribute)
--- 308,317 ----
  /*************************************************************************************************/
  
! void node_t::attribute_value(const adobe::name_t& attribute, adobe::name_t& value) const
  {
  	attribute_set_t::const_iterator result =
  		adobe::lower_bound(	attribute_set_m,
! 							node_t::attribute_set_t::value_type(attribute, adobe::name_t()),
! 							attribute_key_less_t());
  
  	if (result != attribute_set_m.end() && result->first == attribute)
***************
*** 599,603 ****
  	{
  		adobe::name_t name(first->first);
! 		adobe::name_t att_value(first->second.template get<std::string>().c_str());
  
  		result.push_back(std::make_pair(name, att_value));
--- 599,603 ----
  	{
  		adobe::name_t name(first->first);
! 		adobe::name_t att_value(first->second.template get<adobe::name_t>());
  
  		result.push_back(std::make_pair(name, att_value));