[Toon-members] tag libtool tag/fn.h

[Edward Rosten]

CVSROOT:        /cvsroot/toon
Module name:    tag
Changes by:     Edward Rosten <edrosten>        09/01/05 15:25:34

Modified files:
        .              : libtool 
        tag            : fn.h 

Log message:
        Make member_iterator non-const. Add member_const_iterator

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/tag/libtool?cvsroot=toon&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/tag/tag/fn.h?cvsroot=toon&r1=1.6&r2=1.7

Patches:
Index: libtool
===================================================================
RCS file: /cvsroot/toon/tag/libtool,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libtool     18 Aug 2008 17:36:27 -0000      1.12
+++ libtool     5 Jan 2009 15:25:33 -0000       1.13
@@ -44,7 +44,7 @@
 
 # ### BEGIN LIBTOOL CONFIG
 
-# Libtool was configured on host bigfrog.lanl.gov:
+# Libtool was configured on host mesofrog:
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -66,12 +66,12 @@
 
 # The host system.
 host_alias=
-host=x86_64-unknown-linux
+host=i686-pc-linux
 host_os=linux
 
 # The build system.
 build_alias=
-build=x86_64-unknown-linux
+build=i686-pc-linux
 build_os=linux
 
 # An echo program that does not interpret backslashes.
@@ -85,7 +85,7 @@
 LTCC="gcc"
 
 # LTCC compiler flags.
-LTCFLAGS="-g -O2"
+LTCFLAGS="-I /usr/local/include -L /usr/local/include"
 
 # A language-specific compiler.
 CC="gcc"
@@ -97,7 +97,7 @@
 EGREP="/bin/grep -E"
 
 # The linker used to build libraries.
-LD="/usr/bin/ld -m elf_x86_64"
+LD="/usr/bin/ld"
 
 # Whether we need hard or soft links.
 LN_S="ln -s"
@@ -147,7 +147,7 @@
 pic_mode=default
 
 # What is the maximum length of a command?
-max_cmd_len=98304
+max_cmd_len=1572864
 
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o="yes"
@@ -325,10 +325,10 @@
 link_all_deplibs=unknown
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.1.2 /usr/lib64 
/lib64"
+sys_lib_search_path_spec="/usr/lib/gcc/i686-pc-linux-gnu/4.3.2 /usr/lib /lib"
 
 # Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/R/lib /usr/lib64/R/lib 
/usr/lib/cernlib/2006-g77/lib /usr/lib64/cernlib/2006-g77/lib 
/usr/lib/cernlib/2006/lib /usr/lib64/cernlib/2006/lib 
/packages/lib/intel/fce/lib /usr/lib/mysql /usr/lib64/mysql 
/usr/lib/octave-3.0.1 /usr/lib64/octave-3.0.1 /usr/lib/qt-3.3/lib 
/usr/lib64/qt-3.3/lib /usr/lib64/qt4/lib64 /usr/lib/wine/ /usr/local/lib64 
/usr/local/lib "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/libfakeroot /lib /usr/lib 
/usr/local/lib /opt/qt/lib /usr/i486-linux-libc5/lib "
 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""
@@ -6812,7 +6812,7 @@
 # End:
 # ### BEGIN LIBTOOL TAG CONFIG: CXX
 
-# Libtool was configured on host bigfrog.lanl.gov:
+# Libtool was configured on host mesofrog:
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -6834,12 +6834,12 @@
 
 # The host system.
 host_alias=
-host=x86_64-unknown-linux
+host=i686-pc-linux
 host_os=linux
 
 # The build system.
 build_alias=
-build=x86_64-unknown-linux
+build=i686-pc-linux
 build_os=linux
 
 # An echo program that does not interpret backslashes.
@@ -6853,7 +6853,7 @@
 LTCC="gcc"
 
 # LTCC compiler flags.
-LTCFLAGS="-g -O2"
+LTCFLAGS="-I /usr/local/include -L /usr/local/include"
 
 # A language-specific compiler.
 CC="g++"
@@ -6865,7 +6865,7 @@
 EGREP="/bin/grep -E"
 
 # The linker used to build libraries.
-LD="/usr/bin/ld -m elf_x86_64"
+LD="/usr/bin/ld"
 
 # Whether we need hard or soft links.
 LN_S="ln -s"
@@ -6915,7 +6915,7 @@
 pic_mode=default
 
 # What is the maximum length of a command?
-max_cmd_len=98304
+max_cmd_len=1572864
 
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o="yes"
@@ -6994,11 +6994,11 @@
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.1.2/../../../../lib64/crti.o
 /usr/lib/gcc/x86_64-redhat-linux/4.1.2/crtbeginS.o"
+predep_objects="/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/../../../crti.o 
/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/crtbeginS.o"
 
 # Dependencies to place after the objects being linked to create a
 # shared library.
-postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.1.2/crtendS.o 
/usr/lib/gcc/x86_64-redhat-linux/4.1.2/../../../../lib64/crtn.o"
+postdep_objects="/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/crtendS.o 
/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/../../../crtn.o"
 
 # Dependencies to place before the objects being linked to create a
 # shared library.
@@ -7010,7 +7010,7 @@
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.2 
-L/usr/lib/gcc/x86_64-redhat-linux/4.1.2 
-L/usr/lib/gcc/x86_64-redhat-linux/4.1.2/../../../../lib64 -L/lib/../lib64 
-L/usr/lib/../lib64"
+compiler_lib_search_path="-L/usr/lib/gcc/i686-pc-linux-gnu/4.3.2 
-L/usr/lib/gcc/i686-pc-linux-gnu/4.3.2 
-L/usr/lib/gcc/i686-pc-linux-gnu/4.3.2/../../.."
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method="pass_all"
@@ -7090,10 +7090,10 @@
 link_all_deplibs=unknown
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.1.2 /usr/lib64 
/lib64"
+sys_lib_search_path_spec="/usr/lib/gcc/i686-pc-linux-gnu/4.3.2 /usr/lib /lib"
 
 # Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/R/lib /usr/lib64/R/lib 
/usr/lib/cernlib/2006-g77/lib /usr/lib64/cernlib/2006-g77/lib 
/usr/lib/cernlib/2006/lib /usr/lib64/cernlib/2006/lib 
/packages/lib/intel/fce/lib /usr/lib/mysql /usr/lib64/mysql 
/usr/lib/octave-3.0.1 /usr/lib64/octave-3.0.1 /usr/lib/qt-3.3/lib 
/usr/lib64/qt-3.3/lib /usr/lib64/qt4/lib64 /usr/lib/wine/ /usr/local/lib64 
/usr/local/lib "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/libfakeroot /lib /usr/lib 
/usr/local/lib /opt/qt/lib /usr/i486-linux-libc5/lib "
 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""
@@ -7117,7 +7117,7 @@
 
 # ### BEGIN LIBTOOL TAG CONFIG: F77
 
-# Libtool was configured on host bigfrog.lanl.gov:
+# Libtool was configured on host mesofrog:
 
 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -7139,12 +7139,12 @@
 
 # The host system.
 host_alias=
-host=x86_64-unknown-linux
+host=i686-pc-linux
 host_os=linux
 
 # The build system.
 build_alias=
-build=x86_64-unknown-linux
+build=i686-pc-linux
 build_os=linux
 
 # An echo program that does not interpret backslashes.
@@ -7158,10 +7158,10 @@
 LTCC="gcc"
 
 # LTCC compiler flags.
-LTCFLAGS="-g -O2"
+LTCFLAGS="-I /usr/local/include -L /usr/local/include"
 
 # A language-specific compiler.
-CC="g77"
+CC="gfortran"
 
 # Is the compiler the GNU C compiler?
 with_gcc=yes
@@ -7170,7 +7170,7 @@
 EGREP="/bin/grep -E"
 
 # The linker used to build libraries.
-LD="/usr/bin/ld -m elf_x86_64"
+LD="/usr/bin/ld"
 
 # Whether we need hard or soft links.
 LN_S="ln -s"
@@ -7220,7 +7220,7 @@
 pic_mode=default
 
 # What is the maximum length of a command?
-max_cmd_len=98304
+max_cmd_len=1572864
 
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o="yes"
@@ -7398,10 +7398,10 @@
 link_all_deplibs=unknown
 
 # Compile-time system search path for libraries
-sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.1.2 /usr/lib64 
/lib64"
+sys_lib_search_path_spec="/usr/lib/gcc/i686-pc-linux-gnu/4.3.2 /usr/lib /lib"
 
 # Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/R/lib /usr/lib64/R/lib 
/usr/lib/cernlib/2006-g77/lib /usr/lib64/cernlib/2006-g77/lib 
/usr/lib/cernlib/2006/lib /usr/lib64/cernlib/2006/lib 
/packages/lib/intel/fce/lib /usr/lib/mysql /usr/lib64/mysql 
/usr/lib/octave-3.0.1 /usr/lib64/octave-3.0.1 /usr/lib/qt-3.3/lib 
/usr/lib64/qt-3.3/lib /usr/lib64/qt4/lib64 /usr/lib/wine/ /usr/local/lib64 
/usr/local/lib "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/libfakeroot /lib /usr/lib 
/usr/local/lib /opt/qt/lib /usr/i486-linux-libc5/lib "
 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""

Index: tag/fn.h
===================================================================
RCS file: /cvsroot/toon/tag/tag/fn.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- tag/fn.h    16 Jul 2007 23:13:49 -0000      1.6
+++ tag/fn.h    5 Jan 2009 15:25:33 -0000       1.7
@@ -193,6 +193,15 @@
     inline reference operator->(void) const {
         return iterator->*data;
     }
+
+    inline reference operator*(void) {
+        return (*iterator).*data;
+    }
+    inline reference operator->(void) {
+        return iterator->*data;
+    }
+
+
     inline reference operator[](difference_type n) const {
         return iterator[n].*data;
     }
@@ -248,7 +257,7 @@
 /**
 helper function to simplify the use of @ref member_iterator_t wrapper. This is 
useful for passing
 member iterators as arguments.
address@hidden it the iterator to wrap, the new member_iterator_t returned will 
point to the same position
address@hidden it the const iterator to wrap, the new member_iterator_t 
returned will point to the same position
 @arg d the member to wrap
 @code
 struct simple { int a; float b; };
@@ -257,10 +266,28 @@
 @endcode
 */
 template <typename It, typename m>
-inline struct member_iterator_t<It, m> member_iterator( const It & it, m 
std::iterator_traits<It>::value_type::*d ){
+inline struct member_iterator_t<It, m> member_const_iterator( const It & it, m 
std::iterator_traits<It>::value_type::*d ){
     return member_iterator_t<It, m>(it, d);
 }
 
+/*
+helper function to simplify the use of @ref member_iterator_t wrapper. This is 
useful for passing
+member iterators as arguments.
address@hidden it the iterator to wrap, the new member_iterator_t returned will 
point to the same position
address@hidden d the member to wrap
address@hidden
+struct simple { int a; float b; };
+vector<simple> test;
+fill(member_iterator(test.begin(), &simple::a), member_iterator(test.end(), 
&simple::a), 0 );
address@hidden
+*/
+
+template <typename It, typename m>
+inline struct member_iterator_t<It, m> member_iterator(It it, m 
std::iterator_traits<It>::value_type::*d ){
+    return member_iterator_t<It, m>(it, d);
+}
+
+
 //@}
 
 }