[pkg-boost-devel] Re: [pkg-boost-commits] r13965 - in boost/trunk/boost: archive/detail numeric/ublas

Christophe Prud'homme prudhomm at debian.org
Mon Apr 10 07:31:54 UTC 2006


Domenico

Sorry if the log seems big, it is not
my emacs is configured to remove extra white spaces at end of lines and it 
seems that boost code is full of them
essentially I 
 o commented out flags in (o|i)serializer.hpp 
 o added one detail::ignore_unused_variable_warning(it); in
   boost/numeric/matrix.hpp 
in order to get rid of tons of unused variable warnings with -Wall

[ Monday 10 April 2006 09:26 ]
| Author: prudhomm
| Date: 2006-04-10 07:25:59 +0000 (Mon, 10 Apr 2006)
| New Revision: 13965
|
| Modified:
|    boost/trunk/boost/archive/detail/iserializer.hpp
|    boost/trunk/boost/archive/detail/oserializer.hpp
|    boost/trunk/boost/numeric/ublas/matrix.hpp
| Log:
| -- unused variable warnings
|
|
| Modified: boost/trunk/boost/archive/detail/iserializer.hpp
| ===================================================================
| --- boost/trunk/boost/archive/detail/iserializer.hpp	2006-03-22 15:30:04
| UTC (rev 13964) +++
| boost/trunk/boost/archive/detail/iserializer.hpp	2006-04-10 07:25:59 UTC
| (rev 13965) @@ -15,7 +15,7 @@
| 
| /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////
|////8 // iserializer.hpp: interface for serialization system.
|
| -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
| +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
|  // Use, modification and distribution is subject to the Boost Software
|  // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
|  // http://www.boost.org/LICENSE_1_0.txt)
| @@ -29,8 +29,8 @@
|  #include <boost/config.hpp>
|  #include <boost/detail/workaround.hpp>
|  #if defined(BOOST_NO_STDC_NAMESPACE)
| -namespace std{
| -    using ::size_t;
| +namespace std{
| +    using ::size_t;
|  } // namespace std
|  #endif
|  #include <boost/throw_exception.hpp>
| @@ -106,7 +106,7 @@
|      virtual void destroy(/*const*/ void *address) const {
|          boost::serialization::access::destroy(static_cast<T *>(address));
|      }
| -    // private constructor to inhibit any existence other than the
| +    // private constructor to inhibit any existence other than the
|      // static one
|      explicit iserializer() :
|          basic_iserializer(
| @@ -116,19 +116,19 @@
|  public:
|      virtual BOOST_DLLEXPORT void load_object_data(
|          basic_iarchive & ar,
| -        void *x,
| +        void *x,
|          const unsigned int file_version
|      ) const BOOST_USED ;
|      virtual bool class_info() const {
| -        return boost::serialization::implementation_level<T>::value
| +        return boost::serialization::implementation_level<T>::value
|
|              >= boost::serialization::object_class_info;
|
|      }
| -    virtual bool tracking(const unsigned int flags) const {
| +    virtual bool tracking(const unsigned int /*flags*/) const {
|  //        if(0 != (flags & no_tracking))
|  //            return false;
| -        return boost::serialization::tracking_level<T>::value
| +        return boost::serialization::tracking_level<T>::value
|                  == boost::serialization::track_always
| -            || boost::serialization::tracking_level<T>::value
| +            || boost::serialization::tracking_level<T>::value
|                  == boost::serialization::track_selectivly
|              && serialized_as_pointer();
|      }
| @@ -136,7 +136,7 @@
|          return ::boost::serialization::version<T>::value;
|      }
|      virtual bool is_polymorphic() const {
| -        typedef BOOST_DEDUCED_TYPENAME
| +        typedef BOOST_DEDUCED_TYPENAME
|              boost::serialization::type_info_implementation<
|                  T
|
|              >::type::is_polymorphic::type typex;
|
| @@ -152,14 +152,14 @@
|  template<class Archive, class T>
|  BOOST_DLLEXPORT void iserializer<Archive, T>::load_object_data(
|      basic_iarchive & ar,
| -    void *x,
| +    void *x,
|      const unsigned int file_version
|  ) const {
|      // make sure call is routed through the higest interface that might
|      // be specialized by the user.
|      boost::serialization::serialize_adl(
|          boost::smart_cast_reference<Archive &>(ar),
| -        * static_cast<T *>(x),
| +        * static_cast<T *>(x),
|          file_version
|      );
|  }
| @@ -168,27 +168,27 @@
|  // normal argument order to workaround bizarre error in MSVC 6.0 which
| only // manifests iftself during compiler time.
|  template<class T, class Archive>
| -class pointer_iserializer : public archive_pointer_iserializer<Archive>
| +class pointer_iserializer : public archive_pointer_iserializer<Archive>
|  {
|  private:
|      virtual const basic_iserializer & get_basic_serializer() const {
|          return iserializer<Archive, T>::instantiate();
|      }
|      virtual BOOST_DLLEXPORT void load_object_ptr(
| -        basic_iarchive & ar,
| +        basic_iarchive & ar,
|          void * & x,
|          const unsigned int file_version
|      ) const BOOST_USED;
|  #if defined(__GNUC__) || ( defined(BOOST_MSVC) && (_MSC_VER <= 1300) )
|  public:
|  #endif
| -    // private constructor to inhibit any existence other than the
| +    // private constructor to inhibit any existence other than the
|      // static one.  Note GCC doesn't permit constructor to be private
|      explicit BOOST_DLLEXPORT pointer_iserializer() BOOST_USED;
|      static const pointer_iserializer instance;
|  public:
|      // at least one compiler (CW) seems to require that serialize_adl
| -    // be explicitly instantiated. Still under investigation.
| +    // be explicitly instantiated. Still under investigation.
|      #if !defined(__BORLANDC__)
|      void (* const m)(Archive &, T &, const unsigned);
|      boost::serialization::extended_type_info * (* e)();
| @@ -198,7 +198,7 @@
|  };
|
|  template<class T, class Archive>
| -BOOST_DLLEXPORT const pointer_iserializer<T, Archive> &
| +BOOST_DLLEXPORT const pointer_iserializer<T, Archive> &
|  pointer_iserializer<T, Archive>::instantiate() {
|      return instance;
|  }
| @@ -214,7 +214,7 @@
|  // version if such exists. Due to Peter Dimov.
|  // note: the following fails if T has no default constructor.
|  // otherwise it would have been ideal
| -//struct heap_allocator : public T
| +//struct heap_allocator : public T
|  //{
|  //    T * invoke(){
|  //        return ::new(sizeof(T));
| @@ -282,7 +282,7 @@
|
|  template<class T, class Archive>
|  BOOST_DLLEXPORT void pointer_iserializer<T, Archive>::load_object_ptr(
| -    basic_iarchive & ar,
| +    basic_iarchive & ar,
|      void * & x,
|      const unsigned int file_version
|  ) const {
| @@ -304,12 +304,12 @@
|      // automatically delete the t which is most likely not fully
|      // constructed
|      BOOST_TRY {
| -        // this addresses an obscure situtation that occurs when
| +        // this addresses an obscure situtation that occurs when
|          // load_constructor de-serializes something through a pointer.
|          ar.next_object_pointer(t);
|          boost::serialization::load_construct_data_adl<Archive, T>(
|              ar_impl,
| -            t,
| +            t,
|              file_version
|          );
|      }
| @@ -418,7 +418,7 @@
|      static void invoke(Archive & ar, T &t){
|          BOOST_STATIC_ASSERT((
|              mpl::greater_equal<
| -                boost::serialization::implementation_level<T>,
| +                boost::serialization::implementation_level<T>,
|                  mpl::int_<boost::serialization::primitive_type>
|
|              >::value
|
|          ));
| @@ -433,7 +433,7 @@
|      {
|          static const basic_pointer_iserializer * register_type(Archive &
| /* ar */){ #if ! defined(__BORLANDC__)
| -            typedef BOOST_DEDUCED_TYPENAME
| +            typedef BOOST_DEDUCED_TYPENAME
|                 
| boost::serialization::type_info_implementation<T>::type::is_polymorphic
| typex; // it has? to be polymorphic
|              BOOST_STATIC_ASSERT(typex::value);
| @@ -452,7 +452,7 @@
|
|      template<class T>
|      static const basic_pointer_iserializer * register_type(Archive &ar, T
| & /*t*/){ -        // there should never be any need to load an abstract
| polymorphic +        // there should never be any need to load an abstract
| polymorphic // class pointer.  Inhibiting code generation for this
|          // permits abstract base classes to be used - note: exception
|          // virtual serialize functions used for plug-ins
| @@ -460,7 +460,7 @@
|              mpl::eval_if<
|                  serialization::is_abstract<T>,
|                  mpl::identity<abstract<T> >,
| -                mpl::identity<non_abstract<T> >
| +                mpl::identity<non_abstract<T> >
|
|              >::type typex;
|
|          return typex::register_type(ar);
|      }
| @@ -510,7 +510,7 @@
|      static void invoke(Archive &ar, T &t){
|          // convert integers to correct enum to load
|          int current_count = sizeof(t) / (
| -            static_cast<char *>(static_cast<void *>(&t[1]))
| +            static_cast<char *>(static_cast<void *>(&t[1]))
|              - static_cast<char *>(static_cast<void *>(&t[0]))
|          );
|          int count;
| @@ -527,7 +527,7 @@
|
|  // note bogus arguments to workaround msvc 6 silent runtime failure
|  template<class Archive, class T>
| -BOOST_DLLEXPORT
| +BOOST_DLLEXPORT
|  inline const basic_pointer_iserializer &
|  instantiate_pointer_iserializer(
|      Archive * /* ar = NULL */,
| @@ -535,7 +535,7 @@
|  ) BOOST_USED;
|
|  template<class Archive, class T>
| -BOOST_DLLEXPORT
| +BOOST_DLLEXPORT
|  inline const basic_pointer_iserializer &
|  instantiate_pointer_iserializer(
|      Archive * /* ar = NULL */,
|
| Modified: boost/trunk/boost/archive/detail/oserializer.hpp
| ===================================================================
| --- boost/trunk/boost/archive/detail/oserializer.hpp	2006-03-22 15:30:04
| UTC (rev 13964) +++
| boost/trunk/boost/archive/detail/oserializer.hpp	2006-04-10 07:25:59 UTC
| (rev 13965) @@ -15,7 +15,7 @@
| 
| /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////
|////8 // oserializer.hpp: interface for serialization system.
|
| -// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
| +// (C) Copyright 2002 Robert Ramey - http://www.rrsd.com .
|  // Use, modification and distribution is subject to the Boost Software
|  // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
|  // http://www.boost.org/LICENSE_1_0.txt)
| @@ -99,7 +99,7 @@
|  class oserializer : public basic_oserializer
|  {
|  private:
| -    // private constructor to inhibit any existence other than the
| +    // private constructor to inhibit any existence other than the
|      // static one
|      explicit oserializer() :
|          basic_oserializer(
| @@ -108,14 +108,14 @@
|      {}
|  public:
|      virtual BOOST_DLLEXPORT void save_object_data(
| -        basic_oarchive & ar,
| +        basic_oarchive & ar,
|          const void *x
|      ) const BOOST_USED ;
|      virtual bool class_info() const {
| -        return boost::serialization::implementation_level<T>::value
| +        return boost::serialization::implementation_level<T>::value
|
|              >= boost::serialization::object_class_info;
|
|      }
| -    virtual bool tracking(const unsigned int flags) const {
| +    virtual bool tracking(const unsigned int /*flags*/) const {
|  //        if(0 != (flags &  no_tracking))
|  //            return false;
|          return boost::serialization::tracking_level<T>::value ==
| boost::serialization::track_always @@ -140,7 +140,7 @@
|
|  template<class Archive, class T>
|  BOOST_DLLEXPORT void oserializer<Archive, T>::save_object_data(
| -    basic_oarchive & ar,
| +    basic_oarchive & ar,
|      const void *x
|  ) const {
|      // make sure call is routed through the highest interface that might
| @@ -156,7 +156,7 @@
|  // normal argument order to workaround bizarre error in MSVC 6.0 which
| only // manifests iftself during compiler time.
|  template<class T, class Archive>
| -class pointer_oserializer : public archive_pointer_oserializer<Archive>
| +class pointer_oserializer : public archive_pointer_oserializer<Archive>
|  {
|  private:
|      virtual const basic_oserializer & get_basic_serializer() const {
| @@ -169,14 +169,14 @@
|  #if defined(__GNUC__) || ( defined(BOOST_MSVC) && (_MSC_VER <= 1300) )
|  public:
|  #endif
| -    // private constructor to inhibit any existence other than the
| +    // private constructor to inhibit any existence other than the
|      // static one.  Note GCC doesn't permit constructor to be private
|      explicit BOOST_DLLEXPORT pointer_oserializer() BOOST_USED;
|      static const pointer_oserializer instance;
|  public:
|      #if !defined(__BORLANDC__)
|      // at least one compiler (CW) seems to require that serialize_adl
| -    // be explicitly instantiated. Still under investigation.
| +    // be explicitly instantiated. Still under investigation.
|      void (* const m)(Archive &, T &, const unsigned);
|      boost::serialization::extended_type_info * (* e)();
|      #endif
| @@ -185,7 +185,7 @@
|  };
|
|  template<class T, class Archive>
| -BOOST_DLLEXPORT const pointer_oserializer<T, Archive> &
| +BOOST_DLLEXPORT const pointer_oserializer<T, Archive> &
|  pointer_oserializer<T, Archive>::instantiate(){
|      return instance;
|  }
| @@ -209,8 +209,8 @@
|      const unsigned int file_version =
| boost::serialization::version<T>::value; Archive & ar_impl =
| boost::smart_cast_reference<Archive &>(ar);
| boost::serialization::save_construct_data_adl<Archive, T>(
| -        ar_impl,
| -        t,
| +        ar_impl,
| +        t,
|          file_version
|      );
|      ar_impl << boost::serialization::make_nvp(NULL, * t);
| @@ -251,8 +251,8 @@
|              // make sure call is routed through the highest interface that
| might // be specialized by the user.
|              boost::serialization::serialize_adl(
| -                ar,
| -                const_cast<T &>(t),
| +                ar,
| +                const_cast<T &>(t),
|
|                  ::boost::serialization::version<T>::value
|
|              );
|          }
| @@ -276,7 +276,7 @@
|          }
|      };
|
| -    typedef
| +    typedef
|          BOOST_DEDUCED_TYPENAME mpl::eval_if<
|          // if its primitive
|              mpl::equal_to<
| @@ -305,7 +305,7 @@
|          // else
|              // do a fast save only tracking is turned off
|              mpl::identity<save_conditional>
| -    > > >::type typex;
| +    > > >::type typex;
|
|      static void invoke(Archive & ar, const T & t){
|          // check that we're not trying to serialize something that
| @@ -315,7 +315,7 @@
|          // (see level.hpp) or change program not to serialize items of
| this class BOOST_STATIC_ASSERT((
|              mpl::greater_equal<
| -                boost::serialization::implementation_level<T>,
| +                boost::serialization::implementation_level<T>,
|                  mpl::int_<boost::serialization::primitive_type>
|
|              >::value
|
|          ));
| @@ -347,15 +347,15 @@
|
|      template<class T>
|      static const basic_pointer_oserializer * register_type(Archive &ar, T
| & /*t*/){ -        // there should never be any need to save an abstract
| polymorphic +        // there should never be any need to save an abstract
| polymorphic // class pointer.  Inhibiting code generation for this
|          // permits abstract base classes to be used - note: exception
|          // virtual serialize functions used for plug-ins
| -        typedef
| +        typedef
|              BOOST_DEDUCED_TYPENAME mpl::eval_if<
|                  serialization::is_abstract<T>,
|                  mpl::identity<abstract<T> >,
| -                mpl::identity<non_abstract<T> >
| +                mpl::identity<non_abstract<T> >
|
|              >::type typex;
|
|          return typex::register_type(ar);
|      }
| @@ -364,8 +364,8 @@
|      struct non_polymorphic
|      {
|          static void save(
| -            Archive &ar,
| -            const T & t,
| +            Archive &ar,
| +            const T & t,
|              const basic_pointer_oserializer * bpos_ptr
|          ){
|              // save the requested pointer type
| @@ -377,8 +377,8 @@
|      struct polymorphic
|      {
|          static void save(
| -            Archive &ar,
| -            const T & t,
| +            Archive &ar,
| +            const T & t,
|              const basic_pointer_oserializer * bpos_ptr
|          ){
|              const boost::serialization::extended_type_info * this_type
| @@ -386,7 +386,7 @@
|              // retrieve the true type of the object pointed to
|              // if this assertion fails its an error in this library
|              assert(NULL != this_type);
| -            const boost::serialization::extended_type_info * true_type
| +            const boost::serialization::extended_type_info * true_type
|                  =
| boost::serialization::type_info_implementation<T>::type::get_derived_extend
|ed_type_info(t); // note:if this exception is thrown, be sure that derived
| pointer // is either regsitered or exported.
| @@ -411,7 +411,7 @@
|                  );
|              }
|
| -            // sice true_type is valid, and this only gets made if the
| +            // sice true_type is valid, and this only gets made if the
|              // pointer oserializer object has been created, this should
| never // fail
|              bpos_ptr = archive_pointer_oserializer<Archive>::find(*
| true_type); @@ -426,7 +426,7 @@
|
|      template<class T>
|      static void save(
| -        Archive & ar,
| +        Archive & ar,
|          const T &t,
|          const basic_pointer_oserializer * bpos_ptr
|      ){
| @@ -485,7 +485,7 @@
|          save_access::end_preamble(ar);
|          // consider alignment
|          int count = sizeof(t) / (
| -            static_cast<const char *>(static_cast<const void *>(&t[1]))
| +            static_cast<const char *>(static_cast<const void *>(&t[1]))
|              - static_cast<const char *>(static_cast<const void *>(&t[0]))
|          );
|          ar << BOOST_SERIALIZATION_NVP(count);
| @@ -519,7 +519,7 @@
|
|  template<class Archive, class T>
|  inline void save(Archive & ar, const T &t){
| -    typedef
| +    typedef
|          BOOST_DEDUCED_TYPENAME mpl::eval_if<is_pointer<T>,
|              mpl::identity<detail::save_pointer_type<Archive, T> >,
|          //else
|
| Modified: boost/trunk/boost/numeric/ublas/matrix.hpp
| ===================================================================
| --- boost/trunk/boost/numeric/ublas/matrix.hpp	2006-03-22 15:30:04 UTC (rev
| 13964) +++ boost/trunk/boost/numeric/ublas/matrix.hpp	2006-04-10 07:25:59
| UTC (rev 13965) @@ -1048,7 +1048,7 @@
|              return size1_;
|          }
|          BOOST_UBLAS_INLINE
| -        size_type size2 () const {
| +        size_type size2 () const {
|              return size2_;
|          }
|
| @@ -1082,27 +1082,27 @@
|          // Element access
|          BOOST_UBLAS_INLINE
|          const_reference operator () (size_type i, size_type j) const {
| -            return data () [layout_type::element1 (i, size1_, j, size2_)]
| [layout_type::element2 (i, size1_, j, size2_)]; +            return data ()
| [layout_type::element1 (i, size1_, j, size2_)] [layout_type::element2 (i,
| size1_, j, size2_)]; }
|          BOOST_UBLAS_INLINE
|          reference at_element (size_type i, size_type j) {
| -            return data () [layout_type::element1 (i, size1_, j, size2_)]
| [layout_type::element2 (i, size1_, j, size2_)]; +            return data ()
| [layout_type::element1 (i, size1_, j, size2_)] [layout_type::element2 (i,
| size1_, j, size2_)]; }
|          BOOST_UBLAS_INLINE
|          reference operator () (size_type i, size_type j) {
| -            return at_element (i, j);
| +            return at_element (i, j);
|          }
|
|          // Element assignment
|          BOOST_UBLAS_INLINE
|          reference insert_element (size_type i, size_type j,
| const_reference t) { -            return (at_element (i, j) = t);
| +            return (at_element (i, j) = t);
|          }
|          BOOST_UBLAS_INLINE
|          void erase_element (size_type i, size_type j) {
| -            at_element (i, j) = value_type/*zero*/();
| +            at_element (i, j) = value_type/*zero*/();
|          }
| -
| +
|          // Zeroing
|          BOOST_UBLAS_INLINE
|          void clear () {
| @@ -1119,13 +1119,13 @@
|              return *this;
|          }
|          BOOST_UBLAS_INLINE
| -        vector_of_vector &assign_temporary (vector_of_vector &m) {
| +        vector_of_vector &assign_temporary (vector_of_vector &m) {
|              swap (m);
|              return *this;
|          }
|          template<class AE>
|          BOOST_UBLAS_INLINE
| -        vector_of_vector &operator = (const matrix_expression<AE> &ae) {
| +        vector_of_vector &operator = (const matrix_expression<AE> &ae) {
|              self_type temporary (ae);
|              return assign_temporary (temporary);
|          }
| @@ -1138,8 +1138,8 @@
|          }
|          template<class AE>
|          BOOST_UBLAS_INLINE
| -        vector_of_vector &assign (const matrix_expression<AE> &ae) {
| -            matrix_assign<scalar_assign> (*this, ae);
| +        vector_of_vector &assign (const matrix_expression<AE> &ae) {
| +            matrix_assign<scalar_assign> (*this, ae);
|              return *this;
|          }
|          template<class AE>
| @@ -1156,8 +1156,8 @@
|          }
|          template<class AE>
|          BOOST_UBLAS_INLINE
| -        vector_of_vector &plus_assign (const matrix_expression<AE> &ae) {
| -            matrix_assign<scalar_plus_assign> (*this, ae);
| +        vector_of_vector &plus_assign (const matrix_expression<AE> &ae) {
| +            matrix_assign<scalar_plus_assign> (*this, ae);
|              return *this;
|          }
|          template<class AE>
| @@ -1175,7 +1175,7 @@
|          template<class AE>
|          BOOST_UBLAS_INLINE
|          vector_of_vector &minus_assign (const matrix_expression<AE> &ae) {
| -            matrix_assign<scalar_minus_assign> (*this, ae);
| +            matrix_assign<scalar_minus_assign> (*this, ae);
|              return *this;
|          }
|          template<class AT>
| @@ -1294,7 +1294,7 @@
|                  const self_type &m = (*this) ();
|                  if (layout_type::fast1 ())
|                      ++ it_;
| -                else
| +                else
|                      it_ = m.find1 (1, i_, j_).it_;
|                  return *this;
|              }
| @@ -2248,6 +2248,7 @@
|              BOOST_UBLAS_INLINE
|              bool operator == (const const_iterator2 &it) const {
|                  BOOST_UBLAS_CHECK (&(*this) () == &it (), external_logic
| ()); +		detail::ignore_unused_variable_warning(it);
|                  return true;
|              }
|          };
| @@ -2371,7 +2372,7 @@
|              return *this;
|          }
|          BOOST_UBLAS_INLINE
| -        identity_matrix &assign_temporary (identity_matrix &m) {
| +        identity_matrix &assign_temporary (identity_matrix &m) {
|              swap (m);
|              return *this;
|          }
| @@ -2466,14 +2467,14 @@
|              typename self_type::
|  #endif
|              const_iterator2 begin () const {
| -                return const_iterator2 ((*this) (), it_);
| +                return const_iterator2 ((*this) (), it_);
|              }
|              BOOST_UBLAS_INLINE
|  #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION
|              typename self_type::
|  #endif
|              const_iterator2 end () const {
| -                return const_iterator2 ((*this) (), it_ + 1);
| +                return const_iterator2 ((*this) (), it_ + 1);
|              }
|              BOOST_UBLAS_INLINE
|  #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION
| @@ -2578,14 +2579,14 @@
|              typename self_type::
|  #endif
|              const_iterator1 begin () const {
| -                return const_iterator1 ((*this) (), it_);
| +                return const_iterator1 ((*this) (), it_);
|              }
|              BOOST_UBLAS_INLINE
|  #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION
|              typename self_type::
|  #endif
|              const_iterator1 end () const {
| -                return const_iterator1 ((*this) (), it_ + 1);
| +                return const_iterator1 ((*this) (), it_ + 1);
|              }
|              BOOST_UBLAS_INLINE
|  #ifdef BOOST_UBLAS_MSVC_NESTED_CLASS_RELATION
| @@ -2731,7 +2732,7 @@
|          // Element access
|          BOOST_UBLAS_INLINE
|          const_reference operator () (size_type /*i*/, size_type /*j*/)
| const { -            return value_;
| +            return value_;
|          }
|
|          // Assignment
| @@ -2743,7 +2744,7 @@
|              return *this;
|          }
|          BOOST_UBLAS_INLINE
| -        scalar_matrix &assign_temporary (scalar_matrix &m) {
| +        scalar_matrix &assign_temporary (scalar_matrix &m) {
|              swap (m);
|              return *this;
|          }
| @@ -2788,7 +2789,7 @@
|          BOOST_UBLAS_INLINE
|          const_iterator2 find2 (int /*rank*/, size_type i, size_type j)
| const { return const_iterator2 (*this, i, j);
| -        }
| +        }
|
|
|  #ifndef BOOST_UBLAS_USE_INDEXED_ITERATOR
| @@ -3218,7 +3219,7 @@
|          reference insert_element (size_type i, size_type j,
| const_reference t) { return (at_element (i, j) = t);
|          }
| -
| +
|          // Zeroing
|          BOOST_UBLAS_INLINE
|          void clear () {
| @@ -3249,14 +3250,14 @@
|          }
|          template<class AE>
|          BOOST_UBLAS_INLINE
| -        c_matrix &operator = (const matrix_expression<AE> &ae) {
| +        c_matrix &operator = (const matrix_expression<AE> &ae) {
|              self_type temporary (ae);
|              return assign_temporary (temporary);
|          }
|          template<class AE>
|          BOOST_UBLAS_INLINE
| -        c_matrix &assign (const matrix_expression<AE> &ae) {
| -            matrix_assign<scalar_assign> (*this, ae);
| +        c_matrix &assign (const matrix_expression<AE> &ae) {
| +            matrix_assign<scalar_assign> (*this, ae);
|              return *this;
|          }
|          template<class AE>
| @@ -3273,8 +3274,8 @@
|          }
|          template<class AE>
|          BOOST_UBLAS_INLINE
| -        c_matrix &plus_assign (const matrix_expression<AE> &ae) {
| -            matrix_assign<scalar_plus_assign> (*this, ae);
| +        c_matrix &plus_assign (const matrix_expression<AE> &ae) {
| +            matrix_assign<scalar_plus_assign> (*this, ae);
|              return *this;
|          }
|          template<class AE>
| @@ -3291,8 +3292,8 @@
|          }
|          template<class AE>
|          BOOST_UBLAS_INLINE
| -        c_matrix &minus_assign (const matrix_expression<AE> &ae) {
| -            matrix_assign<scalar_minus_assign> (*this, ae);
| +        c_matrix &minus_assign (const matrix_expression<AE> &ae) {
| +            matrix_assign<scalar_minus_assign> (*this, ae);
|              return *this;
|          }
|          template<class AT>
|
|
| _______________________________________________
| pkg-boost-commits mailing list
| pkg-boost-commits at lists.alioth.debian.org
| http://lists.alioth.debian.org/mailman/listinfo/pkg-boost-commits

-- 
Debian Developer - http://people.debian.org/~prudhomm/
Scienfific computing packages maintainer
Fingerprint = 3703 50DE 7A9F 024E 0F26  0D07 A18F B40B D4BE 1450



More information about the pkg-boost-devel mailing list