Ticket #3924: boost_r59655_gcc_warning_cleanup.patch
File boost_r59655_gcc_warning_cleanup.patch, 53.3 KB (added by , 13 years ago) |
---|
-
boost/gil/locator.hpp
309 309 310 310 private: 311 311 template <typename X> friend class memory_based_2d_locator; 312 std::ptrdiff_t offset(x_coord_t x, y_coord_t y) const { return y*row_size() +x*pixel_size(); }312 std::ptrdiff_t offset(x_coord_t p_x, y_coord_t p_y) const { return p_y*row_size() + p_x*pixel_size(); } 313 313 StepIterator _p; 314 314 }; 315 315 -
boost/gil/virtual_locator.hpp
53 53 } 54 54 }; 55 55 56 virtual_2d_locator(const point_t& p=point_t(0,0), const point_t& step=point_t(1,1), const deref_fn_t& d=deref_fn_t()) : _p(p,step,d) {}56 virtual_2d_locator(const point_t& p=point_t(0,0), const point_t& p_step=point_t(1,1), const deref_fn_t& d=deref_fn_t()) : _p(p,p_step,d) {} 57 57 template <typename D, bool TR> virtual_2d_locator(const virtual_2d_locator<D,TR>& loc, coord_t y_step) 58 58 : _p(loc.pos(), point_t(loc.step().x,loc.step().y*y_step), loc.deref_fn()) {} 59 59 template <typename D, bool TR> virtual_2d_locator(const virtual_2d_locator<D,TR>& loc, coord_t x_step, coord_t y_step, bool transpose=false) -
boost/gil/image_view.hpp
101 101 template <typename View> image_view(const View& iv) : _dimensions(iv.dimensions()), _pixels(iv.pixels()) {} 102 102 103 103 template <typename L2> image_view(const point_t& sz , const L2& loc) : _dimensions(sz), _pixels(loc) {} 104 template <typename L2> image_view(coord_t width, coord_t height, const L2& loc) : _dimensions(x_coord_t(width),y_coord_t(height)), _pixels(loc) {}104 template <typename L2> image_view(coord_t p_width, coord_t p_height, const L2& loc) : _dimensions(x_coord_t(p_width),y_coord_t(p_height)), _pixels(loc) {} 105 105 106 106 template <typename View> image_view& operator=(const View& iv) { _pixels=iv.pixels(); _dimensions=iv.dimensions(); return *this; } 107 107 image_view& operator=(const image_view& iv) { _pixels=iv.pixels(); _dimensions=iv.dimensions(); return *this; } -
boost/gil/position_iterator.hpp
52 52 typedef typename Deref::argument_type point_t; 53 53 54 54 position_iterator() {} 55 position_iterator(const point_t& p, const point_t& step, const Deref& d) : _p(p), _step(step), _d(d) {}55 position_iterator(const point_t& p, const point_t& p_step, const Deref& d) : _p(p), _step(p_step), _d(d) {} 56 56 57 57 position_iterator(const position_iterator& p) : _p(p._p), _step(p._step), _d(p._d) {} 58 58 template <typename D> position_iterator(const position_iterator<D,Dim>& p) : _p(p._p), _step(p._step), _d(p._d) {} -
boost/gil/iterator_from_2d.hpp
78 78 x_iterator& x() { return _p.x(); } 79 79 80 80 iterator_from_2d(){} 81 iterator_from_2d(const Loc2& p, std::ptrdiff_t width, std::ptrdiff_t x=0, std::ptrdiff_t y=0) : _coords(x,y), _width(width), _p(p) {}81 iterator_from_2d(const Loc2& p, std::ptrdiff_t p_width, std::ptrdiff_t p_x=0, std::ptrdiff_t p_y=0) : _coords(p_x,p_y), _width(p_width), _p(p) {} 82 82 iterator_from_2d(const iterator_from_2d& pit) : _coords(pit._coords), _width(pit._width), _p(pit._p) {} 83 83 template <typename Loc> iterator_from_2d(const iterator_from_2d<Loc>& pit) : _coords(pit._coords), _width(pit._width), _p(pit._p) {} 84 84 -
boost/gil/pixel_iterator_adaptor.hpp
62 62 dereference_iterator_adaptor() {} 63 63 template <typename Iterator1> 64 64 dereference_iterator_adaptor(const dereference_iterator_adaptor<Iterator1,DFn>& dit) : parent_t(dit.base()), _deref_fn(dit._deref_fn) {} 65 dereference_iterator_adaptor(Iterator it, DFn deref_fn=DFn()) : parent_t(it), _deref_fn(deref_fn) {}65 dereference_iterator_adaptor(Iterator it, DFn p_deref_fn=DFn()) : parent_t(it), _deref_fn(p_deref_fn) {} 66 66 template <typename Iterator1, typename DFn1> 67 67 dereference_iterator_adaptor(const dereference_iterator_adaptor<Iterator1,DFn1>& it) : parent_t(it.base()), _deref_fn(it._deref_fn) {} 68 68 /// For some reason operator[] provided by iterator_facade returns a custom class that is convertible to reference -
boost/gil/channel.hpp
482 482 typedef const packed_dynamic_channel_reference<BitField,NumBits,true> mutable_reference; 483 483 typedef typename parent_t::integer_t integer_t; 484 484 485 packed_dynamic_channel_reference(const void* data_ptr, unsigned first_bit) : parent_t(data_ptr), _first_bit(first_bit) {}485 packed_dynamic_channel_reference(const void* data_ptr, unsigned p_first_bit) : parent_t(data_ptr), _first_bit(p_first_bit) {} 486 486 packed_dynamic_channel_reference(const const_reference& ref) : parent_t(ref._data_ptr), _first_bit(ref._first_bit) {} 487 487 packed_dynamic_channel_reference(const mutable_reference& ref) : parent_t(ref._data_ptr), _first_bit(ref._first_bit) {} 488 488 … … 510 510 typedef const packed_dynamic_channel_reference<BitField,NumBits,true> mutable_reference; 511 511 typedef typename parent_t::integer_t integer_t; 512 512 513 packed_dynamic_channel_reference(void* data_ptr, unsigned first_bit) : parent_t(data_ptr), _first_bit(first_bit) {}513 packed_dynamic_channel_reference(void* data_ptr, unsigned p_first_bit) : parent_t(data_ptr), _first_bit(p_first_bit) {} 514 514 packed_dynamic_channel_reference(const packed_dynamic_channel_reference& ref) : parent_t(ref._data_ptr), _first_bit(ref._first_bit) {} 515 515 516 516 const packed_dynamic_channel_reference& operator=(integer_t value) const { assert(value<=parent_t::max_val); set_unsafe(value); return *this; } -
boost/gil/bit_aligned_pixel_reference.hpp
54 54 55 55 public: 56 56 bit_range() : _current_byte(NULL), _bit_offset(0) {} 57 bit_range(byte_t* current_byte, int bit_offset) : _current_byte(current_byte), _bit_offset(bit_offset) { assert(bit_offset>=0 &&bit_offset<8); }57 bit_range(byte_t* p_current_byte, int p_bit_offset) : _current_byte(p_current_byte), _bit_offset(p_bit_offset) { assert(p_bit_offset>=0 && p_bit_offset<8); } 58 58 59 59 bit_range(const bit_range& br) : _current_byte(br._current_byte), _bit_offset(br._bit_offset) {} 60 60 template <bool M> bit_range(const bit_range<RangeSize,M>& br) : _current_byte(br._current_byte), _bit_offset(br._bit_offset) {} … … 135 135 136 136 bit_aligned_pixel_reference(){} 137 137 bit_aligned_pixel_reference(data_ptr_t data_ptr, int bit_offset) : _bit_range(data_ptr, bit_offset) {} 138 explicit bit_aligned_pixel_reference(const bit_range_t& bit_range) : _bit_range(bit_range) {}138 explicit bit_aligned_pixel_reference(const bit_range_t& p_bit_range) : _bit_range(p_bit_range) {} 139 139 template <bool IsMutable2> bit_aligned_pixel_reference(const bit_aligned_pixel_reference<BitField,ChannelBitSizes,Layout,IsMutable2>& p) : _bit_range(p._bit_range) {} 140 140 141 141 // Grayscale references can be constructed from the channel reference -
boost/gil/image.hpp
68 68 _memory(0), _align_in_bytes(alignment), _alloc(alloc_in) {} 69 69 70 70 // Create with dimensions and optional initial value and alignment 71 image(const point_t& dimensions,71 image(const point_t& p_dimensions, 72 72 std::size_t alignment=0, 73 73 const Alloc alloc_in = Alloc()) : _memory(0), _align_in_bytes(alignment), _alloc(alloc_in) { 74 allocate_and_default_construct( dimensions);74 allocate_and_default_construct(p_dimensions); 75 75 } 76 image(x_coord_t width, y_coord_theight,76 image(x_coord_t p_width, y_coord_t p_height, 77 77 std::size_t alignment=0, 78 78 const Alloc alloc_in = Alloc()) : _memory(0), _align_in_bytes(alignment), _alloc(alloc_in) { 79 allocate_and_default_construct(point_t( width,height));79 allocate_and_default_construct(point_t(p_width,p_height)); 80 80 } 81 image(const point_t& dimensions,81 image(const point_t& p_dimensions, 82 82 const Pixel& p_in, 83 83 std::size_t alignment, 84 84 const Alloc alloc_in = Alloc()) : 85 85 _memory(0), _align_in_bytes(alignment), _alloc(alloc_in) { 86 allocate_and_fill( dimensions, p_in);86 allocate_and_fill(p_dimensions, p_in); 87 87 } 88 image(x_coord_t width, y_coord_theight,88 image(x_coord_t p_width, y_coord_t p_height, 89 89 const Pixel& p_in, 90 90 std::size_t alignment, 91 91 const Alloc alloc_in = Alloc()) : 92 92 _memory(0), _align_in_bytes(alignment), _alloc(alloc_in) { 93 allocate_and_fill(point_t( width,height),p_in);93 allocate_and_fill(point_t(p_width,p_height),p_in); 94 94 } 95 95 96 96 image(const image& img) : … … 146 146 swap(tmp); 147 147 } 148 148 } 149 void recreate(x_coord_t width, y_coord_theight, std::size_t alignment=0, const Alloc alloc_in = Alloc()) {150 recreate(point_t( width,height),alignment,alloc_in);149 void recreate(x_coord_t p_width, y_coord_t p_height, std::size_t alignment=0, const Alloc alloc_in = Alloc()) { 150 recreate(point_t(p_width,p_height),alignment,alloc_in); 151 151 } 152 152 void recreate(const point_t& dims, 153 153 const Pixel& p_in, std::size_t alignment, const Alloc alloc_in = Alloc()) { … … 156 156 swap(tmp); 157 157 } 158 158 } 159 void recreate(x_coord_t width, y_coord_theight,159 void recreate(x_coord_t p_width, y_coord_t p_height, 160 160 const Pixel& p_in, std::size_t alignment, const Alloc alloc_in = Alloc()) { 161 recreate(point_t( width,height),p_in,alignment,alloc_in);161 recreate(point_t(p_width,p_height),p_in,alignment,alloc_in); 162 162 } 163 163 164 164 view_t _view; // contains pointer to the pixels, the image size and ways to navigate pixels … … 167 167 std::size_t _align_in_bytes; 168 168 allocator_type _alloc; 169 169 170 void allocate_and_default_construct(const point_t& dimensions) {170 void allocate_and_default_construct(const point_t& p_dimensions) { 171 171 try { 172 allocate_( dimensions,mpl::bool_<IsPlanar>());172 allocate_(p_dimensions,mpl::bool_<IsPlanar>()); 173 173 default_construct_pixels(_view); 174 } catch(...) { deallocate( dimensions); throw; }174 } catch(...) { deallocate(p_dimensions); throw; } 175 175 } 176 176 177 void allocate_and_fill(const point_t& dimensions, const Pixel& p_in) {177 void allocate_and_fill(const point_t& p_dimensions, const Pixel& p_in) { 178 178 try { 179 allocate_( dimensions,mpl::bool_<IsPlanar>());179 allocate_(p_dimensions,mpl::bool_<IsPlanar>()); 180 180 uninitialized_fill_pixels(_view, p_in); 181 } catch(...) { deallocate( dimensions); throw; }181 } catch(...) { deallocate(p_dimensions); throw; } 182 182 } 183 183 184 184 template <typename View> 185 void allocate_and_copy(const point_t& dimensions, const View& v) {185 void allocate_and_copy(const point_t& p_dimensions, const View& v) { 186 186 try { 187 allocate_( dimensions,mpl::bool_<IsPlanar>());187 allocate_(p_dimensions,mpl::bool_<IsPlanar>()); 188 188 uninitialized_copy_pixels(v,_view); 189 } catch(...) { deallocate( dimensions); throw; }189 } catch(...) { deallocate(p_dimensions); throw; } 190 190 } 191 191 192 void deallocate(const point_t& dimensions) {193 if (_memory) _alloc.deallocate(_memory, total_allocated_size_in_bytes( dimensions));192 void deallocate(const point_t& p_dimensions) { 193 if (_memory) _alloc.deallocate(_memory, total_allocated_size_in_bytes(p_dimensions)); 194 194 } 195 195 196 std::size_t total_allocated_size_in_bytes(const point_t& dimensions) const {197 std::size_t size_in_units = get_row_size_in_memunits( dimensions.x)*dimensions.y;196 std::size_t total_allocated_size_in_bytes(const point_t& p_dimensions) const { 197 std::size_t size_in_units = get_row_size_in_memunits(p_dimensions.x)*p_dimensions.y; 198 198 if (IsPlanar) 199 199 size_in_units = size_in_units*num_channels<view_t>::value; 200 200 … … 203 203 + (_align_in_bytes>0 ? _align_in_bytes-1:0); // add extra padding in case we need to align the first image pixel 204 204 } 205 205 206 std::size_t get_row_size_in_memunits(x_coord_t width) const { // number of units per row207 std::size_t size_in_memunits = width*memunit_step(typename view_t::x_iterator());206 std::size_t get_row_size_in_memunits(x_coord_t p_width) const { // number of units per row 207 std::size_t size_in_memunits = p_width*memunit_step(typename view_t::x_iterator()); 208 208 if (_align_in_bytes>0) { 209 209 std::size_t alignment_in_memunits=_align_in_bytes*byte_to_memunit<typename view_t::x_iterator>::value; 210 210 return align(size_in_memunits, alignment_in_memunits); … … 212 212 return size_in_memunits; 213 213 } 214 214 215 void allocate_(const point_t& dimensions, mpl::false_) { // if it throws and _memory!=0 the client must deallocate _memory216 _memory=_alloc.allocate(total_allocated_size_in_bytes( dimensions));215 void allocate_(const point_t& p_dimensions, mpl::false_) { // if it throws and _memory!=0 the client must deallocate _memory 216 _memory=_alloc.allocate(total_allocated_size_in_bytes(p_dimensions)); 217 217 unsigned char* tmp=(_align_in_bytes>0) ? (unsigned char*)align((std::size_t)_memory,_align_in_bytes) : _memory; 218 _view=view_t( dimensions,typename view_t::locator(typename view_t::x_iterator(tmp),get_row_size_in_memunits(dimensions.x)));218 _view=view_t(p_dimensions,typename view_t::locator(typename view_t::x_iterator(tmp),get_row_size_in_memunits(p_dimensions.x))); 219 219 } 220 220 221 void allocate_(const point_t& dimensions, mpl::true_) { // if it throws and _memory!=0 the client must deallocate _memory222 std::size_t row_size=get_row_size_in_memunits( dimensions.x);223 std::size_t plane_size=row_size* dimensions.y;224 _memory=_alloc.allocate(total_allocated_size_in_bytes( dimensions));221 void allocate_(const point_t& p_dimensions, mpl::true_) { // if it throws and _memory!=0 the client must deallocate _memory 222 std::size_t row_size=get_row_size_in_memunits(p_dimensions.x); 223 std::size_t plane_size=row_size*p_dimensions.y; 224 _memory=_alloc.allocate(total_allocated_size_in_bytes(p_dimensions)); 225 225 unsigned char* tmp=(_align_in_bytes>0) ? (unsigned char*)align((std::size_t)_memory,_align_in_bytes) : _memory; 226 226 typename view_t::x_iterator first; 227 227 for (int i=0; i<num_channels<view_t>::value; ++i) { 228 228 dynamic_at_c(first,i) = (typename channel_type<view_t>::type*)tmp; 229 229 memunit_advance(dynamic_at_c(first,i), plane_size*i); 230 230 } 231 _view=view_t( dimensions, typename view_t::locator(first, row_size));231 _view=view_t(p_dimensions, typename view_t::locator(first, row_size)); 232 232 } 233 233 }; 234 234 -
boost/gil/step_iterator.hpp
133 133 struct memunit_step_fn { 134 134 typedef std::ptrdiff_t difference_type; 135 135 136 memunit_step_fn(difference_type step=memunit_step(Iterator())) : _step(step) {}136 memunit_step_fn(difference_type p_step=memunit_step(Iterator())) : _step(p_step) {} 137 137 138 138 difference_type difference(const Iterator& it1, const Iterator& it2) const { return memunit_distance(it1,it2)/_step; } 139 139 void advance(Iterator& it, difference_type d) const { memunit_advance(it,d*_step); } 140 140 difference_type step() const { return _step; } 141 141 142 void set_step(std::ptrdiff_t step) { _step=step; }142 void set_step(std::ptrdiff_t p_step) { _step=p_step; } 143 143 private: 144 144 GIL_CLASS_REQUIRE(Iterator, boost::gil, MemoryBasedIteratorConcept) 145 145 difference_type _step; -
boost/gil/extension/io/io_error.hpp
24 24 25 25 namespace boost { namespace gil { 26 26 27 inline void io_error(const char* descr) 28 #if BOOST_WORKAROUND(__GNUC__, >= 3) 29 __attribute__((noreturn)) 30 #endif 31 ; 27 32 inline void io_error(const char* descr) { throw std::ios_base::failure(descr); } 28 33 inline void io_error_if(bool expr, const char* descr="") { if (expr) io_error(descr); } 29 34 -
boost/gil/algorithm.hpp
192 192 /// Source range is delimited by image iterators 193 193 template <typename IL, typename O> // IL Models ConstPixelLocatorConcept, O Models PixelIteratorConcept 194 194 struct copier_n<iterator_from_2d<IL>,O> { 195 typedef typename std::iterator_traits<iterator_from_2d<IL> >::difference_type diff_t;196 GIL_FORCEINLINE void operator()(iterator_from_2d<IL> src, diff_t n, O dst) const {195 typedef typename std::iterator_traits<iterator_from_2d<IL> >::difference_type it_diff_t; 196 GIL_FORCEINLINE void operator()(iterator_from_2d<IL> src, it_diff_t n, O dst) const { 197 197 gil_function_requires<PixelLocatorConcept<IL> >(); 198 198 gil_function_requires<MutablePixelIteratorConcept<O> >(); 199 199 while (n>0) { -
boost/detail/workaround.hpp
65 65 #else 66 66 #define BOOST_MSVC_WORKAROUND_GUARD 0 67 67 #endif 68 #ifndef BOOST_MSVC_FULL_VER 69 #define BOOST_MSVC_FULL_VER_WORKAROUND_GUARD 1 70 #else 71 #define BOOST_MSVC_FULL_VER_WORKAROUND_GUARD 0 72 #endif 68 73 #ifndef __GNUC__ 69 74 #define __GNUC___WORKAROUND_GUARD 1 70 75 #else -
boost/multi_index/sequenced_index.hpp
346 346 } 347 347 348 348 template<typename Modifier,typename Rollback> 349 bool modify(iterator position,Modifier mod,Rollback back)349 bool modify(iterator position,Modifier mod,Rollback p_back) 350 350 { 351 351 BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(position); 352 352 BOOST_MULTI_INDEX_CHECK_DEREFERENCEABLE_ITERATOR(position); … … 363 363 #endif 364 364 365 365 return this->final_modify_( 366 mod, back,static_cast<final_node_type*>(position.get_node()));366 mod,p_back,static_cast<final_node_type*>(position.get_node())); 367 367 } 368 368 369 369 void swap(sequenced_index<SuperMeta,TagList>& x) -
boost/multi_index/ordered_index.hpp
436 436 437 437 template<typename CompatibleKey,typename CompatibleCompare> 438 438 iterator find( 439 const CompatibleKey& x,const CompatibleCompare& comp)const439 const CompatibleKey& x,const CompatibleCompare& p_comp)const 440 440 { 441 return make_iterator(ordered_index_find(root(),header(),key,x, comp));441 return make_iterator(ordered_index_find(root(),header(),key,x,p_comp)); 442 442 } 443 443 444 444 template<typename CompatibleKey> … … 448 448 } 449 449 450 450 template<typename CompatibleKey,typename CompatibleCompare> 451 size_type count(const CompatibleKey& x,const CompatibleCompare& comp)const451 size_type count(const CompatibleKey& x,const CompatibleCompare& p_comp)const 452 452 { 453 std::pair<iterator,iterator> p=equal_range(x, comp);453 std::pair<iterator,iterator> p=equal_range(x,p_comp); 454 454 size_type n=std::distance(p.first,p.second); 455 455 return n; 456 456 } … … 464 464 465 465 template<typename CompatibleKey,typename CompatibleCompare> 466 466 iterator lower_bound( 467 const CompatibleKey& x,const CompatibleCompare& comp)const467 const CompatibleKey& x,const CompatibleCompare& p_comp)const 468 468 { 469 469 return make_iterator( 470 ordered_index_lower_bound(root(),header(),key,x, comp));470 ordered_index_lower_bound(root(),header(),key,x,p_comp)); 471 471 } 472 472 473 473 template<typename CompatibleKey> … … 479 479 480 480 template<typename CompatibleKey,typename CompatibleCompare> 481 481 iterator upper_bound( 482 const CompatibleKey& x,const CompatibleCompare& comp)const482 const CompatibleKey& x,const CompatibleCompare& p_comp)const 483 483 { 484 484 return make_iterator( 485 ordered_index_upper_bound(root(),header(),key,x, comp));485 ordered_index_upper_bound(root(),header(),key,x,p_comp)); 486 486 } 487 487 488 488 template<typename CompatibleKey> … … 497 497 498 498 template<typename CompatibleKey,typename CompatibleCompare> 499 499 std::pair<iterator,iterator> equal_range( 500 const CompatibleKey& x,const CompatibleCompare& comp)const500 const CompatibleKey& x,const CompatibleCompare& p_comp)const 501 501 { 502 502 std::pair<node_type*,node_type*> p= 503 ordered_index_equal_range(root(),header(),key,x, comp);503 ordered_index_equal_range(root(),header(),key,x,p_comp); 504 504 return std::pair<iterator,iterator>( 505 505 make_iterator(p.first),make_iterator(p.second)); 506 506 } -
boost/multi_index/detail/index_matcher.hpp
132 132 entries(),entries()+size_, 133 133 entry(node),entry::less_by_node()); /* localize entry */ 134 134 ent->ordered=false; 135 std::size_t n=ent->pos; /* get its position */135 std::size_t epos=ent->pos; /* get its position */ 136 136 137 137 entry dummy(0); 138 dummy.pile_top= n;138 dummy.pile_top=epos; 139 139 140 140 entry* pile_ent= /* find the first available pile */ 141 141 std::lower_bound( /* to stack the entry */ 142 142 entries(),entries()+num_piles, 143 143 dummy,entry::less_by_pile_top()); 144 144 145 pile_ent->pile_top= n; /* stack the entry */145 pile_ent->pile_top=epos; /* stack the entry */ 146 146 pile_ent->pile_top_entry=ent; 147 147 148 148 /* if not the first pile, link entry to top of the preceding pile */ … … 164 164 */ 165 165 166 166 entry* ent=entries()[num_piles-1].pile_top_entry; 167 for(std::size_t n=num_piles;n--;){167 for(std::size_t pnum=num_piles;pnum--;){ 168 168 ent->ordered=true; 169 169 ent=ent->previous; 170 170 } -
boost/property_tree/detail/exception_implementation.hpp
30 30 /////////////////////////////////////////////////////////////////////////// 31 31 // ptree_error 32 32 33 inline ptree_error::ptree_error(const std::string & what):34 std::runtime_error( what)33 inline ptree_error::ptree_error(const std::string &p_what): 34 std::runtime_error(p_what) 35 35 { 36 36 } 37 37 … … 43 43 // ptree_bad_data 44 44 45 45 template<class D> inline 46 ptree_bad_data::ptree_bad_data(const std::string & what, const D &data):47 ptree_error( what), m_data(data)46 ptree_bad_data::ptree_bad_data(const std::string &p_what, const D &p_data): 47 ptree_error(p_what), m_data(p_data) 48 48 { 49 49 } 50 50 … … 62 62 // ptree_bad_path 63 63 64 64 template<class P> inline 65 ptree_bad_path::ptree_bad_path(const std::string & what, const P &path):66 ptree_error(detail::prepare_bad_path_what( what, path)), m_path(path)65 ptree_bad_path::ptree_bad_path(const std::string &p_what, const P &p_path): 66 ptree_error(detail::prepare_bad_path_what(p_what, p_path)), m_path(p_path) 67 67 { 68 68 69 69 } -
boost/property_tree/detail/file_parser_error.hpp
26 26 // Construction & destruction 27 27 28 28 // Construct error 29 file_parser_error(const std::string & message,30 const std::string & filename,31 unsigned long line) :32 ptree_error(format_what( message, filename,line)),33 m_message( message), m_filename(filename), m_line(line)29 file_parser_error(const std::string &p_message, 30 const std::string &p_filename, 31 unsigned long p_line) : 32 ptree_error(format_what(p_message, p_filename, p_line)), 33 m_message(p_message), m_filename(p_filename), m_line(p_line) 34 34 { 35 35 } 36 36 … … 69 69 unsigned long m_line; 70 70 71 71 // Format error message to be returned by std::runtime_error::what() 72 std::string format_what(const std::string & message,73 const std::string & filename,74 unsigned long line)72 std::string format_what(const std::string &p_message, 73 const std::string &p_filename, 74 unsigned long p_line) 75 75 { 76 76 std::stringstream stream; 77 if ( line > 0)78 stream << ( filename.empty() ? "<unspecified file>"79 : filename.c_str())80 << '(' << line << "): "81 << message;77 if (p_line > 0) 78 stream << (p_filename.empty() ? "<unspecified file>" 79 : p_filename.c_str()) 80 << '(' << p_line << "): " 81 << p_message; 82 82 else 83 stream << ( filename.empty() ? "<unspecified file>"84 : filename.c_str())85 << ": " << message;83 stream << (p_filename.empty() ? "<unspecified file>" 84 : p_filename.c_str()) 85 << ": " << p_message; 86 86 return stream.str(); 87 87 } 88 88 -
boost/property_tree/detail/rapidxml.hpp
80 80 public: 81 81 82 82 //! Constructs parse error 83 parse_error(const char * what, void *where)84 : m_what( what)85 , m_where( where)83 parse_error(const char *p_what, void *p_where) 84 : m_what(p_what) 85 , m_where(p_where) 86 86 { 87 87 } 88 88 … … 724 724 //! Use name(const Ch *) function to have the length automatically calculated (string must be zero terminated). 725 725 //! \param name Name of node to set. Does not have to be zero terminated. 726 726 //! \param size Size of name, in characters. This does not include zero terminator, if one is present. 727 void name(const Ch * name, std::size_t size)727 void name(const Ch *p_name, std::size_t size) 728 728 { 729 m_name = const_cast<Ch *>( name);729 m_name = const_cast<Ch *>(p_name); 730 730 m_name_size = size; 731 731 } 732 732 733 733 //! Sets name of node to a zero-terminated string. 734 734 //! See also \ref ownership_of_strings and xml_node::name(const Ch *, std::size_t). 735 735 //! \param name Name of node to set. Must be zero terminated. 736 void name(const Ch * name)736 void name(const Ch *p_name) 737 737 { 738 this->name( name, internal::measure(name));738 this->name(p_name, internal::measure(p_name)); 739 739 } 740 740 741 741 //! Sets value of node to a non zero-terminated string. … … 754 754 //! If you want to manipulate data of elements using values, use parser flag rapidxml::parse_no_data_nodes to prevent creation of data nodes by the parser. 755 755 //! \param value value of node to set. Does not have to be zero terminated. 756 756 //! \param size Size of value, in characters. This does not include zero terminator, if one is present. 757 void value(const Ch * value, std::size_t size)757 void value(const Ch *p_value, std::size_t size) 758 758 { 759 m_value = const_cast<Ch *>( value);759 m_value = const_cast<Ch *>(p_value); 760 760 m_value_size = size; 761 761 } 762 762 763 763 //! Sets value of node to a zero-terminated string. 764 764 //! See also \ref ownership_of_strings and xml_node::value(const Ch *, std::size_t). 765 765 //! \param value Vame of node to set. Must be zero terminated. 766 void value(const Ch * value)766 void value(const Ch *p_value) 767 767 { 768 this->value( value, internal::measure(value));768 this->value(p_value, internal::measure(p_value)); 769 769 } 770 770 771 771 /////////////////////////////////////////////////////////////////////////// … … 839 839 //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string 840 840 //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters 841 841 //! \return Pointer to found attribute, or 0 if not found. 842 xml_attribute<Ch> *previous_attribute(const Ch * name = 0, std::size_tname_size = 0, bool case_sensitive = true) const842 xml_attribute<Ch> *previous_attribute(const Ch *p_name = 0, std::size_t p_name_size = 0, bool case_sensitive = true) const 843 843 { 844 if ( name)844 if (p_name) 845 845 { 846 if ( name_size == 0)847 name_size = internal::measure(name);846 if (p_name_size == 0) 847 p_name_size = internal::measure(p_name); 848 848 for (xml_attribute<Ch> *attribute = m_prev_attribute; attribute; attribute = attribute->m_prev_attribute) 849 if (internal::compare(attribute->name(), attribute->name_size(), name,name_size, case_sensitive))849 if (internal::compare(attribute->name(), attribute->name_size(), p_name, p_name_size, case_sensitive)) 850 850 return attribute; 851 851 return 0; 852 852 } … … 859 859 //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string 860 860 //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters 861 861 //! \return Pointer to found attribute, or 0 if not found. 862 xml_attribute<Ch> *next_attribute(const Ch * name = 0, std::size_tname_size = 0, bool case_sensitive = true) const862 xml_attribute<Ch> *next_attribute(const Ch *p_name = 0, std::size_t p_name_size = 0, bool case_sensitive = true) const 863 863 { 864 if ( name)864 if (p_name) 865 865 { 866 if ( name_size == 0)867 name_size = internal::measure(name);866 if (p_name_size == 0) 867 p_name_size = internal::measure(p_name); 868 868 for (xml_attribute<Ch> *attribute = m_next_attribute; attribute; attribute = attribute->m_next_attribute) 869 if (internal::compare(attribute->name(), attribute->name_size(), name,name_size, case_sensitive))869 if (internal::compare(attribute->name(), attribute->name_size(), p_name, p_name_size, case_sensitive)) 870 870 return attribute; 871 871 return 0; 872 872 } … … 904 904 //! Constructs an empty node with the specified type. 905 905 //! Consider using memory_pool of appropriate document to allocate nodes manually. 906 906 //! \param type Type of node to construct. 907 xml_node(node_type type)908 : m_type( type)907 xml_node(node_type p_type) 908 : m_type(p_type) 909 909 , m_first_node(0) 910 910 , m_first_attribute(0) 911 911 { … … 939 939 //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string 940 940 //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters 941 941 //! \return Pointer to found child, or 0 if not found. 942 xml_node<Ch> *first_node(const Ch * name = 0, std::size_tname_size = 0, bool case_sensitive = true) const942 xml_node<Ch> *first_node(const Ch *p_name = 0, std::size_t p_name_size = 0, bool case_sensitive = true) const 943 943 { 944 if ( name)944 if (p_name) 945 945 { 946 if ( name_size == 0)947 name_size = internal::measure(name);946 if (p_name_size == 0) 947 p_name_size = internal::measure(p_name); 948 948 for (xml_node<Ch> *child = m_first_node; child; child = child->next_sibling()) 949 if (internal::compare(child->name(), child->name_size(), name,name_size, case_sensitive))949 if (internal::compare(child->name(), child->name_size(), p_name, p_name_size, case_sensitive)) 950 950 return child; 951 951 return 0; 952 952 } … … 961 961 //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string 962 962 //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters 963 963 //! \return Pointer to found child, or 0 if not found. 964 xml_node<Ch> *last_node(const Ch * name = 0, std::size_tname_size = 0, bool case_sensitive = true) const964 xml_node<Ch> *last_node(const Ch *p_name = 0, std::size_t p_name_size = 0, bool case_sensitive = true) const 965 965 { 966 966 assert(m_first_node); // Cannot query for last child if node has no children 967 if ( name)967 if (p_name) 968 968 { 969 if ( name_size == 0)970 name_size = internal::measure(name);969 if (p_name_size == 0) 970 p_name_size = internal::measure(p_name); 971 971 for (xml_node<Ch> *child = m_last_node; child; child = child->previous_sibling()) 972 if (internal::compare(child->name(), child->name_size(), name,name_size, case_sensitive))972 if (internal::compare(child->name(), child->name_size(), p_name, p_name_size, case_sensitive)) 973 973 return child; 974 974 return 0; 975 975 } … … 984 984 //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string 985 985 //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters 986 986 //! \return Pointer to found sibling, or 0 if not found. 987 xml_node<Ch> *previous_sibling(const Ch * name = 0, std::size_tname_size = 0, bool case_sensitive = true) const987 xml_node<Ch> *previous_sibling(const Ch *p_name = 0, std::size_t p_name_size = 0, bool case_sensitive = true) const 988 988 { 989 989 assert(this->m_parent); // Cannot query for siblings if node has no parent 990 if ( name)990 if (p_name) 991 991 { 992 if ( name_size == 0)993 name_size = internal::measure(name);992 if (p_name_size == 0) 993 p_name_size = internal::measure(p_name); 994 994 for (xml_node<Ch> *sibling = m_prev_sibling; sibling; sibling = sibling->m_prev_sibling) 995 if (internal::compare(sibling->name(), sibling->name_size(), name,name_size, case_sensitive))995 if (internal::compare(sibling->name(), sibling->name_size(), p_name, p_name_size, case_sensitive)) 996 996 return sibling; 997 997 return 0; 998 998 } … … 1007 1007 //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string 1008 1008 //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters 1009 1009 //! \return Pointer to found sibling, or 0 if not found. 1010 xml_node<Ch> *next_sibling(const Ch * name = 0, std::size_tname_size = 0, bool case_sensitive = true) const1010 xml_node<Ch> *next_sibling(const Ch *p_name = 0, std::size_t p_name_size = 0, bool case_sensitive = true) const 1011 1011 { 1012 1012 assert(this->m_parent); // Cannot query for siblings if node has no parent 1013 if ( name)1013 if (p_name) 1014 1014 { 1015 if ( name_size == 0)1016 name_size = internal::measure(name);1015 if (p_name_size == 0) 1016 p_name_size = internal::measure(p_name); 1017 1017 for (xml_node<Ch> *sibling = m_next_sibling; sibling; sibling = sibling->m_next_sibling) 1018 if (internal::compare(sibling->name(), sibling->name_size(), name,name_size, case_sensitive))1018 if (internal::compare(sibling->name(), sibling->name_size(), p_name, p_name_size, case_sensitive)) 1019 1019 return sibling; 1020 1020 return 0; 1021 1021 } … … 1028 1028 //! \param name_size Size of name, in characters, or 0 to have size calculated automatically from string 1029 1029 //! \param case_sensitive Should name comparison be case-sensitive; non case-sensitive comparison works properly only for ASCII characters 1030 1030 //! \return Pointer to found attribute, or 0 if not found. 1031 xml_attribute<Ch> *first_attribute(const Ch * name = 0, std::size_tname_size = 0, bool case_sensitive = true) const1031 xml_attribute<Ch> *first_attribute(const Ch *p_name = 0, std::size_t p_name_size = 0, bool case_sensitive = true) const 1032 1032 { 1033 if ( name)1033 if (p_name) 1034 1034 { 1035 if ( name_size == 0)1036 name_size = internal::measure(name);1035 if (p_name_size == 0) 1036 p_name_size = internal::measure(p_name); 1037 1037 for (xml_attribute<Ch> *attribute = m_first_attribute; attribute; attribute = attribute->m_next_attribute) 1038 if (internal::compare(attribute->name(), attribute->name_size(), name,name_size, case_sensitive))1038 if (internal::compare(attribute->name(), attribute->name_size(), p_name, p_name_size, case_sensitive)) 1039 1039 return attribute; 1040 1040 return 0; 1041 1041 } … … 1068 1068 1069 1069 //! Sets type of node. 1070 1070 //! \param type Type of node to set. 1071 void type(node_type type)1071 void type(node_type p_type) 1072 1072 { 1073 m_type = type;1073 m_type = p_type; 1074 1074 } 1075 1075 1076 1076 /////////////////////////////////////////////////////////////////////////// … … 1793 1793 } 1794 1794 1795 1795 // Remember value start 1796 Ch * value = text;1796 Ch *text_value = text; 1797 1797 1798 1798 // Skip until end of comment 1799 1799 while (text[0] != Ch('-') || text[1] != Ch('-') || text[2] != Ch('>')) … … 1805 1805 1806 1806 // Create comment node 1807 1807 xml_node<Ch> *comment = this->allocate_node(node_comment); 1808 comment->value( value, text -value);1808 comment->value(text_value, text - text_value); 1809 1809 1810 1810 // Place zero terminator after comment value 1811 1811 if (!(Flags & parse_no_string_terminators)) … … 1820 1820 xml_node<Ch> *parse_doctype(Ch *&text) 1821 1821 { 1822 1822 // Remember value start 1823 Ch * value = text;1823 Ch *text_value = text; 1824 1824 1825 1825 // Skip to > 1826 1826 while (*text != Ch('>')) … … 1842 1842 case Ch('['): ++depth; break; 1843 1843 case Ch(']'): --depth; break; 1844 1844 case 0: RAPIDXML_PARSE_ERROR("unexpected end of data", text); 1845 default: break; 1845 1846 } 1846 1847 ++text; 1847 1848 } … … 1864 1865 { 1865 1866 // Create a new doctype node 1866 1867 xml_node<Ch> *doctype = this->allocate_node(node_doctype); 1867 doctype->value( value, text -value);1868 doctype->value(text_value, text - text_value); 1868 1869 1869 1870 // Place zero terminator after value 1870 1871 if (!(Flags & parse_no_string_terminators)) … … 1892 1893 xml_node<Ch> *pi = this->allocate_node(node_pi); 1893 1894 1894 1895 // Extract PI target name 1895 Ch * name = text;1896 Ch *text_name = text; 1896 1897 skip<node_name_pred, Flags>(text); 1897 if (text == name)1898 if (text == text_name) 1898 1899 RAPIDXML_PARSE_ERROR("expected PI target", text); 1899 pi->name( name, text -name);1900 pi->name(text_name, text - text_name); 1900 1901 1901 1902 // Skip whitespace between pi target and pi 1902 1903 skip<whitespace_pred, Flags>(text); 1903 1904 1904 1905 // Remember start of pi 1905 Ch * value = text;1906 Ch *text_value = text; 1906 1907 1907 1908 // Skip to '?>' 1908 1909 while (text[0] != Ch('?') || text[1] != Ch('>')) … … 1913 1914 } 1914 1915 1915 1916 // Set pi value (verbatim, no entity expansion or whitespace normalization) 1916 pi->value( value, text -value);1917 pi->value(text_value, text - text_value); 1917 1918 1918 1919 // Place zero terminator after name and value 1919 1920 if (!(Flags & parse_no_string_terminators)) … … 1950 1951 text = contents_start; 1951 1952 1952 1953 // Skip until end of data 1953 Ch * value = text, *end;1954 Ch *text_value = text, *end; 1954 1955 if (Flags & parse_normalize_whitespace) 1955 1956 end = skip_and_expand_character_refs<text_pred, text_pure_with_ws_pred, Flags>(text); 1956 1957 else … … 1978 1979 if (!(Flags & parse_no_data_nodes)) 1979 1980 { 1980 1981 xml_node<Ch> *data = this->allocate_node(node_data); 1981 data->value( value, end -value);1982 data->value(text_value, end - text_value); 1982 1983 node->append_node(data); 1983 1984 } 1984 1985 1985 1986 // Add data to parent node if no data exists yet 1986 1987 if (!(Flags & parse_no_element_values)) 1987 1988 if (*node->value() == Ch('\0')) 1988 node->value( value, end -value);1989 node->value(text_value, end - text_value); 1989 1990 1990 1991 // Place zero terminator after value 1991 1992 if (!(Flags & parse_no_string_terminators)) … … 2018 2019 } 2019 2020 2020 2021 // Skip until end of cdata 2021 Ch * value = text;2022 Ch *text_value = text; 2022 2023 while (text[0] != Ch(']') || text[1] != Ch(']') || text[2] != Ch('>')) 2023 2024 { 2024 2025 if (!text[0]) … … 2028 2029 2029 2030 // Create new cdata node 2030 2031 xml_node<Ch> *cdata = this->allocate_node(node_cdata); 2031 cdata->value( value, text -value);2032 cdata->value(text_value, text - text_value); 2032 2033 2033 2034 // Place zero terminator after value 2034 2035 if (!(Flags & parse_no_string_terminators)) … … 2046 2047 xml_node<Ch> *element = this->allocate_node(node_element); 2047 2048 2048 2049 // Extract element name 2049 Ch * name = text;2050 Ch *text_name = text; 2050 2051 skip<node_name_pred, Flags>(text); 2051 if (text == name)2052 if (text == text_name) 2052 2053 RAPIDXML_PARSE_ERROR("expected element name", text); 2053 element->name( name, text -name);2054 element->name(text_name, text - text_name); 2054 2055 2055 2056 // Skip whitespace between element name and attributes or > 2056 2057 skip<whitespace_pred, Flags>(text); … … 2151 2152 text += 9; // skip '!DOCTYPE ' 2152 2153 return parse_doctype<Flags>(text); 2153 2154 } 2155 default: break; 2154 2156 2155 2157 } // switch 2156 2158 … … 2247 2249 while (attribute_name_pred::test(*text)) 2248 2250 { 2249 2251 // Extract attribute name 2250 Ch * name = text;2252 Ch *text_name = text; 2251 2253 ++text; // Skip first character of attribute name 2252 2254 skip<attribute_name_pred, Flags>(text); 2253 if (text == name)2254 RAPIDXML_PARSE_ERROR("expected attribute name", name);2255 if (text == text_name) 2256 RAPIDXML_PARSE_ERROR("expected attribute name", text_name); 2255 2257 2256 2258 // Create new attribute 2257 2259 xml_attribute<Ch> *attribute = this->allocate_attribute(); 2258 attribute->name( name, text -name);2260 attribute->name(text_name, text - text_name); 2259 2261 node->append_attribute(attribute); 2260 2262 2261 2263 // Skip whitespace after attribute name … … 2280 2282 ++text; 2281 2283 2282 2284 // Extract attribute value and expand char refs in it 2283 Ch * value = text, *end;2285 Ch *text_value = text, *end; 2284 2286 const int AttFlags = Flags & ~parse_normalize_whitespace; // No whitespace normalization in attributes 2285 2287 if (quote == Ch('\'')) 2286 2288 end = skip_and_expand_character_refs<attribute_value_pred<Ch('\'')>, attribute_value_pure_pred<Ch('\'')>, AttFlags>(text); … … 2288 2290 end = skip_and_expand_character_refs<attribute_value_pred<Ch('"')>, attribute_value_pure_pred<Ch('"')>, AttFlags>(text); 2289 2291 2290 2292 // Set attribute value 2291 attribute->value( value, end -value);2293 attribute->value(text_value, end - text_value); 2292 2294 2293 2295 // Make sure that end quote is present 2294 2296 if (*text != quote) -
boost/property_tree/detail/ptree_implementation.hpp
161 161 } 162 162 163 163 template<class K, class D, class C> inline 164 basic_ptree<K, D, C>::basic_ptree(const data_type & data)165 : m_data( data), m_children(new typename subs::base_container)164 basic_ptree<K, D, C>::basic_ptree(const data_type &p_data) 165 : m_data(p_data), m_children(new typename subs::base_container) 166 166 { 167 167 } 168 168 -
boost/property_tree/detail/xml_parser_error.hpp
20 20 class xml_parser_error: public file_parser_error 21 21 { 22 22 public: 23 xml_parser_error(const std::string & message,24 const std::string & filename,25 unsigned long line):26 file_parser_error( message, filename,line)23 xml_parser_error(const std::string &p_message, 24 const std::string &p_filename, 25 unsigned long p_line): 26 file_parser_error(p_message, p_filename, p_line) 27 27 { 28 28 } 29 29 }; -
boost/property_tree/detail/xml_parser_writer_settings.hpp
35 35 class xml_writer_settings 36 36 { 37 37 public: 38 xml_writer_settings(Ch indent_char = Ch(' '),39 typename std::basic_string<Ch>::size_type indent_count = 0,40 const std::basic_string<Ch> & encoding = widen<Ch>("utf-8"))41 : indent_char( indent_char)42 , indent_count( indent_count)43 , encoding( encoding)38 xml_writer_settings(Ch p_indent_char = Ch(' '), 39 typename std::basic_string<Ch>::size_type p_indent_count = 0, 40 const std::basic_string<Ch> &p_encoding = widen<Ch>("utf-8")) 41 : indent_char(p_indent_char) 42 , indent_count(p_indent_count) 43 , encoding(p_encoding) 44 44 { 45 45 } 46 46 -
boost/exception/exception.hpp
411 411 412 412 void 413 413 rethrow() const 414 #if BOOST_WORKAROUND(__GNUC__, >= 3) 415 __attribute__((noreturn)) 416 #endif 414 417 { 415 418 throw*this; 416 419 } -
boost/multi_index_container.hpp
360 360 IteratorType it 361 361 BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int,N)) 362 362 { 363 typedef typename nth_index<N>::type index;363 typedef typename nth_index<N>::type n_index; 364 364 365 365 #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */ 366 366 BOOST_STATIC_ASSERT( … … 371 371 BOOST_MULTI_INDEX_CHECK_IS_OWNER( 372 372 it,static_cast<typename IteratorType::container_type&>(*this)); 373 373 374 return index::make_iterator(static_cast<node_type*>(it.get_node()));374 return n_index::make_iterator(static_cast<node_type*>(it.get_node())); 375 375 } 376 376 377 377 template<int N,typename IteratorType> … … 379 379 IteratorType it 380 380 BOOST_APPEND_EXPLICIT_TEMPLATE_NON_TYPE(int,N))const 381 381 { 382 typedef typename nth_index<N>::type index;382 typedef typename nth_index<N>::type n_index; 383 383 384 384 #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */ 385 385 BOOST_STATIC_ASSERT(( … … 390 390 BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it); 391 391 BOOST_MULTI_INDEX_CHECK_IS_OWNER( 392 392 it,static_cast<const typename IteratorType::container_type&>(*this)); 393 return index::make_iterator(static_cast<node_type*>(it.get_node()));393 return n_index::make_iterator(static_cast<node_type*>(it.get_node())); 394 394 } 395 395 #endif 396 396 … … 414 414 IteratorType it 415 415 BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag)) 416 416 { 417 typedef typename index<Tag>::type index;417 typedef typename index<Tag>::type tag_index; 418 418 419 419 #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */ 420 420 BOOST_STATIC_ASSERT( … … 424 424 BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it); 425 425 BOOST_MULTI_INDEX_CHECK_IS_OWNER( 426 426 it,static_cast<typename IteratorType::container_type&>(*this)); 427 return index::make_iterator(static_cast<node_type*>(it.get_node()));427 return tag_index::make_iterator(static_cast<node_type*>(it.get_node())); 428 428 } 429 429 430 430 template<typename Tag,typename IteratorType> … … 432 432 IteratorType it 433 433 BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))const 434 434 { 435 typedef typename index<Tag>::type index;435 typedef typename index<Tag>::type tag_index; 436 436 437 437 #if !defined(__SUNPRO_CC)||!(__SUNPRO_CC<0x580) /* fails in Sun C++ 5.7 */ 438 438 BOOST_STATIC_ASSERT(( … … 443 443 BOOST_MULTI_INDEX_CHECK_VALID_ITERATOR(it); 444 444 BOOST_MULTI_INDEX_CHECK_IS_OWNER( 445 445 it,static_cast<const typename IteratorType::container_type&>(*this)); 446 return index::make_iterator(static_cast<node_type*>(it.get_node()));446 return tag_index::make_iterator(static_cast<node_type*>(it.get_node())); 447 447 } 448 448 #endif 449 449 -
boost/test/utils/lazy_ostream.hpp
45 45 // actual printing interface; to be accessed only by this class and children 46 46 virtual std::ostream& operator()( std::ostream& ostr ) const { return ostr; } 47 47 protected: 48 explicit lazy_ostream( bool empty = true ) : m_empty(empty ) {}48 explicit lazy_ostream( bool p_empty = true ) : m_empty( p_empty ) {} 49 49 50 50 // protected destructor to make sure right one is called 51 51 #if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x582))