Skip to content

Work around G++ 8 warnings #2353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 20, 2018
Merged

Work around G++ 8 warnings #2353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cd6d31
Unit test framwork: use references when catching exceptions
tautschnig Jun 20, 2018
961b29a
Silence GCC 8's warning about using realloc/memmove on non-POD
tautschnig Jun 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jbmc/unit/java_bytecode/java_types/erase_type_arguments.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@ SCENARIO("erase_type_arguments", "[core][java_types]")
REQUIRE_THROWS_AS(
erase_type_arguments(
"testClassName<testTypeArgument1<testTypeArgument2>"),
unsupported_java_class_signature_exceptiont &);
unsupported_java_class_signature_exceptiont);
}
}
11 changes: 9 additions & 2 deletions src/util/small_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,10 @@ class small_mapt
if(n == 0)
return nullptr;

T *mem = (T *)realloc(ptr, sizeof(T) * n);
// explicitly cast to char * as GCC 8 warns about not using new/delete for
// class sharing_node_innert<dstringt, std::basic_string<char>,
// std::equal_to<dstringt> >
T *mem = (T *)realloc((char *)ptr, sizeof(T) * n);

if(!mem)
throw std::bad_alloc();
Expand Down Expand Up @@ -486,7 +489,11 @@ class small_mapt
std::size_t n = size();
if(ii < n - 1)
{
memmove(p + ii, p + ii + 1, sizeof(T) * (n - ii - 1));
// explicitly cast to char * as GCC 8 warns about not using new/delete
// for
// class sharing_node_innert<dstringt, std::basic_string<char>,
// std::equal_to<dstringt> >
memmove((char *)(p + ii), p + ii + 1, sizeof(T) * (n - ii - 1));
}

p = allocate(p, n - 1);
Expand Down
2 changes: 1 addition & 1 deletion unit/testing-utils/catch.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2245,7 +2245,7 @@ namespace Catch {
static_cast<void>(expr); \
__catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \
} \
catch( exceptionType ) { \
catch( const exceptionType & ) { \
__catchResult.captureResult( Catch::ResultWas::Ok ); \
} \
catch( ... ) { \
Expand Down