Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dlib/any/any_abstract.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace dlib
!*/

public:
virtual const char* what() const throw() { return "bad_any_cast"; }
virtual const char* what() const noexcept { return "bad_any_cast"; }
};

// ----------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion dlib/cmd_line_parser/cmd_line_parser_check_1.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ namespace dlib
required_opts()
{ set_info_string(); }

~cmd_line_check_error() throw() {}
~cmd_line_check_error() noexcept {}

void set_info_string (
)
Expand Down
2 changes: 1 addition & 1 deletion dlib/cmd_line_parser/cmd_line_parser_kernel_1.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ namespace dlib
num(0)
{ set_info_string();}

~cmd_line_parse_error() throw() {}
~cmd_line_parse_error() noexcept {}

const std::basic_string<charT> item;
const unsigned long num;
Expand Down
4 changes: 2 additions & 2 deletions dlib/config_reader/config_reader_kernel_1.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ namespace dlib
file_name(file_name_)
{}

~file_not_found() throw() {}
~file_not_found() noexcept {}

public:
const std::string file_name;
Expand All @@ -117,7 +117,7 @@ namespace dlib
const_cast<std::string&>(info) = sout.str();
}

~config_reader_access_error() throw() {}
~config_reader_access_error() noexcept {}
const std::string block_name;
const std::string key_name;
};
Expand Down
6 changes: 3 additions & 3 deletions dlib/error.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ namespace dlib
!*/

virtual ~error(
) throw() {}
) noexcept {}
/*!
ensures
- does nothing
!*/

const char* what(
) const throw()
) const noexcept
/*!
ensures
- if (info.size() != 0) then
Expand All @@ -128,7 +128,7 @@ namespace dlib
}

const char* type_to_string (
) const throw()
) const noexcept
/*!
ensures
- returns a string that names the contents of the type member.
Expand Down
2 changes: 1 addition & 1 deletion dlib/misc_api/misc_api_kernel_1.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ namespace dlib
name(dir_name)
{}

~dir_create_error() throw() {}
~dir_create_error() noexcept {}
const std::string name;
};

Expand Down
14 changes: 7 additions & 7 deletions dlib/std_allocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,17 @@ namespace dlib
/*constructors and destructor
*-nothing to do because the std_allocator has no state
*/
std_allocator() throw() { }
std_allocator() noexcept { }

std_allocator(const std_allocator&) throw() { }
std_allocator(const std_allocator&) noexcept { }

template <typename U>
std_allocator (const std_allocator<U,M>&) throw() { }
std_allocator (const std_allocator<U,M>&) noexcept { }

~std_allocator() throw() { }
~std_allocator() noexcept { }

//return maximum number of elements that can be allocated
size_type max_size () const throw()
size_type max_size () const noexcept
{
//for numeric_limits see Section 4.3, page 59
return std::numeric_limits<size_t>::max() / sizeof(T);
Expand Down Expand Up @@ -173,14 +173,14 @@ namespace dlib
bool operator== (
const std_allocator<T1,M1>&,
const std_allocator<T2,M2>&
) throw()
) noexcept
{ return std_alloc_compare<M1,M2>::are_interchangeable; }

template <typename T1, typename M1, typename T2, typename M2>
bool operator!= (
const std_allocator<T1,M1>&,
const std_allocator<T2,M2>&
) throw()
) noexcept
{ return !std_alloc_compare<M1,M2>::are_interchangeable; }

// ----------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion dlib/svm/one_vs_all_trainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ namespace dlib
) : dlib::error(msg), l(l_) {};

virtual ~invalid_label(
) throw() {}
) noexcept {}

label_type l;
};
Expand Down
2 changes: 1 addition & 1 deletion dlib/svm/one_vs_one_trainer.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ namespace dlib
) : dlib::error(msg), l1(l1_), l2(l2_) {};

virtual ~invalid_label(
) throw() {}
) noexcept {}

label_type l1, l2;
};
Expand Down
2 changes: 1 addition & 1 deletion dlib/type_safe_union/type_safe_union_kernel.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace dlib
class bad_type_safe_union_cast : public std::bad_cast
{
public:
virtual const char * what() const throw()
virtual const char * what() const noexcept
{
return "bad_type_safe_union_cast";
}
Expand Down
Loading