Ticket #1766: wave_predefined.patch
File wave_predefined.patch, 1.1 KB (added by , 15 years ago) |
---|
-
cpp_macromap.hpp
426 426 427 427 IteratorT it = begin; 428 428 string_type name ((*it).get_value()); 429 typename defined_macros_type::iterator cit (current_macros -> find(name));429 typename defined_macros_type::iterator cit; 430 430 431 431 if (++it != end) { 432 432 // there should be only one token as the inspected name … … 434 434 impl::get_full_name(begin, end).c_str(), main_pos); 435 435 return false; 436 436 } 437 return cit != current_macros -> end();437 return is_defined(name, cit, 0); 438 438 } 439 439 440 440 /////////////////////////////////////////////////////////////////////////////// … … 445 445 macromap<ContextT>::is_defined(StringT const &str) const 446 446 { 447 447 string_type name (str.c_str()); 448 typename defined_macros_type::iterator cit (current_macros -> find(name));448 typename defined_macros_type::iterator cit; 449 449 450 return cit != current_macros -> end();450 return is_defined(name, cit, 0); 451 451 } 452 452 453 453 ///////////////////////////////////////////////////////////////////////////////