Skip to content

Commit cce6646

Browse files
committed
Merge branch 'fix-invalid-assignment' into 'bugfix-70'
Use std::copy to copy arrays See merge request integer/soplex!439
2 parents 492848c + 08cc39c commit cce6646

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/soplex/datahashtable.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
#ifndef _DATAHASHTABLE_H_
2929
#define _DATAHASHTABLE_H_
3030

31+
#include <algorithm>
3132
#include <iostream>
33+
#include <iterator>
3234
#include <assert.h>
3335
#include <limits.h>
3436

@@ -358,7 +360,7 @@ class DataHashTable
358360
m_memfactor = base.m_memfactor;
359361
m_used = base.m_used;
360362
m_hashsize = base.m_hashsize;
361-
primes = base.primes;
363+
std::copy(std::begin(base.primes), std::end(base.primes), std::begin(primes));
362364
nprimes = base.nprimes;
363365

364366
assert(m_memfactor > 1.0);
@@ -373,9 +375,9 @@ class DataHashTable
373375
, m_memfactor(base.m_memfactor)
374376
, m_used(base.m_used)
375377
, m_hashsize(base.m_hashsize)
376-
, primes(base.primes)
377378
, nprimes(base.nprimes)
378379
{
380+
std::copy(std::begin(base.primes), std::end(base.primes), std::begin(primes));
379381
assert(m_memfactor > 1.0);
380382
assert(isConsistent());
381383
}

0 commit comments

Comments
 (0)