Merge pull request #12 from posterior/fix-ubuntu-1604

Fixes for Ubuntu 1604
posterior · Nov 6, 2017 · 55ef279 · 55ef279
2 parents 795befc + c967122
commit 55ef279
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/distributions/timers.hpp b/include/distributions/timers.hpp
@@ -25,7 +25,7 @@
 // TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# pragma once
+#pragma once
 
 #include <distributions/common.hpp>
 #include <sys/time.h>

diff --git a/include/distributions/vector.hpp b/include/distributions/vector.hpp
@@ -46,7 +46,9 @@ struct Packed_ : std::vector<Value, Alloc> {
 
     void packed_remove(size_t pos) {
         DIST_ASSERT1(pos < Base::size(), "bad pos: " << pos);
-        Base::operator[](pos) = std::move(Base::back());
+        if (pos != Base::size() - 1) {
+            Base::operator[](pos) = std::move(Base::back());
+        }
         Base::pop_back();
     }