Updated wrappers

openscenegraph · May 27, 2007 · 7bd9961 · 7bd9961
1 parent 380f054
commit 7bd9961
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/genwrapper.conf b/genwrapper.conf
@@ -42,6 +42,8 @@ ignore file "osgViewer/api/X11/GraphicsWindowX11"
 ignore file "osgViewer/api/Win32/GraphicsWindowWin32"
 ignore file "osgViewer/api/Cocoa/GraphicsWindowCocoa"
 
+suppress reflector "CPluginFunction"
+suppress reflector "PluginFunctionProxy"
 
 #############################################################################
 

diff --git a/include/osgDB/Registry b/include/osgDB/Registry
@@ -26,6 +26,10 @@
 #include <map>
 #include <string>
 
+extern "C"
+{
+    typedef void (* CPluginFunction) (void);
+}
 
 namespace osgDB {
 
@@ -565,10 +569,6 @@ class RegisterReaderWriterProxy
         osg::ref_ptr<T> _rw;
 };
 
-extern "C"
-{
-    typedef void (* CPluginFunction) (void);
-}
 
 class PluginFunctionProxy
 {

diff --git a/src/osgWrappers/osgDB/Registry.cpp b/src/osgWrappers/osgDB/Registry.cpp
@@ -49,7 +49,7 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osgDB::basic_type_wrapper)
 END_REFLECTOR
 
 BEGIN_VALUE_REFLECTOR(osgDB::PluginFunctionProxy)
-	I_Constructor1(IN, osgDB::CPluginFunction, function,
+	I_Constructor1(IN, CPluginFunction, function,
 	               Properties::NON_EXPLICIT,
 	               ____PluginFunctionProxy__CPluginFunction,
 	               "",
@@ -600,5 +600,3 @@ BEGIN_OBJECT_REFLECTOR(osgDB::Registry::WriteFileCallback)
 	          "");
 END_REFLECTOR
 
-TYPE_NAME_ALIAS(void(*, osgDB::CPluginFunction)
-