Fix "friend declarations declares a non-template function"

Fix "friend declarations declares a non-template function" #2141