3 files changed, 6 insertions, 5 deletions
diff --git a/src/context/Makefile.am b/src/context/Makefile.am
index 54accdd6e..85847e096 100644
--- a/src/context/Makefile.am
+++ b/src/context/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
 	-D__BUILDING_CVC4LIB \
 	-I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall -fvisibility=hidden
+AM_CXXFLAGS = -Wall $(FLAG_VISIBILITY_HIDDEN)
 
 noinst_LTLIBRARIES = libcontext.la
 
diff --git a/src/context/cdmap.h b/src/context/cdmap.h
index e9ae8337e..d4de88daf 100644
--- a/src/context/cdmap.h
+++ b/src/context/cdmap.h
@@ -191,7 +191,8 @@ class CDMap : public ContextObj {
     for(typename std::vector<Element*>::iterator i = d_trash.begin();
         i != d_trash.end();
         ++i) {
-      (*i)->deleteSelf();
+      Debug("gc") << "emptyTrash(): " << *i << std::endl;
+      //(*i)->deleteSelf();
     }
     d_trash.clear();
   }
diff --git a/src/context/context.h b/src/context/context.h
index 455169a62..0e2a9107f 100644
--- a/src/context/context.h
+++ b/src/context/context.h
@@ -208,12 +208,12 @@ public:
   /**
    * Get the level of the current Scope
    */
-  int getLevel(void) const { return d_level; }
+  int getLevel() const { return d_level; }
 
   /**
    * Return true iff this Scope is the current top Scope
    */
-  bool isCurrent(void) const { return this == d_pContext->getTopScope(); }
+  bool isCurrent() const { return this == d_pContext->getTopScope(); }
 
   /**
    * When a ContextObj object is modified for the first time in this Scope, it
@@ -240,7 +240,7 @@ public:
   static void operator delete(void* pMem) {}
 
   //FIXME:  //! Check for memory leaks
-  //  void check(void);
+  //  void check();
 
 };/* class Scope */