mirror of git://gcc.gnu.org/git/gcc.git
tables.html: Finished now.
2003-01-11 Phil Edwards <pme@gcc.gnu.org> * docs/doxygen/tables.html: Finished now. * docs/doxygen/user.cfg.in: Update to latest version of Doxygen. * include/bits/basic_ios.h (basic_ios::rdbuf): Add example to comments. * include/bits/deque.tcc, include/bits/stl_alloc.h, include/bits/stl_deque.h, include/bits/stl_list.h, include/bits/stl_vector.h: Remove _GLIBCPP_DEPRECATED bits scheduled for 3.4 removal. From-SVN: r61221
This commit is contained in:
parent
b3504bc126
commit
3a9fdf3058
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -31,10 +31,6 @@
|
||||||
are also noted or incorporated.
|
are also noted or incorporated.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p class="smallertext">This will probably be incomplete for a while because
|
|
||||||
filling out the tables is mind-frothingly boring. Also, the HTML table
|
|
||||||
rendering is ugly. (Update: mozilla 0.9.9 looks MUCH better.)</p>
|
|
||||||
|
|
||||||
<hr />
|
<hr />
|
||||||
|
|
||||||
<a name="65"><p>
|
<a name="65"><p>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# Doxyfile 1.2.18
|
# Doxyfile 1.3-rc2
|
||||||
|
|
||||||
# This file describes the settings to be used by the documentation system
|
# This file describes the settings to be used by the documentation system
|
||||||
# doxygen (www.doxygen.org) for a project
|
# doxygen (www.doxygen.org) for a project
|
||||||
|
@ -48,7 +48,6 @@ OUTPUT_DIRECTORY = @outdir@
|
||||||
# (Japanese with english messages), Korean, Norwegian, Polish, Portuguese,
|
# (Japanese with english messages), Korean, Norwegian, Polish, Portuguese,
|
||||||
# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish and Ukrainian.
|
# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish and Ukrainian.
|
||||||
|
|
||||||
|
|
||||||
OUTPUT_LANGUAGE = English
|
OUTPUT_LANGUAGE = English
|
||||||
|
|
||||||
# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
|
# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
|
||||||
|
@ -96,6 +95,13 @@ HIDE_UNDOC_CLASSES = YES
|
||||||
|
|
||||||
HIDE_FRIEND_COMPOUNDS = NO
|
HIDE_FRIEND_COMPOUNDS = NO
|
||||||
|
|
||||||
|
# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
|
||||||
|
# documentation blocks found inside the body of a function.
|
||||||
|
# If set to NO (the default) these blocks will be appended to the
|
||||||
|
# function's detailed documentation block.
|
||||||
|
|
||||||
|
HIDE_IN_BODY_DOCS = NO
|
||||||
|
|
||||||
# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
|
# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
|
||||||
# include brief member descriptions after the members that are listed in
|
# include brief member descriptions after the members that are listed in
|
||||||
# the file and class documentation (similar to JavaDoc).
|
# the file and class documentation (similar to JavaDoc).
|
||||||
|
@ -144,12 +150,6 @@ STRIP_FROM_PATH =
|
||||||
|
|
||||||
INTERNAL_DOCS = NO
|
INTERNAL_DOCS = NO
|
||||||
|
|
||||||
# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
|
|
||||||
# doxygen to hide any special comment blocks from generated source code
|
|
||||||
# fragments. Normal C and C++ comments will always remain visible.
|
|
||||||
|
|
||||||
STRIP_CODE_COMMENTS = YES
|
|
||||||
|
|
||||||
# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
|
# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
|
||||||
# file names in lower case letters. If set to YES upper case letters are also
|
# file names in lower case letters. If set to YES upper case letters are also
|
||||||
# allowed. This is useful if you have classes or files whose names only differ
|
# allowed. This is useful if you have classes or files whose names only differ
|
||||||
|
@ -267,7 +267,7 @@ GENERATE_DEPRECATEDLIST= YES
|
||||||
# You can put \n's in the value part of an alias to insert newlines.
|
# You can put \n's in the value part of an alias to insert newlines.
|
||||||
|
|
||||||
ALIASES = "doctodo=@todo\nDoc me! See docs/doxygen/TODO and http://gcc.gnu.org/ml/libstdc++/2002-02/msg00003.html for more." \
|
ALIASES = "doctodo=@todo\nDoc me! See docs/doxygen/TODO and http://gcc.gnu.org/ml/libstdc++/2002-02/msg00003.html for more." \
|
||||||
"isiosfwd=One of the @link s27_2_iosfwd I/O forward declarations @endlink"
|
"isiosfwd=One of the @link s27_2_iosfwd I/O forward declarations @endlink"
|
||||||
|
|
||||||
# The ENABLED_SECTIONS tag can be used to enable conditional
|
# The ENABLED_SECTIONS tag can be used to enable conditional
|
||||||
# documentation sections, marked by \if sectionname ... \endif.
|
# documentation sections, marked by \if sectionname ... \endif.
|
||||||
|
@ -325,6 +325,13 @@ WARNINGS = NO
|
||||||
|
|
||||||
WARN_IF_UNDOCUMENTED = NO
|
WARN_IF_UNDOCUMENTED = NO
|
||||||
|
|
||||||
|
# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
|
||||||
|
# potential errors in the documentation, such as not documenting some
|
||||||
|
# parameters in a documented function, or documenting parameters that
|
||||||
|
# don't exist or using markup commands wrongly.
|
||||||
|
|
||||||
|
WARN_IF_DOC_ERROR = NO
|
||||||
|
|
||||||
# The WARN_FORMAT tag determines the format of the warning messages that
|
# The WARN_FORMAT tag determines the format of the warning messages that
|
||||||
# doxygen can produce. The string should contain the $file, $line, and $text
|
# doxygen can produce. The string should contain the $file, $line, and $text
|
||||||
# tags, which will be replaced by the file and line number from which the
|
# tags, which will be replaced by the file and line number from which the
|
||||||
|
@ -375,7 +382,8 @@ RECURSIVE = YES
|
||||||
# excluded from the INPUT source files. This way you can easily exclude a
|
# excluded from the INPUT source files. This way you can easily exclude a
|
||||||
# subdirectory from a directory tree whose root is specified with the INPUT tag.
|
# subdirectory from a directory tree whose root is specified with the INPUT tag.
|
||||||
|
|
||||||
EXCLUDE = Makefile CVS
|
EXCLUDE = Makefile \
|
||||||
|
CVS
|
||||||
|
|
||||||
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
|
# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories
|
||||||
# that are symbolic links (a Unix filesystem feature) are excluded from the input.
|
# that are symbolic links (a Unix filesystem feature) are excluded from the input.
|
||||||
|
@ -445,6 +453,12 @@ SOURCE_BROWSER = YES
|
||||||
|
|
||||||
INLINE_SOURCES = NO
|
INLINE_SOURCES = NO
|
||||||
|
|
||||||
|
# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
|
||||||
|
# doxygen to hide any special comment blocks from generated source code
|
||||||
|
# fragments. Normal C and C++ comments will always remain visible.
|
||||||
|
|
||||||
|
STRIP_CODE_COMMENTS = YES
|
||||||
|
|
||||||
# If the REFERENCED_BY_RELATION tag is set to YES (the default)
|
# If the REFERENCED_BY_RELATION tag is set to YES (the default)
|
||||||
# then for each documented function all documented
|
# then for each documented function all documented
|
||||||
# functions referencing it will be listed.
|
# functions referencing it will be listed.
|
||||||
|
@ -606,8 +620,8 @@ GENERATE_LATEX = NO
|
||||||
|
|
||||||
LATEX_OUTPUT = latex
|
LATEX_OUTPUT = latex
|
||||||
|
|
||||||
# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to
|
# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
|
||||||
# be invoked. If left blank `latex' will be used as the default command name.
|
# invoked. If left blank `latex' will be used as the default command name.
|
||||||
|
|
||||||
LATEX_CMD_NAME = latex
|
LATEX_CMD_NAME = latex
|
||||||
|
|
||||||
|
@ -767,6 +781,39 @@ XML_DTD =
|
||||||
|
|
||||||
GENERATE_AUTOGEN_DEF = NO
|
GENERATE_AUTOGEN_DEF = NO
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------
|
||||||
|
# configuration options related to the Perl module output
|
||||||
|
#---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
# If the GENERATE_PERLMOD tag is set to YES Doxygen will
|
||||||
|
# generate a Perl module file that captures the structure of
|
||||||
|
# the code including all documentation. Note that this
|
||||||
|
# feature is still experimental and incomplete at the
|
||||||
|
# moment.
|
||||||
|
|
||||||
|
GENERATE_PERLMOD = NO
|
||||||
|
|
||||||
|
# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
|
||||||
|
# the necessary Makefile rules, Perl scripts and LaTeX code to be able
|
||||||
|
# to generate PDF and DVI output from the Perl module output.
|
||||||
|
|
||||||
|
PERLMOD_LATEX = NO
|
||||||
|
|
||||||
|
# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
|
||||||
|
# nicely formatted so it can be parsed by a human reader. This is useful
|
||||||
|
# if you want to understand what is going on. On the other hand, if this
|
||||||
|
# tag is set to NO the size of the Perl module output will be much smaller
|
||||||
|
# and Perl will parse it just the same.
|
||||||
|
|
||||||
|
PERLMOD_PRETTY = YES
|
||||||
|
|
||||||
|
# The names of the make variables in the generated doxyrules.make file
|
||||||
|
# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
|
||||||
|
# This is useful so different doxyrules.make files included by the same
|
||||||
|
# Makefile don't overwrite each other's variables.
|
||||||
|
|
||||||
|
PERLMOD_MAKEVAR_PREFIX =
|
||||||
|
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# Configuration options related to the preprocessor
|
# Configuration options related to the preprocessor
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
|
@ -1022,6 +1069,3 @@ BIN_ABSPATH = /usr/local/bin/
|
||||||
# the documentation for these projects as well.
|
# the documentation for these projects as well.
|
||||||
|
|
||||||
EXT_DOC_PATHS =
|
EXT_DOC_PATHS =
|
||||||
|
|
||||||
### End of file.
|
|
||||||
|
|
||||||
|
|
|
@ -302,7 +302,14 @@ namespace std
|
||||||
* in derived classes by overrides of the zero-argument @c rdbuf(),
|
* in derived classes by overrides of the zero-argument @c rdbuf(),
|
||||||
* which is non-virtual for hysterical raisins. As a result, you
|
* which is non-virtual for hysterical raisins. As a result, you
|
||||||
* must use explicit qualifications to access this function via any
|
* must use explicit qualifications to access this function via any
|
||||||
* derived class.
|
* derived class. For example:
|
||||||
|
*
|
||||||
|
* @code
|
||||||
|
* std::fstream foo; // or some other derived type
|
||||||
|
* std::streambuf* p = .....;
|
||||||
|
*
|
||||||
|
* foo.ios::rdbuf(p); // ios == basic_ios<char>
|
||||||
|
* @endcode
|
||||||
*/
|
*/
|
||||||
basic_streambuf<_CharT, _Traits>*
|
basic_streambuf<_CharT, _Traits>*
|
||||||
rdbuf(basic_streambuf<_CharT, _Traits>* __sb);
|
rdbuf(basic_streambuf<_CharT, _Traits>* __sb);
|
||||||
|
|
|
@ -328,29 +328,6 @@ namespace std
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
// Called only if _M_finish._M_cur == _M_finish._M_last - 1.
|
|
||||||
template <typename _Tp, typename _Alloc>
|
|
||||||
void
|
|
||||||
deque<_Tp,_Alloc>::
|
|
||||||
_M_push_back_aux()
|
|
||||||
{
|
|
||||||
_M_reserve_map_at_back();
|
|
||||||
*(_M_finish._M_node + 1) = _M_allocate_node();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
_Construct(_M_finish._M_cur);
|
|
||||||
_M_finish._M_set_node(_M_finish._M_node + 1);
|
|
||||||
_M_finish._M_cur = _M_finish._M_first;
|
|
||||||
}
|
|
||||||
catch(...)
|
|
||||||
{
|
|
||||||
_M_deallocate_node(*(_M_finish._M_node + 1));
|
|
||||||
__throw_exception_again;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Called only if _M_start._M_cur == _M_start._M_first.
|
// Called only if _M_start._M_cur == _M_start._M_first.
|
||||||
template <typename _Tp, typename _Alloc>
|
template <typename _Tp, typename _Alloc>
|
||||||
void
|
void
|
||||||
|
@ -374,30 +351,6 @@ namespace std
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
// Called only if _M_start._M_cur == _M_start._M_first.
|
|
||||||
template <typename _Tp, typename _Alloc>
|
|
||||||
void
|
|
||||||
deque<_Tp,_Alloc>::
|
|
||||||
_M_push_front_aux()
|
|
||||||
{
|
|
||||||
_M_reserve_map_at_front();
|
|
||||||
*(_M_start._M_node - 1) = _M_allocate_node();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
_M_start._M_set_node(_M_start._M_node - 1);
|
|
||||||
_M_start._M_cur = _M_start._M_last - 1;
|
|
||||||
_Construct(_M_start._M_cur);
|
|
||||||
}
|
|
||||||
catch(...)
|
|
||||||
{
|
|
||||||
++_M_start;
|
|
||||||
_M_deallocate_node(*(_M_start._M_node - 1));
|
|
||||||
__throw_exception_again;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Called only if _M_finish._M_cur == _M_finish._M_first.
|
// Called only if _M_finish._M_cur == _M_finish._M_first.
|
||||||
template <typename _Tp, typename _Alloc>
|
template <typename _Tp, typename _Alloc>
|
||||||
void deque<_Tp,_Alloc>::
|
void deque<_Tp,_Alloc>::
|
||||||
|
@ -508,44 +461,6 @@ namespace std
|
||||||
return __pos;
|
return __pos;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
// Nothing seems to actually use this. According to the pattern followed by
|
|
||||||
// the rest of the SGI code, it would be called by the deprecated insert(pos)
|
|
||||||
// function, but that has been replaced. We'll take our time removing this
|
|
||||||
// anyhow; mark for 3.4. -pme
|
|
||||||
template <typename _Tp, typename _Alloc>
|
|
||||||
typename deque<_Tp,_Alloc>::iterator
|
|
||||||
deque<_Tp,_Alloc>::
|
|
||||||
_M_insert_aux(iterator __pos)
|
|
||||||
{
|
|
||||||
difference_type __index = __pos - _M_start;
|
|
||||||
if (static_cast<size_type>(__index) < size() / 2)
|
|
||||||
{
|
|
||||||
push_front(front());
|
|
||||||
iterator __front1 = _M_start;
|
|
||||||
++__front1;
|
|
||||||
iterator __front2 = __front1;
|
|
||||||
++__front2;
|
|
||||||
__pos = _M_start + __index;
|
|
||||||
iterator __pos1 = __pos;
|
|
||||||
++__pos1;
|
|
||||||
copy(__front2, __pos1, __front1);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
push_back(back());
|
|
||||||
iterator __back1 = _M_finish;
|
|
||||||
--__back1;
|
|
||||||
iterator __back2 = __back1;
|
|
||||||
--__back2;
|
|
||||||
__pos = _M_start + __index;
|
|
||||||
copy_backward(__pos, __back2, __back1);
|
|
||||||
}
|
|
||||||
*__pos = value_type();
|
|
||||||
return __pos;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
template <typename _Tp, typename _Alloc>
|
template <typename _Tp, typename _Alloc>
|
||||||
void
|
void
|
||||||
deque<_Tp,_Alloc>::
|
deque<_Tp,_Alloc>::
|
||||||
|
|
|
@ -74,10 +74,6 @@
|
||||||
* into a "standard" one.
|
* into a "standard" one.
|
||||||
* @endif
|
* @endif
|
||||||
*
|
*
|
||||||
* @note The @c reallocate member functions have been deprecated for 3.2
|
|
||||||
* and will be removed in 3.4. You must define @c _GLIBCPP_DEPRECATED
|
|
||||||
* to make this visible in 3.2; see c++config.h.
|
|
||||||
*
|
|
||||||
* The canonical description of these classes is in docs/html/ext/howto.html
|
* The canonical description of these classes is in docs/html/ext/howto.html
|
||||||
* or online at http://gcc.gnu.org/onlinedocs/libstdc++/ext/howto.html#3
|
* or online at http://gcc.gnu.org/onlinedocs/libstdc++/ext/howto.html#3
|
||||||
*/
|
*/
|
||||||
|
@ -129,9 +125,6 @@ namespace std
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
static void* _S_oom_malloc(size_t);
|
static void* _S_oom_malloc(size_t);
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
static void* _S_oom_realloc(void*, size_t);
|
|
||||||
#endif
|
|
||||||
static void (* __malloc_alloc_oom_handler)();
|
static void (* __malloc_alloc_oom_handler)();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
@ -148,17 +141,6 @@ namespace std
|
||||||
deallocate(void* __p, size_t /* __n */)
|
deallocate(void* __p, size_t /* __n */)
|
||||||
{ free(__p); }
|
{ free(__p); }
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
static void*
|
|
||||||
reallocate(void* __p, size_t /* old_sz */, size_t __new_sz)
|
|
||||||
{
|
|
||||||
void* __result = realloc(__p, __new_sz);
|
|
||||||
if (__builtin_expect(__result == 0, 0))
|
|
||||||
__result = _S_oom_realloc(__p, __new_sz);
|
|
||||||
return __result;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void (* __set_malloc_handler(void (*__f)()))()
|
static void (* __set_malloc_handler(void (*__f)()))()
|
||||||
{
|
{
|
||||||
void (* __old)() = __malloc_alloc_oom_handler;
|
void (* __old)() = __malloc_alloc_oom_handler;
|
||||||
|
@ -191,28 +173,6 @@ namespace std
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
template<int __inst>
|
|
||||||
void*
|
|
||||||
__malloc_alloc_template<__inst>::
|
|
||||||
_S_oom_realloc(void* __p, size_t __n)
|
|
||||||
{
|
|
||||||
void (* __my_malloc_handler)();
|
|
||||||
void* __result;
|
|
||||||
|
|
||||||
for (;;)
|
|
||||||
{
|
|
||||||
__my_malloc_handler = __malloc_alloc_oom_handler;
|
|
||||||
if (__builtin_expect(__my_malloc_handler == 0, 0))
|
|
||||||
__throw_bad_alloc();
|
|
||||||
(*__my_malloc_handler)();
|
|
||||||
__result = realloc(__p, __n);
|
|
||||||
if (__result)
|
|
||||||
return __result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Should not be referenced within the library anymore.
|
// Should not be referenced within the library anymore.
|
||||||
typedef __new_alloc __mem_interface;
|
typedef __new_alloc __mem_interface;
|
||||||
|
|
||||||
|
@ -292,20 +252,6 @@ namespace std
|
||||||
assert(*(size_t*)__real_p == __n);
|
assert(*(size_t*)__real_p == __n);
|
||||||
_Alloc::deallocate(__real_p, __n + (int) _S_extra);
|
_Alloc::deallocate(__real_p, __n + (int) _S_extra);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
static void*
|
|
||||||
reallocate(void* __p, size_t __old_sz, size_t __new_sz)
|
|
||||||
{
|
|
||||||
char* __real_p = (char*)__p - (int) _S_extra;
|
|
||||||
assert(*(size_t*)__real_p == __old_sz);
|
|
||||||
char* __result = (char*) _Alloc::reallocate(__real_p,
|
|
||||||
__old_sz + (int) _S_extra,
|
|
||||||
__new_sz + (int) _S_extra);
|
|
||||||
*(size_t*)__result = __new_sz;
|
|
||||||
return __result + (int) _S_extra;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -455,11 +401,6 @@ namespace std
|
||||||
*__my_free_list = __q;
|
*__my_free_list = __q;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
static void*
|
|
||||||
reallocate(void* __p, size_t __old_sz, size_t __new_sz);
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
template<bool __threads, int __inst> _Atomic_word
|
template<bool __threads, int __inst> _Atomic_word
|
||||||
|
@ -591,27 +532,6 @@ namespace std
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
template<bool threads, int inst>
|
|
||||||
void*
|
|
||||||
__default_alloc_template<threads, inst>::
|
|
||||||
reallocate(void* __p, size_t __old_sz, size_t __new_sz)
|
|
||||||
{
|
|
||||||
void* __result;
|
|
||||||
size_t __copy_sz;
|
|
||||||
|
|
||||||
if (__old_sz > (size_t) _MAX_BYTES && __new_sz > (size_t) _MAX_BYTES)
|
|
||||||
return(realloc(__p, __new_sz));
|
|
||||||
if (_S_round_up(__old_sz) == _S_round_up(__new_sz))
|
|
||||||
return(__p);
|
|
||||||
__result = allocate(__new_sz);
|
|
||||||
__copy_sz = __new_sz > __old_sz? __old_sz : __new_sz;
|
|
||||||
memcpy(__result, __p, __copy_sz);
|
|
||||||
deallocate(__p, __old_sz);
|
|
||||||
return __result;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
template<bool __threads, int __inst>
|
template<bool __threads, int __inst>
|
||||||
_STL_mutex_lock
|
_STL_mutex_lock
|
||||||
__default_alloc_template<__threads,__inst>::_S_node_allocator_lock
|
__default_alloc_template<__threads,__inst>::_S_node_allocator_lock
|
||||||
|
|
|
@ -1025,31 +1025,6 @@ namespace std
|
||||||
_M_push_front_aux(__x);
|
_M_push_front_aux(__x);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
/**
|
|
||||||
* @brief Add data to the front of the %deque.
|
|
||||||
*
|
|
||||||
* This is a typical stack operation. The function creates a
|
|
||||||
* default-constructed element at the front of the %deque. Due to the
|
|
||||||
* nature of a %deque this operation can be done in constant time. You
|
|
||||||
* should consider using push_front(value_type()) instead.
|
|
||||||
*
|
|
||||||
* @note This was deprecated in 3.2 and will be removed in 3.4. You must
|
|
||||||
* define @c _GLIBCPP_DEPRECATED to make this visible in 3.2; see
|
|
||||||
* c++config.h.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
push_front()
|
|
||||||
{
|
|
||||||
if (_M_start._M_cur != _M_start._M_first) {
|
|
||||||
_Construct(_M_start._M_cur - 1);
|
|
||||||
--_M_start._M_cur;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
_M_push_front_aux();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Add data to the end of the %deque.
|
* @brief Add data to the end of the %deque.
|
||||||
* @param x Data to be added.
|
* @param x Data to be added.
|
||||||
|
@ -1069,31 +1044,6 @@ namespace std
|
||||||
_M_push_back_aux(__x);
|
_M_push_back_aux(__x);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
/**
|
|
||||||
* @brief Add data to the end of the %deque.
|
|
||||||
*
|
|
||||||
* This is a typical stack operation. The function creates a
|
|
||||||
* default-constructed element at the end of the %deque. Due to the nature
|
|
||||||
* of a %deque this operation can be done in constant time. You should
|
|
||||||
* consider using push_back(value_type()) instead.
|
|
||||||
*
|
|
||||||
* @note This was deprecated in 3.2 and will be removed in 3.4. You must
|
|
||||||
* define @c _GLIBCPP_DEPRECATED to make this visible in 3.2; see
|
|
||||||
* c++config.h.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
push_back()
|
|
||||||
{
|
|
||||||
if (_M_finish._M_cur != _M_finish._M_last - 1) {
|
|
||||||
_Construct(_M_finish._M_cur);
|
|
||||||
++_M_finish._M_cur;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
_M_push_back_aux();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Removes first element.
|
* @brief Removes first element.
|
||||||
*
|
*
|
||||||
|
@ -1144,25 +1094,6 @@ namespace std
|
||||||
iterator
|
iterator
|
||||||
insert(iterator position, const value_type& __x);
|
insert(iterator position, const value_type& __x);
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
/**
|
|
||||||
* @brief Inserts an element into the %deque.
|
|
||||||
* @param position An iterator into the %deque.
|
|
||||||
* @return An iterator that points to the inserted element.
|
|
||||||
*
|
|
||||||
* This function will insert a default-constructed element before the
|
|
||||||
* specified location. You should consider using
|
|
||||||
* insert(position,value_type()) instead.
|
|
||||||
*
|
|
||||||
* @note This was deprecated in 3.2 and will be removed in 3.4. You must
|
|
||||||
* define @c _GLIBCPP_DEPRECATED to make this visible in 3.2; see
|
|
||||||
* c++config.h.
|
|
||||||
*/
|
|
||||||
iterator
|
|
||||||
insert(iterator __position)
|
|
||||||
{ return insert(__position, value_type()); }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Inserts a number of copies of given data into the %deque.
|
* @brief Inserts a number of copies of given data into the %deque.
|
||||||
* @param position An iterator into the %deque.
|
* @param position An iterator into the %deque.
|
||||||
|
@ -1392,10 +1323,6 @@ namespace std
|
||||||
*/
|
*/
|
||||||
void _M_push_back_aux(const value_type&);
|
void _M_push_back_aux(const value_type&);
|
||||||
void _M_push_front_aux(const value_type&);
|
void _M_push_front_aux(const value_type&);
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
void _M_push_back_aux();
|
|
||||||
void _M_push_front_aux();
|
|
||||||
#endif
|
|
||||||
void _M_pop_back_aux();
|
void _M_pop_back_aux();
|
||||||
void _M_pop_front_aux();
|
void _M_pop_front_aux();
|
||||||
//@}
|
//@}
|
||||||
|
@ -1459,11 +1386,6 @@ namespace std
|
||||||
_ForwardIterator __first, _ForwardIterator __last,
|
_ForwardIterator __first, _ForwardIterator __last,
|
||||||
size_type __n);
|
size_type __n);
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
// unused, see comment in implementation
|
|
||||||
iterator _M_insert_aux(iterator __pos);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//@{
|
//@{
|
||||||
/**
|
/**
|
||||||
* @if maint
|
* @if maint
|
||||||
|
|
|
@ -702,23 +702,6 @@ namespace std
|
||||||
void
|
void
|
||||||
push_front(const value_type& __x) { this->insert(begin(), __x); }
|
push_front(const value_type& __x) { this->insert(begin(), __x); }
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
/**
|
|
||||||
* @brief Add data to the front of the %list.
|
|
||||||
*
|
|
||||||
* This is a typical stack operation. The function creates a
|
|
||||||
* default-constructed element at the front of the %list. Due to the
|
|
||||||
* nature of a %list this operation can be done in constant time. You
|
|
||||||
* should consider using push_front(value_type()) instead.
|
|
||||||
*
|
|
||||||
* @note This was deprecated in 3.2 and will be removed in 3.4. You must
|
|
||||||
* define @c _GLIBCPP_DEPRECATED to make this visible in 3.2; see
|
|
||||||
* c++config.h.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
push_front() { this->insert(begin(), value_type()); }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Removes first element.
|
* @brief Removes first element.
|
||||||
*
|
*
|
||||||
|
@ -745,23 +728,6 @@ namespace std
|
||||||
void
|
void
|
||||||
push_back(const value_type& __x) { this->insert(end(), __x); }
|
push_back(const value_type& __x) { this->insert(end(), __x); }
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
/**
|
|
||||||
* @brief Add data to the end of the %list.
|
|
||||||
*
|
|
||||||
* This is a typical stack operation. The function creates a
|
|
||||||
* default-constructed element at the end of the %list. Due to the nature
|
|
||||||
* of a %list this operation can be done in constant time. You should
|
|
||||||
* consider using push_back(value_type()) instead.
|
|
||||||
*
|
|
||||||
* @note This was deprecated in 3.2 and will be removed in 3.4. You must
|
|
||||||
* define @c _GLIBCPP_DEPRECATED to make this visible in 3.2; see
|
|
||||||
* c++config.h.
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
push_back() { this->insert(end(), value_type()); }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Removes last element.
|
* @brief Removes last element.
|
||||||
*
|
*
|
||||||
|
@ -794,26 +760,6 @@ namespace std
|
||||||
iterator
|
iterator
|
||||||
insert(iterator __position, const value_type& __x);
|
insert(iterator __position, const value_type& __x);
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
/**
|
|
||||||
* @brief Inserts an element into the %list.
|
|
||||||
* @param position An iterator into the %list.
|
|
||||||
* @return An iterator that points to the inserted element.
|
|
||||||
*
|
|
||||||
* This function will insert a default-constructed element before the
|
|
||||||
* specified location. You should consider using
|
|
||||||
* insert(position,value_type()) instead.
|
|
||||||
* Due to the nature of a %list this operation can be done in constant
|
|
||||||
* time, and does not invalidate iterators and references.
|
|
||||||
*
|
|
||||||
* @note This was deprecated in 3.2 and will be removed in 3.4. You must
|
|
||||||
* define @c _GLIBCPP_DEPRECATED to make this visible in 3.2; see
|
|
||||||
* c++config.h.
|
|
||||||
*/
|
|
||||||
iterator
|
|
||||||
insert(iterator __position) { return insert(__position, value_type()); }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Inserts a number of copies of given data into the %list.
|
* @brief Inserts a number of copies of given data into the %list.
|
||||||
* @param position An iterator into the %list.
|
* @param position An iterator into the %list.
|
||||||
|
|
|
@ -632,27 +632,6 @@ namespace std
|
||||||
iterator
|
iterator
|
||||||
insert(iterator __position, const value_type& __x);
|
insert(iterator __position, const value_type& __x);
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
/**
|
|
||||||
* @brief Inserts an element into the %vector.
|
|
||||||
* @param position An iterator into the %vector.
|
|
||||||
* @return An iterator that points to the inserted element.
|
|
||||||
*
|
|
||||||
* This function will insert a default-constructed element
|
|
||||||
* before the specified location. You should consider using
|
|
||||||
* insert(position,value_type()) instead. Note that this kind
|
|
||||||
* of operation could be expensive for a vector and if it is
|
|
||||||
* frequently used the user should consider using std::list.
|
|
||||||
*
|
|
||||||
* @note This was deprecated in 3.2 and will be removed in 3.4.
|
|
||||||
* You must define @c _GLIBCPP_DEPRECATED to make this visible
|
|
||||||
* in 3.2; see c++config.h.
|
|
||||||
*/
|
|
||||||
iterator
|
|
||||||
insert(iterator __position)
|
|
||||||
{ return insert(__position, value_type()); }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Inserts a number of copies of given data into the %vector.
|
* @brief Inserts a number of copies of given data into the %vector.
|
||||||
* @param position An iterator into the %vector.
|
* @param position An iterator into the %vector.
|
||||||
|
@ -913,11 +892,6 @@ namespace std
|
||||||
// Called by insert(p,x)
|
// Called by insert(p,x)
|
||||||
void
|
void
|
||||||
_M_insert_aux(iterator __position, const value_type& __x);
|
_M_insert_aux(iterator __position, const value_type& __x);
|
||||||
|
|
||||||
#ifdef _GLIBCPP_DEPRECATED
|
|
||||||
// Unused now (same situation as in deque)
|
|
||||||
void _M_insert_aux(iterator __position);
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue