Changeset 4032 for trunk

Timestamp:

Jan 21, 2021, 8:44:38 AM (2 years ago)

Author:

Peter

Message:

merge release 0.18.1 into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• NEWS (modified) (2 diffs)
• m4/version.m4 (modified) (2 diffs)
• test/segment.cc (modified) (4 diffs)
• yat/utility/SegmentTree.h (modified) (2 diffs)

trunk/NEWS

@@ -9 +9 @@
 
 yat 0.18.x series from http://dev.thep.lu.se/yat/svn/branches/0.18-stable
+
+version 0.18.1 (released 21 January 2021)
+  - SegmentTree::key_comp() and ::value_comp() now compile (bug #970).
+
+  A complete list of closed tickets can be found here [[br]]
+  http://dev.thep.lu.se/yat/query?status=closed&milestone=yat+0.18.1
 
 version 0.18 (released 6 November 2020)
@@ -558 +564 @@
 Copyright (C) 2010, 2011 Peter Johansson
 Copyright (C) 2012 Jari Häkkinen, Peter Johansson
-Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Peter Johansson
+Copyright (C) 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Peter Johansson
 
 This file is part of yat library, http://dev.thep.lu.se/yat

trunk/m4/version.m4

@@ -2 +2 @@
 #
 # Copyright (C) 2008, 2009 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Peter Johansson
+# Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2017, 2018, 2019, 2020, 2021 Peter Johansson
 #
 # This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -96 +96 @@
 # yat-0.17.2 14:2:0
 # yat-0.18   15:0:0
+# yat-0.18.1 15:1:0
 #
 # *Accidently, the libtool number was not updated for yat 0.5

trunk/test/segment.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016, 2017 Peter Johansson
+  Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016, 2017, 2021 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -30 +30 @@
 using namespace theplu::yat;
 using namespace utility;
+void test_comp(test::Suite& suite);
 void test_compare(test::Suite& suite);
 void test_count(test::Suite&);
@@ -52 +53 @@
   test::Suite suite(argc, argv);
 
+  test_comp(suite);
   test_compare(suite);
   test_count(suite);
@@ -68 +70 @@
 
   return suite.return_value();
+}
+
+
+void test_comp(test::Suite& suite)
+{
+  Segment<double> key;
+  {
+    SegmentSet<double> set;
+    SegmentSet<double>::key_compare kcompare = set.key_comp();
+    if (kcompare(key, key))
+      suite.add(false);
+    test::avoid_compiler_warning(kcompare);
+    SegmentSet<double>::value_compare vcompare = set.value_comp();
+    if (vcompare(key, key))
+      suite.add(false);
+    test::avoid_compiler_warning(vcompare);
+  }
+
+  {
+    SegmentMap<double, std::string> map;
+    std::pair<const Segment<double>, std::string> value(key, "hello");
+    SegmentMap<double, std::string>::key_compare kcompare = map.key_comp();
+    if (kcompare(key, key))
+      suite.add(false);
+    test::avoid_compiler_warning(kcompare);
+    SegmentMap<double, std::string>::value_compare vcompare = map.value_comp();
+    if (vcompare(value, value))
+      suite.add(false);
+    test::avoid_compiler_warning(vcompare);
+  }
 }
 

trunk/yat/utility/SegmentTree.h

@@ -192 +192 @@
     key_compare key_comp(void) const
     {
-      return key_compare(compare);
+      return container_.key_comp();
     }
 
@@ -234 +234 @@
        \c values
      */
-    value_compare value_comp(void) const { return key_comp(); }
+    value_compare value_comp(void) const { return container_.value_comp(); }
 
   protected: