From 9d5216497310cf33ef3db2d511787a779ebccda3 Mon Sep 17 00:00:00 2001
From: mihaf <miha.fosnaric@gmail.com>
Date: Tue, 08 Jul 2014 16:27:32 +0000
Subject: [PATCH] Merge branch 'master' of https://bitbucket.org/samop/trisurf-ng

---
 src/cell.h |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/cell.h b/src/cell.h
index 660792b..20a58e4 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -4,9 +4,8 @@
 ts_bool cell_free(ts_cell* cell);
 ts_bool cell_list_free(ts_cell_list *clist);
 inline ts_uint vertex_self_avoidance(ts_vesicle *vesicle, ts_vertex *vtx);
-ts_bool cell_add_vertex(ts_cell *cell, ts_vertex *vtx);
+inline ts_bool cell_add_vertex(ts_cell *cell, ts_vertex *vtx);
+inline ts_bool cell_remove_vertex(ts_cell *cell, ts_vertex *vtx);
 ts_bool cell_list_cell_occupation_clear(ts_cell_list *clist);
-
-//ts_bool cell_occupation_number_and_internal_proximity(ts_cell_list *clist,
-//ts_uint cellidx, ts_vertex *vtx, ts_vertex *tvtx);
+inline ts_bool cell_occupation_number_and_internal_proximity(ts_cell_list *clist, ts_uint cellidx, ts_vertex *vtx);
 #endif

--
Gitblit v1.9.3