FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

linker-map.gnu: Verbose comments, clean up spacing.

Browse source 
2002-08-23  Phil Edwards  <pme@gcc.gnu.org>

	* config/linker-map.gnu:  Verbose comments, clean up spacing.
	* include/bits/stl_alloc.h:  Fix indentation of 'if' bodies, return
	statements.
	__allocator:  Change class declaration to struct.
	* docs/html/17_intro/C++STYLE:  Fix typo.
	* include/bits/stl_deque.h, include/bits/stl_list.h,
	include/bits/stl_map.h, include/bits/stl_multimap.h,
	include/bits/stl_vector.h:  Fix fallout from typo.

From-SVN: r56540
This commit is contained in:
Phil Edwards 2002-08-23 16:52:29 +00:00
parent 939e32f060
commit 6dc5fdfd5f
9 changed files with 83 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,14 @@
2002-08-23 Phil Edwards <pme@gcc.gnu.org>
* config/linker-map.gnu: Verbose comments, clean up spacing.
* include/bits/stl_alloc.h: Fix indentation of 'if' bodies, return
statements.
__allocator: Change class declaration to struct.
* docs/html/17_intro/C++STYLE: Fix typo.
* include/bits/stl_deque.h, include/bits/stl_list.h,
include/bits/stl_map.h, include/bits/stl_multimap.h,
include/bits/stl_vector.h: Fix fallout from typo.
2002-08-22 Benjamin Kosnik <bkoz@redhat.com> 2002-08-22 Benjamin Kosnik <bkoz@redhat.com>
* acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Set * acinclude.m4 (GLIBCPP_CONFIGURE_TESTSUITE): Set

2
libstdc++-v3/config/linker-map.gnu
View file

@ -42,6 +42,8 @@ GLIBCPP_3.2 {
}; };
# Names not in an 'extern' block are mangled names. # Names not in an 'extern' block are mangled names.
# std::has_facet*
_ZSt9has_facet*; _ZSt9has_facet*;
# operator new(unsigned) # operator new(unsigned)

14
libstdc++-v3/docs/html/17_intro/C++STYLE
View file

@ -173,7 +173,7 @@ Notable areas of divergence from what may be previous local practice
int foo; int foo;
13. Spacing WRT return statements. 13. Spacing WRT return statements.
no extra spacing before returns no extra spacing before returns, no parenthesis
ie ie
} }
@ -184,6 +184,12 @@ Notable areas of divergence from what may be previous local practice
return __ret; return __ret;
-NOT-
}
return (__ret);
14. Location of global variables. 14. Location of global variables.
All global variables of class type, whether in the "user visable" All global variables of class type, whether in the "user visable"
space (e.g., cin) or the implementation namespace, must be defined space (e.g., cin) or the implementation namespace, must be defined
@ -264,7 +270,7 @@ namespace std
int int
two_lines(const char* arg) two_lines(const char* arg)
{ return strchr(arg, 'a'); } { return strchr(arg, 'a'); }
inline int inline int
three_lines(); // inline, but defined below. three_lines(); // inline, but defined below.
@ -360,7 +366,3 @@ namespace std
} }
} // namespace std } // namespace std

53
libstdc++-v3/include/bits/stl_alloc.h
View file

@ -111,6 +111,7 @@ namespace std
{ ::operator delete(__p); } { ::operator delete(__p); }
}; };
/** /**
* @if maint * @if maint
* A malloc-based allocator. Typically slower than the * A malloc-based allocator. Typically slower than the
@ -159,7 +160,7 @@ namespace std
{ {
void (* __old)() = __malloc_alloc_oom_handler; void (* __old)() = __malloc_alloc_oom_handler;
__malloc_alloc_oom_handler = __f; __malloc_alloc_oom_handler = __f;
return(__old); return __old;
} }
}; };
@ -179,11 +180,11 @@ namespace std
{ {
__my_malloc_handler = __malloc_alloc_oom_handler; __my_malloc_handler = __malloc_alloc_oom_handler;
if (0 == __my_malloc_handler) if (0 == __my_malloc_handler)
std::__throw_bad_alloc(); std::__throw_bad_alloc();
(*__my_malloc_handler)(); (*__my_malloc_handler)();
__result = malloc(__n); __result = malloc(__n);
if (__result) if (__result)
return(__result); return __result;
} }
} }
@ -204,7 +205,7 @@ namespace std
(*__my_malloc_handler)(); (*__my_malloc_handler)();
__result = realloc(__p, __n); __result = realloc(__p, __n);
if (__result) if (__result)
return(__result); return __result;
} }
} }
#endif #endif
@ -230,25 +231,25 @@ namespace std
* (See @link Allocators allocators info @endlink for more.) * (See @link Allocators allocators info @endlink for more.)
*/ */
template<typename _Tp, typename _Alloc> template<typename _Tp, typename _Alloc>
class __simple_alloc class __simple_alloc
{ {
public: public:
static _Tp* static _Tp*
allocate(size_t __n) allocate(size_t __n)
{ return 0 == __n ? 0 : (_Tp*) _Alloc::allocate(__n * sizeof (_Tp)); } { return 0 == __n ? 0 : (_Tp*) _Alloc::allocate(__n * sizeof (_Tp)); }
static _Tp* static _Tp*
allocate() allocate()
{ return (_Tp*) _Alloc::allocate(sizeof (_Tp)); } { return (_Tp*) _Alloc::allocate(sizeof (_Tp)); }
static void static void
deallocate(_Tp* __p, size_t __n) deallocate(_Tp* __p, size_t __n)
{ if (0 != __n) _Alloc::deallocate(__p, __n * sizeof (_Tp)); } { if (0 != __n) _Alloc::deallocate(__p, __n * sizeof (_Tp)); }
static void static void
deallocate(_Tp* __p) deallocate(_Tp* __p)
{ _Alloc::deallocate(__p, sizeof (_Tp)); } { _Alloc::deallocate(__p, sizeof (_Tp)); }
}; };
/** /**
@ -479,7 +480,7 @@ namespace std
{ {
__result = _S_start_free; __result = _S_start_free;
_S_start_free += __total_bytes; _S_start_free += __total_bytes;
return(__result); return __result ;
} }
else if (__bytes_left >= __size) else if (__bytes_left >= __size)
{ {
@ -487,7 +488,7 @@ namespace std
__total_bytes = __size * __nobjs; __total_bytes = __size * __nobjs;
__result = _S_start_free; __result = _S_start_free;
_S_start_free += __total_bytes; _S_start_free += __total_bytes;
return(__result); return __result;
} }
else else
{ {
@ -521,7 +522,7 @@ namespace std
*__my_free_list = __p -> _M_free_list_link; *__my_free_list = __p -> _M_free_list_link;
_S_start_free = (char*)__p; _S_start_free = (char*)__p;
_S_end_free = _S_start_free + __i; _S_end_free = _S_start_free + __i;
return(_S_chunk_alloc(__size, __nobjs)); return _S_chunk_alloc(__size, __nobjs);
// Any leftover piece will eventually make it to the // Any leftover piece will eventually make it to the
// right free list. // right free list.
} }
@ -533,7 +534,7 @@ namespace std
} }
_S_heap_size += __bytes_to_get; _S_heap_size += __bytes_to_get;
_S_end_free = _S_start_free + __bytes_to_get; _S_end_free = _S_start_free + __bytes_to_get;
return(_S_chunk_alloc(__size, __nobjs)); return _S_chunk_alloc(__size, __nobjs);
} }
} }
@ -554,7 +555,7 @@ namespace std
int __i; int __i;
if (1 == __nobjs) if (1 == __nobjs)
return(__chunk); return __chunk;
__my_free_list = _S_free_list + _S_freelist_index(__n); __my_free_list = _S_free_list + _S_freelist_index(__n);
// Build free list in chunk. // Build free list in chunk.
@ -784,7 +785,7 @@ namespace std
}; };
template<typename _Alloc> template<typename _Alloc>
class __allocator<void, _Alloc> struct __allocator<void, _Alloc>
{ {
typedef size_t size_type; typedef size_t size_type;
typedef ptrdiff_t difference_type; typedef ptrdiff_t difference_type;

6
libstdc++-v3/include/bits/stl_deque.h
View file

@ -81,7 +81,7 @@ namespace std
*/ */
inline size_t inline size_t
__deque_buf_size(size_t __size) __deque_buf_size(size_t __size)
{ return __size < 512 ? size_t(512 / __size) : size_t(1); } { return __size < 512 ? size_t(512 / __size) : size_t(1); }
/** /**
@ -1160,7 +1160,7 @@ namespace std
*/ */
iterator iterator
insert(iterator __position) insert(iterator __position)
{ return insert(__position, value_type()); } { return insert(__position, value_type()); }
#endif #endif
/** /**
@ -1174,7 +1174,7 @@ namespace std
*/ */
void void
insert(iterator __position, size_type __n, const value_type& __x) insert(iterator __position, size_type __n, const value_type& __x)
{ _M_fill_insert(__position, __n, __x); } { _M_fill_insert(__position, __n, __x); }
/** /**
* @brief Inserts a range into the %deque. * @brief Inserts a range into the %deque.

24
libstdc++-v3/include/bits/stl_list.h
View file

@ -113,20 +113,20 @@ namespace std
/// Walk the %list forward. /// Walk the %list forward.
void void
_M_incr() _M_incr()
{ _M_node = _M_node->_M_next; } { _M_node = _M_node->_M_next; }
/// Walk the %list backward. /// Walk the %list backward.
void void
_M_decr() _M_decr()
{ _M_node = _M_node->_M_prev; } { _M_node = _M_node->_M_prev; }
bool bool
operator==(const _List_iterator_base& __x) const operator==(const _List_iterator_base& __x) const
{ return _M_node == __x._M_node; } { return _M_node == __x._M_node; }
bool bool
operator!=(const _List_iterator_base& __x) const operator!=(const _List_iterator_base& __x) const
{ return _M_node != __x._M_node; } { return _M_node != __x._M_node; }
}; };
/** /**
@ -164,12 +164,12 @@ namespace std
reference reference
operator*() const operator*() const
{ return static_cast<_Node*>(_M_node)->_M_data; } { return static_cast<_Node*>(_M_node)->_M_data; }
// Must downcast from List_node_base to _List_node to get to _M_data. // Must downcast from List_node_base to _List_node to get to _M_data.
pointer pointer
operator->() const operator->() const
{ return &(operator*()); } { return &(operator*()); }
_Self& _Self&
operator++() operator++()
@ -226,11 +226,11 @@ namespace std
protected: protected:
_List_node<_Tp>* _List_node<_Tp>*
_M_get_node() _M_get_node()
{ return _M_node_allocator.allocate(1); } { return _M_node_allocator.allocate(1); }
void void
_M_put_node(_List_node<_Tp>* __p) _M_put_node(_List_node<_Tp>* __p)
{ _M_node_allocator.deallocate(__p, 1); } { _M_node_allocator.deallocate(__p, 1); }
// NOTA BENE // NOTA BENE
// The stored instance is not actually of "allocator_type"'s type. Instead // The stored instance is not actually of "allocator_type"'s type. Instead
@ -272,11 +272,11 @@ namespace std
_List_node<_Tp>* _List_node<_Tp>*
_M_get_node() _M_get_node()
{ return _Alloc_type::allocate(1); } { return _Alloc_type::allocate(1); }
void void
_M_put_node(_List_node<_Tp>* __p) _M_put_node(_List_node<_Tp>* __p)
{ _Alloc_type::deallocate(__p, 1); } { _Alloc_type::deallocate(__p, 1); }
_List_node<_Tp>* _M_node; _List_node<_Tp>* _M_node;
}; };
@ -828,7 +828,7 @@ namespace std
*/ */
void void
insert(iterator __pos, size_type __n, const value_type& __x) insert(iterator __pos, size_type __n, const value_type& __x)
{ _M_fill_insert(__pos, __n, __x); } { _M_fill_insert(__pos, __n, __x); }
/** /**
* @brief Inserts a range into the %list. * @brief Inserts a range into the %list.

16
libstdc++-v3/include/bits/stl_map.h
View file

@ -109,7 +109,7 @@ namespace std
value_compare(_Compare __c) : comp(__c) {} value_compare(_Compare __c) : comp(__c) {}
public: public:
bool operator()(const value_type& __x, const value_type& __y) const bool operator()(const value_type& __x, const value_type& __y) const
{ return comp(__x.first, __y.first); } { return comp(__x.first, __y.first); }
}; };
private: private:
@ -337,7 +337,7 @@ namespace std
*/ */
pair<iterator,bool> pair<iterator,bool>
insert(const value_type& __x) insert(const value_type& __x)
{ return _M_t.insert_unique(__x); } { return _M_t.insert_unique(__x); }
/** /**
* @brief Attempts to insert a std::pair into the %map. * @brief Attempts to insert a std::pair into the %map.
@ -361,7 +361,7 @@ namespace std
*/ */
iterator iterator
insert(iterator position, const value_type& __x) insert(iterator position, const value_type& __x)
{ return _M_t.insert_unique(position, __x); } { return _M_t.insert_unique(position, __x); }
/** /**
* @brief A template function that attemps to insert a range of elements. * @brief A template function that attemps to insert a range of elements.
@ -374,7 +374,7 @@ namespace std
template <typename _InputIterator> template <typename _InputIterator>
void void
insert(_InputIterator __first, _InputIterator __last) insert(_InputIterator __first, _InputIterator __last)
{ _M_t.insert_unique(__first, __last); } { _M_t.insert_unique(__first, __last); }
/** /**
* @brief Erases an element from a %map. * @brief Erases an element from a %map.
@ -491,7 +491,7 @@ namespace std
*/ */
size_type size_type
count(const key_type& __x) const count(const key_type& __x) const
{ return _M_t.find(__x) == _M_t.end() ? 0 : 1; } { return _M_t.find(__x) == _M_t.end() ? 0 : 1; }
/** /**
* @brief Finds the beginning of a subsequence matching given key. * @brief Finds the beginning of a subsequence matching given key.
@ -541,7 +541,7 @@ namespace std
*/ */
const_iterator const_iterator
upper_bound(const key_type& __x) const upper_bound(const key_type& __x) const
{ return _M_t.upper_bound(__x); } { return _M_t.upper_bound(__x); }
/** /**
* @brief Finds a subsequence matching given key. * @brief Finds a subsequence matching given key.
@ -560,7 +560,7 @@ namespace std
*/ */
pair<iterator,iterator> pair<iterator,iterator>
equal_range(const key_type& __x) equal_range(const key_type& __x)
{ return _M_t.equal_range(__x); } { return _M_t.equal_range(__x); }
/** /**
* @brief Finds a subsequence matching given key. * @brief Finds a subsequence matching given key.
@ -579,7 +579,7 @@ namespace std
*/ */
pair<const_iterator,const_iterator> pair<const_iterator,const_iterator>
equal_range(const key_type& __x) const equal_range(const key_type& __x) const
{ return _M_t.equal_range(__x); } { return _M_t.equal_range(__x); }
template <typename _K1, typename _T1, typename _C1, typename _A1> template <typename _K1, typename _T1, typename _C1, typename _A1>
friend bool operator== (const map<_K1,_T1,_C1,_A1>&, friend bool operator== (const map<_K1,_T1,_C1,_A1>&,

6
libstdc++-v3/include/bits/stl_multimap.h
View file

@ -123,7 +123,7 @@ namespace std
value_compare(_Compare __c) : comp(__c) {} value_compare(_Compare __c) : comp(__c) {}
public: public:
bool operator()(const value_type& __x, const value_type& __y) const bool operator()(const value_type& __x, const value_type& __y) const
{ return comp(__x.first, __y.first); } { return comp(__x.first, __y.first); }
}; };
private: private:
@ -347,7 +347,7 @@ namespace std
*/ */
iterator iterator
insert(iterator __position, const value_type& __x) insert(iterator __position, const value_type& __x)
{ return _M_t.insert_equal(__position, __x); } { return _M_t.insert_equal(__position, __x); }
/** /**
* @brief A template function that attemps to insert a range of elements. * @brief A template function that attemps to insert a range of elements.
@ -360,7 +360,7 @@ namespace std
template <typename _InputIterator> template <typename _InputIterator>
void void
insert(_InputIterator __first, _InputIterator __last) insert(_InputIterator __first, _InputIterator __last)
{ _M_t.insert_equal(__first, __last); } { _M_t.insert_equal(__first, __last); }
/** /**
* @brief Erases an element from a %multimap. * @brief Erases an element from a %multimap.

8
libstdc++-v3/include/bits/stl_vector.h
View file

@ -98,7 +98,7 @@ namespace std
void void
_M_deallocate(_Tp* __p, size_t __n) _M_deallocate(_Tp* __p, size_t __n)
{ if (__p) _M_data_allocator.deallocate(__p, __n); } { if (__p) _M_data_allocator.deallocate(__p, __n); }
}; };
/// @if maint Specialization for instanceless allocators. @endif /// @if maint Specialization for instanceless allocators. @endif
@ -447,7 +447,7 @@ namespace std
*/ */
size_type size_type
capacity() const capacity() const
{ return size_type(const_iterator(_M_end_of_storage) - begin()); } { return size_type(const_iterator(_M_end_of_storage) - begin()); }
/** /**
* Returns true if the %vector is empty. (Thus begin() would equal end().) * Returns true if the %vector is empty. (Thus begin() would equal end().)
@ -631,7 +631,7 @@ namespace std
*/ */
iterator iterator
insert(iterator __position) insert(iterator __position)
{ return insert(__position, value_type()); } { return insert(__position, value_type()); }
#endif #endif
/** /**
@ -648,7 +648,7 @@ namespace std
*/ */
void void
insert (iterator __pos, size_type __n, const value_type& __x) insert (iterator __pos, size_type __n, const value_type& __x)
{ _M_fill_insert(__pos, __n, __x); } { _M_fill_insert(__pos, __n, __x); }
/** /**
* @brief Inserts a range into the %vector. * @brief Inserts a range into the %vector.