--- a/epoc32/include/es_wsms.inl	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/es_wsms.inl	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,9 @@
 // Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
@@ -16,9 +16,6 @@
 // 
 //
 
-
-
-
 /**
  @file
  
@@ -71,7 +68,7 @@
  */
 inline TPtrC8 TWapAddr::WapAddress() const
     {
-    return TPtrC8(UserPtr(),CONST_CAST(TWapAddr*,this)->GetUserLen());
+    return TPtrC8(UserPtr(),const_cast<TWapAddr*>(this)->GetUserLen());
     }