mirror of https://github.com/davisking/dlib.git
merged
This commit is contained in:
commit
3ca0806358
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue