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 /dpmert | |
| 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 'dpmert')
| -rw-r--r-- | dpmert/Jamfile | 33 | ||||
| -rw-r--r-- | dpmert/lo_test.cc | 2 |
2 files changed, 1 insertions, 34 deletions
diff --git a/dpmert/Jamfile b/dpmert/Jamfile deleted file mode 100644 index 6f6a3d40..00000000 --- a/dpmert/Jamfile +++ /dev/null @@ -1,33 +0,0 @@ -import testing ; -import lex ; -import option ; - -lib dpmert : - ces.cc - error_surface.cc - line_optimizer.cc - mert_geometry.cc - ..//utils - ..//mteval - ../decoder//decoder - ../klm/lm//kenlm - ..//boost_program_options - : <include>. - : : - <library>..//utils - <library>..//mteval - <library>../decoder//decoder - <library>../klm/lm//kenlm - <library>..//boost_program_options - <include>. - ; - -all_tests [ glob *_test.cc ] : dpmert : <testing.arg>$(TOP)/dpmert/test_data ; - -exe sentserver : sentserver.c : <threading>multi ; -exe sentclient : sentclient.c ; -exe mr_dpmert_generate_mapper_input : mr_dpmert_generate_mapper_input.cc dpmert ..//boost_program_options ; -exe mr_dpmert_map : mr_dpmert_map.cc dpmert ..//boost_program_options ; -exe mr_dpmert_reduce : mr_dpmert_reduce.cc dpmert ..//boost_program_options ; - -alias programs : sentserver sentclient mr_dpmert_generate_mapper_input mr_dpmert_map mr_dpmert_reduce ; diff --git a/dpmert/lo_test.cc b/dpmert/lo_test.cc index 2daf87bb..95a08d3d 100644 --- a/dpmert/lo_test.cc +++ b/dpmert/lo_test.cc @@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE( TestCheckNaN) { double x = 0; double y = 0; double z = x / y; - BOOST_CHECK_EQUAL(true, isnan(z)); + BOOST_CHECK_EQUAL(true, std::isnan(z)); } BOOST_AUTO_TEST_CASE(TestConvexHull) { |