Skip to content

Commit

Permalink
Fix unit test merge error
Browse files Browse the repository at this point in the history
PROTO_N_THREADS clause tries to set mangled variable name. Fixed.

Signed-off-by: Charlie Vigue <[email protected]>
  • Loading branch information
cvigue committed Apr 19, 2024
1 parent 6f9bca5 commit 80e07cd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/unittests/test_proto.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,7 @@ TEST_F(ProtoUnitTest, base_multiple_thread)
{
unsigned int num_threads = std::thread::hardware_concurrency();
#if defined(PROTO_N_THREADS) && PROTO_N_THREADS >= 1
num_threadsnum_threads = PROTO_N_THREADS;
num_threads = PROTO_N_THREADS;
#endif

std::vector<std::thread> running_threads{};
Expand Down

0 comments on commit 80e07cd

Please sign in to comment.