Ignore:
Timestamp:
Jan 13, 2014, 4:09:37 PM (10 years ago)
Author:
rybkin
Message:

merge -r 646:663 HEAD

Location:
CMT/v1r25-branch
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CMT/v1r25-branch

  • CMT/v1r25-branch/source/cmt_map.h

    r11 r664  
    22// Copyright Christian Arnault LAL-Orsay CNRS
    33// arnault@lal.in2p3.fr
     4// Modified by Grigory Rybkin
    45// See the complete license in cmt_license.txt "http://www.cecill.info".
    56//-----------------------------------------------------------
     
    276277   *   Return 0 if not found
    277278   */
    278   const T* find (const K& key) const
     279  T* find (const K& key)
     280    //  const T* find (const K& key) const
    279281  {
    280282    if (key < m_key)
     
    504506   *   Returns 0 if not found
    505507   */
    506   const T* find (const K& key) const
     508  T* find (const K& key) const
     509    //  const T* find (const K& key) const
    507510  {
    508511    if (m_top != 0)
Note: See TracChangeset for help on using the changeset viewer.