[tor-commits] [tor/master] Make memarea use smartlist_core, not container.

[nickm at torproject.org]

commit c9f9c9bc497bbfdd5e1acdc37f84da5f3f7396c2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 6 17:52:44 2018 -0500

    Make memarea use smartlist_core, not container.
---
 src/lib/memarea/.may_include | 2 +-
 src/lib/memarea/memarea.c    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/memarea/.may_include b/src/lib/memarea/.may_include
index 814652a93..a1edaf223 100644
--- a/src/lib/memarea/.may_include
+++ b/src/lib/memarea/.may_include
@@ -1,7 +1,7 @@
 orconfig.h
 lib/arch/*.h
 lib/cc/*.h
-lib/container/*.h
 lib/log/*.h
 lib/malloc/*.h
 lib/memarea/*.h
+lib/smartlist_core/*.h
\ No newline at end of file
diff --git a/src/lib/memarea/memarea.c b/src/lib/memarea/memarea.c
index dd7c48c07..96d94c89d 100644
--- a/src/lib/memarea/memarea.c
+++ b/src/lib/memarea/memarea.c
@@ -16,7 +16,8 @@
 
 #include "lib/arch/bytes.h"
 #include "lib/cc/torint.h"
-#include "lib/container/smartlist.h"
+#include "lib/smartlist_core/smartlist_core.h"
+#include "lib/smartlist_core/smartlist_foreach.h"
 #include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"