[vlc-devel] [PATCH 1/2] nporuntime: do not mix friend declarations with static implementations

Felix Paul Kühne fkuehne at videolan.org
Wed Feb 12 13:17:10 CET 2014


Fix compilation with clang++, part one
---
 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,
-- 
1.8.3.4 (Apple Git-47)




More information about the vlc-devel mailing list