Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecGop.cpp
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecGop.cpp	(revision 924)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecGop.cpp	(revision 930)
@@ -52,7 +52,7 @@
 
 #if CONFORMANCE_BITSTREAM_MODE
-Bool pocCompareFunction( TComPic &pic1, TComPic &pic2 )
-{
-  return (pic1.getPOC() < pic2.getPOC());
+Bool pocCompareFunction( const TComPic &pic1, const TComPic &pic2 )
+{
+  return (const_cast<TComPic&>(pic1).getPOC() < const_cast<TComPic&>(pic2).getPOC());
 }
 #endif
Index: branches/SHM-dev/source/Lib/TLibDecoder/TDecGop.h
===================================================================
--- branches/SHM-dev/source/Lib/TLibDecoder/TDecGop.h	(revision 924)
+++ branches/SHM-dev/source/Lib/TLibDecoder/TDecGop.h	(revision 930)
@@ -115,7 +115,7 @@
   Void  filterPicture  (TComPic*& rpcPic );
 
-  void setDecodedPictureHashSEIEnabled(Int enabled) { m_decodedPictureHashSEIEnabled = enabled; }
+  Void setDecodedPictureHashSEIEnabled(Int enabled) { m_decodedPictureHashSEIEnabled = enabled; }
 #if Q0074_COLOUR_REMAPPING_SEI
-  void setColourRemappingInfoSEIEnabled(Int enabled) { m_colourRemapSEIEnabled = enabled; }
+  Void setColourRemappingInfoSEIEnabled(Int enabled) { m_colourRemapSEIEnabled = enabled; }
 #endif
 #if SVC_EXTENSION