Changeset 4032


Ignore:
Timestamp:
Jan 21, 2021, 8:44:38 AM (8 months ago)
Author:
Peter
Message:

merge release 0.18.1 into trunk

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/NEWS

    r4019 r4032  
    99
    1010yat 0.18.x series from http://dev.thep.lu.se/yat/svn/branches/0.18-stable
     11
     12version 0.18.1 (released 21 January 2021)
     13  - SegmentTree::key_comp() and ::value_comp() now compile (bug #970).
     14
     15  A complete list of closed tickets can be found here [[br]]
     16  http://dev.thep.lu.se/yat/query?status=closed&milestone=yat+0.18.1
    1117
    1218version 0.18 (released 6 November 2020)
     
    558564Copyright (C) 2010, 2011 Peter Johansson
    559565Copyright (C) 2012 Jari Häkkinen, Peter Johansson
    560 Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Peter Johansson
     566Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Peter Johansson
    561567
    562568This file is part of yat library, http://dev.thep.lu.se/yat
  • trunk/m4/version.m4

    r4019 r4032  
    22#
    33# Copyright (C) 2008, 2009 Jari Häkkinen, Peter Johansson
    4 # Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Peter Johansson
     4# Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019, 2020, 2021 Peter Johansson
    55#
    66# This file is part of the yat library, http://dev.thep.lu.se/yat
     
    9696# yat-0.17.2 14:2:0
    9797# yat-0.18   15:0:0
     98# yat-0.18.1 15:1:0
    9899#
    99100# *Accidently, the libtool number was not updated for yat 0.5
  • trunk/test/segment.cc

    r4027 r4032  
    22
    33/*
    4   Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016, 2017 Peter Johansson
     4  Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016, 2017, 2021 Peter Johansson
    55
    66  This file is part of the yat library, http://dev.thep.lu.se/yat
     
    3030using namespace theplu::yat;
    3131using namespace utility;
     32void test_comp(test::Suite& suite);
    3233void test_compare(test::Suite& suite);
    3334void test_count(test::Suite&);
     
    5253  test::Suite suite(argc, argv);
    5354
     55  test_comp(suite);
    5456  test_compare(suite);
    5557  test_count(suite);
     
    6870
    6971  return suite.return_value();
     72}
     73
     74
     75void test_comp(test::Suite& suite)
     76{
     77  Segment<double> key;
     78  {
     79    SegmentSet<double> set;
     80    SegmentSet<double>::key_compare kcompare = set.key_comp();
     81    if (kcompare(key, key))
     82      suite.add(false);
     83    test::avoid_compiler_warning(kcompare);
     84    SegmentSet<double>::value_compare vcompare = set.value_comp();
     85    if (vcompare(key, key))
     86      suite.add(false);
     87    test::avoid_compiler_warning(vcompare);
     88  }
     89
     90  {
     91    SegmentMap<double, std::string> map;
     92    std::pair<const Segment<double>, std::string> value(key, "hello");
     93    SegmentMap<double, std::string>::key_compare kcompare = map.key_comp();
     94    if (kcompare(key, key))
     95      suite.add(false);
     96    test::avoid_compiler_warning(kcompare);
     97    SegmentMap<double, std::string>::value_compare vcompare = map.value_comp();
     98    if (vcompare(value, value))
     99      suite.add(false);
     100    test::avoid_compiler_warning(vcompare);
     101  }
    70102}
    71103
  • trunk/yat/utility/SegmentTree.h

    r4024 r4032  
    192192    key_compare key_comp(void) const
    193193    {
    194       return key_compare(compare);
     194      return container_.key_comp();
    195195    }
    196196
     
    234234       \c values
    235235     */
    236     value_compare value_comp(void) const { return key_comp(); }
     236    value_compare value_comp(void) const { return container_.value_comp(); }
    237237
    238238  protected:
Note: See TracChangeset for help on using the changeset viewer.