Unneeded include of <iostream>, change of begin() and end() as issue #2.

hanickadot · Oct 24, 2017 · d1a7ca4 · d1a7ca4
1 parent b225e6b
commit d1a7ca4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 .PHONY: all clean
 
 # -ftemplate-depth-1024 -ftemplate-backtrace-limit=0
-override CXXFLAGS += -std=c++1z -Wno-gnu-string-literal-operator-template -O3
+override CXXFLAGS += -std=c++1z -Wno-gnu-string-literal-operator-template -O3 -Iinclude
 
 override TARGETS := math regexp pregexp code-size-test catch-regexp-example
 

diff --git a/include/pregexp.hpp b/include/pregexp.hpp
@@ -2,7 +2,6 @@
 #include "static-regexp/string.hpp"
 #include "static-regexp/static-regexp.hpp"
 
-#include <iostream>
 #include <cassert>
 
 /*

diff --git a/include/static-regexp/static-regexp.hpp b/include/static-regexp/static-regexp.hpp
@@ -123,10 +123,10 @@ class DynamicMemory {
 		data.emplace_back(std::forward<PositionPair>(pair));
 	}
 	const PositionPair * begin() const {
-		return &*data.cbegin();
+		return data.empty() ? nullptr : &data.front();
 	}
 	const PositionPair * end() const {
-		return &*data.cend();
+		return data.empty() ? nullptr : &data.back() + 1;
 	}
 	CatchRange getRange() const {
 		return {begin(),end()};