Fix some const-correctness issues in the GC info encoder.

diff --git a/src/gcinfo/gcinfoencoder.cpp b/src/gcinfo/gcinfoencoder.cpp
index 8f3fe95..3aa8f0e 100644 (file)
--- a/src/gcinfo/gcinfoencoder.cpp
+++ b/src/gcinfo/gcinfoencoder.cpp
@@ -129,7 +129,7 @@ GcInfoEncoder::GcInfoEncoder(
 
     // Get the name of the current method along with the enclosing class
     // or module name.
-    m_MethodName = (char *)
+    m_MethodName =
         pCorJitInfo->getMethodName(methodHandle, (const char **)&m_ModuleName);
 #endif
 
@@ -495,10 +495,10 @@ public:
 };
 
 
-int __cdecl CompareLifetimeTransitionsByOffsetThenSlot( const void* p1, const void* p2 )
+int __cdecl CompareLifetimeTransitionsByOffsetThenSlot(const void* p1, const void* p2)
 {
-    GcInfoEncoder::LifetimeTransition* pFirst = (GcInfoEncoder::LifetimeTransition*) p1;
-    GcInfoEncoder::LifetimeTransition* pSecond = (GcInfoEncoder::LifetimeTransition*) p2;
+    const GcInfoEncoder::LifetimeTransition* pFirst = (const GcInfoEncoder::LifetimeTransition*) p1;
+    const GcInfoEncoder::LifetimeTransition* pSecond = (const GcInfoEncoder::LifetimeTransition*) p2;
         
     UINT32 firstOffset  = pFirst->CodeOffset;
     UINT32 secondOffset = pSecond->CodeOffset;
@@ -514,10 +514,10 @@ int __cdecl CompareLifetimeTransitionsByOffsetThenSlot( const void* p1, const vo
 }
 
 
-int __cdecl CompareLifetimeTransitionsBySlot( const void* p1, const void* p2 )
+int __cdecl CompareLifetimeTransitionsBySlot(const void* p1, const void* p2)
 {
-    GcInfoEncoder::LifetimeTransition* pFirst = (GcInfoEncoder::LifetimeTransition*) p1;
-    GcInfoEncoder::LifetimeTransition* pSecond = (GcInfoEncoder::LifetimeTransition*) p2;
+    const GcInfoEncoder::LifetimeTransition* pFirst = (const GcInfoEncoder::LifetimeTransition*) p1;
+    const GcInfoEncoder::LifetimeTransition* pSecond = (const GcInfoEncoder::LifetimeTransition*) p2;
         
     UINT32 firstOffset  = pFirst->CodeOffset;
     UINT32 secondOffset = pSecond->CodeOffset;

diff --git a/src/inc/gcinfoencoder.h b/src/inc/gcinfoencoder.h
index ea9c295..b14587c 100644 (file)
--- a/src/inc/gcinfoencoder.h
+++ b/src/inc/gcinfoencoder.h
@@ -866,7 +866,7 @@ private:
     IAllocator*                 m_pAllocator;
 
 #ifdef _DEBUG
-    char *m_MethodName, *m_ModuleName;
+    const char *m_MethodName, *m_ModuleName;
 #endif
 
     BitStreamWriter     m_Info1;    // Used for everything except for chunk encodings