2 files changed, 5 insertions, 5 deletions
diff --git a/lib/Core/Memory.h b/lib/Core/Memory.h
index 7f7b86a8..9ce8e09b 100644
--- a/lib/Core/Memory.h
+++ b/lib/Core/Memory.h
@@ -40,10 +40,10 @@ public:
 
   /// size in bytes
   unsigned size;
-  std::string name;
+  mutable std::string name;
 
   bool isLocal;
-  bool isGlobal;
+  mutable bool isGlobal;
   bool isFixed;
 
   /// true if created by us.
@@ -96,7 +96,7 @@ public:
   /// Get an identifying string for this allocation.
   void getAllocInfo(std::string &result) const;
 
-  void setName(std::string name) {
+  void setName(std::string name) const {
     this->name = name;
   }
 
diff --git a/lib/Core/SpecialFunctionHandler.cpp b/lib/Core/SpecialFunctionHandler.cpp
index ba86428d..1b96d5f1 100644
--- a/lib/Core/SpecialFunctionHandler.cpp
+++ b/lib/Core/SpecialFunctionHandler.cpp
@@ -644,7 +644,7 @@ void SpecialFunctionHandler::handleMakeSymbolic(ExecutionState &state,
   
   for (Executor::ExactResolutionList::iterator it = rl.begin(), 
          ie = rl.end(); it != ie; ++it) {
-    MemoryObject *mo = (MemoryObject*) it->first.first;
+    const MemoryObject *mo = it->first.first;
     mo->setName(name);
     
     const ObjectState *old = it->first.second;
@@ -688,7 +688,7 @@ void SpecialFunctionHandler::handleMarkGlobal(ExecutionState &state,
   
   for (Executor::ExactResolutionList::iterator it = rl.begin(), 
          ie = rl.end(); it != ie; ++it) {
-    MemoryObject *mo = (MemoryObject*) it->first.first;
+    const MemoryObject *mo = it->first.first;
     assert(!mo->isLocal);
     mo->isGlobal = true;
   }