From 13877f54560d8ff2d6ded395160afe4864d59dd1 Mon Sep 17 00:00:00 2001 From: Davis King Date: Tue, 29 Sep 2015 22:36:46 -0400 Subject: [PATCH 1/2] Made makerel put the tag on the right revision --- docs/makerel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/makerel b/docs/makerel index a9137027b..112159234 100755 --- a/docs/makerel +++ b/docs/makerel @@ -36,8 +36,8 @@ set_dlib_version PATCH 0 RELEASE=${MAJOR_NUM}.${MINOR_NUM} # Commit changes to the version numbers so that the makedocs script will use them. echo Create Mercurial tags and commit release -hg tag v$RELEASE || report_failure hg commit -m "Created release v$RELEASE" || report_failure +hg tag v$RELEASE || report_failure ./makedocs makerel || exit 1 From af6163d9a2b82af4d84c107352afb0603583bb74 Mon Sep 17 00:00:00 2001 From: Davis King Date: Mon, 12 Oct 2015 20:07:16 -0400 Subject: [PATCH 2/2] Fixed potential compile time error. --- dlib/hash_map/hash_map_kernel_c.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlib/hash_map/hash_map_kernel_c.h b/dlib/hash_map/hash_map_kernel_c.h index b643c5d4d..4db937249 100644 --- a/dlib/hash_map/hash_map_kernel_c.h +++ b/dlib/hash_map/hash_map_kernel_c.h @@ -218,7 +218,7 @@ namespace dlib ) const { // make sure requires clause is not broken - DLIB_CASSERT( is_in_domain(d), + DLIB_CASSERT( this->is_in_domain(d), "\tconst range& hash_map::operator[]" << "\n\td must be in the domain of the hash_map" << "\n\tthis: " << this