Index: OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/PrimaryRecords.cpp
===================================================================
--- OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/PrimaryRecords.cpp (revision 9573)
+++ OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/PrimaryRecords.cpp (revision 10283)
@@ -154,5 +154,5 @@
 };
 
-RegisterRecordProxy<Header> g_Header(HEADER_OP);
+REGISTER_FLTRECORD(Header, HEADER_OP)
 
 
@@ -293,5 +293,6 @@
 };
 
-RegisterRecordProxy<Group> g_Group(GROUP_OP);
+REGISTER_FLTRECORD(Group, GROUP_OP)
+
 
 
@@ -458,5 +459,6 @@
 };
 
-RegisterRecordProxy<DegreeOfFreedom> g_DegreeOfFreedom(DOF_OP);
+REGISTER_FLTRECORD(DegreeOfFreedom, DOF_OP)
+
 
 
@@ -514,5 +516,6 @@
 };
 
-RegisterRecordProxy<LevelOfDetail> g_LevelOfDetail(LOD_OP);
+REGISTER_FLTRECORD(LevelOfDetail, LOD_OP)
+
 
 
@@ -570,5 +573,6 @@
 };
 
-RegisterRecordProxy<OldLevelOfDetail> g_OldLevelOfDetail(OLD_LOD_OP);
+REGISTER_FLTRECORD(OldLevelOfDetail, OLD_LOD_OP)
+
 
 
@@ -646,5 +650,6 @@
 };
 
-RegisterRecordProxy<Switch> g_Switch(SWITCH_OP);
+REGISTER_FLTRECORD(Switch, SWITCH_OP)
+
 
 
@@ -730,5 +735,6 @@
 };
 
-RegisterRecordProxy<ExternalReference> g_ExternalReference(EXTERNAL_REFERENCE_OP);
+REGISTER_FLTRECORD(ExternalReference, EXTERNAL_REFERENCE_OP)
+
 
 
@@ -779,5 +785,6 @@
 };
 
-RegisterRecordProxy<InstanceDefinition> g_InstanceDefinition(INSTANCE_DEFINITION_OP);
+REGISTER_FLTRECORD(InstanceDefinition, INSTANCE_DEFINITION_OP)
+
 
 
@@ -810,5 +817,6 @@
 };
 
-RegisterRecordProxy<InstanceReference> g_InstanceReference(INSTANCE_REFERENCE_OP);
+REGISTER_FLTRECORD(InstanceReference, INSTANCE_REFERENCE_OP)
+
 
 
@@ -849,5 +857,6 @@
 };
 
-RegisterRecordProxy<Extension> g_Extension(EXTENSION_OP);
+REGISTER_FLTRECORD(Extension, EXTENSION_OP)
+
 
 
@@ -953,5 +962,6 @@
 };
 
-RegisterRecordProxy<Object> g_Object(OBJECT_OP);
+REGISTER_FLTRECORD(Object, OBJECT_OP)
+
 
 
@@ -1036,5 +1046,6 @@
 };
 
-RegisterRecordProxy<LightSource> g_LightSource(LIGHT_SOURCE_OP);
+REGISTER_FLTRECORD(LightSource, LIGHT_SOURCE_OP)
+