Merge
authorAlpar Juttner <alpar@cs.elte.hu>
Fri, 04 Jan 2008 21:42:16 +0100
changeset 31742abd64255e
parent 30 72364ba3466d
parent 28 e337bdf46777
child 32 ad7f593399b0
child 65 bfbc57a51fbb
Merge
     1.1 --- a/lemon/concept_check.h	Fri Jan 04 08:16:15 2008 +0100
     1.2 +++ b/lemon/concept_check.h	Fri Jan 04 21:42:16 2008 +0100
     1.3 @@ -33,8 +33,8 @@
     1.4  
     1.5  // See http://www.boost.org/libs/concept_check for documentation.
     1.6  
     1.7 -#ifndef LEMON_BOOST_CONCEPT_CHECKS_HPP
     1.8 -#define LEMON_BOOST_CONCEPT_CHECKS_HPP
     1.9 +#ifndef LEMON_CONCEPT_CHECKS_H
    1.10 +#define LEMON_CONCEPT_CHECKS_H
    1.11  
    1.12  namespace lemon {
    1.13  
    1.14 @@ -102,4 +102,4 @@
    1.15  
    1.16  } // namespace lemon
    1.17  
    1.18 -#endif // LEMON_BOOST_CONCEPT_CHECKS_HPP
    1.19 +#endif // LEMON_CONCEPT_CHECKS_H
     2.1 --- a/lemon/concepts/maps.h	Fri Jan 04 08:16:15 2008 +0100
     2.2 +++ b/lemon/concepts/maps.h	Fri Jan 04 21:42:16 2008 +0100
     2.3 @@ -34,6 +34,9 @@
     2.4      /// @{
     2.5  
     2.6      /// Readable map concept
     2.7 +
     2.8 +    /// Readable map concept.
     2.9 +    ///
    2.10      template<typename K, typename T>
    2.11      class ReadMap
    2.12      {
    2.13 @@ -45,7 +48,7 @@
    2.14  
    2.15        /// Returns the value associated with a key.
    2.16  
    2.17 -      /// \bug Value should n't need to be default constructible.
    2.18 +      /// \bug Value shouldn't need to be default constructible.
    2.19        ///
    2.20        Value operator[](const Key &) const {return Value();}
    2.21  
    2.22 @@ -71,6 +74,9 @@
    2.23  
    2.24  
    2.25      /// Writable map concept
    2.26 +    
    2.27 +    /// Writable map concept.
    2.28 +    ///
    2.29      template<typename K, typename T>
    2.30      class WriteMap
    2.31      {
    2.32 @@ -107,7 +113,10 @@
    2.33        };
    2.34      };
    2.35  
    2.36 -    ///Read/Writable map concept
    2.37 +    /// Read/Writable map concept
    2.38 +    
    2.39 +    /// Read/writable map concept.
    2.40 +    ///
    2.41      template<typename K, typename T>
    2.42      class ReadWriteMap : public ReadMap<K,T>,
    2.43  			    public WriteMap<K,T>
    2.44 @@ -133,7 +142,10 @@
    2.45      };
    2.46    
    2.47    
    2.48 -    ///Dereferable map concept
    2.49 +    /// Dereferable map concept
    2.50 +    
    2.51 +    /// Dereferable map concept.
    2.52 +    ///
    2.53      template<typename K, typename T, typename R, typename CR>
    2.54      class ReferenceMap : public ReadWriteMap<K,T>
    2.55      {
    2.56 @@ -156,12 +168,11 @@
    2.57        ///Returns a reference to the value associated to a key.
    2.58        Reference operator[](const Key &) { return tmp; }
    2.59        ///Returns a const reference to the value associated to a key.
    2.60 -      ConstReference operator[](const Key &) const
    2.61 -      { return tmp; }
    2.62 +      ConstReference operator[](const Key &) const { return tmp; }
    2.63        /// Sets the value associated with a key.
    2.64        void set(const Key &k,const Value &t) { operator[](k)=t; }
    2.65  
    2.66 -      // \todo rethink this concept
    2.67 +      /// \todo Rethink this concept. 
    2.68        template<typename _ReferenceMap>
    2.69        struct ReferenceMapConcept {
    2.70  
    2.71 @@ -190,5 +201,7 @@
    2.72      // @}
    2.73  
    2.74    } //namespace concepts
    2.75 +
    2.76  } //namespace lemon
    2.77 +
    2.78  #endif // LEMON_CONCEPT_MAPS_H