From fa1c054f17f6c71a5314e4c3e638c15aa33ec09c Mon Sep 17 00:00:00 2001
From: sgeerken <devnull@localhost>
Date: Wed, 11 Jul 2012 19:04:12 +0200
Subject: NotSoSimpleVector is now working in the intended way.

---
 lout/misc.hh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'lout')

diff --git a/lout/misc.hh b/lout/misc.hh
index f4d0f8de..f877c879 100644
--- a/lout/misc.hh
+++ b/lout/misc.hh
@@ -327,10 +327,12 @@ private:
    {
       if (startExtra != -1) {
          numMain += numExtra;
+         resizeMain ();
          memmove (arrayMain + startExtra + numExtra, arrayMain + startExtra,
                   (numMain - (startExtra + numExtra)) * sizeof (T));
-         memmove (arrayMain + startExtra, arrayExtra1, numExtra);
+         memmove (arrayMain + startExtra, arrayExtra1, numExtra * sizeof (T));
          startExtra = -1;
+         numExtra = 0;
       }
    }
    
@@ -387,10 +389,10 @@ public:
       assert (numInsert >= 0);
 
       // The following lines are a simple (but inefficient) replacement.
-      setSize (numMain + numInsert);
-      memmove (arrayMain + index + numInsert, arrayMain + index,
-               (numMain - index - numInsert) * sizeof (T));
-      return;
+      //setSize (numMain + numInsert);
+      //memmove (arrayMain + index + numInsert, arrayMain + index,
+      //         (numMain - index - numInsert) * sizeof (T));
+      //return;
 
       if (this->startExtra == -1) {
          // simple case
-- 
cgit v1.2.3