diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
| commit | 9b852f5f243e5cf68662b7152b5fa331a83e55fb (patch) | |
| tree | 159ffe0761f78dd87e2ecc97abea14494abab4ff /host/tests/blockdef_test.cpp | |
| parent | c66cb1bad0d881394f3519bd94f4693cceab4c64 (diff) | |
| parent | 99c2730bc9db270560671f2d7d173768465ed51f (diff) | |
| download | uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.gz uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.bz2 uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/tests/blockdef_test.cpp')
| -rw-r--r-- | host/tests/blockdef_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/tests/blockdef_test.cpp b/host/tests/blockdef_test.cpp index 2cd06a43a..11ddc4b59 100644 --- a/host/tests/blockdef_test.cpp +++ b/host/tests/blockdef_test.cpp @@ -17,7 +17,7 @@ #include <iostream> #include <map> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <boost/assign/list_of.hpp> #include <boost/test/unit_test.hpp> #include <boost/format.hpp> @@ -27,7 +27,7 @@ using namespace uhd::rfnoc; BOOST_AUTO_TEST_CASE(test_lookup) { - std::map<boost::uint64_t, std::string> blocknames = boost::assign::list_of< std::pair<boost::uint64_t, std::string> > + std::map<uint64_t, std::string> blocknames = boost::assign::list_of< std::pair<uint64_t, std::string> > (0, "NullSrcSink") (0xFF70000000000000, "FFT") (0xF112000000000001, "FIR") @@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE(test_lookup) { std::cout << blocknames.size() << std::endl; - for (std::map<boost::uint64_t, std::string>::iterator it = blocknames.begin(); it != blocknames.end(); ++it) { + for (std::map<uint64_t, std::string>::iterator it = blocknames.begin(); it != blocknames.end(); ++it) { std::cout << "Testing " << it->second << " => " << str(boost::format("%016X") % it->first) << std::endl; blockdef::sptr block_definition = blockdef::make_from_noc_id(it->first); // If the previous function fails, it'll return a NULL pointer |