[vlc-commits] nporuntime: do not mix friend declarations with static implementations

Felix Paul Kühne git at videolan.org
Thu Feb 13 20:02:24 CET 2014


npapi-vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Wed Feb 12 13:12:07 2014 +0100| [f4a86b5994a797a36d94bb4cc8033efad3e7632b] | committer: Felix Paul Kühne

nporuntime: do not mix friend declarations with static implementations

Fix compilation with clang++, part one

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=f4a86b5994a797a36d94bb4cc8033efad3e7632b
---

 npapi/control/nporuntime.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/npapi/control/nporuntime.h b/npapi/control/nporuntime.h
index d67ec8c..b279ade 100644
--- a/npapi/control/nporuntime.h
+++ b/npapi/control/nporuntime.h
@@ -114,10 +114,10 @@ protected:
 
     friend void RuntimeNPClassDeallocate(NPObject *npobj);
     friend void RuntimeNPClassInvalidate(NPObject *npobj);
-    template <class RuntimeNPObject> friend bool RuntimeNPClassGetProperty(NPObject *npobj, NPIdentifier name, NPVariant *result);
-    template <class RuntimeNPObject> friend bool RuntimeNPClassSetProperty(NPObject *npobj, NPIdentifier name, const NPVariant *value);
-    template <class RuntimeNPObject> friend bool RuntimeNPClassRemoveProperty(NPObject *npobj, NPIdentifier name);
-    template <class RuntimeNPObject> friend bool RuntimeNPClassInvoke(NPObject *npobj, NPIdentifier name,
+    template <class RuntimeNPObject> static bool RuntimeNPClassGetProperty(NPObject *npobj, NPIdentifier name, NPVariant *result);
+    template <class RuntimeNPObject> static bool RuntimeNPClassSetProperty(NPObject *npobj, NPIdentifier name, const NPVariant *value);
+    template <class RuntimeNPObject> static bool RuntimeNPClassRemoveProperty(NPObject *npobj, NPIdentifier name);
+    template <class RuntimeNPObject> static bool RuntimeNPClassInvoke(NPObject *npobj, NPIdentifier name,
                                                     const NPVariant *args, uint32_t argCount,
                                                     NPVariant *result);
     friend bool RuntimeNPClassInvokeDefault(NPObject *npobj,



More information about the vlc-commits mailing list