diff --git a/spir_name_mangler/ParameterType.cpp b/spir_name_mangler/ParameterType.cpp
index 05f01ee..8d5e87b 100644
--- a/spir_name_mangler/ParameterType.cpp
+++ b/spir_name_mangler/ParameterType.cpp
@@ -61,7 +61,7 @@ namespace SPIR {
     m_address_space = attr;
   }
 
-  const TypeAttributeEnum PointerType::getAddressSpace() const {
+  TypeAttributeEnum PointerType::getAddressSpace() const {
     return m_address_space;
   }
 
diff --git a/spir_name_mangler/ParameterType.h b/spir_name_mangler/ParameterType.h
index a52ca71..d48c1bd 100644
--- a/spir_name_mangler/ParameterType.h
+++ b/spir_name_mangler/ParameterType.h
@@ -199,13 +199,13 @@ namespace SPIR {
 
     /// @brief Returns the pointer's address space.
     /// @return pointer's address space.
-    const TypeAttributeEnum getAddressSpace() const;
+    TypeAttributeEnum getAddressSpace() const;
 
     /// @brief Adds or removes a pointer's qualifier.
     /// @param TypeAttributeEnum qual - qualifier to add/remove.
     /// @param bool enabled - true if qualifier should exist false otherwise.
     ///        default is set to false.
-    void PointerType::setQualifier(TypeAttributeEnum qual, bool enabled);
+    void setQualifier(TypeAttributeEnum qual, bool enabled);
 
     /// @brief Checks if the pointer has a certain qualifier.
     /// @param TypeAttributeEnum qual - qualifier to check.