Skip to content

R
riscv-gcc-1
Commit 65be6ddd by Benjamin Kosnik
Options

Makefile.am (install-data-local): Remove pch-install rules. 

2007-08-21  Benjamin Kosnik  <bkoz@montsouris.artheist.org>

	* include/Makefile.am (install-data-local): Remove pch-install rules.
	(host_headers): Add stdc++.h, stdtr1c++.h, extc++.h.
	* include/Makefile.in: Regenerate.
	* config.h.in: Same.

	* scripts/check_compile: Remove space between outputs.	
	* include/ext/throw_allocator.h: Correct doxygen markup.	
	* include/bits/char_traits.h: Correct spacing.
	* include/bits/stl_function.h: Same, for 80 column.
	* include/std/valarray: Same.
	* testsuite/util/testsuite_iterators.h: Same.	
	* testsuite/25_algorithms/headers/algorithm/synopsis.cc: Format.

From-SVN: r127685
parent 7e501b00
Showing with 87 additions and 78 deletions
libstdc++-v3/ChangeLog
2007-08-21 Benjamin Kosnik <bkoz@montsouris.artheist.org>
* include/Makefile.am (install-data-local): Remove pch-install rules.
(host_headers): Add stdc++.h, stdtr1c++.h, extc++.h.
* include/Makefile.in: Regenerate.
* config.h.in: Same.
* scripts/check_compile: Remove space between outputs.
* include/ext/throw_allocator.h: Correct doxygen markup.
* include/bits/char_traits.h: Correct spacing.
* include/bits/stl_function.h: Same, for 80 column.
* include/std/valarray: Same.
* testsuite/util/testsuite_iterators.h: Same.
* testsuite/25_algorithms/headers/algorithm/synopsis.cc: Format.
2007-08-17 Daniel Jacobowitz <dan@codesourcery.com> 2007-08-17 Daniel Jacobowitz <dan@codesourcery.com>
PR testsuite/31884 PR testsuite/31884
...@@ -24,10 +39,14 @@ ...@@ -24,10 +39,14 @@
testsuite/ext/throw_allocator/check_deallocate_null.cc, testsuite/ext/throw_allocator/check_deallocate_null.cc,
testsuite/ext/throw_allocator/check_new.cc, testsuite/ext/throw_allocator/check_new.cc,
testsuite/ext/throw_allocator/deallocate_local.cc, testsuite/ext/throw_allocator/deallocate_local.cc,
testsuite/tr1/5_numerical_facilities/random/subtract_with_carry_01/cons/gen1.cc, testsuite/tr1/5_numerical_facilities/random/subtract_with_carry_01/
testsuite/tr1/5_numerical_facilities/random/subtract_with_carry/cons/gen1.cc, cons/gen1.cc,
testsuite/tr1/5_numerical_facilities/random/linear_congruential/cons/gen1.cc, testsuite/tr1/5_numerical_facilities/random/subtract_with_carry/cons/
testsuite/tr1/5_numerical_facilities/random/mersenne_twister/cons/gen1.cc, gen1.cc,
testsuite/tr1/5_numerical_facilities/random/linear_congruential/cons/
gen1.cc,
testsuite/tr1/5_numerical_facilities/random/mersenne_twister/cons/
gen1.cc,
testsuite/23_containers/list/modifiers/insert/25288.cc: Use testsuite/23_containers/list/modifiers/insert/25288.cc: Use
dg-require-time. dg-require-time.
......
libstdc++-v3/config.h.in
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
/* Define to 1 if you have the `atanl' function. */ /* Define to 1 if you have the `atanl' function. */
#undef HAVE_ATANL #undef HAVE_ATANL
/* Define to 1 if the target assembler supports thread-local storage. */
#undef HAVE_CC_TLS
/* Define to 1 if you have the `ceilf' function. */ /* Define to 1 if you have the `ceilf' function. */
#undef HAVE_CEILF #undef HAVE_CEILF
......
libstdc++-v3/include/Makefile.am
...@@ -754,7 +754,10 @@ host_headers = \ ...@@ -754,7 +754,10 @@ host_headers = \
${host_srcdir}/os_defines.h \ ${host_srcdir}/os_defines.h \
${glibcxx_srcdir}/$(ATOMIC_WORD_SRCDIR)/atomic_word.h \ ${glibcxx_srcdir}/$(ATOMIC_WORD_SRCDIR)/atomic_word.h \
${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \ ${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \
${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h \
${glibcxx_srcdir}/include/precompiled/stdc++.h \
${glibcxx_srcdir}/include/precompiled/stdtr1c++.h \
${glibcxx_srcdir}/include/precompiled/extc++.h
# Non-installed host_header files. # Non-installed host_header files.
COMPATIBILITY_H = config/abi/compatibility.h COMPATIBILITY_H = config/abi/compatibility.h
...@@ -809,10 +812,8 @@ pch_output_anchors = \ ...@@ -809,10 +812,8 @@ pch_output_anchors = \
PCHFLAGS=-Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS) PCHFLAGS=-Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS)
if GLIBCXX_BUILD_PCH if GLIBCXX_BUILD_PCH
pch_build = ${pch_output} pch_build = ${pch_output}
pch_install = install-pch
else else
pch_build = pch_build =
pch_install =
endif endif
# List of all timestamp files. By keeping only one copy of this list, both # List of all timestamp files. By keeping only one copy of this list, both
...@@ -1129,7 +1130,7 @@ ${pch3_output}: ${pch3_source} ${pch2_output} ...@@ -1129,7 +1130,7 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
# the rest are taken from the original source tree. # the rest are taken from the original source tree.
if GLIBCXX_HOSTED if GLIBCXX_HOSTED
install-data-local: install-headers ${pch_install} install-data-local: install-headers
else else
install-data-local: install-freestanding-headers install-data-local: install-freestanding-headers
endif endif
...@@ -1219,16 +1220,6 @@ install-headers: ...@@ -1219,16 +1220,6 @@ install-headers:
${thread_host_headers}; do \ ${thread_host_headers}; do \
$(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
install-pch:
$(mkinstalldirs) $(DESTDIR)${pch1_output_installdir}
for file in ${pch1_output_builddir}/*; do \
$(INSTALL_DATA) $$file $(DESTDIR)${pch1_output_installdir}; done
$(mkinstalldirs) $(DESTDIR)${pch2_output_installdir}
for file in ${pch2_output_builddir}/*; do \
$(INSTALL_DATA) $$file $(DESTDIR)${pch2_output_installdir}; done
$(INSTALL_DATA) ${pch1_output_anchor} $(DESTDIR)${host_installdir}
$(INSTALL_DATA) ${pch2_output_anchor} $(DESTDIR)${host_installdir}
# By adding these files here, automake will remove them for 'make clean' # By adding these files here, automake will remove them for 'make clean'
CLEANFILES = ${pch_output} ${pch_output_anchors} CLEANFILES = ${pch_output} ${pch_output_anchors}
......
libstdc++-v3/include/Makefile.in
...@@ -981,7 +981,10 @@ host_headers = \ ...@@ -981,7 +981,10 @@ host_headers = \
${host_srcdir}/os_defines.h \ ${host_srcdir}/os_defines.h \
${glibcxx_srcdir}/$(ATOMIC_WORD_SRCDIR)/atomic_word.h \ ${glibcxx_srcdir}/$(ATOMIC_WORD_SRCDIR)/atomic_word.h \
${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \ ${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h \
${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h \
${glibcxx_srcdir}/include/precompiled/stdc++.h \
${glibcxx_srcdir}/include/precompiled/stdtr1c++.h \
${glibcxx_srcdir}/include/precompiled/extc++.h
# Non-installed host_header files. # Non-installed host_header files.
...@@ -1035,8 +1038,6 @@ pch_output_anchors = \ ...@@ -1035,8 +1038,6 @@ pch_output_anchors = \
PCHFLAGS = -Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS) PCHFLAGS = -Winvalid-pch -Wno-deprecated -x c++-header $(CXXFLAGS)
@GLIBCXX_BUILD_PCH_FALSE@pch_build = @GLIBCXX_BUILD_PCH_FALSE@pch_build =
@GLIBCXX_BUILD_PCH_TRUE@pch_build = ${pch_output} @GLIBCXX_BUILD_PCH_TRUE@pch_build = ${pch_output}
@GLIBCXX_BUILD_PCH_FALSE@pch_install =
@GLIBCXX_BUILD_PCH_TRUE@pch_install = install-pch
# List of all timestamp files. By keeping only one copy of this list, both # List of all timestamp files. By keeping only one copy of this list, both
# CLEANFILES and all-local are kept up-to-date. # CLEANFILES and all-local are kept up-to-date.
...@@ -1512,7 +1513,7 @@ ${pch3_output}: ${pch3_source} ${pch2_output} ...@@ -1512,7 +1513,7 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
# host_headers_extra are taken out of the build tree staging area; # host_headers_extra are taken out of the build tree staging area;
# the rest are taken from the original source tree. # the rest are taken from the original source tree.
@GLIBCXX_HOSTED_TRUE@install-data-local: install-headers ${pch_install} @GLIBCXX_HOSTED_TRUE@install-data-local: install-headers
@GLIBCXX_HOSTED_FALSE@install-data-local: install-freestanding-headers @GLIBCXX_HOSTED_FALSE@install-data-local: install-freestanding-headers
# This is a subset of the full install-headers rule. We only need <cstddef>, # This is a subset of the full install-headers rule. We only need <cstddef>,
...@@ -1600,16 +1601,6 @@ install-headers: ...@@ -1600,16 +1601,6 @@ install-headers:
${thread_host_headers}; do \ ${thread_host_headers}; do \
$(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
install-pch:
$(mkinstalldirs) $(DESTDIR)${pch1_output_installdir}
for file in ${pch1_output_builddir}/*; do \
$(INSTALL_DATA) $$file $(DESTDIR)${pch1_output_installdir}; done
$(mkinstalldirs) $(DESTDIR)${pch2_output_installdir}
for file in ${pch2_output_builddir}/*; do \
$(INSTALL_DATA) $$file $(DESTDIR)${pch2_output_installdir}; done
$(INSTALL_DATA) ${pch1_output_anchor} $(DESTDIR)${host_installdir}
$(INSTALL_DATA) ${pch2_output_anchor} $(DESTDIR)${host_installdir}
# To remove directories. # To remove directories.
clean-local: clean-local:
rm -rf ${pch_output_dirs} rm -rf ${pch_output_dirs}
......
libstdc++-v3/include/bits/char_traits.h
...@@ -60,7 +60,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) ...@@ -60,7 +60,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
* types, but who don't need to change the definitions of any function * types, but who don't need to change the definitions of any function
* defined in char_traits, can specialize __gnu_cxx::_Char_types * defined in char_traits, can specialize __gnu_cxx::_Char_types
* while leaving __gnu_cxx::char_traits alone. */ * while leaving __gnu_cxx::char_traits alone. */
template <class _CharT> template<typename _CharT>
struct _Char_types struct _Char_types
{ {
typedef unsigned long int_type; typedef unsigned long int_type;
......
libstdc++-v3/include/bits/stl_function.h
...@@ -124,9 +124,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -124,9 +124,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// 20.3.2 arithmetic // 20.3.2 arithmetic
/** @defgroup s20_3_2_arithmetic Arithmetic Classes /** @defgroup s20_3_2_arithmetic Arithmetic Classes
* Because basic math often needs to be done during an algorithm, the library
* provides functors for those operations. See the documentation for * Because basic math often needs to be done during an algorithm,
* @link s20_3_1_base the base classes@endlink for examples of their use. * the library provides functors for those operations. See the
* documentation for @link s20_3_1_base the base classes@endlink
* for examples of their use.
* *
* @{ * @{
*/ */
...@@ -249,7 +251,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -249,7 +251,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
// 20.3.4 logical operations // 20.3.4 logical operations
/** @defgroup s20_3_4_logical Boolean Operations Classes /** @defgroup s20_3_4_logical Boolean Operations Classes
* Here are wrapper functors for Boolean operations: @c &&, @c ||, and @c !. * Here are wrapper functors for Boolean operations: @c &&, @c ||,
* and @c !.
* *
* @{ * @{
*/ */
...@@ -360,15 +363,14 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -360,15 +363,14 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
template <class _Predicate> template <class _Predicate>
class binary_negate class binary_negate
: public binary_function<typename _Predicate::first_argument_type, : public binary_function<typename _Predicate::first_argument_type,
typename _Predicate::second_argument_type, typename _Predicate::second_argument_type, bool>
bool>
{ {
protected: protected:
_Predicate _M_pred; _Predicate _M_pred;
public: public:
explicit explicit
binary_negate(const _Predicate& __x) binary_negate(const _Predicate& __x) : _M_pred(__x) { }
: _M_pred(__x) { }
bool bool
operator()(const typename _Predicate::first_argument_type& __x, operator()(const typename _Predicate::first_argument_type& __x,
...@@ -605,7 +607,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -605,7 +607,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
* *
* @{ * @{
*/ */
/// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink. /// One of the @link s20_3_8_memadaptors adaptors for member
/// pointers@endlink.
template <class _Ret, class _Tp> template <class _Ret, class _Tp>
class mem_fun_t : public unary_function<_Tp*, _Ret> class mem_fun_t : public unary_function<_Tp*, _Ret>
{ {
...@@ -621,7 +624,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -621,7 +624,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_Ret (_Tp::*_M_f)(); _Ret (_Tp::*_M_f)();
}; };
/// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink. /// One of the @link s20_3_8_memadaptors adaptors for member
/// pointers@endlink.
template <class _Ret, class _Tp> template <class _Ret, class _Tp>
class const_mem_fun_t : public unary_function<const _Tp*, _Ret> class const_mem_fun_t : public unary_function<const _Tp*, _Ret>
{ {
...@@ -637,7 +641,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -637,7 +641,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_Ret (_Tp::*_M_f)() const; _Ret (_Tp::*_M_f)() const;
}; };
/// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink. /// One of the @link s20_3_8_memadaptors adaptors for member
/// pointers@endlink.
template <class _Ret, class _Tp> template <class _Ret, class _Tp>
class mem_fun_ref_t : public unary_function<_Tp, _Ret> class mem_fun_ref_t : public unary_function<_Tp, _Ret>
{ {
...@@ -653,7 +658,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -653,7 +658,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_Ret (_Tp::*_M_f)(); _Ret (_Tp::*_M_f)();
}; };
/// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink. /// One of the @link s20_3_8_memadaptors adaptors for member
/// pointers@endlink.
template <class _Ret, class _Tp> template <class _Ret, class _Tp>
class const_mem_fun_ref_t : public unary_function<_Tp, _Ret> class const_mem_fun_ref_t : public unary_function<_Tp, _Ret>
{ {
...@@ -669,7 +675,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -669,7 +675,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_Ret (_Tp::*_M_f)() const; _Ret (_Tp::*_M_f)() const;
}; };
/// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink. /// One of the @link s20_3_8_memadaptors adaptors for member
/// pointers@endlink.
template <class _Ret, class _Tp, class _Arg> template <class _Ret, class _Tp, class _Arg>
class mem_fun1_t : public binary_function<_Tp*, _Arg, _Ret> class mem_fun1_t : public binary_function<_Tp*, _Arg, _Ret>
{ {
...@@ -685,7 +692,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -685,7 +692,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_Ret (_Tp::*_M_f)(_Arg); _Ret (_Tp::*_M_f)(_Arg);
}; };
/// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink. /// One of the @link s20_3_8_memadaptors adaptors for member
/// pointers@endlink.
template <class _Ret, class _Tp, class _Arg> template <class _Ret, class _Tp, class _Arg>
class const_mem_fun1_t : public binary_function<const _Tp*, _Arg, _Ret> class const_mem_fun1_t : public binary_function<const _Tp*, _Arg, _Ret>
{ {
...@@ -701,7 +709,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -701,7 +709,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_Ret (_Tp::*_M_f)(_Arg) const; _Ret (_Tp::*_M_f)(_Arg) const;
}; };
/// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink. /// One of the @link s20_3_8_memadaptors adaptors for member
/// pointers@endlink.
template <class _Ret, class _Tp, class _Arg> template <class _Ret, class _Tp, class _Arg>
class mem_fun1_ref_t : public binary_function<_Tp, _Arg, _Ret> class mem_fun1_ref_t : public binary_function<_Tp, _Arg, _Ret>
{ {
...@@ -717,7 +726,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -717,7 +726,8 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_Ret (_Tp::*_M_f)(_Arg); _Ret (_Tp::*_M_f)(_Arg);
}; };
/// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink. /// One of the @link s20_3_8_memadaptors adaptors for member
/// pointers@endlink.
template <class _Ret, class _Tp, class _Arg> template <class _Ret, class _Tp, class _Arg>
class const_mem_fun1_ref_t : public binary_function<_Tp, _Arg, _Ret> class const_mem_fun1_ref_t : public binary_function<_Tp, _Arg, _Ret>
{ {
......
libstdc++-v3/include/ext/throw_allocator.h
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
// purpose. It is provided "as is" without express or implied // purpose. It is provided "as is" without express or implied
// warranty. // warranty.
/** @file ext/vstring.h /** @file ext/throw_allocator.h
* This file is a GNU extension to the Standard C++ Library. * This file is a GNU extension to the Standard C++ Library.
* *
* Contains an exception-throwing allocator, useful for testing * Contains an exception-throwing allocator, useful for testing
...@@ -47,10 +47,6 @@ ...@@ -47,10 +47,6 @@
* sanity checked. * sanity checked.
*/ */
/**
* @file throw_allocator.h
*/
#ifndef _THROW_ALLOCATOR_H #ifndef _THROW_ALLOCATOR_H
#define _THROW_ALLOCATOR_H 1 #define _THROW_ALLOCATOR_H 1
......
libstdc++-v3/include/std/valarray
...@@ -881,7 +881,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -881,7 +881,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
valarray<_Tp>::min() const valarray<_Tp>::min() const
{ {
_GLIBCXX_DEBUG_ASSERT(_M_size > 0); _GLIBCXX_DEBUG_ASSERT(_M_size > 0);
return *std::min_element(_M_data, _M_data+_M_size); return *std::min_element(_M_data, _M_data + _M_size);
} }
template<typename _Tp> template<typename _Tp>
...@@ -889,7 +889,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) ...@@ -889,7 +889,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
valarray<_Tp>::max() const valarray<_Tp>::max() const
{ {
_GLIBCXX_DEBUG_ASSERT(_M_size > 0); _GLIBCXX_DEBUG_ASSERT(_M_size > 0);
return *std::max_element(_M_data, _M_data+_M_size); return *std::max_element(_M_data, _M_data + _M_size);
} }
template<class _Tp> template<class _Tp>
......
libstdc++-v3/scripts/check_compile
...@@ -28,7 +28,7 @@ PCH_FLAGS=`$flags_script --cxxpchflags` ...@@ -28,7 +28,7 @@ PCH_FLAGS=`$flags_script --cxxpchflags`
FLAGS=`$flags_script --cxxflags` FLAGS=`$flags_script --cxxflags`
TEST_FLAGS="-S" TEST_FLAGS="-S"
COMPILER=`$flags_script --build-cxx` COMPILER=`$flags_script --build-cxx`
CXX="$COMPILER $INCLUDES $PCH_FLAGS $FLAGS $TEST_FLAGS" CXX="$COMPILER $INCLUDES $PCH_FLAGS $FLAGS -Wfatal-errors $TEST_FLAGS"
echo "compile line is:" echo "compile line is:"
echo $CXX echo $CXX
...@@ -49,7 +49,6 @@ do ...@@ -49,7 +49,6 @@ do
# mv $OUTPUT_NAME binaries # mv $OUTPUT_NAME binaries
rm $OUTPUT_NAME rm $OUTPUT_NAME
fi fi
echo ""
let UNIQUE_ID+=1 let UNIQUE_ID+=1
fi fi
done done
......
libstdc++-v3/testsuite/util/testsuite_iterators.h
...@@ -61,8 +61,7 @@ namespace __gnu_test ...@@ -61,8 +61,7 @@ namespace __gnu_test
{ {
T* first; T* first;
T* last; T* last;
BoundsContainer(T* _first, T* _last) BoundsContainer(T* _first, T* _last) : first(_first), last(_last)
: first(_first), last(_last)
{ } { }
}; };
...@@ -73,7 +72,7 @@ namespace __gnu_test ...@@ -73,7 +72,7 @@ namespace __gnu_test
T* incrementedto; T* incrementedto;
bool* writtento; bool* writtento;
OutputContainer(T* _first, T* _last) OutputContainer(T* _first, T* _last)
: BoundsContainer<T>(_first, _last), incrementedto(_first) : BoundsContainer<T>(_first, _last), incrementedto(_first)
{ {
writtento = new bool[this->last - this->first]; writtento = new bool[this->last - this->first];
for(int i = 0; i < this->last - this->first; i++) for(int i = 0; i < this->last - this->first; i++)
...@@ -114,21 +113,21 @@ namespace __gnu_test ...@@ -114,21 +113,21 @@ namespace __gnu_test
* instansiated directly, but generated from a test_container * instansiated directly, but generated from a test_container
*/ */
template<class T> template<class T>
struct output_iterator_wrapper: public std::iterator struct output_iterator_wrapper
<std::output_iterator_tag, T, ptrdiff_t, T*, T&> : public std::iterator<std::output_iterator_tag, T, ptrdiff_t, T*, T&>
{ {
typedef OutputContainer<T> ContainerType; typedef OutputContainer<T> ContainerType;
T* ptr; T* ptr;
ContainerType* SharedInfo; ContainerType* SharedInfo;
output_iterator_wrapper(T* _ptr, ContainerType* SharedInfo_in) output_iterator_wrapper(T* _ptr, ContainerType* SharedInfo_in)
:ptr(_ptr), SharedInfo(SharedInfo_in) : ptr(_ptr), SharedInfo(SharedInfo_in)
{ {
ITERATOR_VERIFY(ptr >= SharedInfo->first && ptr <= SharedInfo->last); ITERATOR_VERIFY(ptr >= SharedInfo->first && ptr <= SharedInfo->last);
} }
output_iterator_wrapper(const output_iterator_wrapper& in) output_iterator_wrapper(const output_iterator_wrapper& in)
:ptr(in.ptr), SharedInfo(in.SharedInfo) : ptr(in.ptr), SharedInfo(in.SharedInfo)
{ } { }
WritableObject<T> WritableObject<T>
...@@ -175,8 +174,8 @@ namespace __gnu_test ...@@ -175,8 +174,8 @@ namespace __gnu_test
* instansiated directly, but generated from a test_container * instansiated directly, but generated from a test_container
*/ */
template<class T> template<class T>
class input_iterator_wrapper:public std::iterator class input_iterator_wrapper
<std::input_iterator_tag, T, ptrdiff_t, T*, T&> : public std::iterator<std::input_iterator_tag, T, ptrdiff_t, T*, T&>
{ {
protected: protected:
input_iterator_wrapper() input_iterator_wrapper()
...@@ -188,11 +187,11 @@ namespace __gnu_test ...@@ -188,11 +187,11 @@ namespace __gnu_test
ContainerType* SharedInfo; ContainerType* SharedInfo;
input_iterator_wrapper(T* _ptr, ContainerType* SharedInfo_in) input_iterator_wrapper(T* _ptr, ContainerType* SharedInfo_in)
: ptr(_ptr), SharedInfo(SharedInfo_in) : ptr(_ptr), SharedInfo(SharedInfo_in)
{ ITERATOR_VERIFY(ptr >= SharedInfo->first && ptr <= SharedInfo->last); } { ITERATOR_VERIFY(ptr >= SharedInfo->first && ptr <= SharedInfo->last); }
input_iterator_wrapper(const input_iterator_wrapper& in) input_iterator_wrapper(const input_iterator_wrapper& in)
: ptr(in.ptr), SharedInfo(in.SharedInfo) : ptr(in.ptr), SharedInfo(in.SharedInfo)
{ } { }
bool bool
...@@ -257,16 +256,16 @@ namespace __gnu_test ...@@ -257,16 +256,16 @@ namespace __gnu_test
* instansiated directly, but generated from a test_container * instansiated directly, but generated from a test_container
*/ */
template<class T> template<class T>
struct forward_iterator_wrapper:public input_iterator_wrapper<T> struct forward_iterator_wrapper : public input_iterator_wrapper<T>
{ {
typedef BoundsContainer<T> ContainerType; typedef BoundsContainer<T> ContainerType;
typedef std::forward_iterator_tag iterator_category; typedef std::forward_iterator_tag iterator_category;
forward_iterator_wrapper(T* _ptr, ContainerType* SharedInfo_in) forward_iterator_wrapper(T* _ptr, ContainerType* SharedInfo_in)
:input_iterator_wrapper<T>(_ptr, SharedInfo_in) : input_iterator_wrapper<T>(_ptr, SharedInfo_in)
{ } { }
forward_iterator_wrapper(const forward_iterator_wrapper& in) forward_iterator_wrapper(const forward_iterator_wrapper& in)
:input_iterator_wrapper<T>(in) : input_iterator_wrapper<T>(in)
{ } { }
forward_iterator_wrapper() forward_iterator_wrapper()
...@@ -311,16 +310,16 @@ namespace __gnu_test ...@@ -311,16 +310,16 @@ namespace __gnu_test
* instansiated directly, but generated from a test_container * instansiated directly, but generated from a test_container
*/ */
template<class T> template<class T>
struct bidirectional_iterator_wrapper:public forward_iterator_wrapper<T> struct bidirectional_iterator_wrapper : public forward_iterator_wrapper<T>
{ {
typedef BoundsContainer<T> ContainerType; typedef BoundsContainer<T> ContainerType;
typedef std::bidirectional_iterator_tag iterator_category; typedef std::bidirectional_iterator_tag iterator_category;
bidirectional_iterator_wrapper(T* _ptr, ContainerType* SharedInfo_in) bidirectional_iterator_wrapper(T* _ptr, ContainerType* SharedInfo_in)
:forward_iterator_wrapper<T>(_ptr, SharedInfo_in) : forward_iterator_wrapper<T>(_ptr, SharedInfo_in)
{ } { }
bidirectional_iterator_wrapper(const bidirectional_iterator_wrapper& in) bidirectional_iterator_wrapper(const bidirectional_iterator_wrapper& in)
:forward_iterator_wrapper<T>(in) : forward_iterator_wrapper<T>(in)
{ } { }
bidirectional_iterator_wrapper(): forward_iterator_wrapper<T>() bidirectional_iterator_wrapper(): forward_iterator_wrapper<T>()
...@@ -375,16 +374,17 @@ namespace __gnu_test ...@@ -375,16 +374,17 @@ namespace __gnu_test
* instansiated directly, but generated from a test_container * instansiated directly, but generated from a test_container
*/ */
template<class T> template<class T>
struct random_access_iterator_wrapper:public bidirectional_iterator_wrapper<T> struct random_access_iterator_wrapper
: public bidirectional_iterator_wrapper<T>
{ {
typedef BoundsContainer<T> ContainerType; typedef BoundsContainer<T> ContainerType;
typedef std::random_access_iterator_tag iterator_category; typedef std::random_access_iterator_tag iterator_category;
random_access_iterator_wrapper(T* _ptr, ContainerType* SharedInfo_in) random_access_iterator_wrapper(T* _ptr, ContainerType* SharedInfo_in)
: bidirectional_iterator_wrapper<T>(_ptr, SharedInfo_in) : bidirectional_iterator_wrapper<T>(_ptr, SharedInfo_in)
{ } { }
random_access_iterator_wrapper(const random_access_iterator_wrapper<T>& in) random_access_iterator_wrapper(const random_access_iterator_wrapper<T>& in)
: bidirectional_iterator_wrapper<T>(in) : bidirectional_iterator_wrapper<T>(in)
{ } { }
random_access_iterator_wrapper():bidirectional_iterator_wrapper<T>() random_access_iterator_wrapper():bidirectional_iterator_wrapper<T>()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment