Commit dbe569a1 authored by Adrià Arrufat's avatar Adrià Arrufat Committed by Davis E. King

fix some pedantic warnings (#1756)

* fix some pedantic warnings

* remove unneeded assert
parent 3ce7177a
......@@ -896,7 +896,6 @@ namespace dlib
size_t num
)
{
DLIB_CASSERT(0 <= num);
num_random_samples = num;
}
......
......@@ -18,25 +18,25 @@ namespace dlib
// ----------------------------------------------------------------------------------------
DLIB_DEFINE_FUNCTION_M(op_sqrt, sqrt, std::sqrt ,7);
DLIB_DEFINE_FUNCTION_M(op_log, log, std::log ,7);
DLIB_DEFINE_FUNCTION_M(op_log10, log10, std::log10 ,7);
DLIB_DEFINE_FUNCTION_M(op_exp, exp, std::exp ,7);
DLIB_DEFINE_FUNCTION_M(op_conj, conj, std::conj ,2);
DLIB_DEFINE_FUNCTION_M(op_ceil, ceil, std::ceil ,7);
DLIB_DEFINE_FUNCTION_M(op_floor, floor, std::floor ,7);
DLIB_DEFINE_FUNCTION_M(op_sin, sin, std::sin ,7);
DLIB_DEFINE_FUNCTION_M(op_cos, cos, std::cos ,7);
DLIB_DEFINE_FUNCTION_M(op_tan, tan, std::tan ,7);
DLIB_DEFINE_FUNCTION_M(op_sinh, sinh, std::sinh ,7);
DLIB_DEFINE_FUNCTION_M(op_cosh, cosh, std::cosh ,7);
DLIB_DEFINE_FUNCTION_M(op_tanh, tanh, std::tanh ,7);
DLIB_DEFINE_FUNCTION_M(op_asin, asin, std::asin ,7);
DLIB_DEFINE_FUNCTION_M(op_acos, acos, std::acos ,7);
DLIB_DEFINE_FUNCTION_M(op_atan, atan, std::atan ,7);
DLIB_DEFINE_FUNCTION_M(op_sqrt, sqrt, std::sqrt, 7)
DLIB_DEFINE_FUNCTION_M(op_log, log, std::log, 7)
DLIB_DEFINE_FUNCTION_M(op_log10, log10, std::log10, 7)
DLIB_DEFINE_FUNCTION_M(op_exp, exp, std::exp, 7)
DLIB_DEFINE_FUNCTION_M(op_conj, conj, std::conj, 2)
DLIB_DEFINE_FUNCTION_M(op_ceil, ceil, std::ceil, 7)
DLIB_DEFINE_FUNCTION_M(op_floor, floor, std::floor, 7)
DLIB_DEFINE_FUNCTION_M(op_sin, sin, std::sin, 7)
DLIB_DEFINE_FUNCTION_M(op_cos, cos, std::cos, 7)
DLIB_DEFINE_FUNCTION_M(op_tan, tan, std::tan, 7)
DLIB_DEFINE_FUNCTION_M(op_sinh, sinh, std::sinh, 7)
DLIB_DEFINE_FUNCTION_M(op_cosh, cosh, std::cosh, 7)
DLIB_DEFINE_FUNCTION_M(op_tanh, tanh, std::tanh, 7)
DLIB_DEFINE_FUNCTION_M(op_asin, asin, std::asin, 7)
DLIB_DEFINE_FUNCTION_M(op_acos, acos, std::acos, 7)
DLIB_DEFINE_FUNCTION_M(op_atan, atan, std::atan, 7)
// ----------------------------------------------------------------------------------------
......@@ -157,16 +157,16 @@ namespace dlib
}
DLIB_DEFINE_FUNCTION_M(op_sigmoid, sigmoid, impl::sigmoid, 7);
DLIB_DEFINE_FUNCTION_MS(op_round_zeros, round_zeros, impl::round_zeros_eps, 7);
DLIB_DEFINE_FUNCTION_M(op_round_zeros2, round_zeros, impl::round_zeros, 7);
DLIB_DEFINE_FUNCTION_M(op_cubed, cubed, impl::cubed, 7);
DLIB_DEFINE_FUNCTION_M(op_squared, squared, impl::squared, 6);
DLIB_DEFINE_FUNCTION_M(op_sign, sign, impl::sign, 6);
DLIB_DEFINE_FUNCTION_MS(op_pow1, pow, impl::pow1, 7);
DLIB_DEFINE_FUNCTION_SM(op_pow2, pow, impl::pow2, 7);
DLIB_DEFINE_FUNCTION_M(op_reciprocal, reciprocal, impl::reciprocal, 6);
DLIB_DEFINE_FUNCTION_M(op_reciprocal_max, reciprocal_max, impl::reciprocal_max, 6);
DLIB_DEFINE_FUNCTION_M(op_sigmoid, sigmoid, impl::sigmoid, 7)
DLIB_DEFINE_FUNCTION_MS(op_round_zeros, round_zeros, impl::round_zeros_eps, 7)
DLIB_DEFINE_FUNCTION_M(op_round_zeros2, round_zeros, impl::round_zeros, 7)
DLIB_DEFINE_FUNCTION_M(op_cubed, cubed, impl::cubed, 7)
DLIB_DEFINE_FUNCTION_M(op_squared, squared, impl::squared, 6)
DLIB_DEFINE_FUNCTION_M(op_sign, sign, impl::sign, 6)
DLIB_DEFINE_FUNCTION_MS(op_pow1, pow, impl::pow1, 7)
DLIB_DEFINE_FUNCTION_SM(op_pow2, pow, impl::pow2, 7)
DLIB_DEFINE_FUNCTION_M(op_reciprocal, reciprocal, impl::reciprocal, 6)
DLIB_DEFINE_FUNCTION_M(op_reciprocal_max, reciprocal_max, impl::reciprocal_max, 6)
// ----------------------------------------------------------------------------------------
......
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