diff options
| author | Kenneth Heafield <github@kheafield.com> | 2012-10-22 12:07:20 +0100 |
|---|---|---|
| committer | Kenneth Heafield <github@kheafield.com> | 2012-10-22 12:07:20 +0100 |
| commit | ac586bc9b156b4ae687cd5961ba1fe7b20ec57d6 (patch) | |
| tree | 052473b46d7fa18d51f897cdb9e7c93a7186dafd /training/mr_optimize_reduce.cc | |
| parent | 97b85c082b3e55c28a8b0c0eb762483ac84a1577 (diff) | |
| parent | ad6d4a1b2519896f2b16a282699ce4e64041fab8 (diff) | |
Merge remote branch 'upstream/master'
Conflicts:
Jamroot
bjam
decoder/Jamfile
decoder/cdec.cc
dpmert/Jamfile
jam-files/sanity.jam
klm/lm/Jamfile
klm/util/Jamfile
mira/Jamfile
Diffstat (limited to 'training/mr_optimize_reduce.cc')
| -rw-r--r-- | training/mr_optimize_reduce.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/training/mr_optimize_reduce.cc b/training/mr_optimize_reduce.cc index 461e6b5f..d490192f 100644 --- a/training/mr_optimize_reduce.cc +++ b/training/mr_optimize_reduce.cc @@ -19,8 +19,8 @@ namespace po = boost::program_options; void SanityCheck(const vector<double>& w) { for (int i = 0; i < w.size(); ++i) { - assert(!isnan(w[i])); - assert(!isinf(w[i])); + assert(!std::isnan(w[i])); + assert(!std::isinf(w[i])); } } |