From a905414491cec5eb2388c8097bac7e13def81491 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Fri, 5 Oct 2012 10:55:52 -0400 Subject: [PATCH] add util repo as submodule --- .gitmodules | 3 +++ Makefile | 2 +- memory.hh | 11 ----------- termite.cc | 2 +- util | 1 + 5 files changed, 6 insertions(+), 13 deletions(-) create mode 100644 .gitmodules delete mode 100644 memory.hh create mode 160000 util diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..388a381 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "util"] + path = util + url = git://github.com/thestinger/util.git diff --git a/Makefile b/Makefile index b9202c0..7547933 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ endif LDFLAGS := -s -Wl,--as-needed ${LDFLAGS} LDLIBS := ${shell pkg-config --libs ${GTK} ${VTE}} -termite: termite.cc memory.hh url_regex.hh +termite: termite.cc util/memory.hh url_regex.hh ${CXX} ${CXXFLAGS} ${LDFLAGS} $< ${LDLIBS} -o $@ install: termite diff --git a/memory.hh b/memory.hh deleted file mode 100644 index 660f488..0000000 --- a/memory.hh +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef MEMORY_HH -#define MEMORY_HH - -#include - -template -std::unique_ptr make_unique(T *p, Deleter d) { - return std::unique_ptr(p, d); -} - -#endif diff --git a/termite.cc b/termite.cc index c02219b..a23804b 100644 --- a/termite.cc +++ b/termite.cc @@ -12,8 +12,8 @@ #include #include -#include "memory.hh" #include "url_regex.hh" +#include "util/memory.hh" using namespace std::placeholders; diff --git a/util b/util new file mode 160000 index 0000000..4d92489 --- /dev/null +++ b/util @@ -0,0 +1 @@ +Subproject commit 4d9248982472c774ea539c4180a0f89103ebaec3