--- a/bluetooth/btsdp/server/protocol/reqhandler.cpp	Thu Sep 23 17:06:47 2010 +0300
+++ b/bluetooth/btsdp/server/protocol/reqhandler.cpp	Wed Oct 13 16:20:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2000-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2000-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -49,11 +49,7 @@
 		}
 	}
 
-#ifdef __FLOGGING__
-TInt SdpReqHandler::RunError(TInt aError, const TSdpPdu& aReqPdu, TSdpPdu &aRespPdu)
-#else
 TInt SdpReqHandler::RunError(TInt aError, const TSdpPdu& /*aReqPdu*/, TSdpPdu &aRespPdu)
-#endif
 /**
 	Send an appropriate error.
 
@@ -371,7 +367,7 @@
 	TInt oldLen = responseAttributes.Length();
 	responseAttributes.SetLength(oldLen + KRspAttributeCountSize);
 	BigEndian::Put16(&responseAttributes[KRspAttributeCountOffset], (TUint16)(pduSize));
-	CAttrSizeItem* currentAttItem = collector->AttributeOf(sentRecords, sentAttributes);
+	TAttrSizeItem* currentAttItem = collector->AttributeOf(sentRecords, sentAttributes);
 	TInt lastAttr = collector->AttrCount(sentRecords);
 	TPtrC8 attrValPtr(0,0);
 	TBuf8<1> wBuffer(1); // used for byte insertion
@@ -615,7 +611,7 @@
 	TInt oldLen = responseAttributes.Length();
 	responseAttributes.SetLength(oldLen + KRspAttributeCountSize);
 	BigEndian::Put16(&responseAttributes[KRspAttributeCountOffset], (TUint16)(pduSize));
-	CAttrSizeItem* currentAttItem = collector->AttributeOf(sentRecords, sentAttributes);
+	TAttrSizeItem* currentAttItem = collector->AttributeOf(sentRecords, sentAttributes);
 	TInt lastAttr = collector->AttrCount(sentRecords);
 	TPtrC8 attrValPtr(0,0);
 	TBuf8<1> wBuffer(1); // used for byte insertion