Skip to content
Snippets Groups Projects
Commit a37004e0 authored by Jonathan Hanks's avatar Jonathan Hanks
Browse files

Removing some C++14isms from test code and a typo from DV.

Dataviewer had a spurious character after an include.  That was removed.

Removed some C++14isms in the cps_recv test code.
parent 2c22b223
No related branches found
No related tags found
1 merge request!178Removing some C++14isms from test code and a typo from DV.
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h>q #include <sys/wait.h>
/* Action Table */ /* Action Table */
......
...@@ -16,31 +16,29 @@ ...@@ -16,31 +16,29 @@
namespace namespace
{ {
DCUStats
make_stats( int config_crc,
unsigned int status,
int crc_per_sec,
int crc_sum,
std::string model_name )
{
DCUStats d;
d.expected_config_crc = config_crc;
d.status = status;
d.crc_per_sec = crc_per_sec;
d.crc_sum = crc_sum;
d.full_model_name = std::move( model_name );
return d;
}
std::vector< DCUStats > std::vector< DCUStats >
basic_dcus( ) basic_dcus( )
{ {
std::vector< DCUStats > dcus; std::vector< DCUStats > dcus;
dcus.emplace_back( DCUStats{ dcus.emplace_back( make_stats( 0, 0, 0, 0, "mod0" ) );
0, dcus.emplace_back( make_stats( 1, 0, 0, 0, "mod1" ) );
0, dcus.emplace_back( make_stats( 2, 0, 0, 0, "mod2" ) );
0,
0,
"mod0",
} );
dcus.emplace_back( DCUStats{
1,
0,
0,
0,
"mod1",
} );
dcus.emplace_back( DCUStats{
2,
0,
0,
0,
"mod2",
} );
return dcus; return dcus;
} }
...@@ -237,4 +235,4 @@ TEST_CASE( "CRCs are cleared at the second boundary" ) ...@@ -237,4 +235,4 @@ TEST_CASE( "CRCs are cleared at the second boundary" )
dc_stats.stop( ); dc_stats.stop( );
th.join( ); th.join( );
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment