From 9f42bb5d910c97ff6862b3a14dc55be46e076095 Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Thu, 18 Jul 2019 21:57:17 -0400
Subject: [PATCH] Fix buggy rebase

Former-commit-id: 6037d1f326116e5aae56be9a73a8f9ca68a45bbe
---
 src/compactvector.h | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/src/compactvector.h b/src/compactvector.h
index ee10a135b..65a40f114 100644
--- a/src/compactvector.h
+++ b/src/compactvector.h
@@ -12,24 +12,10 @@
  * 
  *************************************************/
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 template<typename T, bool MEMMOVE_SAFE=false>
 class compactvector
 {
     static_assert(MEMMOVE_SAFE || std::is_trivially_copyable<T>::value, "compactvector requires trivially copyable types");
-=======
-template<typename T>
-class compactvector
-{
-    static_assert(std::is_trivially_copyable<T>::value, "compactvector requires trivially copyable types");
->>>>>>> New expire datastructure and algorithm.  Allows us to expire in sublinear time
-=======
-template<typename T, bool MEMMOVE_SAFE=false>
-class compactvector
-{
-    static_assert(MEMMOVE_SAFE || std::is_trivially_copyable<T>::value, "compactvector requires trivially copyable types");
->>>>>>> Initial prototype of EXPIREMEMBER command
     T *m_data = nullptr;
     unsigned m_celem = 0;
     unsigned m_max = 0;
@@ -40,14 +26,7 @@ public:
     compactvector() noexcept = default;
     ~compactvector() noexcept
     {
-<<<<<<< HEAD
-<<<<<<< HEAD
         clear();    // call dtors
-=======
->>>>>>> New expire datastructure and algorithm.  Allows us to expire in sublinear time
-=======
-        clear();    // call dtors
->>>>>>> Initial prototype of EXPIREMEMBER command
         zfree(m_data);
     }
 
@@ -99,15 +78,7 @@ public:
         assert(idx < m_max);
         where = m_data + idx;
         memmove(m_data + idx + 1, m_data + idx, (m_celem - idx)*sizeof(T));
-<<<<<<< HEAD
-<<<<<<< HEAD
         new(m_data + idx) T(std::move(val));
-=======
-        m_data[idx] = val;
->>>>>>> New expire datastructure and algorithm.  Allows us to expire in sublinear time
-=======
-        new(m_data + idx) T(std::move(val));
->>>>>>> Initial prototype of EXPIREMEMBER command
         ++m_celem;
         return where;
     }