Skip to content

Commit b3695e0

Browse files
Address remaining issues for enabling dev15 jenkins ci
1 parent 80438b7 commit b3695e0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

bin/GCStress/WeightedTable.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ template <class T>
1313
class WeightedTable
1414
{
1515
public:
16-
WeightedTable() :
16+
WeightedTable() noexcept :
1717
entries(nullptr), size(0)
1818
{
1919
}
2020

2121
void AddWeightedEntry(T value, unsigned int weight)
2222
{
23-
T * newEntries = static_cast<T *>(realloc(entries, (size + weight) * sizeof(T)));
23+
T * newEntries = static_cast<T *>(realloc(entries, ((size_t)size + weight) * sizeof(T)));
2424
if (newEntries == nullptr)
2525
{
2626
// Should throw something better

lib/Common/Warnings.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
#pragma warning(disable:25040) // False Constant Expr in OR, e.g., <expr> || 0.
5555
#pragma warning(disable:25041) // 'if' condition is always true
5656
#pragma warning(disable:25042) // 'if' condition is always false
57+
#pragma warning(disable:26434) // function definition hides a non-virtual function
5758
#pragma warning(disable:26437) // avoid slicing - this is more of a guideline than a rule, and we don't do it often regardless
5859
#pragma warning(disable:26439) // noexcept specifier implied
5960
#pragma warning(disable:26451) // doing math on smaller types than possible

0 commit comments

Comments
 (0)