diff --git a/hpvm/projects/visc-rt/visc-rt.h b/hpvm/projects/visc-rt/visc-rt.h
index 0a6cadebd30d5a21bd914ba93022e0e8f63b5b2c..9eab8f8b291966c021b42cb0ff0bbdf169772168 100644
--- a/hpvm/projects/visc-rt/visc-rt.h
+++ b/hpvm/projects/visc-rt/visc-rt.h
@@ -48,7 +48,8 @@ class DFGDepth {
     unsigned dimLimit[3];
     unsigned dimInstance[3];
   public:
-    DFGDepth() {}
+    DFGDepth() = default;
+
     DFGDepth(unsigned n, unsigned dimX = 0, unsigned iX = 0, unsigned dimY = 0, unsigned iY = 0,
         unsigned dimZ = 0, unsigned iZ = 0) {
       assert(n <= 3 && "Error! More than 3 dimensions not supported");
@@ -60,17 +61,18 @@ class DFGDepth {
       dimInstance[1] = iY;
       dimInstance[2] = iZ;
     }
-    unsigned getDimLimit(unsigned dim) {
+
+    unsigned getDimLimit(unsigned dim) const {
       assert(dim <= numDim && "Error! Requested dimension limit is not specified");
       return dimLimit[dim];
     }
 
-    unsigned getDimInstance(unsigned dim) {
+    unsigned getDimInstance(unsigned dim) const {
       assert(dim <= numDim && "Error! Requested dimension instance is not specified");
       return dimInstance[dim];
     }
 
-    unsigned getNumDim() {
+    unsigned getNumDim() const {
       return numDim;
     }
 };
@@ -97,19 +99,19 @@ public:
       size(_size), loc(_loc), addr(_addr), Context(_Context) {
     }
 
-    size_t getSize() {
+    size_t getSize() const {
       return size;
     }
 
-    Location getLocation() {
+    Location getLocation() const {
       return loc;
     }
 
-    void* getAddress() {
+    void* getAddress() const {
       return addr;
     }
 
-    void* getContext() {
+    void* getContext() const {
       return Context;
     }