From 6705af6d3d02e47a797c53146666a1d168e1aefc Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 06 Mar 2014 08:56:37 +0000
Subject: [PATCH] Merge branch 'trisurf-polyel'. It is the most debugged version. True, without polymeres dump may not work yet, still, from scratch with polymeres set to 0, there should be minimal time penalty.

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

diff --git a/src/cell.h b/src/cell.h
index 76ba105..20a58e4 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -4,8 +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