Skip to content

GitLab

Commit 3ca08063 authored by Davis King's avatar Davis King
Browse files

merged

parents c2b66ecc af6163d9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
dlib/hash_map/hash_map_kernel_c.h
View file @ 3ca08063
...@@ -218,7 +218,7 @@ namespace dlib ...@@ -218,7 +218,7 @@ namespace dlib
) const ) const
{ {
// make sure requires clause is not broken // 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[]" "\tconst range& hash_map::operator[]"
<< "\n\td must be in the domain of the hash_map" << "\n\td must be in the domain of the hash_map"
<< "\n\tthis: " << this << "\n\tthis: " << this
......
docs/makerel
View file @ 3ca08063
...@@ -36,8 +36,8 @@ set_dlib_version PATCH 0 ...@@ -36,8 +36,8 @@ set_dlib_version PATCH 0
RELEASE=${MAJOR_NUM}.${MINOR_NUM} RELEASE=${MAJOR_NUM}.${MINOR_NUM}
# Commit changes to the version numbers so that the makedocs script will use them. # Commit changes to the version numbers so that the makedocs script will use them.
echo Create Mercurial tags and commit release echo Create Mercurial tags and commit release
hg tag v$RELEASE || report_failure
hg commit -m "Created release v$RELEASE" || report_failure hg commit -m "Created release v$RELEASE" || report_failure
hg tag v$RELEASE || report_failure
./makedocs makerel || exit 1 ./makedocs makerel || exit 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment