Module: ppl/ppl Branch: master Commit: b3b76781cae62bf5ffc7e779d1275bc41f03a90b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b3b76781cae62...

Author: Roberto Bagnara bagnara@cs.unipr.it Date: Sat Oct 29 14:40:31 2011 +0200

Removed trailing whitespace.

---

src/Dense_Row.cc | 46 +++++++++++++++++++++++----------------------- src/Dense_Row.defs.hh | 18 +++++++++--------- src/Dense_Row.inlines.hh | 14 +++++++------- 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/Dense_Row.cc b/src/Dense_Row.cc index 9bfb45d..4f3ea60 100644 --- a/src/Dense_Row.cc +++ b/src/Dense_Row.cc @@ -45,13 +45,13 @@ PPL::Dense_Row::resize(dimension_type new_size) { dimension_type new_capacity = new_size; Coefficient* new_vec = static_cast<Coefficient*>( operator new(sizeof(Coefficient) * new_capacity)); - + if (impl.vec != 0) { memcpy(new_vec, impl.vec, sizeof(Coefficient) * impl.size); - + operator delete(impl.vec); } - + impl.vec = new_vec; impl.capacity = new_capacity; } @@ -69,56 +69,56 @@ PPL::Dense_Row::resize(dimension_type new_size) { void PPL::Dense_Row::resize(dimension_type new_size, dimension_type new_capacity) { PPL_ASSERT(new_size <= new_capacity); - + if (new_capacity == 0) { destroy(); impl.vec = 0; impl.size = 0; impl.capacity = 0; - + PPL_ASSERT(size() == new_size); PPL_ASSERT(capacity() == new_capacity); PPL_ASSERT(OK()); - + return; } - + if (new_capacity < capacity()) { - + shrink(new_size); - + PPL_ASSERT(impl.size == new_size); - + Coefficient* new_vec = static_cast<Coefficient*>( operator new(sizeof(Coefficient) * new_capacity)); - + PPL_ASSERT(impl.vec != 0); - + memcpy(new_vec, impl.vec, sizeof(Coefficient) * impl.size); - + operator delete(impl.vec); - + impl.vec = new_vec; impl.capacity = new_capacity; } else { if (new_capacity > capacity()) { - + Coefficient* new_vec = static_cast<Coefficient*>( operator new(sizeof(Coefficient) * new_capacity)); - + if (impl.vec != 0) { memcpy(new_vec, impl.vec, sizeof(Coefficient) * impl.size); - + operator delete(impl.vec); } - + impl.vec = new_vec; impl.capacity = new_capacity; - + resize(new_size); } } - + PPL_ASSERT(size() == new_size); PPL_ASSERT(capacity() == new_capacity); PPL_ASSERT(OK()); @@ -147,7 +147,7 @@ PPL::Dense_Row::shrink(dimension_type new_size) { --impl.size; impl.vec[impl.size].~Coefficient(); } - + PPL_ASSERT(size() == new_size); PPL_ASSERT(OK()); } @@ -387,7 +387,7 @@ PPL::Dense_Row::OK() const { #endif is_broken = true; } - + if (capacity() == 0) { if (impl.vec != 0) is_broken = true; @@ -434,7 +434,7 @@ bool PPL::operator==(const Dense_Row& x, const Dense_Row& y) { const dimension_type x_size = x.size(); const dimension_type y_size = y.size(); - + if (x_size != y_size) return false;

diff --git a/src/Dense_Row.defs.hh b/src/Dense_Row.defs.hh index 3059fc6..6fd4186 100644 --- a/src/Dense_Row.defs.hh +++ b/src/Dense_Row.defs.hh @@ -49,7 +49,7 @@ public: Dense_Row();

explicit Dense_Row(const Sparse_Row& row); - + explicit Dense_Row(Flags f);

//! Tight constructor: resizing may require reallocation. @@ -103,7 +103,7 @@ public:

//! Swaps \p *this with \p y. void swap(Dense_Row& y); - + //! Resizes the row to \p sz. void resize(dimension_type sz);

@@ -375,18 +375,18 @@ public:

private: void init(const Sparse_Row& row); - + void destroy(); - + struct Impl { - + Impl(); - + ~Impl(); - + //! The number of coefficients in the row. dimension_type size; - + //! The capacity of the row. dimension_type capacity;

@@ -397,7 +397,7 @@ private: //! An empty vector may be stored as NULL instead of using a valid pointer. Coefficient* vec; }; - + Impl impl;

//! Returns the capacity of the row. diff --git a/src/Dense_Row.inlines.hh b/src/Dense_Row.inlines.hh index d65716a..9a47264 100644 --- a/src/Dense_Row.inlines.hh +++ b/src/Dense_Row.inlines.hh @@ -84,7 +84,7 @@ Dense_Row::Dense_Row() inline Dense_Row::Dense_Row(Flags f) : impl() { - + impl.flags = f;

PPL_ASSERT(OK()); @@ -154,7 +154,7 @@ Dense_Row::Dense_Row(const Dense_Row& y, ++impl.size; } } - + PPL_ASSERT(size() == y.size()); PPL_ASSERT(impl.capacity = capacity); PPL_ASSERT(OK()); @@ -169,13 +169,13 @@ Dense_Row::Dense_Row(const Dense_Row& y, PPL_ASSERT(sz <= capacity); PPL_ASSERT(capacity <= max_size()); PPL_ASSERT(capacity != 0); - + impl.flags = y.flags(); - + impl.vec = static_cast<Coefficient*>( operator new(sizeof(Coefficient) * capacity)); impl.capacity = capacity; - + dimension_type n = std::min(sz, y.size()); while (impl.size != n) { new (&impl.vec[impl.size]) Coefficient(y[impl.size]); @@ -185,7 +185,7 @@ Dense_Row::Dense_Row(const Dense_Row& y, new (&impl.vec[impl.size]) Coefficient(); ++impl.size; } - + PPL_ASSERT(size() == sz); PPL_ASSERT(impl.capacity = capacity); PPL_ASSERT(OK()); @@ -214,7 +214,7 @@ Dense_Row::swap(Dense_Row& y) {

inline Dense_Row& Dense_Row::operator=(const Dense_Row& y) { - + Dense_Row x(y); std::swap(*this, x);