boost/ublas
2
0
Fork 0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-20 15:12:16 +00:00
Code Issues Projects Releases Wiki Activity

try 2 param (VC6) syntax for NO_STD_ALLOCATOR

Browse Source 
[SVN r24904]
This commit is contained in:
Michael Stevens
2004-09-04 15:04:21 +00:00
parent dc9e3f7bde
commit 44eef4f563
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/boost/numeric/ublas/storage.hpp
View File

@@ -85,7 +85,11 @@ namespace boost { namespace numeric { namespace ublas {
unbounded_array (size_type size, const ALLOC &a = ALLOC()):
alloc(a), size_ (size) {
if (size_) {
#ifdef BOOST_NO_STD_ALLOCATOR
data_ = alloc.allocate (size_, 0);
#else
data_ = alloc.allocate (size_);
#endif
const value_type v = value_type();
for (iterator i = begin(); i != end(); ++i) {
alloc.construct (&(*i), v);
@@ -97,7 +101,11 @@ namespace boost { namespace numeric { namespace ublas {
unbounded_array (size_type size, no_init, const ALLOC &a = ALLOC()):
alloc (a), size_ (size) {
if (size_) {
#ifdef BOOST_NO_STD_ALLOCATOR
data_ = alloc.allocate (size_, 0);
#else
data_ = alloc.allocate (size_);
#endif
for (iterator i = begin(); i != end(); ++i) {
new (&(*i)) value_type;
}
@@ -107,7 +115,11 @@ namespace boost { namespace numeric { namespace ublas {
unbounded_array (const unbounded_array &c):
alloc (c.alloc), size_ (c.size_) {
if (size_) {
data_ = alloc.allocate (c.size_);
#ifdef BOOST_NO_STD_ALLOCATOR
data_ = alloc.allocate (size_, 0);
#else
data_ = alloc.allocate (size_);
#endif
const_iterator ci = c.begin();
for (iterator i = begin(); i != end(); ++i) {
alloc.construct (&(*i), *ci);
@@ -133,7 +145,11 @@ namespace boost { namespace numeric { namespace ublas {
if (size != size_) {
pointer data;
if (size) {
#ifdef BOOST_NO_STD_ALLOCATOR
data = alloc.allocate (size, 0);
#else
data = alloc.allocate (size);
#endif
if (preserve) {
const_iterator si = begin();
pointer di = data;