From 620f6923bb822f4e879ef18d173d79ddc880a72f Mon Sep 17 00:00:00 2001 From: hrchilds Date: Fri, 13 Nov 2009 05:45:01 +0000 Subject: [PATCH] Add initial support for linking the server statically. git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@8950 18c085ea-50e0-402c-830e-de6fd14e8384 --- Makefile.in | 8 + avt/Makefile.in | 5 + common/plugin/PluginManager.C | 42 ++- configure | 69 +++- configure.in | 59 +++- databases/ANALYZE/ANALYZEEnginePluginInfo.C | 6 +- databases/ANALYZE/ANALYZEMDServerPluginInfo.C | 6 +- databases/ANALYZE/ANALYZEPluginInfo.C | 10 +- databases/ANSYS/ANSYSEnginePluginInfo.C | 6 +- databases/ANSYS/ANSYSMDServerPluginInfo.C | 6 +- databases/ANSYS/ANSYSPluginInfo.C | 10 +- databases/AUXFile/AUXFileEnginePluginInfo.C | 6 +- databases/AUXFile/AUXFileMDServerPluginInfo.C | 6 +- databases/AUXFile/AUXFilePluginInfo.C | 10 +- databases/Adios/AdiosCommonPluginInfo.C | 4 +- databases/Adios/AdiosEnginePluginInfo.C | 6 +- databases/Adios/AdiosMDServerPluginInfo.C | 6 +- databases/Adios/AdiosPluginInfo.C | 12 +- .../Adventure/AdventureEnginePluginInfo.C | 6 +- .../Adventure/AdventureMDServerPluginInfo.C | 6 +- databases/Adventure/AdventurePluginInfo.C | 10 +- .../AugDecomp/AugDecompEnginePluginInfo.C | 6 +- .../AugDecomp/AugDecompMDServerPluginInfo.C | 6 +- databases/AugDecomp/AugDecompPluginInfo.C | 10 +- databases/BOV/BOVEnginePluginInfo.C | 6 +- databases/BOV/BOVMDServerPluginInfo.C | 6 +- databases/BOV/BOVPluginInfo.C | 10 +- databases/BOW/BOWEnginePluginInfo.C | 6 +- databases/BOW/BOWMDServerPluginInfo.C | 6 +- databases/BOW/BOWPluginInfo.C | 10 +- databases/Boxlib2D/Boxlib2DEnginePluginInfo.C | 6 +- .../Boxlib2D/Boxlib2DMDServerPluginInfo.C | 6 +- databases/Boxlib2D/Boxlib2DPluginInfo.C | 10 +- databases/Boxlib3D/Boxlib3DEnginePluginInfo.C | 6 +- .../Boxlib3D/Boxlib3DMDServerPluginInfo.C | 6 +- databases/Boxlib3D/Boxlib3DPluginInfo.C | 10 +- databases/CCM/CCMEnginePluginInfo.C | 6 +- databases/CCM/CCMMDServerPluginInfo.C | 6 +- databases/CCM/CCMPluginInfo.C | 10 +- databases/CEAucd/CEAucdEnginePluginInfo.C | 6 +- databases/CEAucd/CEAucdMDServerPluginInfo.C | 6 +- databases/CEAucd/CEAucdPluginInfo.C | 10 +- databases/CGNS/CGNSEnginePluginInfo.C | 6 +- databases/CGNS/CGNSMDServerPluginInfo.C | 6 +- databases/CGNS/CGNSPluginInfo.C | 10 +- databases/CMAT/CMATEnginePluginInfo.C | 6 +- databases/CMAT/CMATMDServerPluginInfo.C | 6 +- databases/CMAT/CMATPluginInfo.C | 10 +- databases/CTRL/CTRLEnginePluginInfo.C | 6 +- databases/CTRL/CTRLMDServerPluginInfo.C | 6 +- databases/CTRL/CTRLPluginInfo.C | 10 +- databases/Cale/CaleEnginePluginInfo.C | 6 +- databases/Cale/CaleMDServerPluginInfo.C | 6 +- databases/Cale/CalePluginInfo.C | 10 +- databases/Chombo/ChomboEnginePluginInfo.C | 6 +- databases/Chombo/ChomboMDServerPluginInfo.C | 6 +- databases/Chombo/ChomboPluginInfo.C | 10 +- databases/Claw/ClawEnginePluginInfo.C | 6 +- databases/Claw/ClawMDServerPluginInfo.C | 6 +- databases/Claw/ClawPluginInfo.C | 10 +- databases/Cosmos/CosmosEnginePluginInfo.C | 6 +- databases/Cosmos/CosmosMDServerPluginInfo.C | 6 +- databases/Cosmos/CosmosPluginInfo.C | 10 +- databases/CosmosPP/CosmosPPEnginePluginInfo.C | 6 +- .../CosmosPP/CosmosPPMDServerPluginInfo.C | 6 +- databases/CosmosPP/CosmosPPPluginInfo.C | 10 +- databases/Curve2D/Curve2DEnginePluginInfo.C | 6 +- databases/Curve2D/Curve2DMDServerPluginInfo.C | 6 +- databases/Curve2D/Curve2DPluginInfo.C | 10 +- databases/DDCMD/DDCMDEnginePluginInfo.C | 6 +- databases/DDCMD/DDCMDMDServerPluginInfo.C | 6 +- databases/DDCMD/DDCMDPluginInfo.C | 10 +- databases/Dyna3D/Dyna3DEnginePluginInfo.C | 6 +- databases/Dyna3D/Dyna3DMDServerPluginInfo.C | 6 +- databases/Dyna3D/Dyna3DPluginInfo.C | 10 +- databases/EnSight/EnSightEnginePluginInfo.C | 6 +- databases/EnSight/EnSightMDServerPluginInfo.C | 6 +- databases/EnSight/EnSightPluginInfo.C | 10 +- databases/Enzo/EnzoEnginePluginInfo.C | 6 +- databases/Enzo/EnzoMDServerPluginInfo.C | 6 +- databases/Enzo/EnzoPluginInfo.C | 10 +- databases/Exodus/ExodusEnginePluginInfo.C | 6 +- databases/Exodus/ExodusMDServerPluginInfo.C | 6 +- databases/Exodus/ExodusPluginInfo.C | 10 +- .../ExtrudedVol/ExtrudedVolEnginePluginInfo.C | 6 +- .../ExtrudedVolMDServerPluginInfo.C | 6 +- databases/ExtrudedVol/ExtrudedVolPluginInfo.C | 10 +- databases/FITS/FITSEnginePluginInfo.C | 6 +- databases/FITS/FITSMDServerPluginInfo.C | 6 +- databases/FITS/FITSPluginInfo.C | 10 +- databases/FLASH/FLASHEnginePluginInfo.C | 6 +- databases/FLASH/FLASHMDServerPluginInfo.C | 6 +- databases/FLASH/FLASHPluginInfo.C | 10 +- databases/Fluent/FluentEnginePluginInfo.C | 6 +- databases/Fluent/FluentMDServerPluginInfo.C | 6 +- databases/Fluent/FluentPluginInfo.C | 10 +- databases/GDAL/GDALEnginePluginInfo.C | 6 +- databases/GDAL/GDALMDServerPluginInfo.C | 6 +- databases/GDAL/GDALPluginInfo.C | 10 +- databases/GGCM/GGCMEnginePluginInfo.C | 6 +- databases/GGCM/GGCMMDServerPluginInfo.C | 6 +- databases/GGCM/GGCMPluginInfo.C | 10 +- databases/GTC/GTCEnginePluginInfo.C | 6 +- databases/GTC/GTCMDServerPluginInfo.C | 6 +- databases/GTC/GTCPluginInfo.C | 10 +- databases/Gadget/GadgetEnginePluginInfo.C | 6 +- databases/Gadget/GadgetMDServerPluginInfo.C | 6 +- databases/Gadget/GadgetPluginInfo.C | 10 +- databases/H5Nimrod/H5NimrodEnginePluginInfo.C | 6 +- .../H5Nimrod/H5NimrodMDServerPluginInfo.C | 6 +- databases/H5Nimrod/H5NimrodPluginInfo.C | 11 +- databases/H5Part/H5PartEnginePluginInfo.C | 6 +- databases/H5Part/H5PartMDServerPluginInfo.C | 6 +- databases/H5Part/H5PartPluginInfo.C | 10 +- databases/HDF_UC/HDF_UCEnginePluginInfo.C | 6 +- databases/HDF_UC/HDF_UCMDServerPluginInfo.C | 6 +- databases/HDF_UC/HDF_UCPluginInfo.C | 10 +- databases/Hex/HexEnginePluginInfo.C | 6 +- databases/Hex/HexMDServerPluginInfo.C | 6 +- databases/Hex/HexPluginInfo.C | 10 +- databases/ITAPS_C/ITAPS_CEnginePluginInfo.C | 6 +- databases/ITAPS_C/ITAPS_CMDServerPluginInfo.C | 6 +- databases/ITAPS_C/ITAPS_CPluginInfo.C | 10 +- databases/Image/ImageEnginePluginInfo.C | 6 +- databases/Image/ImageMDServerPluginInfo.C | 6 +- databases/Image/ImagePluginInfo.C | 10 +- databases/KullLite/KullLiteEnginePluginInfo.C | 6 +- .../KullLite/KullLiteMDServerPluginInfo.C | 6 +- databases/KullLite/KullLitePluginInfo.C | 10 +- databases/LAMMPS/LAMMPSEnginePluginInfo.C | 6 +- databases/LAMMPS/LAMMPSMDServerPluginInfo.C | 6 +- databases/LAMMPS/LAMMPSPluginInfo.C | 10 +- databases/Lines/LinesEnginePluginInfo.C | 6 +- databases/Lines/LinesMDServerPluginInfo.C | 6 +- databases/Lines/LinesPluginInfo.C | 10 +- databases/M3D/M3D.xml | 3 +- databases/M3D/M3DEnginePluginInfo.C | 6 +- databases/M3D/M3DMDServerPluginInfo.C | 6 +- databases/M3D/M3DPluginInfo.C | 10 +- databases/MFIX/MFIXEnginePluginInfo.C | 6 +- databases/MFIX/MFIXMDServerPluginInfo.C | 6 +- databases/MFIX/MFIXPluginInfo.C | 10 +- databases/MM5/MM5EnginePluginInfo.C | 6 +- databases/MM5/MM5MDServerPluginInfo.C | 6 +- databases/MM5/MM5PluginInfo.C | 10 +- .../MatrixMarketEnginePluginInfo.C | 6 +- .../MatrixMarketMDServerPluginInfo.C | 6 +- .../MatrixMarket/MatrixMarketPluginInfo.C | 10 +- databases/Mili/MiliEnginePluginInfo.C | 6 +- databases/Mili/MiliMDServerPluginInfo.C | 6 +- databases/Mili/MiliPluginInfo.C | 10 +- databases/Miranda/MirandaEnginePluginInfo.C | 6 +- databases/Miranda/MirandaMDServerPluginInfo.C | 6 +- databases/Miranda/MirandaPluginInfo.C | 10 +- databases/NASTRAN/NASTRANEnginePluginInfo.C | 6 +- databases/NASTRAN/NASTRANMDServerPluginInfo.C | 6 +- databases/NASTRAN/NASTRANPluginInfo.C | 10 +- databases/NETCDF/NETCDFEnginePluginInfo.C | 6 +- databases/NETCDF/NETCDFMDServerPluginInfo.C | 6 +- databases/NETCDF/NETCDFPluginInfo.C | 10 +- databases/Nek5000/Nek5000EnginePluginInfo.C | 6 +- databases/Nek5000/Nek5000MDServerPluginInfo.C | 6 +- databases/Nek5000/Nek5000PluginInfo.C | 10 +- databases/OVERFLOW/OVERFLOWEnginePluginInfo.C | 6 +- .../OVERFLOW/OVERFLOWMDServerPluginInfo.C | 6 +- databases/OVERFLOW/OVERFLOWPluginInfo.C | 10 +- databases/OpenFOAM/OpenFOAMEnginePluginInfo.C | 6 +- .../OpenFOAM/OpenFOAMMDServerPluginInfo.C | 6 +- databases/OpenFOAM/OpenFOAMPluginInfo.C | 10 +- databases/PATRAN/PATRANEnginePluginInfo.C | 6 +- databases/PATRAN/PATRANMDServerPluginInfo.C | 6 +- databases/PATRAN/PATRANPluginInfo.C | 10 +- databases/PDB/PDBEnginePluginInfo.C | 6 +- databases/PDB/PDBMDServerPluginInfo.C | 6 +- databases/PDB/PDBPluginInfo.C | 10 +- databases/PFLOTRAN/PFLOTRANEnginePluginInfo.C | 6 +- .../PFLOTRAN/PFLOTRANMDServerPluginInfo.C | 6 +- databases/PFLOTRAN/PFLOTRANPluginInfo.C | 10 +- databases/PLOT2D/PLOT2DEnginePluginInfo.C | 6 +- databases/PLOT2D/PLOT2DMDServerPluginInfo.C | 6 +- databases/PLOT2D/PLOT2DPluginInfo.C | 10 +- databases/PLOT3D/PLOT3DEnginePluginInfo.C | 6 +- databases/PLOT3D/PLOT3DMDServerPluginInfo.C | 6 +- databases/PLOT3D/PLOT3DPluginInfo.C | 10 +- databases/Pixie/PixieEnginePluginInfo.C | 6 +- databases/Pixie/PixieMDServerPluginInfo.C | 6 +- databases/Pixie/PixiePluginInfo.C | 10 +- .../PlainText/PlainTextEnginePluginInfo.C | 6 +- .../PlainText/PlainTextMDServerPluginInfo.C | 6 +- databases/PlainText/PlainTextPluginInfo.C | 10 +- .../PlasmaState/PlasmaStateEnginePluginInfo.C | 6 +- .../PlasmaStateMDServerPluginInfo.C | 6 +- databases/PlasmaState/PlasmaStatePluginInfo.C | 10 +- databases/Point3D/Point3DEnginePluginInfo.C | 6 +- databases/Point3D/Point3DMDServerPluginInfo.C | 6 +- databases/Point3D/Point3DPluginInfo.C | 10 +- .../ProteinDataBankEnginePluginInfo.C | 6 +- .../ProteinDataBankMDServerPluginInfo.C | 6 +- .../ProteinDataBankPluginInfo.C | 10 +- databases/RAW/RAWEnginePluginInfo.C | 6 +- databases/RAW/RAWMDServerPluginInfo.C | 6 +- databases/RAW/RAWPluginInfo.C | 10 +- databases/Rect/RectEnginePluginInfo.C | 6 +- databases/Rect/RectMDServerPluginInfo.C | 6 +- databases/Rect/RectPluginInfo.C | 10 +- databases/S3D/S3DEnginePluginInfo.C | 6 +- databases/S3D/S3DMDServerPluginInfo.C | 6 +- databases/S3D/S3DPluginInfo.C | 10 +- databases/SAMI/SAMIEnginePluginInfo.C | 6 +- databases/SAMI/SAMIMDServerPluginInfo.C | 6 +- databases/SAMI/SAMIPluginInfo.C | 10 +- databases/SAMRAI/SAMRAIEnginePluginInfo.C | 6 +- databases/SAMRAI/SAMRAIMDServerPluginInfo.C | 6 +- databases/SAMRAI/SAMRAIPluginInfo.C | 10 +- databases/SAR/SAREnginePluginInfo.C | 6 +- databases/SAR/SARMDServerPluginInfo.C | 6 +- databases/SAR/SARPluginInfo.C | 10 +- databases/SAS/SASEnginePluginInfo.C | 6 +- databases/SAS/SASMDServerPluginInfo.C | 6 +- databases/SAS/SASPluginInfo.C | 10 +- databases/STL/STLEnginePluginInfo.C | 6 +- databases/STL/STLMDServerPluginInfo.C | 6 +- databases/STL/STLPluginInfo.C | 10 +- .../Shapefile/ShapefileEnginePluginInfo.C | 6 +- .../Shapefile/ShapefileMDServerPluginInfo.C | 6 +- databases/Shapefile/ShapefilePluginInfo.C | 10 +- databases/Silo/SiloCommonPluginInfo.C | 123 ++----- databases/Silo/SiloEnginePluginInfo.C | 6 +- databases/Silo/SiloMDServerPluginInfo.C | 6 +- databases/Silo/SiloPluginInfo.C | 10 +- databases/Silo/SiloPluginInfo.h | 7 +- databases/SimV1/SimV1EnginePluginInfo.C | 6 +- databases/SimV1/SimV1MDServerPluginInfo.C | 6 +- databases/SimV1/SimV1PluginInfo.C | 10 +- .../SimV1Writer/SimV1WriterEnginePluginInfo.C | 6 +- .../SimV1WriterMDServerPluginInfo.C | 6 +- databases/SimV1Writer/SimV1WriterPluginInfo.C | 10 +- databases/SimV2/SimV2EnginePluginInfo.C | 6 +- databases/SimV2/SimV2MDServerPluginInfo.C | 6 +- databases/SimV2/SimV2PluginInfo.C | 10 +- databases/Spheral/SpheralEnginePluginInfo.C | 6 +- databases/Spheral/SpheralMDServerPluginInfo.C | 6 +- databases/Spheral/SpheralPluginInfo.C | 10 +- .../StreamGhostTestEnginePluginInfo.C | 6 +- .../StreamGhostTestMDServerPluginInfo.C | 6 +- .../StreamGhostTestPluginInfo.C | 10 +- databases/TFT/TFTEnginePluginInfo.C | 6 +- databases/TFT/TFTMDServerPluginInfo.C | 6 +- databases/TFT/TFTPluginInfo.C | 10 +- databases/TSurf/TSurfEnginePluginInfo.C | 6 +- databases/TSurf/TSurfMDServerPluginInfo.C | 6 +- databases/TSurf/TSurfPluginInfo.C | 10 +- databases/Tecplot/TecplotEnginePluginInfo.C | 6 +- databases/Tecplot/TecplotMDServerPluginInfo.C | 6 +- databases/Tecplot/TecplotPluginInfo.C | 10 +- databases/Tetrad/TetradEnginePluginInfo.C | 6 +- databases/Tetrad/TetradMDServerPluginInfo.C | 6 +- databases/Tetrad/TetradPluginInfo.C | 10 +- .../TimeVaryingExodusEnginePluginInfo.C | 6 +- .../TimeVaryingExodusMDServerPluginInfo.C | 6 +- .../TimeVaryingExodusPluginInfo.C | 10 +- databases/UNIC/UNICEnginePluginInfo.C | 6 +- databases/UNIC/UNICMDServerPluginInfo.C | 6 +- databases/UNIC/UNICPluginInfo.C | 10 +- databases/VASP/VASPEnginePluginInfo.C | 6 +- databases/VASP/VASPMDServerPluginInfo.C | 6 +- databases/VASP/VASPPluginInfo.C | 10 +- databases/VLI/VLIEnginePluginInfo.C | 6 +- databases/VLI/VLIMDServerPluginInfo.C | 6 +- databases/VLI/VLIPluginInfo.C | 10 +- databases/VTK/VTKEnginePluginInfo.C | 6 +- databases/VTK/VTKMDServerPluginInfo.C | 6 +- databases/VTK/VTKPluginInfo.C | 10 +- databases/ViSUS/ViSUSEnginePluginInfo.C | 6 +- databases/ViSUS/ViSUSMDServerPluginInfo.C | 6 +- databases/ViSUS/ViSUSPluginInfo.C | 10 +- databases/Vis5D/Vis5DEnginePluginInfo.C | 6 +- databases/Vis5D/Vis5DMDServerPluginInfo.C | 6 +- databases/Vis5D/Vis5DPluginInfo.C | 10 +- databases/Vista/VistaEnginePluginInfo.C | 6 +- databases/Vista/VistaMDServerPluginInfo.C | 6 +- databases/Vista/VistaPluginInfo.C | 10 +- databases/Vs/VsEnginePluginInfo.C | 6 +- databases/Vs/VsMDServerPluginInfo.C | 6 +- databases/Vs/VsPluginInfo.C | 23 +- .../WavefrontOBJEnginePluginInfo.C | 6 +- .../WavefrontOBJMDServerPluginInfo.C | 6 +- .../WavefrontOBJ/WavefrontOBJPluginInfo.C | 10 +- databases/XDMF/XDMFEnginePluginInfo.C | 6 +- databases/XDMF/XDMFMDServerPluginInfo.C | 6 +- databases/XDMF/XDMFPluginInfo.C | 10 +- databases/XYZ/XYZEnginePluginInfo.C | 6 +- databases/XYZ/XYZMDServerPluginInfo.C | 6 +- databases/XYZ/XYZPluginInfo.C | 10 +- databases/Xmdv/XmdvEnginePluginInfo.C | 6 +- databases/Xmdv/XmdvMDServerPluginInfo.C | 6 +- databases/Xmdv/XmdvPluginInfo.C | 10 +- databases/ZeusMP/ZeusMPEnginePluginInfo.C | 6 +- databases/ZeusMP/ZeusMPMDServerPluginInfo.C | 6 +- databases/ZeusMP/ZeusMPPluginInfo.C | 10 +- .../ZipWrapper/ZipWrapperEnginePluginInfo.C | 6 +- .../ZipWrapper/ZipWrapperMDServerPluginInfo.C | 6 +- databases/ZipWrapper/ZipWrapperPluginInfo.C | 10 +- databases/paraDIS/paraDISEnginePluginInfo.C | 6 +- databases/paraDIS/paraDISMDServerPluginInfo.C | 6 +- databases/paraDIS/paraDISPluginInfo.C | 10 +- .../paraDIS_tecplotEnginePluginInfo.C | 6 +- .../paraDIS_tecplotMDServerPluginInfo.C | 6 +- .../paraDIS_tecplotPluginInfo.C | 10 +- engine/Makefile.in | 6 +- engine/main/Makefile.in | 35 +- engine/ssl/EngineStaticSymbolLocator.C | 320 ++++++++++++++++++ engine/ssl/Makefile.in | 75 ++++ include/visit-config.h.in | 3 + launcher/main/Makefile.in | 5 +- mdserver/Makefile.in | 6 +- mdserver/main/Makefile.in | 23 +- mdserver/ssl/MDServerStaticSymbolLocator.C | 98 ++++++ mdserver/ssl/Makefile.in | 75 ++++ .../BoundaryOp/BoundaryOpEnginePluginInfo.C | 6 +- .../BoundaryOp/BoundaryOpGUIPluginInfo.C | 6 +- operators/BoundaryOp/BoundaryOpPluginInfo.C | 10 +- .../BoundaryOpScriptingPluginInfo.C | 6 +- .../BoundaryOp/BoundaryOpViewerPluginInfo.C | 6 +- operators/Box/BoxEnginePluginInfo.C | 6 +- operators/Box/BoxGUIPluginInfo.C | 6 +- operators/Box/BoxPluginInfo.C | 10 +- operators/Box/BoxScriptingPluginInfo.C | 6 +- operators/Box/BoxViewerPluginInfo.C | 6 +- operators/Clip/ClipEnginePluginInfo.C | 6 +- operators/Clip/ClipGUIPluginInfo.C | 6 +- operators/Clip/ClipPluginInfo.C | 10 +- operators/Clip/ClipScriptingPluginInfo.C | 6 +- operators/Clip/ClipViewerPluginInfo.C | 6 +- operators/Cone/ConeEnginePluginInfo.C | 6 +- operators/Cone/ConeGUIPluginInfo.C | 6 +- operators/Cone/ConePluginInfo.C | 10 +- operators/Cone/ConeScriptingPluginInfo.C | 6 +- operators/Cone/ConeViewerPluginInfo.C | 6 +- .../ConnCompReduceEnginePluginInfo.C | 6 +- .../ConnCompReduceGUIPluginInfo.C | 6 +- .../ConnCompReduce/ConnCompReducePluginInfo.C | 10 +- .../ConnCompReduceScriptingPluginInfo.C | 6 +- .../ConnCompReduceViewerPluginInfo.C | 6 +- operators/Context/ContextEnginePluginInfo.C | 6 +- operators/Context/ContextGUIPluginInfo.C | 6 +- operators/Context/ContextPluginInfo.C | 10 +- .../Context/ContextScriptingPluginInfo.C | 6 +- operators/Context/ContextViewerPluginInfo.C | 6 +- .../CoordSwap/CoordSwapEnginePluginInfo.C | 6 +- operators/CoordSwap/CoordSwapGUIPluginInfo.C | 6 +- operators/CoordSwap/CoordSwapPluginInfo.C | 10 +- .../CoordSwap/CoordSwapScriptingPluginInfo.C | 6 +- .../CoordSwap/CoordSwapViewerPluginInfo.C | 6 +- .../CracksClipperEnginePluginInfo.C | 6 +- .../CracksClipperGUIPluginInfo.C | 6 +- .../CracksClipper/CracksClipperPluginInfo.C | 10 +- .../CracksClipperScriptingPluginInfo.C | 6 +- .../CracksClipperViewerPluginInfo.C | 6 +- .../CreateBonds/CreateBondsEnginePluginInfo.C | 6 +- .../CreateBonds/CreateBondsGUIPluginInfo.C | 6 +- operators/CreateBonds/CreateBondsPluginInfo.C | 10 +- .../CreateBondsScriptingPluginInfo.C | 6 +- .../CreateBonds/CreateBondsViewerPluginInfo.C | 6 +- operators/Cylinder/CylinderEnginePluginInfo.C | 6 +- operators/Cylinder/CylinderGUIPluginInfo.C | 6 +- operators/Cylinder/CylinderPluginInfo.C | 10 +- .../Cylinder/CylinderScriptingPluginInfo.C | 6 +- operators/Cylinder/CylinderViewerPluginInfo.C | 6 +- operators/Decimate/DecimateEnginePluginInfo.C | 6 +- operators/Decimate/DecimateGUIPluginInfo.C | 6 +- operators/Decimate/DecimatePluginInfo.C | 10 +- .../Decimate/DecimateScriptingPluginInfo.C | 6 +- operators/Decimate/DecimateViewerPluginInfo.C | 6 +- .../DeferExpressionEnginePluginInfo.C | 6 +- .../DeferExpressionGUIPluginInfo.C | 6 +- .../DeferExpressionPluginInfo.C | 10 +- .../DeferExpressionScriptingPluginInfo.C | 6 +- .../DeferExpressionViewerPluginInfo.C | 6 +- .../DeformSphereGlyphEnginePluginInfo.C | 6 +- .../DeformSphereGlyphGUIPluginInfo.C | 6 +- .../DeformSphereGlyphPluginInfo.C | 10 +- .../DeformSphereGlyphScriptingPluginInfo.C | 6 +- .../DeformSphereGlyphViewerPluginInfo.C | 6 +- operators/Delaunay/DelaunayEnginePluginInfo.C | 6 +- operators/Delaunay/DelaunayGUIPluginInfo.C | 6 +- operators/Delaunay/DelaunayPluginInfo.C | 10 +- .../Delaunay/DelaunayScriptingPluginInfo.C | 6 +- operators/Delaunay/DelaunayViewerPluginInfo.C | 6 +- operators/Displace/DisplaceEnginePluginInfo.C | 6 +- operators/Displace/DisplaceGUIPluginInfo.C | 6 +- operators/Displace/DisplacePluginInfo.C | 10 +- .../Displace/DisplaceScriptingPluginInfo.C | 6 +- operators/Displace/DisplaceViewerPluginInfo.C | 6 +- operators/DualMesh/DualMeshEnginePluginInfo.C | 6 +- operators/DualMesh/DualMeshGUIPluginInfo.C | 6 +- operators/DualMesh/DualMeshPluginInfo.C | 10 +- .../DualMesh/DualMeshScriptingPluginInfo.C | 6 +- operators/DualMesh/DualMeshViewerPluginInfo.C | 6 +- operators/Edge/EdgeEnginePluginInfo.C | 6 +- operators/Edge/EdgeGUIPluginInfo.C | 6 +- operators/Edge/EdgePluginInfo.C | 10 +- operators/Edge/EdgeScriptingPluginInfo.C | 6 +- operators/Edge/EdgeViewerPluginInfo.C | 6 +- operators/Elevate/ElevateEnginePluginInfo.C | 6 +- operators/Elevate/ElevateGUIPluginInfo.C | 6 +- operators/Elevate/ElevatePluginInfo.C | 10 +- .../Elevate/ElevateScriptingPluginInfo.C | 6 +- operators/Elevate/ElevateViewerPluginInfo.C | 6 +- .../ExternalSurfaceEnginePluginInfo.C | 6 +- .../ExternalSurfaceGUIPluginInfo.C | 6 +- .../ExternalSurfacePluginInfo.C | 10 +- .../ExternalSurfaceScriptingPluginInfo.C | 6 +- .../ExternalSurfaceViewerPluginInfo.C | 6 +- .../IndexSelect/IndexSelectEnginePluginInfo.C | 6 +- .../IndexSelect/IndexSelectGUIPluginInfo.C | 6 +- operators/IndexSelect/IndexSelectPluginInfo.C | 10 +- .../IndexSelectScriptingPluginInfo.C | 6 +- .../IndexSelect/IndexSelectViewerPluginInfo.C | 6 +- .../InverseGhostZoneEnginePluginInfo.C | 6 +- .../InverseGhostZoneGUIPluginInfo.C | 6 +- .../InverseGhostZonePluginInfo.C | 10 +- .../InverseGhostZoneScriptingPluginInfo.C | 6 +- .../InverseGhostZoneViewerPluginInfo.C | 6 +- .../Isosurface/IsosurfaceEnginePluginInfo.C | 6 +- .../Isosurface/IsosurfaceGUIPluginInfo.C | 6 +- operators/Isosurface/IsosurfacePluginInfo.C | 10 +- .../IsosurfaceScriptingPluginInfo.C | 6 +- .../Isosurface/IsosurfaceViewerPluginInfo.C | 6 +- .../Isovolume/IsovolumeEnginePluginInfo.C | 6 +- operators/Isovolume/IsovolumeGUIPluginInfo.C | 6 +- operators/Isovolume/IsovolumePluginInfo.C | 10 +- .../Isovolume/IsovolumeScriptingPluginInfo.C | 6 +- .../Isovolume/IsovolumeViewerPluginInfo.C | 6 +- .../LineSurface/LineSurfaceEnginePluginInfo.C | 6 +- .../LineSurface/LineSurfaceGUIPluginInfo.C | 6 +- operators/LineSurface/LineSurfacePluginInfo.C | 10 +- .../LineSurfaceScriptingPluginInfo.C | 6 +- .../LineSurface/LineSurfaceViewerPluginInfo.C | 6 +- operators/Lineout/LineoutEnginePluginInfo.C | 6 +- operators/Lineout/LineoutGUIPluginInfo.C | 6 +- operators/Lineout/LineoutPluginInfo.C | 10 +- .../Lineout/LineoutScriptingPluginInfo.C | 6 +- operators/Lineout/LineoutViewerPluginInfo.C | 6 +- operators/Merge/MergeEnginePluginInfo.C | 6 +- operators/Merge/MergeGUIPluginInfo.C | 6 +- operators/Merge/MergePluginInfo.C | 10 +- operators/Merge/MergeScriptingPluginInfo.C | 6 +- operators/Merge/MergeViewerPluginInfo.C | 6 +- .../MetricThresholdEnginePluginInfo.C | 6 +- .../MetricThresholdGUIPluginInfo.C | 6 +- .../MetricThresholdPluginInfo.C | 10 +- .../MetricThresholdScriptingPluginInfo.C | 6 +- .../MetricThresholdViewerPluginInfo.C | 6 +- .../OnionPeel/OnionPeelEnginePluginInfo.C | 6 +- operators/OnionPeel/OnionPeelGUIPluginInfo.C | 6 +- operators/OnionPeel/OnionPeelPluginInfo.C | 10 +- .../OnionPeel/OnionPeelScriptingPluginInfo.C | 6 +- .../OnionPeel/OnionPeelViewerPluginInfo.C | 6 +- operators/PDF/PDFEnginePluginInfo.C | 6 +- operators/PDF/PDFGUIPluginInfo.C | 6 +- operators/PDF/PDFPluginInfo.C | 10 +- operators/PDF/PDFScriptingPluginInfo.C | 6 +- operators/PDF/PDFViewerPluginInfo.C | 6 +- .../PersistentParticlesEnginePluginInfo.C | 6 +- .../PersistentParticlesGUIPluginInfo.C | 6 +- .../PersistentParticlesPluginInfo.C | 10 +- .../PersistentParticlesScriptingPluginInfo.C | 6 +- .../PersistentParticlesViewerPluginInfo.C | 6 +- operators/Project/ProjectEnginePluginInfo.C | 6 +- operators/Project/ProjectGUIPluginInfo.C | 6 +- operators/Project/ProjectPluginInfo.C | 10 +- .../Project/ProjectScriptingPluginInfo.C | 6 +- operators/Project/ProjectViewerPluginInfo.C | 6 +- operators/Reflect/ReflectEnginePluginInfo.C | 6 +- operators/Reflect/ReflectGUIPluginInfo.C | 6 +- operators/Reflect/ReflectPluginInfo.C | 10 +- .../Reflect/ReflectScriptingPluginInfo.C | 6 +- operators/Reflect/ReflectViewerPluginInfo.C | 6 +- .../RemoveCells/RemoveCellsEnginePluginInfo.C | 6 +- .../RemoveCells/RemoveCellsGUIPluginInfo.C | 6 +- operators/RemoveCells/RemoveCellsPluginInfo.C | 10 +- .../RemoveCellsScriptingPluginInfo.C | 6 +- .../RemoveCells/RemoveCellsViewerPluginInfo.C | 6 +- .../Replicate/ReplicateEnginePluginInfo.C | 6 +- operators/Replicate/ReplicateGUIPluginInfo.C | 6 +- operators/Replicate/ReplicatePluginInfo.C | 10 +- .../Replicate/ReplicateScriptingPluginInfo.C | 6 +- .../Replicate/ReplicateViewerPluginInfo.C | 6 +- operators/Resample/ResampleEnginePluginInfo.C | 6 +- operators/Resample/ResampleGUIPluginInfo.C | 6 +- operators/Resample/ResamplePluginInfo.C | 10 +- .../Resample/ResampleScriptingPluginInfo.C | 6 +- operators/Resample/ResampleViewerPluginInfo.C | 6 +- operators/Revolve/RevolveEnginePluginInfo.C | 6 +- operators/Revolve/RevolveGUIPluginInfo.C | 6 +- operators/Revolve/RevolvePluginInfo.C | 10 +- .../Revolve/RevolveScriptingPluginInfo.C | 6 +- operators/Revolve/RevolveViewerPluginInfo.C | 6 +- operators/SiloDump/SiloDumpEnginePluginInfo.C | 6 +- operators/SiloDump/SiloDumpGUIPluginInfo.C | 6 +- operators/SiloDump/SiloDumpPluginInfo.C | 10 +- .../SiloDump/SiloDumpScriptingPluginInfo.C | 6 +- operators/SiloDump/SiloDumpViewerPluginInfo.C | 6 +- operators/Slice/SliceEnginePluginInfo.C | 6 +- operators/Slice/SliceGUIPluginInfo.C | 6 +- operators/Slice/SlicePluginInfo.C | 10 +- operators/Slice/SliceScriptingPluginInfo.C | 6 +- operators/Slice/SliceViewerPluginInfo.C | 6 +- operators/Smooth/SmoothEnginePluginInfo.C | 6 +- operators/Smooth/SmoothGUIPluginInfo.C | 6 +- operators/Smooth/SmoothPluginInfo.C | 10 +- operators/Smooth/SmoothScriptingPluginInfo.C | 6 +- operators/Smooth/SmoothViewerPluginInfo.C | 6 +- .../SphereSlice/SphereSliceEnginePluginInfo.C | 6 +- .../SphereSlice/SphereSliceGUIPluginInfo.C | 6 +- operators/SphereSlice/SphereSlicePluginInfo.C | 10 +- .../SphereSliceScriptingPluginInfo.C | 6 +- .../SphereSlice/SphereSliceViewerPluginInfo.C | 6 +- .../SubdivideQuadsEnginePluginInfo.C | 6 +- .../SubdivideQuadsGUIPluginInfo.C | 6 +- .../SubdivideQuads/SubdivideQuadsPluginInfo.C | 10 +- .../SubdivideQuadsScriptingPluginInfo.C | 6 +- .../SubdivideQuadsViewerPluginInfo.C | 6 +- .../SurfCompPrepEnginePluginInfo.C | 6 +- .../SurfCompPrep/SurfCompPrepGUIPluginInfo.C | 6 +- .../SurfCompPrep/SurfCompPrepPluginInfo.C | 10 +- .../SurfCompPrepScriptingPluginInfo.C | 6 +- .../SurfCompPrepViewerPluginInfo.C | 6 +- .../ThreeSlice/ThreeSliceEnginePluginInfo.C | 6 +- .../ThreeSlice/ThreeSliceGUIPluginInfo.C | 6 +- operators/ThreeSlice/ThreeSlicePluginInfo.C | 10 +- .../ThreeSliceScriptingPluginInfo.C | 6 +- .../ThreeSlice/ThreeSliceViewerPluginInfo.C | 6 +- .../Threshold/ThresholdEnginePluginInfo.C | 6 +- operators/Threshold/ThresholdGUIPluginInfo.C | 6 +- operators/Threshold/ThresholdPluginInfo.C | 10 +- .../Threshold/ThresholdScriptingPluginInfo.C | 6 +- .../Threshold/ThresholdViewerPluginInfo.C | 6 +- .../TraceHistoryEnginePluginInfo.C | 6 +- .../TraceHistory/TraceHistoryGUIPluginInfo.C | 6 +- .../TraceHistory/TraceHistoryPluginInfo.C | 10 +- .../TraceHistoryScriptingPluginInfo.C | 6 +- .../TraceHistoryViewerPluginInfo.C | 6 +- .../Transform/TransformEnginePluginInfo.C | 6 +- operators/Transform/TransformGUIPluginInfo.C | 6 +- operators/Transform/TransformPluginInfo.C | 10 +- .../Transform/TransformScriptingPluginInfo.C | 6 +- .../Transform/TransformViewerPluginInfo.C | 6 +- ...TriangulateRegularPointsEnginePluginInfo.C | 6 +- .../TriangulateRegularPointsGUIPluginInfo.C | 6 +- .../TriangulateRegularPointsPluginInfo.C | 10 +- ...angulateRegularPointsScriptingPluginInfo.C | 6 +- ...TriangulateRegularPointsViewerPluginInfo.C | 6 +- operators/Tube/TubeEnginePluginInfo.C | 6 +- operators/Tube/TubeGUIPluginInfo.C | 6 +- operators/Tube/TubePluginInfo.C | 10 +- operators/Tube/TubeScriptingPluginInfo.C | 6 +- operators/Tube/TubeViewerPluginInfo.C | 6 +- operators/ZoneDump/ZoneDumpEnginePluginInfo.C | 6 +- operators/ZoneDump/ZoneDumpGUIPluginInfo.C | 6 +- operators/ZoneDump/ZoneDumpPluginInfo.C | 10 +- .../ZoneDump/ZoneDumpScriptingPluginInfo.C | 6 +- operators/ZoneDump/ZoneDumpViewerPluginInfo.C | 6 +- plots/Boundary/BoundaryEnginePluginInfo.C | 6 +- plots/Boundary/BoundaryGUIPluginInfo.C | 6 +- plots/Boundary/BoundaryPluginInfo.C | 10 +- plots/Boundary/BoundaryScriptingPluginInfo.C | 6 +- plots/Boundary/BoundaryViewerPluginInfo.C | 6 +- plots/Contour/ContourEnginePluginInfo.C | 6 +- plots/Contour/ContourGUIPluginInfo.C | 6 +- plots/Contour/ContourPluginInfo.C | 10 +- plots/Contour/ContourScriptingPluginInfo.C | 6 +- plots/Contour/ContourViewerPluginInfo.C | 6 +- plots/Curve/CurveEnginePluginInfo.C | 6 +- plots/Curve/CurveGUIPluginInfo.C | 6 +- plots/Curve/CurvePluginInfo.C | 10 +- plots/Curve/CurveScriptingPluginInfo.C | 6 +- plots/Curve/CurveViewerPluginInfo.C | 6 +- .../FilledBoundaryEnginePluginInfo.C | 6 +- .../FilledBoundaryGUIPluginInfo.C | 6 +- .../FilledBoundary/FilledBoundaryPluginInfo.C | 10 +- .../FilledBoundaryScriptingPluginInfo.C | 6 +- .../FilledBoundaryViewerPluginInfo.C | 6 +- plots/Histogram/HistogramEnginePluginInfo.C | 6 +- plots/Histogram/HistogramGUIPluginInfo.C | 6 +- plots/Histogram/HistogramPluginInfo.C | 10 +- .../Histogram/HistogramScriptingPluginInfo.C | 6 +- plots/Histogram/HistogramViewerPluginInfo.C | 6 +- plots/Kerbel/KerbelEnginePluginInfo.C | 6 +- plots/Kerbel/KerbelGUIPluginInfo.C | 6 +- plots/Kerbel/KerbelPluginInfo.C | 10 +- plots/Kerbel/KerbelScriptingPluginInfo.C | 6 +- plots/Kerbel/KerbelViewerPluginInfo.C | 6 +- plots/Label/LabelEnginePluginInfo.C | 6 +- plots/Label/LabelGUIPluginInfo.C | 6 +- plots/Label/LabelPluginInfo.C | 10 +- plots/Label/LabelScriptingPluginInfo.C | 6 +- plots/Label/LabelViewerPluginInfo.C | 6 +- plots/Mesh/MeshEnginePluginInfo.C | 6 +- plots/Mesh/MeshGUIPluginInfo.C | 6 +- plots/Mesh/MeshPluginInfo.C | 10 +- plots/Mesh/MeshScriptingPluginInfo.C | 6 +- plots/Mesh/MeshViewerPluginInfo.C | 6 +- plots/Molecule/MoleculeEnginePluginInfo.C | 6 +- plots/Molecule/MoleculeGUIPluginInfo.C | 6 +- plots/Molecule/MoleculePluginInfo.C | 10 +- plots/Molecule/MoleculeScriptingPluginInfo.C | 6 +- plots/Molecule/MoleculeViewerPluginInfo.C | 6 +- plots/MultiCurve/MultiCurveEnginePluginInfo.C | 6 +- plots/MultiCurve/MultiCurveGUIPluginInfo.C | 6 +- plots/MultiCurve/MultiCurvePluginInfo.C | 10 +- .../MultiCurveScriptingPluginInfo.C | 6 +- plots/MultiCurve/MultiCurveViewerPluginInfo.C | 6 +- .../ParallelCoordinatesEnginePluginInfo.C | 6 +- .../ParallelCoordinatesGUIPluginInfo.C | 6 +- .../ParallelCoordinatesPluginInfo.C | 10 +- .../ParallelCoordinatesScriptingPluginInfo.C | 6 +- .../ParallelCoordinatesViewerPluginInfo.C | 6 +- plots/Poincare/PoincareEnginePluginInfo.C | 6 +- plots/Poincare/PoincareGUIPluginInfo.C | 6 +- plots/Poincare/PoincarePluginInfo.C | 10 +- plots/Poincare/PoincareScriptingPluginInfo.C | 6 +- plots/Poincare/PoincareViewerPluginInfo.C | 6 +- .../Pseudocolor/PseudocolorEnginePluginInfo.C | 6 +- plots/Pseudocolor/PseudocolorGUIPluginInfo.C | 6 +- plots/Pseudocolor/PseudocolorPluginInfo.C | 10 +- .../PseudocolorScriptingPluginInfo.C | 6 +- .../Pseudocolor/PseudocolorViewerPluginInfo.C | 6 +- plots/Scatter/ScatterEnginePluginInfo.C | 6 +- plots/Scatter/ScatterGUIPluginInfo.C | 6 +- plots/Scatter/ScatterPluginInfo.C | 10 +- plots/Scatter/ScatterPluginInfo.h | 2 +- plots/Scatter/ScatterScriptingPluginInfo.C | 6 +- plots/Scatter/ScatterViewerPluginInfo.C | 6 +- .../Spreadsheet/SpreadsheetEnginePluginInfo.C | 6 +- plots/Spreadsheet/SpreadsheetGUIPluginInfo.C | 6 +- plots/Spreadsheet/SpreadsheetPluginInfo.C | 10 +- .../SpreadsheetScriptingPluginInfo.C | 6 +- .../Spreadsheet/SpreadsheetViewerPluginInfo.C | 6 +- plots/Streamline/StreamlineEnginePluginInfo.C | 6 +- plots/Streamline/StreamlineGUIPluginInfo.C | 6 +- plots/Streamline/StreamlinePluginInfo.C | 10 +- .../StreamlineScriptingPluginInfo.C | 6 +- plots/Streamline/StreamlineViewerPluginInfo.C | 6 +- plots/Subset/SubsetEnginePluginInfo.C | 6 +- plots/Subset/SubsetGUIPluginInfo.C | 6 +- plots/Subset/SubsetPluginInfo.C | 10 +- plots/Subset/SubsetScriptingPluginInfo.C | 6 +- plots/Subset/SubsetViewerPluginInfo.C | 6 +- plots/Surface/SurfaceEnginePluginInfo.C | 6 +- plots/Surface/SurfaceGUIPluginInfo.C | 6 +- plots/Surface/SurfacePluginInfo.C | 10 +- plots/Surface/SurfaceScriptingPluginInfo.C | 6 +- plots/Surface/SurfaceViewerPluginInfo.C | 6 +- plots/Tensor/TensorEnginePluginInfo.C | 6 +- plots/Tensor/TensorGUIPluginInfo.C | 6 +- plots/Tensor/TensorPluginInfo.C | 10 +- plots/Tensor/TensorScriptingPluginInfo.C | 6 +- plots/Tensor/TensorViewerPluginInfo.C | 6 +- plots/Topology/TopologyEnginePluginInfo.C | 6 +- plots/Topology/TopologyGUIPluginInfo.C | 6 +- plots/Topology/TopologyPluginInfo.C | 10 +- plots/Topology/TopologyScriptingPluginInfo.C | 6 +- plots/Topology/TopologyViewerPluginInfo.C | 6 +- plots/Truecolor/TruecolorEnginePluginInfo.C | 6 +- plots/Truecolor/TruecolorGUIPluginInfo.C | 6 +- plots/Truecolor/TruecolorPluginInfo.C | 10 +- .../Truecolor/TruecolorScriptingPluginInfo.C | 6 +- plots/Truecolor/TruecolorViewerPluginInfo.C | 6 +- plots/Vector/VectorEnginePluginInfo.C | 6 +- plots/Vector/VectorGUIPluginInfo.C | 6 +- plots/Vector/VectorPluginInfo.C | 10 +- plots/Vector/VectorScriptingPluginInfo.C | 6 +- plots/Vector/VectorViewerPluginInfo.C | 6 +- plots/Volume/VolumeEnginePluginInfo.C | 6 +- plots/Volume/VolumeGUIPluginInfo.C | 6 +- plots/Volume/VolumePluginInfo.C | 10 +- plots/Volume/VolumeScriptingPluginInfo.C | 6 +- plots/Volume/VolumeViewerPluginInfo.C | 6 +- plots/WellBore/WellBoreEnginePluginInfo.C | 6 +- plots/WellBore/WellBoreGUIPluginInfo.C | 6 +- plots/WellBore/WellBorePluginInfo.C | 10 +- plots/WellBore/WellBoreScriptingPluginInfo.C | 6 +- plots/WellBore/WellBoreViewerPluginInfo.C | 6 +- third_party_builtin/Makefile.in | 4 + tools/xml/GenerateInfo.h | 51 ++- tools/xml/GenerateMakefile.h | 11 + visit_vtk/Makefile.in | 1 + 689 files changed, 1518 insertions(+), 4215 deletions(-) create mode 100644 engine/ssl/EngineStaticSymbolLocator.C create mode 100644 engine/ssl/Makefile.in create mode 100644 mdserver/ssl/MDServerStaticSymbolLocator.C create mode 100644 mdserver/ssl/Makefile.in diff --git a/Makefile.in b/Makefile.in index eb612f3da33..837aa81e386 100644 --- a/Makefile.in +++ b/Makefile.in @@ -177,6 +177,11 @@ # been defined by build_visit and it will contain the user's env. just # after starting build_visit but before build_visit starts adding things # to the user's environment. +# +# Hank Childs, Thu Nov 12 12:23:56 PST 2009 +# Add variable for static link. This places the plugins before the +# components. +# ############################################################################## @SET_MAKE@ @@ -191,6 +196,9 @@ SUBDIRS_ENGINE_ONLY=include lib bin third_party_builtin common visit_vtk avt eng SUBDIRS_SERVER_COMPONENTS_ONLY=include lib bin third_party_builtin common visit_vtk \ avt engine launcher mdserver sim plots operators databases +SUBDIRS_STATIC_LINK=include lib bin third_party_builtin common visit_vtk \ + avt plots operators databases engine launcher mdserver + SUBDIRS_STD=include lib bin third_party_builtin common @VTKQT@ visit_vtk \ avt engine launcher @METADATA_SERVER@ winutil @VIEWER@ \ @GUI@ @VISITPY@ @JAVA_TARGET@ sim plots operators databases @HELP@ \ diff --git a/avt/Makefile.in b/avt/Makefile.in index f7ea458b3d1..d45fed40c21 100644 --- a/avt/Makefile.in +++ b/avt/Makefile.in @@ -95,6 +95,9 @@ # Brad Whitlock, Wed Jun 3 15:42:02 PST 2009 # I added an engine-only build option. # +# Hank Childs, Thu Nov 12 13:42:52 PST 2009 +# Added an option for static linking. +# ############################################################################## @SET_MAKE@ @@ -109,6 +112,8 @@ SUBDIRS_ENGINE_ONLY=DBAtts Math IVP Pipeline DDF MIR Shapelets\ SUBDIRS_SERVER_COMPONENTS_ONLY=$(SUBDIRS_ENGINE_ONLY) +SUBDIRS_STATIC_LINK=$(SUBDIRS_ENGINE_ONLY) + SUBDIRS_STD=$(SUBDIRS_ENGINE_ONLY) QtVisWindow SUBDIRS=@SUBDIRS@ diff --git a/common/plugin/PluginManager.C b/common/plugin/PluginManager.C index 7c0357ed020..69c592e03ba 100644 --- a/common/plugin/PluginManager.C +++ b/common/plugin/PluginManager.C @@ -80,6 +80,12 @@ using std::sort; #define MAX_PLUGINERROR 500 +#ifdef STATIC +extern void *fake_dlsym(const string &); +extern void StaticGetSupportedLibs(std::vector > &, + const string &); +#endif + // **************************************************************************** // Method: PluginManager constructor // @@ -496,11 +502,19 @@ PluginManager::EnablePlugin(const string &id) // Hank Childs, Fri Nov 16 15:24:16 PST 2007 // Fix bug pointed out by Paul Selby of AWE. // +// Hank Childs, Thu Nov 12 17:49:58 PST 2009 +// Only read the supported libraries if we are doing a static link. +// // **************************************************************************** void PluginManager::GetPluginList(vector > &libs) { +#ifdef STATIC + StaticGetSupportedLibs(libs, managerName); + return; +#endif + // Read the files in the plugin directory. vector< vector > > files; ReadPluginDir(files); @@ -1471,6 +1485,10 @@ PluginManager::ReadPluginDir(vector< vector > > &files) // // Mark C. Miller, Thu Aug 14 01:22:59 PDT 2008 // Made messages reported to screen include plugin name and error msg. +// +// Hank Childs, Thu Nov 12 11:28:10 PST 2009 +// Add support for static "plugins". +// // **************************************************************************** void @@ -1488,6 +1506,8 @@ PluginManager::PluginOpen(const string &pluginFile) } handle = (void *)lib; +#elif defined(STATIC) + debug1 << "Not opening " << pluginFile << " because this is a static build." << endl; #else // dlopen the plugin handle = dlopen(pluginFile.c_str(), RTLD_LAZY); @@ -1543,15 +1563,16 @@ PluginManager::PluginOpen(const string &pluginFile) // Cyrus Harrison, Wed Jun 20 14:05:58 PDT 2007 // Changed __DARWIN__ back to __APPLE__ // +// Hank Childs, Thu Nov 12 11:28:10 PST 2009 +// Add support for static "plugins". +// // **************************************************************************** void * PluginManager::PluginSymbol(const string &symbol, bool noError) { void *retval; -#if defined(_WIN32) - retval = (void *)GetProcAddress((HMODULE)handle, symbol.c_str()); -#elif defined(__APPLE__) + string symbolName(symbol); // @@ -1572,17 +1593,24 @@ PluginManager::PluginSymbol(const string &symbol, bool noError) int len = openPlugin.size() - slashPos - suffixLen - 5 - managerName.size() - ext.size(); string pluginPrefix(openPlugin.substr(slashPos + 5, len)); -// debug4 << "PluginSymbol: prefix: " << pluginPrefix << endl; + // debug4 << "PluginSymbol: prefix: " << pluginPrefix << endl; if(pluginVersion) symbolName = string(pluginPrefix + symbol); else symbolName = string(pluginPrefix + "_" + symbol); -// debug4 << "PluginSymbol: sym: " << symbolName << endl; + // debug4 << "PluginSymbol: sym: " << symbolName << endl; } - retval = dlsym(handle, symbolName.c_str()); +#if defined(_WIN32) + retval = (void *)GetProcAddress((HMODULE)handle, symbol.c_str()); #else - retval = dlsym(handle, symbol.c_str()); + #if defined(STATIC) + retval = fake_dlsym(symbolName); + if (retval == NULL) + debug1 << "fake_dlsym was not able to return " << symbolName << endl; + #else + retval = dlsym(handle, symbolName.c_str()); + #endif #endif // If the symbol was not found, print the error message if appropriate. diff --git a/configure b/configure index 2b102969209..72fe20c7a25 100755 --- a/configure +++ b/configure @@ -310,7 +310,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TOPDIR PLATFORM_CPPFLAGS SUBDIRS ALLSUBDIRS SRC BUILD_DBIO_ONLY CHECK_MAKE_AND_ENV_VARS NON_DBIO_SERLIBS NON_DBIO_PARLIBS CMAKE CXXFLAGS EGREP CXX LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP PARALLEL PARALLEL_CPPFLAGS MPI_LIBS MPI_CC MPI_CXX LIBSTATICPAR LIBSHAREDPAR LIBSHAREDPAR_UPDATEONLY PARDEP BUILD_COGNOMEN LIBCOGNOMEN MESA_DIR MESA_INCLUDE MESA_LIBS MESA_LIBGL VIEWER_MESA_STUB_CPPFLAGS VIEWER_MESA_LIBS BUILD_MESA_STUB GL_LIBS OVERLAY_INC OVERLAY_LIB VTK_DIR VTK_INCLUDES VTK_LIBS VTK_LIGHTWEIGHT_LIBS MESA_OBJ SERMESA_OBJ PARMESA_OBJ AVTPREP_SER AVTPREP_PAR CONVERT_SER CONVERT_PAR CONVERT_SER_LITE CONVERT_PAR_LITE MAKEMILI_SER MAKEMILI_PAR ENGINE_SER ENGINE_PAR ENGINELIBSER ENGINELIBPAR METADATA_SERVER MDSERVERLIB MDSERVEROBJ VISITPY SCRIPTINGLIB SCRIPTINGOBJ PY_BUILD_VISITMODULE VIEWER VIEWERLIB VIEWEROBJ VIEWERLIB_SRC VIEWEREXE_SRC GUI GUILIB GUIOBJ GUIFRAMEWORKS ANNOTATION_FLAGS JAVAC JAVA_TARGET JAR JAVAFLAGS JAVAPLUGINFLAGS BUILD_SLIVR SLIVR_INCLUDE SLIVR_LIBS TEEM_CMAKE_C_FLAGS SLIVR_CMAKE_SHARED_LINKER_FLAGS SLIVR_GUI_IMPL SLIVR_GUI_HDR HELP PLOT_BUILD_DIRS OPERATOR_BUILD_DIRS DB_BUILD_DIRS BUILD_GLEW GLEW_INCLUDE GLEW_LIBS BUILD_BILIB VISITWRAPPER_RPATH CXXCPP F77 FFLAGS ac_ct_F77 SET_MAKE RANLIB ac_ct_RANLIB MAKEDEPEND BUILD_FORTRAN XML2MAKEFILE_CXX OS_RULE BUILD_TUVOK TUVOK_LIB TUVOK_INCLUDE BUILD_ZLIB ZLIB_LIB HDF5_INCLUDE HDF5_LIB HDF5_TARGET SILO_INCLUDE SILO_LIB SILO_TARGET EXODUS EXODUS_LIB EXODUS_LIBS EXODUS_FLAGS PDB_INCLUDE PDB_LIB PDB_TARGET MILI MILI_FLAGS MILI_LIBS MILI_DIR TCMALLOC_LIB TCMALLOC_DIR CREATE_TCMALLOC_LINK HDF4 HDF4_FLAGS HDF4_LIBS HDF4_LIBDIR BOXLIB2D BOXLIB2D_INCLUDE BOXLIB2D_LIBS BOXLIB2D_LIBDIR BOXLIB3D BOXLIB3D_INCLUDE BOXLIB3D_LIBS BOXLIB3D_LIBDIR H5PART H5PART_INCLUDE H5PART_LIB H5PART_LIBDIR FASTBIT FASTBIT_INCLUDE FASTBIT_LIB FASTBIT_LIBDIR ADIOS ADIOS_INCLUDE ADIOS_LIB VISUS VISUS_INCLUDE VISUS_LIB NETCDF NETCDF_INCLUDE NETCDF_LIB NETCDF_CXX_LIB CGNS CGNS_INCLUDE CGNS_LIB GDAL GDAL_INCLUDE GDAL_LIB GDAL_LIBS CFITSIO CFITSIO_INCLUDE CFITSIO_LIB CFITSIO_LIBDIR ITAPS_C_INCLUDE ITAPS_C_LIB ITAPS_C0_INCLUDE ITAPS_C0_LIB ITAPS_C1_INCLUDE ITAPS_C1_LIB ITAPS_C2_INCLUDE ITAPS_C2_LIB ITAPS_C3_INCLUDE ITAPS_C3_LIB ITAPS_C4_INCLUDE ITAPS_C4_LIB ITAPS_C CCMIO CCMIO_INCLUDE CCMIO_LIBS CCMIO_LIBDIR ADVIO ADVIO_INCLUDE ADVIO_LIB SIMULATION EXPORT_DYNAMIC ENGINE_CPPFLAGS PREPROCESSOR_CPPFLAGS PREPROCESSOR_PARALLEL_SRC COMPONENT_CPPFLAGS VISIT_VTK_CPPFLAGS VISIT_VTK_LDFLAGS VIEWER_CPPFLAGS QT_BIN QT_INCLUDE QT_LIB QT_LDFLAGS QT_LIBS QT_CORE QT_CORE_LIB QT_DESIGNER QT_DESIGNER_LIB QT_GUI QT_GUI_LIB QT_HELP QT_HELP_LIB QT_CLUCENE QT_CLUCENE_LIB QT_NETWORK QT_NETWORK_LIB QT_OPENGL QT_OPENGL_LIB QT_SCRIPT QT_SCRIPT_LIB QT_SQL QT_SQL_LIB QT_SVG QT_SVG_LIB QT_TEST QT_TEST_LIB QT_XML QT_XML_LIB QT_QUI QT_QUI_LIB QT_CXXFLAGS QT_MOC VTKQT_CPPFLAGS VTKQT VTKQT_LIBS X_LIBS X_CPPFLAGS PTHREAD_LIB PTHREAD_CXXFLAGS ICET_CXXFLAGS ICET_LDFLAGS ICET_LIBS ICET_ENG_MAIN_OBJ PYDIR PYVERSION PY_INCLUDEDIR PY_CXXFLAGS PY_LDFLAGS PY_LIB PY_CLI_LIB EXE_LDFLAGS PLUGIN_LDFLAGS DATA_EXE_LDFLAGS SHLIB_CREATEPROG SHLIB_LIBS SHLIB_SERLIBS SHLIB_PARLIBS SHLIB_MPI_LIBS SHLIB_ILIBS SHLIB_GLIBS SHLIB_VLIBS SHLIB_MLIBS SHLIB_ESERLIBS SHLIB_EPARLIBS SHLIB_SLIBS SHLIB_POSTPROCESS_ILIBS SHLIB_POSTPROCESS_GLIBS SHLIB_POSTPROCESS_VLIBS SHLIB_POSTPROCESS_MLIBS SHLIB_POSTPROCESS_ESERLIBS SHLIB_POSTPROCESS_EPARLIBS SHLIB_POSTPROCESS_SLIBS SHLIB_SOEXT SHLIB_LIBEXT SHLIB_POSTPROCESS SHLIB_POSTPROCESS_SER SHLIB_POSTPROCESS_PAR SHLIB_TMPDIR PREBIND_LIBS LIBSIM_RUNTIME_SER LIBSIM_RUNTIME_PAR CREATE_MILI_LINK CREATE_HDF4_LINK CREATE_NETCDF_LINK CREATE_CGNS_LINK CREATE_GDAL_LINK CREATE_EXODUS_LINK CREATE_BOXLIB2D_LINK CREATE_BOXLIB3D_LINK CREATE_CFITSIO_LINK CREATE_H5PART_LINK CREATE_FASTBIT_LINK CREATE_CCMIO_LINK VAC_CV_LIBDIR_CREATE_LINKS VAC_CV_LIBDIR_DESTROY_LINKS MG tmpbin tmpinc tmplib plotplugindir operatorplugindir databaseplugindir DATA_REL_VISIT_PATH LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TOPDIR PLATFORM_CPPFLAGS SUBDIRS ALLSUBDIRS SRC BUILD_DBIO_ONLY CHECK_MAKE_AND_ENV_VARS NON_DBIO_SERLIBS NON_DBIO_PARLIBS STATIC_LINK STATIC_LINK_PAR STATIC_LINK_DBS CMAKE CXXFLAGS EGREP CXX LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC CPP PARALLEL PARALLEL_CPPFLAGS MPI_LIBS MPI_CC MPI_CXX LIBSTATICPAR LIBSHAREDPAR LIBSHAREDPAR_UPDATEONLY PARDEP BUILD_COGNOMEN LIBCOGNOMEN MESA_DIR MESA_INCLUDE MESA_LIBS MESA_LIBGL VIEWER_MESA_STUB_CPPFLAGS VIEWER_MESA_LIBS BUILD_MESA_STUB GL_LIBS OVERLAY_INC OVERLAY_LIB VTK_DIR VTK_INCLUDES VTK_LIBS VTK_LIGHTWEIGHT_LIBS MESA_OBJ SERMESA_OBJ PARMESA_OBJ AVTPREP_SER AVTPREP_PAR CONVERT_SER CONVERT_PAR CONVERT_SER_LITE CONVERT_PAR_LITE MAKEMILI_SER MAKEMILI_PAR ENGINE_SER ENGINE_PAR ENGINELIBSER ENGINELIBPAR METADATA_SERVER MDSERVERLIB MDSERVEROBJ VISITPY SCRIPTINGLIB SCRIPTINGOBJ PY_BUILD_VISITMODULE VIEWER VIEWERLIB VIEWEROBJ VIEWERLIB_SRC VIEWEREXE_SRC GUI GUILIB GUIOBJ GUIFRAMEWORKS ANNOTATION_FLAGS JAVAC JAVA_TARGET JAR JAVAFLAGS JAVAPLUGINFLAGS BUILD_SLIVR SLIVR_INCLUDE SLIVR_LIBS TEEM_CMAKE_C_FLAGS SLIVR_CMAKE_SHARED_LINKER_FLAGS SLIVR_GUI_IMPL SLIVR_GUI_HDR HELP PLOT_BUILD_DIRS OPERATOR_BUILD_DIRS DB_BUILD_DIRS BUILD_GLEW GLEW_INCLUDE GLEW_LIBS BUILD_BILIB VISITWRAPPER_RPATH CXXCPP F77 FFLAGS ac_ct_F77 SET_MAKE RANLIB ac_ct_RANLIB MAKEDEPEND BUILD_FORTRAN XML2MAKEFILE_CXX OS_RULE BUILD_TUVOK TUVOK_LIB TUVOK_INCLUDE BUILD_ZLIB ZLIB_LIB HDF5_INCLUDE HDF5_LIB HDF5_TARGET SILO_INCLUDE SILO_LIB SILO_TARGET EXODUS EXODUS_LIB EXODUS_LIBS EXODUS_FLAGS PDB_INCLUDE PDB_LIB PDB_TARGET MILI MILI_FLAGS MILI_LIBS MILI_DIR TCMALLOC_LIB TCMALLOC_DIR CREATE_TCMALLOC_LINK HDF4 HDF4_FLAGS HDF4_LIBS HDF4_LIBDIR BOXLIB2D BOXLIB2D_INCLUDE BOXLIB2D_LIBS BOXLIB2D_LIBDIR BOXLIB3D BOXLIB3D_INCLUDE BOXLIB3D_LIBS BOXLIB3D_LIBDIR H5PART H5PART_INCLUDE H5PART_LIB H5PART_LIBDIR FASTBIT FASTBIT_INCLUDE FASTBIT_LIB FASTBIT_LIBDIR ADIOS ADIOS_INCLUDE ADIOS_LIB VISUS VISUS_INCLUDE VISUS_LIB NETCDF NETCDF_INCLUDE NETCDF_LIB NETCDF_CXX_LIB CGNS CGNS_INCLUDE CGNS_LIB GDAL GDAL_INCLUDE GDAL_LIB GDAL_LIBS CFITSIO CFITSIO_INCLUDE CFITSIO_LIB CFITSIO_LIBDIR ITAPS_C_INCLUDE ITAPS_C_LIB ITAPS_C0_INCLUDE ITAPS_C0_LIB ITAPS_C1_INCLUDE ITAPS_C1_LIB ITAPS_C2_INCLUDE ITAPS_C2_LIB ITAPS_C3_INCLUDE ITAPS_C3_LIB ITAPS_C4_INCLUDE ITAPS_C4_LIB ITAPS_C CCMIO CCMIO_INCLUDE CCMIO_LIBS CCMIO_LIBDIR ADVIO ADVIO_INCLUDE ADVIO_LIB SIMULATION EXPORT_DYNAMIC ENGINE_CPPFLAGS PREPROCESSOR_CPPFLAGS PREPROCESSOR_PARALLEL_SRC COMPONENT_CPPFLAGS VISIT_VTK_CPPFLAGS VISIT_VTK_LDFLAGS VIEWER_CPPFLAGS QT_BIN QT_INCLUDE QT_LIB QT_LDFLAGS QT_LIBS QT_CORE QT_CORE_LIB QT_DESIGNER QT_DESIGNER_LIB QT_GUI QT_GUI_LIB QT_HELP QT_HELP_LIB QT_CLUCENE QT_CLUCENE_LIB QT_NETWORK QT_NETWORK_LIB QT_OPENGL QT_OPENGL_LIB QT_SCRIPT QT_SCRIPT_LIB QT_SQL QT_SQL_LIB QT_SVG QT_SVG_LIB QT_TEST QT_TEST_LIB QT_XML QT_XML_LIB QT_QUI QT_QUI_LIB QT_CXXFLAGS QT_MOC VTKQT_CPPFLAGS VTKQT VTKQT_LIBS X_LIBS X_CPPFLAGS PTHREAD_LIB PTHREAD_CXXFLAGS ICET_CXXFLAGS ICET_LDFLAGS ICET_LIBS ICET_ENG_MAIN_OBJ PYDIR PYVERSION PY_INCLUDEDIR PY_CXXFLAGS PY_LDFLAGS PY_LIB PY_CLI_LIB EXE_LDFLAGS PLUGIN_LDFLAGS DATA_EXE_LDFLAGS SHLIB_CREATEPROG SHLIB_LIBS SHLIB_SERLIBS SHLIB_PARLIBS SHLIB_MPI_LIBS SHLIB_ILIBS SHLIB_GLIBS SHLIB_VLIBS SHLIB_MLIBS SHLIB_ESERLIBS SHLIB_EPARLIBS SHLIB_SLIBS SHLIB_POSTPROCESS_ILIBS SHLIB_POSTPROCESS_GLIBS SHLIB_POSTPROCESS_VLIBS SHLIB_POSTPROCESS_MLIBS SHLIB_POSTPROCESS_ESERLIBS SHLIB_POSTPROCESS_EPARLIBS SHLIB_POSTPROCESS_SLIBS SHLIB_SOEXT SHLIB_LIBEXT SHLIB_POSTPROCESS SHLIB_POSTPROCESS_SER SHLIB_POSTPROCESS_PAR SHLIB_TMPDIR PREBIND_LIBS LIBSIM_RUNTIME_SER LIBSIM_RUNTIME_PAR CREATE_MILI_LINK CREATE_HDF4_LINK CREATE_NETCDF_LINK CREATE_CGNS_LINK CREATE_GDAL_LINK CREATE_EXODUS_LINK CREATE_BOXLIB2D_LINK CREATE_BOXLIB3D_LINK CREATE_CFITSIO_LINK CREATE_H5PART_LINK CREATE_FASTBIT_LINK CREATE_CCMIO_LINK VAC_CV_LIBDIR_CREATE_LINKS VAC_CV_LIBDIR_DESTROY_LINKS MG tmpbin tmpinc tmplib plotplugindir operatorplugindir databaseplugindir DATA_REL_VISIT_PATH LIBOBJS LTLIBOBJS' ac_subst_files='VARIABLES TARGETS DIRTARGETS LIBTARGETS PARLIBTARGETS SOURCE_DEPENDENCIES' # Initialize some variables set by options. @@ -871,6 +871,8 @@ Optional Features: --enable-server-components-only build only the server components (engine,mdserver,vcl) + --enable-static build the server components statically (you must + also issue --enable-server-components-only) --enable-fake-exceptions do not make use of C++'s exception library --enable-ignore-hangups ignore hangup signals (this avoids RHEL3 bug) --enable-parallel make the parallel version @@ -1650,6 +1652,39 @@ echo "$as_me: WARNING: --enable-server-components-only overrides --enable-engine enable_engine_only=no fi +# +# Check for static builds. +# +# Check whether --enable-static or --disable-static was given. +if test "${enable_static+set}" = set; then + enableval="$enable_static" + +fi; +if test "$enable_static" = yes && test "$enable_server_components_only" != yes; then + { { echo "$as_me:$LINENO: error: --static requires --enable-server-components-only" >&5 +echo "$as_me: error: --static requires --enable-server-components-only" >&2;} + { (exit 1); exit 1; }; } +fi +STATIC_LINK="" +STATIC_LINK_PAR="" +STATIC_LINK_DBS="" +if test "$enable_static" = yes; then + STATIC_LINK="$""(STATIC_LINK)" + STATIC_LINK_PAR="$""(STATIC_LINK_PAR)" + STATIC_LINK_DBS="$""(STATIC_LINK_DBS)" + +cat >>confdefs.h <<\_ACEOF +#define STATIC 1 +_ACEOF + + SHLIB_CREATEPROG="ar rcs" + SHLIB_SOEXT="a" + SHLIB_LIBEXT="a" +fi + + + + # # Check for CMake # @@ -4073,11 +4108,11 @@ echo "${ECHO_T}found" >&6 VTK_DIR=$VTK VTK_INCROOT="$""(TOPDIR)/include/vtk" VTK_INCLUDES="-I$VTK_INCROOT -I$VTK_INCROOT/vtk-5.0" - VTK_LIBS="-lvtkCommon -lvtkDICOMParser -lvtkFiltering -lvtkGraphics -lvtkHybrid -lvtkIO -lvtkImaging -lvtkRendering -lvtkzlib -lvtkexpat -lvtkjpeg -lvtkpng -lvtktiff -lvtkftgl -lvtkfreetype -lvtksys -lvtkMPEG2Encode " + VTK_LIBS="-lvtkDICOMParser -lvtkHybrid -lvtkIO -lvtkImaging -lvtkRendering -lvtkGraphics -lvtkFiltering -lvtkCommon -lvtkexpat -lvtkjpeg -lvtkpng -lvtktiff -lvtkftgl -lvtkfreetype -lvtkzlib -lvtksys -lvtkMPEG2Encode" if test "$UNAME" = "Darwin"; then VTK_LIGHTWEIGHT_LIBS=$VTK_LIBS else - VTK_LIGHTWEIGHT_LIBS="-lvtkCommon -lvtkFiltering -lvtkzlib -lvtkexpat -lvtksys" + VTK_LIGHTWEIGHT_LIBS="-lvtkFiltering -lvtkCommon -lvtkzlib -lvtkexpat -lvtksys" fi # Determine whether VTK was built with mangled Mesa support. If it wasn't @@ -6355,7 +6390,7 @@ fi # Provide some information about the compiler. -echo "$as_me:6358:" \ +echo "$as_me:6393:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -12579,9 +12614,13 @@ case $UNAME in SHLIB_CREATEPROG="$""(CXX) -shared -o" fi # Set RPATH relative to executable - EXE_LDFLAGS="$EXE_LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../lib" - PLUGIN_LDFLAGS="$PLUGIN_LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../../lib" - DATA_EXE_LDFLAGS="$DATA_EXE_LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../src/lib" + if test "$enable_static" = yes; then + EXE_LDFLAGS="-L$""(TOPDIR)/lib/" + else + EXE_LDFLAGS="$EXE_LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../lib" + PLUGIN_LDFLAGS="$PLUGIN_LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../../lib" + DATA_EXE_LDFLAGS="$DATA_EXE_LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../src/lib" + fi fi ;; @@ -20533,7 +20572,9 @@ operatorplugindir="$""(TOPDIR)/plugins/operators" databaseplugindir="$""(TOPDIR)/plugins/databases" -LDFLAGS="-L$libdir $LDFLAGS" +if test ! "$enable_static" = yes; then + LDFLAGS="-L$libdir $LDFLAGS" +fi # Expand variables. @@ -20553,6 +20594,7 @@ if test -n "$METADATA_SERVER"; then MDSERVER_FILES="mdserver/Makefile mdserver/rpc/Makefile mdserver/proxy/Makefile + mdserver/ssl/Makefile mdserver/main/Makefile" else MDSERVER_FILES="" @@ -20585,6 +20627,7 @@ if test -n "$ENGINE"; then ENGINE_FILES="engine/Makefile engine/rpc/Makefile engine/proxy/Makefile + engine/ssl/Makefile engine/main/Makefile" else ENGINE_FILES="" @@ -20772,7 +20815,7 @@ if test "$enable_engine_only" = yes; then VISITPY_FILES="" CQSCORE_FILES="" JAVA_FILES="" - TOOLS_FILES="" + TOOLS_FILES="tools/xml/Makefile" COMPONENT_FILES="avt/Makefile avt/DBAtts/Makefile avt/DDF/Makefile @@ -20804,7 +20847,7 @@ if test "$enable_server_components_only" = yes; then VISITPY_FILES="" CQSCORE_FILES="" JAVA_FILES="" - TOOLS_FILES="" + TOOLS_FILES="tools/xml/Makefile" COMPONENT_FILES="avt/Makefile avt/DBAtts/Makefile avt/DDF/Makefile @@ -20823,6 +20866,9 @@ if test "$enable_server_components_only" = yes; then avt/View/Makefile avt/VisWindow/Makefile" fi +if test "$enable_static" = yes; then + SUBDIRS="$""(SUBDIRS_STATIC_LINK)" +fi ac_config_files="$ac_config_files $STANDARD_FILES $GUI_FILES $HELP_FILES $WINUTIL_FILES $VIEWER_FILES $ENGINE_FILES $MDSERVER_FILES $LAUNCHER_FILES $COMMON_FILES $TOOLS_FILES $VISIT_VTK_FILES $VTKQT_FILES $COMPONENT_FILES $PLOT_FILES $OPERATOR_FILES $DATABASE_FILES $DATA_FILES $VISITPY_FILES $SIMULATION_PROTOTYPE_FILES $CQSCORE_FILES $THIRD_PARTY_BUILTIN_FILES $JAVA_FILES" ac_config_commands="$ac_config_commands default" @@ -21471,6 +21517,9 @@ s,@BUILD_DBIO_ONLY@,$BUILD_DBIO_ONLY,;t t s,@CHECK_MAKE_AND_ENV_VARS@,$CHECK_MAKE_AND_ENV_VARS,;t t s,@NON_DBIO_SERLIBS@,$NON_DBIO_SERLIBS,;t t s,@NON_DBIO_PARLIBS@,$NON_DBIO_PARLIBS,;t t +s,@STATIC_LINK@,$STATIC_LINK,;t t +s,@STATIC_LINK_PAR@,$STATIC_LINK_PAR,;t t +s,@STATIC_LINK_DBS@,$STATIC_LINK_DBS,;t t s,@CMAKE@,$CMAKE,;t t s,@CXXFLAGS@,$CXXFLAGS,;t t s,@EGREP@,$EGREP,;t t diff --git a/configure.in b/configure.in index 13f1c84878e..07f619ec810 100644 --- a/configure.in +++ b/configure.in @@ -988,6 +988,14 @@ dnl dnl Cyrus Harrison, Tue Oct 6 08:56:58 PDT 2009 dnl Changed vtk include paths to reflect a 'make install'ed vtk dnl installation. +dnl +dnl Hank Childs, Thu Nov 12 11:48:11 PST 2009 +dnl Add support for static linking of the server side components. +dnl Client side components have not been tested. Further, it is assumed +dnl that third party libraries have been linked statically. Dynamic +dnl libraries are nominally fine, but the symlinks in /lib will not work and +dnl you won't get a true "static" binary. +dnl dnl -------------------------------------------------------------------------- dnl @@ -1176,6 +1184,30 @@ if test "$enable_server_components_only" = yes && test "$enable_engine_only" = y enable_engine_only=no fi +# +# Check for static builds. +# +AC_ARG_ENABLE(static, + AC_HELP_STRING([--enable-static], [build the server components statically (you must also issue --enable-server-components-only)])) +if test "$enable_static" = yes && test "$enable_server_components_only" != yes; then + AC_MSG_ERROR([--static requires --enable-server-components-only]) +fi +STATIC_LINK="" +STATIC_LINK_PAR="" +STATIC_LINK_DBS="" +if test "$enable_static" = yes; then + STATIC_LINK="$""(STATIC_LINK)" + STATIC_LINK_PAR="$""(STATIC_LINK_PAR)" + STATIC_LINK_DBS="$""(STATIC_LINK_DBS)" + AC_DEFINE(STATIC, [1], [Preprocessor directive for a static link.]) + SHLIB_CREATEPROG="ar rcs" + SHLIB_SOEXT="a" + SHLIB_LIBEXT="a" +fi +AC_SUBST(STATIC_LINK) +AC_SUBST(STATIC_LINK_PAR) +AC_SUBST(STATIC_LINK_DBS) + # # Check for CMake # @@ -1452,11 +1484,11 @@ if test -n "$VTK"; then VTK_DIR=$VTK VTK_INCROOT="$""(TOPDIR)/include/vtk" VTK_INCLUDES="-I$VTK_INCROOT -I$VTK_INCROOT/vtk-5.0" - VTK_LIBS="-lvtkCommon -lvtkDICOMParser -lvtkFiltering -lvtkGraphics -lvtkHybrid -lvtkIO -lvtkImaging -lvtkRendering -lvtkzlib -lvtkexpat -lvtkjpeg -lvtkpng -lvtktiff -lvtkftgl -lvtkfreetype -lvtksys -lvtkMPEG2Encode " + VTK_LIBS="-lvtkDICOMParser -lvtkHybrid -lvtkIO -lvtkImaging -lvtkRendering -lvtkGraphics -lvtkFiltering -lvtkCommon -lvtkexpat -lvtkjpeg -lvtkpng -lvtktiff -lvtkftgl -lvtkfreetype -lvtkzlib -lvtksys -lvtkMPEG2Encode" if test "$UNAME" = "Darwin"; then VTK_LIGHTWEIGHT_LIBS=$VTK_LIBS else - VTK_LIGHTWEIGHT_LIBS="-lvtkCommon -lvtkFiltering -lvtkzlib -lvtkexpat -lvtksys" + VTK_LIGHTWEIGHT_LIBS="-lvtkFiltering -lvtkCommon -lvtkzlib -lvtkexpat -lvtksys" fi # Determine whether VTK was built with mangled Mesa support. If it wasn't @@ -3928,9 +3960,13 @@ case $UNAME in SHLIB_CREATEPROG="$""(CXX) -shared -o" fi # Set RPATH relative to executable - EXE_LDFLAGS="$EXE_LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../lib" - PLUGIN_LDFLAGS="$PLUGIN_LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../../lib" - DATA_EXE_LDFLAGS="$DATA_EXE_LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../src/lib" + if test "$enable_static" = yes; then + EXE_LDFLAGS="-L$""(TOPDIR)/lib/" + else + EXE_LDFLAGS="$EXE_LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../lib" + PLUGIN_LDFLAGS="$PLUGIN_LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../../lib" + DATA_EXE_LDFLAGS="$DATA_EXE_LDFLAGS -Wl,--rpath,\\\$\$ORIGIN/../src/lib" + fi fi ;; @@ -4221,7 +4257,9 @@ operatorplugindir="$""(TOPDIR)/plugins/operators" AC_SUBST(databaseplugindir) databaseplugindir="$""(TOPDIR)/plugins/databases" -LDFLAGS="-L$libdir $LDFLAGS" +if test ! "$enable_static" = yes; then + LDFLAGS="-L$libdir $LDFLAGS" +fi dnl @@ -4247,6 +4285,7 @@ if test -n "$METADATA_SERVER"; then MDSERVER_FILES="mdserver/Makefile mdserver/rpc/Makefile mdserver/proxy/Makefile + mdserver/ssl/Makefile mdserver/main/Makefile" else MDSERVER_FILES="" @@ -4279,6 +4318,7 @@ if test -n "$ENGINE"; then ENGINE_FILES="engine/Makefile engine/rpc/Makefile engine/proxy/Makefile + engine/ssl/Makefile engine/main/Makefile" else ENGINE_FILES="" @@ -4469,7 +4509,7 @@ if test "$enable_engine_only" = yes; then VISITPY_FILES="" CQSCORE_FILES="" JAVA_FILES="" - TOOLS_FILES="" + TOOLS_FILES="tools/xml/Makefile" COMPONENT_FILES="avt/Makefile avt/DBAtts/Makefile avt/DDF/Makefile @@ -4501,7 +4541,7 @@ if test "$enable_server_components_only" = yes; then VISITPY_FILES="" CQSCORE_FILES="" JAVA_FILES="" - TOOLS_FILES="" + TOOLS_FILES="tools/xml/Makefile" COMPONENT_FILES="avt/Makefile avt/DBAtts/Makefile avt/DDF/Makefile @@ -4520,6 +4560,9 @@ if test "$enable_server_components_only" = yes; then avt/View/Makefile avt/VisWindow/Makefile" fi +if test "$enable_static" = yes; then + SUBDIRS="$""(SUBDIRS_STATIC_LINK)" +fi AC_OUTPUT($STANDARD_FILES $GUI_FILES diff --git a/databases/ANALYZE/ANALYZEEnginePluginInfo.C b/databases/ANALYZE/ANALYZEEnginePluginInfo.C index 66e44e7fbec..81d9e79efec 100644 --- a/databases/ANALYZE/ANALYZEEnginePluginInfo.C +++ b/databases/ANALYZE/ANALYZEEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo ANALYZE_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* ANALYZE_GetEngineInfo() { return new ANALYZEEnginePluginInfo; } diff --git a/databases/ANALYZE/ANALYZEMDServerPluginInfo.C b/databases/ANALYZE/ANALYZEMDServerPluginInfo.C index a86c9df6979..555ed58685b 100644 --- a/databases/ANALYZE/ANALYZEMDServerPluginInfo.C +++ b/databases/ANALYZE/ANALYZEMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo ANALYZE_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* ANALYZE_GetMDServerInfo() { return new ANALYZEMDServerPluginInfo; } diff --git a/databases/ANALYZE/ANALYZEPluginInfo.C b/databases/ANALYZE/ANALYZEPluginInfo.C index 0d1128dc67d..4a0889a520a 100644 --- a/databases/ANALYZE/ANALYZEPluginInfo.C +++ b/databases/ANALYZE/ANALYZEPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *ANALYZEVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo ANALYZE_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* ANALYZE_GetGeneralInfo() { return new ANALYZEGeneralPluginInfo; } diff --git a/databases/ANSYS/ANSYSEnginePluginInfo.C b/databases/ANSYS/ANSYSEnginePluginInfo.C index bfb0274cdb7..a3b4647ccc2 100644 --- a/databases/ANSYS/ANSYSEnginePluginInfo.C +++ b/databases/ANSYS/ANSYSEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo ANSYS_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* ANSYS_GetEngineInfo() { return new ANSYSEnginePluginInfo; } diff --git a/databases/ANSYS/ANSYSMDServerPluginInfo.C b/databases/ANSYS/ANSYSMDServerPluginInfo.C index 76bd66963d7..4416d2cac7b 100644 --- a/databases/ANSYS/ANSYSMDServerPluginInfo.C +++ b/databases/ANSYS/ANSYSMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo ANSYS_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* ANSYS_GetMDServerInfo() { return new ANSYSMDServerPluginInfo; } diff --git a/databases/ANSYS/ANSYSPluginInfo.C b/databases/ANSYS/ANSYSPluginInfo.C index 3a41c116a26..e0baf4889e5 100644 --- a/databases/ANSYS/ANSYSPluginInfo.C +++ b/databases/ANSYS/ANSYSPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *ANSYSVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo ANSYS_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* ANSYS_GetGeneralInfo() { return new ANSYSGeneralPluginInfo; } diff --git a/databases/AUXFile/AUXFileEnginePluginInfo.C b/databases/AUXFile/AUXFileEnginePluginInfo.C index 8ec57c8e2bc..ce188f2410c 100644 --- a/databases/AUXFile/AUXFileEnginePluginInfo.C +++ b/databases/AUXFile/AUXFileEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo AUXFile_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* AUXFile_GetEngineInfo() { return new AUXFileEnginePluginInfo; } diff --git a/databases/AUXFile/AUXFileMDServerPluginInfo.C b/databases/AUXFile/AUXFileMDServerPluginInfo.C index 73e0b493c78..c744714e6a5 100644 --- a/databases/AUXFile/AUXFileMDServerPluginInfo.C +++ b/databases/AUXFile/AUXFileMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo AUXFile_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* AUXFile_GetMDServerInfo() { return new AUXFileMDServerPluginInfo; } diff --git a/databases/AUXFile/AUXFilePluginInfo.C b/databases/AUXFile/AUXFilePluginInfo.C index 2b9862625be..d797924695b 100644 --- a/databases/AUXFile/AUXFilePluginInfo.C +++ b/databases/AUXFile/AUXFilePluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *AUXFileVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo AUXFile_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* AUXFile_GetGeneralInfo() { return new AUXFileGeneralPluginInfo; } diff --git a/databases/Adios/AdiosCommonPluginInfo.C b/databases/Adios/AdiosCommonPluginInfo.C index 47efa6580ae..2a45336e9ab 100644 --- a/databases/Adios/AdiosCommonPluginInfo.C +++ b/databases/Adios/AdiosCommonPluginInfo.C @@ -1,8 +1,8 @@ /***************************************************************************** * -* Copyright (c) 2000 - 2008, Lawrence Livermore National Security, LLC +* Copyright (c) 2000 - 2009, Lawrence Livermore National Security, LLC * Produced at the Lawrence Livermore National Laboratory -* LLNL-CODE-400142 +* LLNL-CODE-400124 * All rights reserved. * * This file is part of VisIt. For details, see https://visit.llnl.gov/. The diff --git a/databases/Adios/AdiosEnginePluginInfo.C b/databases/Adios/AdiosEnginePluginInfo.C index 5ae78ab4b35..2267199f23d 100644 --- a/databases/Adios/AdiosEnginePluginInfo.C +++ b/databases/Adios/AdiosEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Adios_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Adios_GetEngineInfo() { return new AdiosEnginePluginInfo; } diff --git a/databases/Adios/AdiosMDServerPluginInfo.C b/databases/Adios/AdiosMDServerPluginInfo.C index 8d6cfa9a40d..a87cc67fdb4 100644 --- a/databases/Adios/AdiosMDServerPluginInfo.C +++ b/databases/Adios/AdiosMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Adios_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Adios_GetMDServerInfo() { return new AdiosMDServerPluginInfo; } diff --git a/databases/Adios/AdiosPluginInfo.C b/databases/Adios/AdiosPluginInfo.C index f4bc4d99bd5..c36b0fb335f 100644 --- a/databases/Adios/AdiosPluginInfo.C +++ b/databases/Adios/AdiosPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) -extern "C" const char *AdiosVisItPluginVersion = VISIT_VERSION; -#else -extern "C" const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Adios_GetGeneralInfo -#endif +extern "C" DBP_EXPORT const char *AdiosVisItPluginVersion = VISIT_VERSION; // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Adios_GetGeneralInfo() { return new AdiosGeneralPluginInfo; } diff --git a/databases/Adventure/AdventureEnginePluginInfo.C b/databases/Adventure/AdventureEnginePluginInfo.C index cf9e1908598..1cef118b655 100644 --- a/databases/Adventure/AdventureEnginePluginInfo.C +++ b/databases/Adventure/AdventureEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Adventure_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Adventure_GetEngineInfo() { return new AdventureEnginePluginInfo; } diff --git a/databases/Adventure/AdventureMDServerPluginInfo.C b/databases/Adventure/AdventureMDServerPluginInfo.C index 073134e3951..aad81d1d13f 100644 --- a/databases/Adventure/AdventureMDServerPluginInfo.C +++ b/databases/Adventure/AdventureMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Adventure_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Adventure_GetMDServerInfo() { return new AdventureMDServerPluginInfo; } diff --git a/databases/Adventure/AdventurePluginInfo.C b/databases/Adventure/AdventurePluginInfo.C index 8e877ce8574..31398ebe780 100644 --- a/databases/Adventure/AdventurePluginInfo.C +++ b/databases/Adventure/AdventurePluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *AdventureVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Adventure_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Adventure_GetGeneralInfo() { return new AdventureGeneralPluginInfo; } diff --git a/databases/AugDecomp/AugDecompEnginePluginInfo.C b/databases/AugDecomp/AugDecompEnginePluginInfo.C index 9e7d45087f7..f0729963480 100644 --- a/databases/AugDecomp/AugDecompEnginePluginInfo.C +++ b/databases/AugDecomp/AugDecompEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo AugDecomp_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* AugDecomp_GetEngineInfo() { return new AugDecompEnginePluginInfo; } diff --git a/databases/AugDecomp/AugDecompMDServerPluginInfo.C b/databases/AugDecomp/AugDecompMDServerPluginInfo.C index 4e774322c57..b9f748d4a76 100644 --- a/databases/AugDecomp/AugDecompMDServerPluginInfo.C +++ b/databases/AugDecomp/AugDecompMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo AugDecomp_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* AugDecomp_GetMDServerInfo() { return new AugDecompMDServerPluginInfo; } diff --git a/databases/AugDecomp/AugDecompPluginInfo.C b/databases/AugDecomp/AugDecompPluginInfo.C index d0e023b46af..36d35ade7e4 100644 --- a/databases/AugDecomp/AugDecompPluginInfo.C +++ b/databases/AugDecomp/AugDecompPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *AugDecompVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo AugDecomp_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* AugDecomp_GetGeneralInfo() { return new AugDecompGeneralPluginInfo; } diff --git a/databases/BOV/BOVEnginePluginInfo.C b/databases/BOV/BOVEnginePluginInfo.C index 7ac8dbe58e5..17d643f73b4 100644 --- a/databases/BOV/BOVEnginePluginInfo.C +++ b/databases/BOV/BOVEnginePluginInfo.C @@ -39,10 +39,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo BOV_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -53,7 +49,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* BOV_GetEngineInfo() { return new BOVEnginePluginInfo; } diff --git a/databases/BOV/BOVMDServerPluginInfo.C b/databases/BOV/BOVMDServerPluginInfo.C index b0c9874d635..607ba0a87db 100644 --- a/databases/BOV/BOVMDServerPluginInfo.C +++ b/databases/BOV/BOVMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo BOV_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* BOV_GetMDServerInfo() { return new BOVMDServerPluginInfo; } diff --git a/databases/BOV/BOVPluginInfo.C b/databases/BOV/BOVPluginInfo.C index 000f14f0dd3..e269cc81f33 100644 --- a/databases/BOV/BOVPluginInfo.C +++ b/databases/BOV/BOVPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *BOVVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo BOV_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* BOV_GetGeneralInfo() { return new BOVGeneralPluginInfo; } diff --git a/databases/BOW/BOWEnginePluginInfo.C b/databases/BOW/BOWEnginePluginInfo.C index 1202bb262d9..c927cec6bcc 100644 --- a/databases/BOW/BOWEnginePluginInfo.C +++ b/databases/BOW/BOWEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo BOW_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* BOW_GetEngineInfo() { return new BOWEnginePluginInfo; } diff --git a/databases/BOW/BOWMDServerPluginInfo.C b/databases/BOW/BOWMDServerPluginInfo.C index 84c2c2472e1..951c6439a94 100644 --- a/databases/BOW/BOWMDServerPluginInfo.C +++ b/databases/BOW/BOWMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo BOW_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* BOW_GetMDServerInfo() { return new BOWMDServerPluginInfo; } diff --git a/databases/BOW/BOWPluginInfo.C b/databases/BOW/BOWPluginInfo.C index e3f522030da..6e6a98b1c97 100644 --- a/databases/BOW/BOWPluginInfo.C +++ b/databases/BOW/BOWPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *BOWVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo BOW_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* BOW_GetGeneralInfo() { return new BOWGeneralPluginInfo; } diff --git a/databases/Boxlib2D/Boxlib2DEnginePluginInfo.C b/databases/Boxlib2D/Boxlib2DEnginePluginInfo.C index 265ef78d59d..d35ef893f84 100644 --- a/databases/Boxlib2D/Boxlib2DEnginePluginInfo.C +++ b/databases/Boxlib2D/Boxlib2DEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Boxlib2D_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Boxlib2D_GetEngineInfo() { return new Boxlib2DEnginePluginInfo; } diff --git a/databases/Boxlib2D/Boxlib2DMDServerPluginInfo.C b/databases/Boxlib2D/Boxlib2DMDServerPluginInfo.C index c473518d149..c70f22b8876 100644 --- a/databases/Boxlib2D/Boxlib2DMDServerPluginInfo.C +++ b/databases/Boxlib2D/Boxlib2DMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Boxlib2D_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Boxlib2D_GetMDServerInfo() { return new Boxlib2DMDServerPluginInfo; } diff --git a/databases/Boxlib2D/Boxlib2DPluginInfo.C b/databases/Boxlib2D/Boxlib2DPluginInfo.C index c65b6c05eb2..ef00849b756 100644 --- a/databases/Boxlib2D/Boxlib2DPluginInfo.C +++ b/databases/Boxlib2D/Boxlib2DPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *Boxlib2DVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Boxlib2D_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Boxlib2D_GetGeneralInfo() { return new Boxlib2DGeneralPluginInfo; } diff --git a/databases/Boxlib3D/Boxlib3DEnginePluginInfo.C b/databases/Boxlib3D/Boxlib3DEnginePluginInfo.C index 2257910933d..b77ec26f9a7 100644 --- a/databases/Boxlib3D/Boxlib3DEnginePluginInfo.C +++ b/databases/Boxlib3D/Boxlib3DEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Boxlib3D_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Boxlib3D_GetEngineInfo() { return new Boxlib3DEnginePluginInfo; } diff --git a/databases/Boxlib3D/Boxlib3DMDServerPluginInfo.C b/databases/Boxlib3D/Boxlib3DMDServerPluginInfo.C index f123178d1c3..e64c543b54d 100644 --- a/databases/Boxlib3D/Boxlib3DMDServerPluginInfo.C +++ b/databases/Boxlib3D/Boxlib3DMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Boxlib3D_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Boxlib3D_GetMDServerInfo() { return new Boxlib3DMDServerPluginInfo; } diff --git a/databases/Boxlib3D/Boxlib3DPluginInfo.C b/databases/Boxlib3D/Boxlib3DPluginInfo.C index ae207d41e24..9b37b0f7403 100644 --- a/databases/Boxlib3D/Boxlib3DPluginInfo.C +++ b/databases/Boxlib3D/Boxlib3DPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *Boxlib3DVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Boxlib3D_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Boxlib3D_GetGeneralInfo() { return new Boxlib3DGeneralPluginInfo; } diff --git a/databases/CCM/CCMEnginePluginInfo.C b/databases/CCM/CCMEnginePluginInfo.C index f6f0ac1efba..b338324db6f 100644 --- a/databases/CCM/CCMEnginePluginInfo.C +++ b/databases/CCM/CCMEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo CCM_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* CCM_GetEngineInfo() { return new CCMEnginePluginInfo; } diff --git a/databases/CCM/CCMMDServerPluginInfo.C b/databases/CCM/CCMMDServerPluginInfo.C index 24612365a10..5f922dde821 100644 --- a/databases/CCM/CCMMDServerPluginInfo.C +++ b/databases/CCM/CCMMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo CCM_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* CCM_GetMDServerInfo() { return new CCMMDServerPluginInfo; } diff --git a/databases/CCM/CCMPluginInfo.C b/databases/CCM/CCMPluginInfo.C index ba13cf8bdc9..a9a1143f4b4 100644 --- a/databases/CCM/CCMPluginInfo.C +++ b/databases/CCM/CCMPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *CCMVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo CCM_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* CCM_GetGeneralInfo() { return new CCMGeneralPluginInfo; } diff --git a/databases/CEAucd/CEAucdEnginePluginInfo.C b/databases/CEAucd/CEAucdEnginePluginInfo.C index 0fba54318af..83450e27208 100644 --- a/databases/CEAucd/CEAucdEnginePluginInfo.C +++ b/databases/CEAucd/CEAucdEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo CEAucd_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* CEAucd_GetEngineInfo() { return new CEAucdEnginePluginInfo; } diff --git a/databases/CEAucd/CEAucdMDServerPluginInfo.C b/databases/CEAucd/CEAucdMDServerPluginInfo.C index 7a39e5fafc7..eda35778abd 100644 --- a/databases/CEAucd/CEAucdMDServerPluginInfo.C +++ b/databases/CEAucd/CEAucdMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo CEAucd_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* CEAucd_GetMDServerInfo() { return new CEAucdMDServerPluginInfo; } diff --git a/databases/CEAucd/CEAucdPluginInfo.C b/databases/CEAucd/CEAucdPluginInfo.C index 473dfbbf4df..c9b4e9f929a 100644 --- a/databases/CEAucd/CEAucdPluginInfo.C +++ b/databases/CEAucd/CEAucdPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *CEAucdVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo CEAucd_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* CEAucd_GetGeneralInfo() { return new CEAucdGeneralPluginInfo; } diff --git a/databases/CGNS/CGNSEnginePluginInfo.C b/databases/CGNS/CGNSEnginePluginInfo.C index 8f19db829a3..ab9409b539b 100644 --- a/databases/CGNS/CGNSEnginePluginInfo.C +++ b/databases/CGNS/CGNSEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo CGNS_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* CGNS_GetEngineInfo() { return new CGNSEnginePluginInfo; } diff --git a/databases/CGNS/CGNSMDServerPluginInfo.C b/databases/CGNS/CGNSMDServerPluginInfo.C index a33945c21d0..76ec5afadcb 100644 --- a/databases/CGNS/CGNSMDServerPluginInfo.C +++ b/databases/CGNS/CGNSMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo CGNS_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* CGNS_GetMDServerInfo() { return new CGNSMDServerPluginInfo; } diff --git a/databases/CGNS/CGNSPluginInfo.C b/databases/CGNS/CGNSPluginInfo.C index 6db58f69f6c..12da5524efb 100644 --- a/databases/CGNS/CGNSPluginInfo.C +++ b/databases/CGNS/CGNSPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *CGNSVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo CGNS_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* CGNS_GetGeneralInfo() { return new CGNSGeneralPluginInfo; } diff --git a/databases/CMAT/CMATEnginePluginInfo.C b/databases/CMAT/CMATEnginePluginInfo.C index a5f23557c4d..86d831b77c9 100644 --- a/databases/CMAT/CMATEnginePluginInfo.C +++ b/databases/CMAT/CMATEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo CMAT_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* CMAT_GetEngineInfo() { return new CMATEnginePluginInfo; } diff --git a/databases/CMAT/CMATMDServerPluginInfo.C b/databases/CMAT/CMATMDServerPluginInfo.C index e4f7afb85cc..c0cebfe4fc5 100644 --- a/databases/CMAT/CMATMDServerPluginInfo.C +++ b/databases/CMAT/CMATMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo CMAT_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* CMAT_GetMDServerInfo() { return new CMATMDServerPluginInfo; } diff --git a/databases/CMAT/CMATPluginInfo.C b/databases/CMAT/CMATPluginInfo.C index 03f9cecb7a2..3d3f810fa00 100644 --- a/databases/CMAT/CMATPluginInfo.C +++ b/databases/CMAT/CMATPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *CMATVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo CMAT_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* CMAT_GetGeneralInfo() { return new CMATGeneralPluginInfo; } diff --git a/databases/CTRL/CTRLEnginePluginInfo.C b/databases/CTRL/CTRLEnginePluginInfo.C index 4c80cf9c585..b46a993054a 100644 --- a/databases/CTRL/CTRLEnginePluginInfo.C +++ b/databases/CTRL/CTRLEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo CTRL_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* CTRL_GetEngineInfo() { return new CTRLEnginePluginInfo; } diff --git a/databases/CTRL/CTRLMDServerPluginInfo.C b/databases/CTRL/CTRLMDServerPluginInfo.C index 006a96eff5e..ca0f95048f6 100644 --- a/databases/CTRL/CTRLMDServerPluginInfo.C +++ b/databases/CTRL/CTRLMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo CTRL_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* CTRL_GetMDServerInfo() { return new CTRLMDServerPluginInfo; } diff --git a/databases/CTRL/CTRLPluginInfo.C b/databases/CTRL/CTRLPluginInfo.C index 54d55b01920..7fbbee83850 100644 --- a/databases/CTRL/CTRLPluginInfo.C +++ b/databases/CTRL/CTRLPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *CTRLVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo CTRL_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* CTRL_GetGeneralInfo() { return new CTRLGeneralPluginInfo; } diff --git a/databases/Cale/CaleEnginePluginInfo.C b/databases/Cale/CaleEnginePluginInfo.C index 1e0a74a225c..c0b86797fdd 100644 --- a/databases/Cale/CaleEnginePluginInfo.C +++ b/databases/Cale/CaleEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Cale_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Cale_GetEngineInfo() { return new CaleEnginePluginInfo; } diff --git a/databases/Cale/CaleMDServerPluginInfo.C b/databases/Cale/CaleMDServerPluginInfo.C index 304833a293a..2ca3a0c10af 100644 --- a/databases/Cale/CaleMDServerPluginInfo.C +++ b/databases/Cale/CaleMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Cale_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Cale_GetMDServerInfo() { return new CaleMDServerPluginInfo; } diff --git a/databases/Cale/CalePluginInfo.C b/databases/Cale/CalePluginInfo.C index 6f2ac1c1f07..31a12a5842d 100644 --- a/databases/Cale/CalePluginInfo.C +++ b/databases/Cale/CalePluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *CaleVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Cale_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Cale_GetGeneralInfo() { return new CaleGeneralPluginInfo; } diff --git a/databases/Chombo/ChomboEnginePluginInfo.C b/databases/Chombo/ChomboEnginePluginInfo.C index 101891036ae..0efc7961d00 100644 --- a/databases/Chombo/ChomboEnginePluginInfo.C +++ b/databases/Chombo/ChomboEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Chombo_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Chombo_GetEngineInfo() { return new ChomboEnginePluginInfo; } diff --git a/databases/Chombo/ChomboMDServerPluginInfo.C b/databases/Chombo/ChomboMDServerPluginInfo.C index 71730446526..7eeb1a8c6da 100644 --- a/databases/Chombo/ChomboMDServerPluginInfo.C +++ b/databases/Chombo/ChomboMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Chombo_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Chombo_GetMDServerInfo() { return new ChomboMDServerPluginInfo; } diff --git a/databases/Chombo/ChomboPluginInfo.C b/databases/Chombo/ChomboPluginInfo.C index 2a22b19361e..ff97bd8b87d 100644 --- a/databases/Chombo/ChomboPluginInfo.C +++ b/databases/Chombo/ChomboPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *ChomboVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Chombo_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Chombo_GetGeneralInfo() { return new ChomboGeneralPluginInfo; } diff --git a/databases/Claw/ClawEnginePluginInfo.C b/databases/Claw/ClawEnginePluginInfo.C index e72b087b62f..3681e0c1ff0 100644 --- a/databases/Claw/ClawEnginePluginInfo.C +++ b/databases/Claw/ClawEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Claw_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Claw_GetEngineInfo() { return new ClawEnginePluginInfo; } diff --git a/databases/Claw/ClawMDServerPluginInfo.C b/databases/Claw/ClawMDServerPluginInfo.C index 510e7ea727d..54dcc6a9aef 100644 --- a/databases/Claw/ClawMDServerPluginInfo.C +++ b/databases/Claw/ClawMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Claw_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Claw_GetMDServerInfo() { return new ClawMDServerPluginInfo; } diff --git a/databases/Claw/ClawPluginInfo.C b/databases/Claw/ClawPluginInfo.C index 9544c3f1d75..63e06097a60 100644 --- a/databases/Claw/ClawPluginInfo.C +++ b/databases/Claw/ClawPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *ClawVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Claw_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Claw_GetGeneralInfo() { return new ClawGeneralPluginInfo; } diff --git a/databases/Cosmos/CosmosEnginePluginInfo.C b/databases/Cosmos/CosmosEnginePluginInfo.C index 6a3288101d5..bdf2c71c950 100644 --- a/databases/Cosmos/CosmosEnginePluginInfo.C +++ b/databases/Cosmos/CosmosEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Cosmos_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Cosmos_GetEngineInfo() { return new CosmosEnginePluginInfo; } diff --git a/databases/Cosmos/CosmosMDServerPluginInfo.C b/databases/Cosmos/CosmosMDServerPluginInfo.C index ad629b479b2..ca2ca9b3b99 100644 --- a/databases/Cosmos/CosmosMDServerPluginInfo.C +++ b/databases/Cosmos/CosmosMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Cosmos_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Cosmos_GetMDServerInfo() { return new CosmosMDServerPluginInfo; } diff --git a/databases/Cosmos/CosmosPluginInfo.C b/databases/Cosmos/CosmosPluginInfo.C index 2c89207c5b1..c87877c4d4a 100644 --- a/databases/Cosmos/CosmosPluginInfo.C +++ b/databases/Cosmos/CosmosPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *CosmosVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Cosmos_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Cosmos_GetGeneralInfo() { return new CosmosGeneralPluginInfo; } diff --git a/databases/CosmosPP/CosmosPPEnginePluginInfo.C b/databases/CosmosPP/CosmosPPEnginePluginInfo.C index 4642dc985a7..036610170ce 100644 --- a/databases/CosmosPP/CosmosPPEnginePluginInfo.C +++ b/databases/CosmosPP/CosmosPPEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo CosmosPP_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* CosmosPP_GetEngineInfo() { return new CosmosPPEnginePluginInfo; } diff --git a/databases/CosmosPP/CosmosPPMDServerPluginInfo.C b/databases/CosmosPP/CosmosPPMDServerPluginInfo.C index f4a88d47b4c..a4fb8c6308d 100644 --- a/databases/CosmosPP/CosmosPPMDServerPluginInfo.C +++ b/databases/CosmosPP/CosmosPPMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo CosmosPP_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* CosmosPP_GetMDServerInfo() { return new CosmosPPMDServerPluginInfo; } diff --git a/databases/CosmosPP/CosmosPPPluginInfo.C b/databases/CosmosPP/CosmosPPPluginInfo.C index 2015ac72550..404fc39394d 100644 --- a/databases/CosmosPP/CosmosPPPluginInfo.C +++ b/databases/CosmosPP/CosmosPPPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *CosmosPPVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo CosmosPP_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* CosmosPP_GetGeneralInfo() { return new CosmosPPGeneralPluginInfo; } diff --git a/databases/Curve2D/Curve2DEnginePluginInfo.C b/databases/Curve2D/Curve2DEnginePluginInfo.C index 957a06457bd..df95c2e3ca7 100644 --- a/databases/Curve2D/Curve2DEnginePluginInfo.C +++ b/databases/Curve2D/Curve2DEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Curve2D_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Curve2D_GetEngineInfo() { return new Curve2DEnginePluginInfo; } diff --git a/databases/Curve2D/Curve2DMDServerPluginInfo.C b/databases/Curve2D/Curve2DMDServerPluginInfo.C index 171bce5c421..7a07fab8156 100644 --- a/databases/Curve2D/Curve2DMDServerPluginInfo.C +++ b/databases/Curve2D/Curve2DMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Curve2D_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Curve2D_GetMDServerInfo() { return new Curve2DMDServerPluginInfo; } diff --git a/databases/Curve2D/Curve2DPluginInfo.C b/databases/Curve2D/Curve2DPluginInfo.C index 3de59f736dc..3e8747c1894 100644 --- a/databases/Curve2D/Curve2DPluginInfo.C +++ b/databases/Curve2D/Curve2DPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *Curve2DVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Curve2D_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Curve2D_GetGeneralInfo() { return new Curve2DGeneralPluginInfo; } diff --git a/databases/DDCMD/DDCMDEnginePluginInfo.C b/databases/DDCMD/DDCMDEnginePluginInfo.C index e510c0c5f95..f7146fdcf5f 100644 --- a/databases/DDCMD/DDCMDEnginePluginInfo.C +++ b/databases/DDCMD/DDCMDEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo DDCMD_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* DDCMD_GetEngineInfo() { return new DDCMDEnginePluginInfo; } diff --git a/databases/DDCMD/DDCMDMDServerPluginInfo.C b/databases/DDCMD/DDCMDMDServerPluginInfo.C index cf29b7f1ada..4a7aa8259b9 100644 --- a/databases/DDCMD/DDCMDMDServerPluginInfo.C +++ b/databases/DDCMD/DDCMDMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo DDCMD_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* DDCMD_GetMDServerInfo() { return new DDCMDMDServerPluginInfo; } diff --git a/databases/DDCMD/DDCMDPluginInfo.C b/databases/DDCMD/DDCMDPluginInfo.C index 2c76ea1d21e..dd7f4d739f3 100644 --- a/databases/DDCMD/DDCMDPluginInfo.C +++ b/databases/DDCMD/DDCMDPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *DDCMDVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo DDCMD_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* DDCMD_GetGeneralInfo() { return new DDCMDGeneralPluginInfo; } diff --git a/databases/Dyna3D/Dyna3DEnginePluginInfo.C b/databases/Dyna3D/Dyna3DEnginePluginInfo.C index fc2503edb90..5ec11dcaf28 100644 --- a/databases/Dyna3D/Dyna3DEnginePluginInfo.C +++ b/databases/Dyna3D/Dyna3DEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Dyna3D_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Dyna3D_GetEngineInfo() { return new Dyna3DEnginePluginInfo; } diff --git a/databases/Dyna3D/Dyna3DMDServerPluginInfo.C b/databases/Dyna3D/Dyna3DMDServerPluginInfo.C index a0153c421c5..9f7d408ac9c 100644 --- a/databases/Dyna3D/Dyna3DMDServerPluginInfo.C +++ b/databases/Dyna3D/Dyna3DMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Dyna3D_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Dyna3D_GetMDServerInfo() { return new Dyna3DMDServerPluginInfo; } diff --git a/databases/Dyna3D/Dyna3DPluginInfo.C b/databases/Dyna3D/Dyna3DPluginInfo.C index 9af3f152dbb..c5bafe70eda 100644 --- a/databases/Dyna3D/Dyna3DPluginInfo.C +++ b/databases/Dyna3D/Dyna3DPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *Dyna3DVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Dyna3D_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Dyna3D_GetGeneralInfo() { return new Dyna3DGeneralPluginInfo; } diff --git a/databases/EnSight/EnSightEnginePluginInfo.C b/databases/EnSight/EnSightEnginePluginInfo.C index a5e63121629..9a60f11433c 100644 --- a/databases/EnSight/EnSightEnginePluginInfo.C +++ b/databases/EnSight/EnSightEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo EnSight_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* EnSight_GetEngineInfo() { return new EnSightEnginePluginInfo; } diff --git a/databases/EnSight/EnSightMDServerPluginInfo.C b/databases/EnSight/EnSightMDServerPluginInfo.C index 06c0d41992c..5d217f3e6ca 100644 --- a/databases/EnSight/EnSightMDServerPluginInfo.C +++ b/databases/EnSight/EnSightMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo EnSight_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* EnSight_GetMDServerInfo() { return new EnSightMDServerPluginInfo; } diff --git a/databases/EnSight/EnSightPluginInfo.C b/databases/EnSight/EnSightPluginInfo.C index 11f6a986ad7..31b0abb93bf 100644 --- a/databases/EnSight/EnSightPluginInfo.C +++ b/databases/EnSight/EnSightPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *EnSightVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo EnSight_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* EnSight_GetGeneralInfo() { return new EnSightGeneralPluginInfo; } diff --git a/databases/Enzo/EnzoEnginePluginInfo.C b/databases/Enzo/EnzoEnginePluginInfo.C index 33b81ee2ff6..db2389a95a7 100644 --- a/databases/Enzo/EnzoEnginePluginInfo.C +++ b/databases/Enzo/EnzoEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Enzo_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Enzo_GetEngineInfo() { return new EnzoEnginePluginInfo; } diff --git a/databases/Enzo/EnzoMDServerPluginInfo.C b/databases/Enzo/EnzoMDServerPluginInfo.C index e39fd4500b1..542b9483e04 100644 --- a/databases/Enzo/EnzoMDServerPluginInfo.C +++ b/databases/Enzo/EnzoMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Enzo_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Enzo_GetMDServerInfo() { return new EnzoMDServerPluginInfo; } diff --git a/databases/Enzo/EnzoPluginInfo.C b/databases/Enzo/EnzoPluginInfo.C index 5d269a55c67..e30c57fd302 100644 --- a/databases/Enzo/EnzoPluginInfo.C +++ b/databases/Enzo/EnzoPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *EnzoVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Enzo_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Enzo_GetGeneralInfo() { return new EnzoGeneralPluginInfo; } diff --git a/databases/Exodus/ExodusEnginePluginInfo.C b/databases/Exodus/ExodusEnginePluginInfo.C index 289835d5128..3441ec34e3b 100644 --- a/databases/Exodus/ExodusEnginePluginInfo.C +++ b/databases/Exodus/ExodusEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Exodus_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Exodus_GetEngineInfo() { return new ExodusEnginePluginInfo; } diff --git a/databases/Exodus/ExodusMDServerPluginInfo.C b/databases/Exodus/ExodusMDServerPluginInfo.C index 83b3ef5845b..ecdde452c32 100644 --- a/databases/Exodus/ExodusMDServerPluginInfo.C +++ b/databases/Exodus/ExodusMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Exodus_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Exodus_GetMDServerInfo() { return new ExodusMDServerPluginInfo; } diff --git a/databases/Exodus/ExodusPluginInfo.C b/databases/Exodus/ExodusPluginInfo.C index 51833b99ea4..56cd31ef678 100644 --- a/databases/Exodus/ExodusPluginInfo.C +++ b/databases/Exodus/ExodusPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *ExodusVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Exodus_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Exodus_GetGeneralInfo() { return new ExodusGeneralPluginInfo; } diff --git a/databases/ExtrudedVol/ExtrudedVolEnginePluginInfo.C b/databases/ExtrudedVol/ExtrudedVolEnginePluginInfo.C index 3fc15aadbd9..21a4ff444f5 100644 --- a/databases/ExtrudedVol/ExtrudedVolEnginePluginInfo.C +++ b/databases/ExtrudedVol/ExtrudedVolEnginePluginInfo.C @@ -39,10 +39,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo ExtrudedVol_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -53,7 +49,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* ExtrudedVol_GetEngineInfo() { return new ExtrudedVolEnginePluginInfo; } diff --git a/databases/ExtrudedVol/ExtrudedVolMDServerPluginInfo.C b/databases/ExtrudedVol/ExtrudedVolMDServerPluginInfo.C index 03355835440..7f03cd42140 100644 --- a/databases/ExtrudedVol/ExtrudedVolMDServerPluginInfo.C +++ b/databases/ExtrudedVol/ExtrudedVolMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo ExtrudedVol_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* ExtrudedVol_GetMDServerInfo() { return new ExtrudedVolMDServerPluginInfo; } diff --git a/databases/ExtrudedVol/ExtrudedVolPluginInfo.C b/databases/ExtrudedVol/ExtrudedVolPluginInfo.C index 644d98fb91d..51737b674d7 100644 --- a/databases/ExtrudedVol/ExtrudedVolPluginInfo.C +++ b/databases/ExtrudedVol/ExtrudedVolPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *ExtrudedVolVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo ExtrudedVol_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* ExtrudedVol_GetGeneralInfo() { return new ExtrudedVolGeneralPluginInfo; } diff --git a/databases/FITS/FITSEnginePluginInfo.C b/databases/FITS/FITSEnginePluginInfo.C index 60c7562b26a..2e4224adc9c 100644 --- a/databases/FITS/FITSEnginePluginInfo.C +++ b/databases/FITS/FITSEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo FITS_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* FITS_GetEngineInfo() { return new FITSEnginePluginInfo; } diff --git a/databases/FITS/FITSMDServerPluginInfo.C b/databases/FITS/FITSMDServerPluginInfo.C index 48648b8d386..8bc5a3d545c 100644 --- a/databases/FITS/FITSMDServerPluginInfo.C +++ b/databases/FITS/FITSMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo FITS_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* FITS_GetMDServerInfo() { return new FITSMDServerPluginInfo; } diff --git a/databases/FITS/FITSPluginInfo.C b/databases/FITS/FITSPluginInfo.C index b0026c28808..fe1bc6a4b78 100644 --- a/databases/FITS/FITSPluginInfo.C +++ b/databases/FITS/FITSPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *FITSVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo FITS_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* FITS_GetGeneralInfo() { return new FITSGeneralPluginInfo; } diff --git a/databases/FLASH/FLASHEnginePluginInfo.C b/databases/FLASH/FLASHEnginePluginInfo.C index b454ec1ebfd..668ba2feffe 100644 --- a/databases/FLASH/FLASHEnginePluginInfo.C +++ b/databases/FLASH/FLASHEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo FLASH_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* FLASH_GetEngineInfo() { return new FLASHEnginePluginInfo; } diff --git a/databases/FLASH/FLASHMDServerPluginInfo.C b/databases/FLASH/FLASHMDServerPluginInfo.C index 011a788a24e..d66986db308 100644 --- a/databases/FLASH/FLASHMDServerPluginInfo.C +++ b/databases/FLASH/FLASHMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo FLASH_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* FLASH_GetMDServerInfo() { return new FLASHMDServerPluginInfo; } diff --git a/databases/FLASH/FLASHPluginInfo.C b/databases/FLASH/FLASHPluginInfo.C index 3daa11b8dc1..52ef5568b1f 100644 --- a/databases/FLASH/FLASHPluginInfo.C +++ b/databases/FLASH/FLASHPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *FLASHVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo FLASH_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* FLASH_GetGeneralInfo() { return new FLASHGeneralPluginInfo; } diff --git a/databases/Fluent/FluentEnginePluginInfo.C b/databases/Fluent/FluentEnginePluginInfo.C index ebe6ab425fb..e8df3a894c7 100644 --- a/databases/Fluent/FluentEnginePluginInfo.C +++ b/databases/Fluent/FluentEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Fluent_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Fluent_GetEngineInfo() { return new FluentEnginePluginInfo; } diff --git a/databases/Fluent/FluentMDServerPluginInfo.C b/databases/Fluent/FluentMDServerPluginInfo.C index a23c21f6671..7b1cd2700f7 100644 --- a/databases/Fluent/FluentMDServerPluginInfo.C +++ b/databases/Fluent/FluentMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Fluent_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Fluent_GetMDServerInfo() { return new FluentMDServerPluginInfo; } diff --git a/databases/Fluent/FluentPluginInfo.C b/databases/Fluent/FluentPluginInfo.C index dc584d925e6..ee8b2562c1e 100644 --- a/databases/Fluent/FluentPluginInfo.C +++ b/databases/Fluent/FluentPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *FluentVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Fluent_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Fluent_GetGeneralInfo() { return new FluentGeneralPluginInfo; } diff --git a/databases/GDAL/GDALEnginePluginInfo.C b/databases/GDAL/GDALEnginePluginInfo.C index c398b05e48e..3178e27ab4a 100644 --- a/databases/GDAL/GDALEnginePluginInfo.C +++ b/databases/GDAL/GDALEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo GDAL_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* GDAL_GetEngineInfo() { return new GDALEnginePluginInfo; } diff --git a/databases/GDAL/GDALMDServerPluginInfo.C b/databases/GDAL/GDALMDServerPluginInfo.C index 4d6567babc1..9aefc0ce009 100644 --- a/databases/GDAL/GDALMDServerPluginInfo.C +++ b/databases/GDAL/GDALMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo GDAL_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GDAL_GetMDServerInfo() { return new GDALMDServerPluginInfo; } diff --git a/databases/GDAL/GDALPluginInfo.C b/databases/GDAL/GDALPluginInfo.C index 3aa6fdd0e27..b01e7a996e1 100644 --- a/databases/GDAL/GDALPluginInfo.C +++ b/databases/GDAL/GDALPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *GDALVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo GDAL_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GDAL_GetGeneralInfo() { return new GDALGeneralPluginInfo; } diff --git a/databases/GGCM/GGCMEnginePluginInfo.C b/databases/GGCM/GGCMEnginePluginInfo.C index 4f1b8721f61..e5fe4e5b2f6 100644 --- a/databases/GGCM/GGCMEnginePluginInfo.C +++ b/databases/GGCM/GGCMEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo GGCM_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* GGCM_GetEngineInfo() { return new GGCMEnginePluginInfo; } diff --git a/databases/GGCM/GGCMMDServerPluginInfo.C b/databases/GGCM/GGCMMDServerPluginInfo.C index 85d68753193..5db77b2394b 100644 --- a/databases/GGCM/GGCMMDServerPluginInfo.C +++ b/databases/GGCM/GGCMMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo GGCM_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GGCM_GetMDServerInfo() { return new GGCMMDServerPluginInfo; } diff --git a/databases/GGCM/GGCMPluginInfo.C b/databases/GGCM/GGCMPluginInfo.C index f2c5d18a5b8..b7e30dc802b 100644 --- a/databases/GGCM/GGCMPluginInfo.C +++ b/databases/GGCM/GGCMPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *GGCMVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo GGCM_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GGCM_GetGeneralInfo() { return new GGCMGeneralPluginInfo; } diff --git a/databases/GTC/GTCEnginePluginInfo.C b/databases/GTC/GTCEnginePluginInfo.C index 31fcc00aa11..bea503a19e5 100644 --- a/databases/GTC/GTCEnginePluginInfo.C +++ b/databases/GTC/GTCEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo GTC_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* GTC_GetEngineInfo() { return new GTCEnginePluginInfo; } diff --git a/databases/GTC/GTCMDServerPluginInfo.C b/databases/GTC/GTCMDServerPluginInfo.C index 61e69fc27f9..547c7461a62 100644 --- a/databases/GTC/GTCMDServerPluginInfo.C +++ b/databases/GTC/GTCMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo GTC_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GTC_GetMDServerInfo() { return new GTCMDServerPluginInfo; } diff --git a/databases/GTC/GTCPluginInfo.C b/databases/GTC/GTCPluginInfo.C index 9adbab7cb67..9f75f8a74ef 100644 --- a/databases/GTC/GTCPluginInfo.C +++ b/databases/GTC/GTCPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *GTCVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo GTC_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GTC_GetGeneralInfo() { return new GTCGeneralPluginInfo; } diff --git a/databases/Gadget/GadgetEnginePluginInfo.C b/databases/Gadget/GadgetEnginePluginInfo.C index 8794c3ef866..16269245fdb 100644 --- a/databases/Gadget/GadgetEnginePluginInfo.C +++ b/databases/Gadget/GadgetEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Gadget_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Gadget_GetEngineInfo() { return new GadgetEnginePluginInfo; } diff --git a/databases/Gadget/GadgetMDServerPluginInfo.C b/databases/Gadget/GadgetMDServerPluginInfo.C index d9882553775..b7b113375be 100644 --- a/databases/Gadget/GadgetMDServerPluginInfo.C +++ b/databases/Gadget/GadgetMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Gadget_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Gadget_GetMDServerInfo() { return new GadgetMDServerPluginInfo; } diff --git a/databases/Gadget/GadgetPluginInfo.C b/databases/Gadget/GadgetPluginInfo.C index 3a981a1ecda..69ce67de8ce 100644 --- a/databases/Gadget/GadgetPluginInfo.C +++ b/databases/Gadget/GadgetPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *GadgetVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Gadget_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Gadget_GetGeneralInfo() { return new GadgetGeneralPluginInfo; } diff --git a/databases/H5Nimrod/H5NimrodEnginePluginInfo.C b/databases/H5Nimrod/H5NimrodEnginePluginInfo.C index 4320f7d5a01..40124c485fa 100644 --- a/databases/H5Nimrod/H5NimrodEnginePluginInfo.C +++ b/databases/H5Nimrod/H5NimrodEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo H5Nimrod_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* H5Nimrod_GetEngineInfo() { return new H5NimrodEnginePluginInfo; } diff --git a/databases/H5Nimrod/H5NimrodMDServerPluginInfo.C b/databases/H5Nimrod/H5NimrodMDServerPluginInfo.C index 40650a5e5df..4fd14b93457 100644 --- a/databases/H5Nimrod/H5NimrodMDServerPluginInfo.C +++ b/databases/H5Nimrod/H5NimrodMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo H5Nimrod_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* H5Nimrod_GetMDServerInfo() { return new H5NimrodMDServerPluginInfo; } diff --git a/databases/H5Nimrod/H5NimrodPluginInfo.C b/databases/H5Nimrod/H5NimrodPluginInfo.C index 1749e96f803..6b6ccd3d3a4 100644 --- a/databases/H5Nimrod/H5NimrodPluginInfo.C +++ b/databases/H5Nimrod/H5NimrodPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *H5NimrodVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo H5Nimrod_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* H5Nimrod_GetGeneralInfo() { return new H5NimrodGeneralPluginInfo; } @@ -175,7 +167,6 @@ H5NimrodGeneralPluginInfo::GetDfltExtsFromGen() const { std::vector defaultExtensions; defaultExtensions.push_back(".h5nimrod"); - defaultExtensions.push_back(".h5"); return defaultExtensions; } diff --git a/databases/H5Part/H5PartEnginePluginInfo.C b/databases/H5Part/H5PartEnginePluginInfo.C index 04ef8f87801..99ecbbc17d0 100644 --- a/databases/H5Part/H5PartEnginePluginInfo.C +++ b/databases/H5Part/H5PartEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo H5Part_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* H5Part_GetEngineInfo() { return new H5PartEnginePluginInfo; } diff --git a/databases/H5Part/H5PartMDServerPluginInfo.C b/databases/H5Part/H5PartMDServerPluginInfo.C index 936cdab2a1b..525a02296f5 100644 --- a/databases/H5Part/H5PartMDServerPluginInfo.C +++ b/databases/H5Part/H5PartMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo H5Part_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* H5Part_GetMDServerInfo() { return new H5PartMDServerPluginInfo; } diff --git a/databases/H5Part/H5PartPluginInfo.C b/databases/H5Part/H5PartPluginInfo.C index 078b190ba43..205e5753c09 100644 --- a/databases/H5Part/H5PartPluginInfo.C +++ b/databases/H5Part/H5PartPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *H5PartVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo H5Part_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* H5Part_GetGeneralInfo() { return new H5PartGeneralPluginInfo; } diff --git a/databases/HDF_UC/HDF_UCEnginePluginInfo.C b/databases/HDF_UC/HDF_UCEnginePluginInfo.C index c8f971f63db..979f5d56320 100644 --- a/databases/HDF_UC/HDF_UCEnginePluginInfo.C +++ b/databases/HDF_UC/HDF_UCEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo HDF_UC_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* HDF_UC_GetEngineInfo() { return new HDF_UCEnginePluginInfo; } diff --git a/databases/HDF_UC/HDF_UCMDServerPluginInfo.C b/databases/HDF_UC/HDF_UCMDServerPluginInfo.C index 1d18c06d25c..f04d2df78e3 100644 --- a/databases/HDF_UC/HDF_UCMDServerPluginInfo.C +++ b/databases/HDF_UC/HDF_UCMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo HDF_UC_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* HDF_UC_GetMDServerInfo() { return new HDF_UCMDServerPluginInfo; } diff --git a/databases/HDF_UC/HDF_UCPluginInfo.C b/databases/HDF_UC/HDF_UCPluginInfo.C index 6db81055633..27fa6fde519 100644 --- a/databases/HDF_UC/HDF_UCPluginInfo.C +++ b/databases/HDF_UC/HDF_UCPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *HDF_UCVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo HDF_UC_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* HDF_UC_GetGeneralInfo() { return new HDF_UCGeneralPluginInfo; } diff --git a/databases/Hex/HexEnginePluginInfo.C b/databases/Hex/HexEnginePluginInfo.C index 1e782fb6ce5..20c60240840 100644 --- a/databases/Hex/HexEnginePluginInfo.C +++ b/databases/Hex/HexEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Hex_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Hex_GetEngineInfo() { return new HexEnginePluginInfo; } diff --git a/databases/Hex/HexMDServerPluginInfo.C b/databases/Hex/HexMDServerPluginInfo.C index 4c999cd0463..f85e4062c60 100644 --- a/databases/Hex/HexMDServerPluginInfo.C +++ b/databases/Hex/HexMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Hex_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Hex_GetMDServerInfo() { return new HexMDServerPluginInfo; } diff --git a/databases/Hex/HexPluginInfo.C b/databases/Hex/HexPluginInfo.C index aa18c6a2ab3..75b583be861 100644 --- a/databases/Hex/HexPluginInfo.C +++ b/databases/Hex/HexPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *HexVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Hex_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Hex_GetGeneralInfo() { return new HexGeneralPluginInfo; } diff --git a/databases/ITAPS_C/ITAPS_CEnginePluginInfo.C b/databases/ITAPS_C/ITAPS_CEnginePluginInfo.C index 64de9d0fde2..17865ba450f 100644 --- a/databases/ITAPS_C/ITAPS_CEnginePluginInfo.C +++ b/databases/ITAPS_C/ITAPS_CEnginePluginInfo.C @@ -39,10 +39,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo ITAPS_C_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -53,7 +49,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* ITAPS_C_GetEngineInfo() { return new ITAPS_CEnginePluginInfo; } diff --git a/databases/ITAPS_C/ITAPS_CMDServerPluginInfo.C b/databases/ITAPS_C/ITAPS_CMDServerPluginInfo.C index 4d7f6312e7d..0a39b810a10 100644 --- a/databases/ITAPS_C/ITAPS_CMDServerPluginInfo.C +++ b/databases/ITAPS_C/ITAPS_CMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo ITAPS_C_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* ITAPS_C_GetMDServerInfo() { return new ITAPS_CMDServerPluginInfo; } diff --git a/databases/ITAPS_C/ITAPS_CPluginInfo.C b/databases/ITAPS_C/ITAPS_CPluginInfo.C index c8a46c1f340..30786240741 100644 --- a/databases/ITAPS_C/ITAPS_CPluginInfo.C +++ b/databases/ITAPS_C/ITAPS_CPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *ITAPS_CVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo ITAPS_C_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* ITAPS_C_GetGeneralInfo() { return new ITAPS_CGeneralPluginInfo; } diff --git a/databases/Image/ImageEnginePluginInfo.C b/databases/Image/ImageEnginePluginInfo.C index 490587ae0aa..d79607baf63 100644 --- a/databases/Image/ImageEnginePluginInfo.C +++ b/databases/Image/ImageEnginePluginInfo.C @@ -39,10 +39,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Image_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -53,7 +49,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Image_GetEngineInfo() { return new ImageEnginePluginInfo; } diff --git a/databases/Image/ImageMDServerPluginInfo.C b/databases/Image/ImageMDServerPluginInfo.C index aefd89cdf51..0b351582343 100644 --- a/databases/Image/ImageMDServerPluginInfo.C +++ b/databases/Image/ImageMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Image_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Image_GetMDServerInfo() { return new ImageMDServerPluginInfo; } diff --git a/databases/Image/ImagePluginInfo.C b/databases/Image/ImagePluginInfo.C index 8c3a8844a7d..cd0df5e5f9c 100644 --- a/databases/Image/ImagePluginInfo.C +++ b/databases/Image/ImagePluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *ImageVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Image_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Image_GetGeneralInfo() { return new ImageGeneralPluginInfo; } diff --git a/databases/KullLite/KullLiteEnginePluginInfo.C b/databases/KullLite/KullLiteEnginePluginInfo.C index bfb49da4115..bceb507e67a 100644 --- a/databases/KullLite/KullLiteEnginePluginInfo.C +++ b/databases/KullLite/KullLiteEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo KullLite_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* KullLite_GetEngineInfo() { return new KullLiteEnginePluginInfo; } diff --git a/databases/KullLite/KullLiteMDServerPluginInfo.C b/databases/KullLite/KullLiteMDServerPluginInfo.C index ae088bd4e8a..4735476a89b 100644 --- a/databases/KullLite/KullLiteMDServerPluginInfo.C +++ b/databases/KullLite/KullLiteMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo KullLite_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* KullLite_GetMDServerInfo() { return new KullLiteMDServerPluginInfo; } diff --git a/databases/KullLite/KullLitePluginInfo.C b/databases/KullLite/KullLitePluginInfo.C index 59eddc62c8b..b3853950dac 100644 --- a/databases/KullLite/KullLitePluginInfo.C +++ b/databases/KullLite/KullLitePluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *KullLiteVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo KullLite_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* KullLite_GetGeneralInfo() { return new KullLiteGeneralPluginInfo; } diff --git a/databases/LAMMPS/LAMMPSEnginePluginInfo.C b/databases/LAMMPS/LAMMPSEnginePluginInfo.C index f625a0925e9..126ea36dd80 100644 --- a/databases/LAMMPS/LAMMPSEnginePluginInfo.C +++ b/databases/LAMMPS/LAMMPSEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo LAMMPS_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* LAMMPS_GetEngineInfo() { return new LAMMPSEnginePluginInfo; } diff --git a/databases/LAMMPS/LAMMPSMDServerPluginInfo.C b/databases/LAMMPS/LAMMPSMDServerPluginInfo.C index dcaab87fb35..71cfe4abbc7 100644 --- a/databases/LAMMPS/LAMMPSMDServerPluginInfo.C +++ b/databases/LAMMPS/LAMMPSMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo LAMMPS_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* LAMMPS_GetMDServerInfo() { return new LAMMPSMDServerPluginInfo; } diff --git a/databases/LAMMPS/LAMMPSPluginInfo.C b/databases/LAMMPS/LAMMPSPluginInfo.C index cb94bde3ef5..80b02b7bed7 100644 --- a/databases/LAMMPS/LAMMPSPluginInfo.C +++ b/databases/LAMMPS/LAMMPSPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *LAMMPSVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo LAMMPS_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* LAMMPS_GetGeneralInfo() { return new LAMMPSGeneralPluginInfo; } diff --git a/databases/Lines/LinesEnginePluginInfo.C b/databases/Lines/LinesEnginePluginInfo.C index 6a9cbb9f339..b5a6bef9506 100644 --- a/databases/Lines/LinesEnginePluginInfo.C +++ b/databases/Lines/LinesEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Lines_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Lines_GetEngineInfo() { return new LinesEnginePluginInfo; } diff --git a/databases/Lines/LinesMDServerPluginInfo.C b/databases/Lines/LinesMDServerPluginInfo.C index 1ea608483c6..f5a6d3e026d 100644 --- a/databases/Lines/LinesMDServerPluginInfo.C +++ b/databases/Lines/LinesMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Lines_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Lines_GetMDServerInfo() { return new LinesMDServerPluginInfo; } diff --git a/databases/Lines/LinesPluginInfo.C b/databases/Lines/LinesPluginInfo.C index 741aec5cc9c..06d44c733b0 100644 --- a/databases/Lines/LinesPluginInfo.C +++ b/databases/Lines/LinesPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *LinesVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Lines_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Lines_GetGeneralInfo() { return new LinesGeneralPluginInfo; } diff --git a/databases/M3D/M3D.xml b/databases/M3D/M3D.xml index 95294852f7c..7c42695f966 100644 --- a/databases/M3D/M3D.xml +++ b/databases/M3D/M3D.xml @@ -7,7 +7,8 @@ $(HDF5_LIB) $(ZLIB_LIB) - m3d + .m3d + .h5 diff --git a/databases/M3D/M3DEnginePluginInfo.C b/databases/M3D/M3DEnginePluginInfo.C index 3868f6933f1..3c6a5e34abc 100644 --- a/databases/M3D/M3DEnginePluginInfo.C +++ b/databases/M3D/M3DEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo M3D_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* M3D_GetEngineInfo() { return new M3DEnginePluginInfo; } diff --git a/databases/M3D/M3DMDServerPluginInfo.C b/databases/M3D/M3DMDServerPluginInfo.C index 58ee319b685..33b4f98177b 100644 --- a/databases/M3D/M3DMDServerPluginInfo.C +++ b/databases/M3D/M3DMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo M3D_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* M3D_GetMDServerInfo() { return new M3DMDServerPluginInfo; } diff --git a/databases/M3D/M3DPluginInfo.C b/databases/M3D/M3DPluginInfo.C index cc6083023b5..281daf02bac 100644 --- a/databases/M3D/M3DPluginInfo.C +++ b/databases/M3D/M3DPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *M3DVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo M3D_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* M3D_GetGeneralInfo() { return new M3DGeneralPluginInfo; } diff --git a/databases/MFIX/MFIXEnginePluginInfo.C b/databases/MFIX/MFIXEnginePluginInfo.C index 8c252e1a846..56ea4e0e9ad 100644 --- a/databases/MFIX/MFIXEnginePluginInfo.C +++ b/databases/MFIX/MFIXEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo MFIX_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* MFIX_GetEngineInfo() { return new MFIXEnginePluginInfo; } diff --git a/databases/MFIX/MFIXMDServerPluginInfo.C b/databases/MFIX/MFIXMDServerPluginInfo.C index f8c7128658d..f471b22ed69 100644 --- a/databases/MFIX/MFIXMDServerPluginInfo.C +++ b/databases/MFIX/MFIXMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo MFIX_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* MFIX_GetMDServerInfo() { return new MFIXMDServerPluginInfo; } diff --git a/databases/MFIX/MFIXPluginInfo.C b/databases/MFIX/MFIXPluginInfo.C index a8814c83105..053b6bcc9e2 100644 --- a/databases/MFIX/MFIXPluginInfo.C +++ b/databases/MFIX/MFIXPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *MFIXVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo MFIX_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* MFIX_GetGeneralInfo() { return new MFIXGeneralPluginInfo; } diff --git a/databases/MM5/MM5EnginePluginInfo.C b/databases/MM5/MM5EnginePluginInfo.C index 9102805eeab..64abb36a108 100644 --- a/databases/MM5/MM5EnginePluginInfo.C +++ b/databases/MM5/MM5EnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo MM5_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* MM5_GetEngineInfo() { return new MM5EnginePluginInfo; } diff --git a/databases/MM5/MM5MDServerPluginInfo.C b/databases/MM5/MM5MDServerPluginInfo.C index 32b6a02999b..c99758bf829 100644 --- a/databases/MM5/MM5MDServerPluginInfo.C +++ b/databases/MM5/MM5MDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo MM5_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* MM5_GetMDServerInfo() { return new MM5MDServerPluginInfo; } diff --git a/databases/MM5/MM5PluginInfo.C b/databases/MM5/MM5PluginInfo.C index a6757e95e48..75301b2dec3 100644 --- a/databases/MM5/MM5PluginInfo.C +++ b/databases/MM5/MM5PluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *MM5VisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo MM5_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* MM5_GetGeneralInfo() { return new MM5GeneralPluginInfo; } diff --git a/databases/MatrixMarket/MatrixMarketEnginePluginInfo.C b/databases/MatrixMarket/MatrixMarketEnginePluginInfo.C index 23777e4de56..5b93f332610 100644 --- a/databases/MatrixMarket/MatrixMarketEnginePluginInfo.C +++ b/databases/MatrixMarket/MatrixMarketEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo MatrixMarket_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* MatrixMarket_GetEngineInfo() { return new MatrixMarketEnginePluginInfo; } diff --git a/databases/MatrixMarket/MatrixMarketMDServerPluginInfo.C b/databases/MatrixMarket/MatrixMarketMDServerPluginInfo.C index d55eb248b81..15f505d5fff 100644 --- a/databases/MatrixMarket/MatrixMarketMDServerPluginInfo.C +++ b/databases/MatrixMarket/MatrixMarketMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo MatrixMarket_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* MatrixMarket_GetMDServerInfo() { return new MatrixMarketMDServerPluginInfo; } diff --git a/databases/MatrixMarket/MatrixMarketPluginInfo.C b/databases/MatrixMarket/MatrixMarketPluginInfo.C index a5933b91ef1..0589f8fad68 100644 --- a/databases/MatrixMarket/MatrixMarketPluginInfo.C +++ b/databases/MatrixMarket/MatrixMarketPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *MatrixMarketVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo MatrixMarket_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* MatrixMarket_GetGeneralInfo() { return new MatrixMarketGeneralPluginInfo; } diff --git a/databases/Mili/MiliEnginePluginInfo.C b/databases/Mili/MiliEnginePluginInfo.C index 52b27fbc1b9..13ddc660da2 100644 --- a/databases/Mili/MiliEnginePluginInfo.C +++ b/databases/Mili/MiliEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Mili_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Mili_GetEngineInfo() { return new MiliEnginePluginInfo; } diff --git a/databases/Mili/MiliMDServerPluginInfo.C b/databases/Mili/MiliMDServerPluginInfo.C index 729669bf11a..cc82bd385b6 100644 --- a/databases/Mili/MiliMDServerPluginInfo.C +++ b/databases/Mili/MiliMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Mili_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Mili_GetMDServerInfo() { return new MiliMDServerPluginInfo; } diff --git a/databases/Mili/MiliPluginInfo.C b/databases/Mili/MiliPluginInfo.C index 94a16258ce7..147a16e79ba 100644 --- a/databases/Mili/MiliPluginInfo.C +++ b/databases/Mili/MiliPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *MiliVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Mili_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Mili_GetGeneralInfo() { return new MiliGeneralPluginInfo; } diff --git a/databases/Miranda/MirandaEnginePluginInfo.C b/databases/Miranda/MirandaEnginePluginInfo.C index 63350970037..16910f5979b 100644 --- a/databases/Miranda/MirandaEnginePluginInfo.C +++ b/databases/Miranda/MirandaEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Miranda_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Miranda_GetEngineInfo() { return new MirandaEnginePluginInfo; } diff --git a/databases/Miranda/MirandaMDServerPluginInfo.C b/databases/Miranda/MirandaMDServerPluginInfo.C index f6207151ff3..caecdbf1017 100644 --- a/databases/Miranda/MirandaMDServerPluginInfo.C +++ b/databases/Miranda/MirandaMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Miranda_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Miranda_GetMDServerInfo() { return new MirandaMDServerPluginInfo; } diff --git a/databases/Miranda/MirandaPluginInfo.C b/databases/Miranda/MirandaPluginInfo.C index 44553d1604c..c5780667d92 100644 --- a/databases/Miranda/MirandaPluginInfo.C +++ b/databases/Miranda/MirandaPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *MirandaVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Miranda_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Miranda_GetGeneralInfo() { return new MirandaGeneralPluginInfo; } diff --git a/databases/NASTRAN/NASTRANEnginePluginInfo.C b/databases/NASTRAN/NASTRANEnginePluginInfo.C index 88467551e28..a5bfca989a4 100644 --- a/databases/NASTRAN/NASTRANEnginePluginInfo.C +++ b/databases/NASTRAN/NASTRANEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo NASTRAN_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* NASTRAN_GetEngineInfo() { return new NASTRANEnginePluginInfo; } diff --git a/databases/NASTRAN/NASTRANMDServerPluginInfo.C b/databases/NASTRAN/NASTRANMDServerPluginInfo.C index 37fcb68e0e5..8b9c1f138af 100644 --- a/databases/NASTRAN/NASTRANMDServerPluginInfo.C +++ b/databases/NASTRAN/NASTRANMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo NASTRAN_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* NASTRAN_GetMDServerInfo() { return new NASTRANMDServerPluginInfo; } diff --git a/databases/NASTRAN/NASTRANPluginInfo.C b/databases/NASTRAN/NASTRANPluginInfo.C index 1315a11e81f..8e3a7d92fe8 100644 --- a/databases/NASTRAN/NASTRANPluginInfo.C +++ b/databases/NASTRAN/NASTRANPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *NASTRANVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo NASTRAN_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* NASTRAN_GetGeneralInfo() { return new NASTRANGeneralPluginInfo; } diff --git a/databases/NETCDF/NETCDFEnginePluginInfo.C b/databases/NETCDF/NETCDFEnginePluginInfo.C index 7656f009353..85bfb063934 100644 --- a/databases/NETCDF/NETCDFEnginePluginInfo.C +++ b/databases/NETCDF/NETCDFEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo NETCDF_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* NETCDF_GetEngineInfo() { return new NETCDFEnginePluginInfo; } diff --git a/databases/NETCDF/NETCDFMDServerPluginInfo.C b/databases/NETCDF/NETCDFMDServerPluginInfo.C index af403dbf376..26ccbdad8eb 100644 --- a/databases/NETCDF/NETCDFMDServerPluginInfo.C +++ b/databases/NETCDF/NETCDFMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo NETCDF_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* NETCDF_GetMDServerInfo() { return new NETCDFMDServerPluginInfo; } diff --git a/databases/NETCDF/NETCDFPluginInfo.C b/databases/NETCDF/NETCDFPluginInfo.C index a0b9dc51b1e..ceb6994c48d 100644 --- a/databases/NETCDF/NETCDFPluginInfo.C +++ b/databases/NETCDF/NETCDFPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *NETCDFVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo NETCDF_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* NETCDF_GetGeneralInfo() { return new NETCDFGeneralPluginInfo; } diff --git a/databases/Nek5000/Nek5000EnginePluginInfo.C b/databases/Nek5000/Nek5000EnginePluginInfo.C index ed7ebe19310..2f38aa9cb21 100644 --- a/databases/Nek5000/Nek5000EnginePluginInfo.C +++ b/databases/Nek5000/Nek5000EnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Nek5000_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Nek5000_GetEngineInfo() { return new Nek5000EnginePluginInfo; } diff --git a/databases/Nek5000/Nek5000MDServerPluginInfo.C b/databases/Nek5000/Nek5000MDServerPluginInfo.C index c93773333de..a00cb56ad89 100644 --- a/databases/Nek5000/Nek5000MDServerPluginInfo.C +++ b/databases/Nek5000/Nek5000MDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Nek5000_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Nek5000_GetMDServerInfo() { return new Nek5000MDServerPluginInfo; } diff --git a/databases/Nek5000/Nek5000PluginInfo.C b/databases/Nek5000/Nek5000PluginInfo.C index f19c49a3692..8cdb9f7d9f5 100644 --- a/databases/Nek5000/Nek5000PluginInfo.C +++ b/databases/Nek5000/Nek5000PluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *Nek5000VisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Nek5000_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Nek5000_GetGeneralInfo() { return new Nek5000GeneralPluginInfo; } diff --git a/databases/OVERFLOW/OVERFLOWEnginePluginInfo.C b/databases/OVERFLOW/OVERFLOWEnginePluginInfo.C index 338aea34be6..afbdab5666a 100644 --- a/databases/OVERFLOW/OVERFLOWEnginePluginInfo.C +++ b/databases/OVERFLOW/OVERFLOWEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo OVERFLOW_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* OVERFLOW_GetEngineInfo() { return new OVERFLOWEnginePluginInfo; } diff --git a/databases/OVERFLOW/OVERFLOWMDServerPluginInfo.C b/databases/OVERFLOW/OVERFLOWMDServerPluginInfo.C index 0cbf4a1ae48..fe2df064a8c 100644 --- a/databases/OVERFLOW/OVERFLOWMDServerPluginInfo.C +++ b/databases/OVERFLOW/OVERFLOWMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo OVERFLOW_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* OVERFLOW_GetMDServerInfo() { return new OVERFLOWMDServerPluginInfo; } diff --git a/databases/OVERFLOW/OVERFLOWPluginInfo.C b/databases/OVERFLOW/OVERFLOWPluginInfo.C index dbf64e7f2ba..84f91e11f01 100644 --- a/databases/OVERFLOW/OVERFLOWPluginInfo.C +++ b/databases/OVERFLOW/OVERFLOWPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *OVERFLOWVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo OVERFLOW_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* OVERFLOW_GetGeneralInfo() { return new OVERFLOWGeneralPluginInfo; } diff --git a/databases/OpenFOAM/OpenFOAMEnginePluginInfo.C b/databases/OpenFOAM/OpenFOAMEnginePluginInfo.C index 3c577135661..b7fc13a4b0c 100644 --- a/databases/OpenFOAM/OpenFOAMEnginePluginInfo.C +++ b/databases/OpenFOAM/OpenFOAMEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo OpenFOAM_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* OpenFOAM_GetEngineInfo() { return new OpenFOAMEnginePluginInfo; } diff --git a/databases/OpenFOAM/OpenFOAMMDServerPluginInfo.C b/databases/OpenFOAM/OpenFOAMMDServerPluginInfo.C index 8276767e8a5..fd746cc1e93 100644 --- a/databases/OpenFOAM/OpenFOAMMDServerPluginInfo.C +++ b/databases/OpenFOAM/OpenFOAMMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo OpenFOAM_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* OpenFOAM_GetMDServerInfo() { return new OpenFOAMMDServerPluginInfo; } diff --git a/databases/OpenFOAM/OpenFOAMPluginInfo.C b/databases/OpenFOAM/OpenFOAMPluginInfo.C index 847da8c366e..7270798eb4d 100644 --- a/databases/OpenFOAM/OpenFOAMPluginInfo.C +++ b/databases/OpenFOAM/OpenFOAMPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *OpenFOAMVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo OpenFOAM_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* OpenFOAM_GetGeneralInfo() { return new OpenFOAMGeneralPluginInfo; } diff --git a/databases/PATRAN/PATRANEnginePluginInfo.C b/databases/PATRAN/PATRANEnginePluginInfo.C index f71e185cc04..01d775c214c 100644 --- a/databases/PATRAN/PATRANEnginePluginInfo.C +++ b/databases/PATRAN/PATRANEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo PATRAN_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* PATRAN_GetEngineInfo() { return new PATRANEnginePluginInfo; } diff --git a/databases/PATRAN/PATRANMDServerPluginInfo.C b/databases/PATRAN/PATRANMDServerPluginInfo.C index cfe8419aadd..1eae4b1233c 100644 --- a/databases/PATRAN/PATRANMDServerPluginInfo.C +++ b/databases/PATRAN/PATRANMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo PATRAN_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* PATRAN_GetMDServerInfo() { return new PATRANMDServerPluginInfo; } diff --git a/databases/PATRAN/PATRANPluginInfo.C b/databases/PATRAN/PATRANPluginInfo.C index 87ccbe09e0a..caef166b261 100644 --- a/databases/PATRAN/PATRANPluginInfo.C +++ b/databases/PATRAN/PATRANPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *PATRANVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo PATRAN_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* PATRAN_GetGeneralInfo() { return new PATRANGeneralPluginInfo; } diff --git a/databases/PDB/PDBEnginePluginInfo.C b/databases/PDB/PDBEnginePluginInfo.C index acf7b4d2564..ad52ba7075b 100644 --- a/databases/PDB/PDBEnginePluginInfo.C +++ b/databases/PDB/PDBEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo PDB_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* PDB_GetEngineInfo() { return new PDBEnginePluginInfo; } diff --git a/databases/PDB/PDBMDServerPluginInfo.C b/databases/PDB/PDBMDServerPluginInfo.C index 68f3fbec3cb..440bbd37041 100644 --- a/databases/PDB/PDBMDServerPluginInfo.C +++ b/databases/PDB/PDBMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo PDB_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* PDB_GetMDServerInfo() { return new PDBMDServerPluginInfo; } diff --git a/databases/PDB/PDBPluginInfo.C b/databases/PDB/PDBPluginInfo.C index 8c3201ddec8..f5d1f9f9069 100644 --- a/databases/PDB/PDBPluginInfo.C +++ b/databases/PDB/PDBPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *PDBVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo PDB_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* PDB_GetGeneralInfo() { return new PDBGeneralPluginInfo; } diff --git a/databases/PFLOTRAN/PFLOTRANEnginePluginInfo.C b/databases/PFLOTRAN/PFLOTRANEnginePluginInfo.C index 0dd084a4bb9..2883eb29af6 100644 --- a/databases/PFLOTRAN/PFLOTRANEnginePluginInfo.C +++ b/databases/PFLOTRAN/PFLOTRANEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo PFLOTRAN_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* PFLOTRAN_GetEngineInfo() { return new PFLOTRANEnginePluginInfo; } diff --git a/databases/PFLOTRAN/PFLOTRANMDServerPluginInfo.C b/databases/PFLOTRAN/PFLOTRANMDServerPluginInfo.C index c300f89f5e7..bf44b4aa4ae 100644 --- a/databases/PFLOTRAN/PFLOTRANMDServerPluginInfo.C +++ b/databases/PFLOTRAN/PFLOTRANMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo PFLOTRAN_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* PFLOTRAN_GetMDServerInfo() { return new PFLOTRANMDServerPluginInfo; } diff --git a/databases/PFLOTRAN/PFLOTRANPluginInfo.C b/databases/PFLOTRAN/PFLOTRANPluginInfo.C index 89c820c4801..6f68a7d4940 100644 --- a/databases/PFLOTRAN/PFLOTRANPluginInfo.C +++ b/databases/PFLOTRAN/PFLOTRANPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *PFLOTRANVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo PFLOTRAN_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* PFLOTRAN_GetGeneralInfo() { return new PFLOTRANGeneralPluginInfo; } diff --git a/databases/PLOT2D/PLOT2DEnginePluginInfo.C b/databases/PLOT2D/PLOT2DEnginePluginInfo.C index 2238c1444e0..b1a19188ae2 100644 --- a/databases/PLOT2D/PLOT2DEnginePluginInfo.C +++ b/databases/PLOT2D/PLOT2DEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo PLOT2D_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* PLOT2D_GetEngineInfo() { return new PLOT2DEnginePluginInfo; } diff --git a/databases/PLOT2D/PLOT2DMDServerPluginInfo.C b/databases/PLOT2D/PLOT2DMDServerPluginInfo.C index 69ab624fc40..c4cb8629275 100644 --- a/databases/PLOT2D/PLOT2DMDServerPluginInfo.C +++ b/databases/PLOT2D/PLOT2DMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo PLOT2D_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* PLOT2D_GetMDServerInfo() { return new PLOT2DMDServerPluginInfo; } diff --git a/databases/PLOT2D/PLOT2DPluginInfo.C b/databases/PLOT2D/PLOT2DPluginInfo.C index d7f1660f287..30dea2457d3 100644 --- a/databases/PLOT2D/PLOT2DPluginInfo.C +++ b/databases/PLOT2D/PLOT2DPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *PLOT2DVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo PLOT2D_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* PLOT2D_GetGeneralInfo() { return new PLOT2DGeneralPluginInfo; } diff --git a/databases/PLOT3D/PLOT3DEnginePluginInfo.C b/databases/PLOT3D/PLOT3DEnginePluginInfo.C index f48d92f7202..5a5cdffd51a 100644 --- a/databases/PLOT3D/PLOT3DEnginePluginInfo.C +++ b/databases/PLOT3D/PLOT3DEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo PLOT3D_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* PLOT3D_GetEngineInfo() { return new PLOT3DEnginePluginInfo; } diff --git a/databases/PLOT3D/PLOT3DMDServerPluginInfo.C b/databases/PLOT3D/PLOT3DMDServerPluginInfo.C index 20154ba56ac..f5364827390 100644 --- a/databases/PLOT3D/PLOT3DMDServerPluginInfo.C +++ b/databases/PLOT3D/PLOT3DMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo PLOT3D_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* PLOT3D_GetMDServerInfo() { return new PLOT3DMDServerPluginInfo; } diff --git a/databases/PLOT3D/PLOT3DPluginInfo.C b/databases/PLOT3D/PLOT3DPluginInfo.C index cba0dd19f88..391e5fd8101 100644 --- a/databases/PLOT3D/PLOT3DPluginInfo.C +++ b/databases/PLOT3D/PLOT3DPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *PLOT3DVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo PLOT3D_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* PLOT3D_GetGeneralInfo() { return new PLOT3DGeneralPluginInfo; } diff --git a/databases/Pixie/PixieEnginePluginInfo.C b/databases/Pixie/PixieEnginePluginInfo.C index 56ef9892ff4..0e9d798aaf2 100644 --- a/databases/Pixie/PixieEnginePluginInfo.C +++ b/databases/Pixie/PixieEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Pixie_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Pixie_GetEngineInfo() { return new PixieEnginePluginInfo; } diff --git a/databases/Pixie/PixieMDServerPluginInfo.C b/databases/Pixie/PixieMDServerPluginInfo.C index 708d8167d8a..400726b2212 100644 --- a/databases/Pixie/PixieMDServerPluginInfo.C +++ b/databases/Pixie/PixieMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Pixie_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Pixie_GetMDServerInfo() { return new PixieMDServerPluginInfo; } diff --git a/databases/Pixie/PixiePluginInfo.C b/databases/Pixie/PixiePluginInfo.C index 411f62b33ab..55832fc1cb8 100644 --- a/databases/Pixie/PixiePluginInfo.C +++ b/databases/Pixie/PixiePluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *PixieVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Pixie_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Pixie_GetGeneralInfo() { return new PixieGeneralPluginInfo; } diff --git a/databases/PlainText/PlainTextEnginePluginInfo.C b/databases/PlainText/PlainTextEnginePluginInfo.C index 2b8b13b531f..ae0ba95562e 100644 --- a/databases/PlainText/PlainTextEnginePluginInfo.C +++ b/databases/PlainText/PlainTextEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo PlainText_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* PlainText_GetEngineInfo() { return new PlainTextEnginePluginInfo; } diff --git a/databases/PlainText/PlainTextMDServerPluginInfo.C b/databases/PlainText/PlainTextMDServerPluginInfo.C index 378fc8adf8d..5a1542b3a7a 100644 --- a/databases/PlainText/PlainTextMDServerPluginInfo.C +++ b/databases/PlainText/PlainTextMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo PlainText_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* PlainText_GetMDServerInfo() { return new PlainTextMDServerPluginInfo; } diff --git a/databases/PlainText/PlainTextPluginInfo.C b/databases/PlainText/PlainTextPluginInfo.C index 91148246871..c7b0e3f0a6a 100644 --- a/databases/PlainText/PlainTextPluginInfo.C +++ b/databases/PlainText/PlainTextPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *PlainTextVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo PlainText_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* PlainText_GetGeneralInfo() { return new PlainTextGeneralPluginInfo; } diff --git a/databases/PlasmaState/PlasmaStateEnginePluginInfo.C b/databases/PlasmaState/PlasmaStateEnginePluginInfo.C index 58bef5d836d..f8dc4a7023a 100644 --- a/databases/PlasmaState/PlasmaStateEnginePluginInfo.C +++ b/databases/PlasmaState/PlasmaStateEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo PlasmaState_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* PlasmaState_GetEngineInfo() { return new PlasmaStateEnginePluginInfo; } diff --git a/databases/PlasmaState/PlasmaStateMDServerPluginInfo.C b/databases/PlasmaState/PlasmaStateMDServerPluginInfo.C index ed29b8a3477..0dd7083e854 100644 --- a/databases/PlasmaState/PlasmaStateMDServerPluginInfo.C +++ b/databases/PlasmaState/PlasmaStateMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo PlasmaState_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* PlasmaState_GetMDServerInfo() { return new PlasmaStateMDServerPluginInfo; } diff --git a/databases/PlasmaState/PlasmaStatePluginInfo.C b/databases/PlasmaState/PlasmaStatePluginInfo.C index 250c5965771..e69221dad0a 100644 --- a/databases/PlasmaState/PlasmaStatePluginInfo.C +++ b/databases/PlasmaState/PlasmaStatePluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *PlasmaStateVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo PlasmaState_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* PlasmaState_GetGeneralInfo() { return new PlasmaStateGeneralPluginInfo; } diff --git a/databases/Point3D/Point3DEnginePluginInfo.C b/databases/Point3D/Point3DEnginePluginInfo.C index 115c547c3cd..ee4f9a02ab6 100644 --- a/databases/Point3D/Point3DEnginePluginInfo.C +++ b/databases/Point3D/Point3DEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Point3D_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Point3D_GetEngineInfo() { return new Point3DEnginePluginInfo; } diff --git a/databases/Point3D/Point3DMDServerPluginInfo.C b/databases/Point3D/Point3DMDServerPluginInfo.C index a1c8e8c216e..27e85f5b209 100644 --- a/databases/Point3D/Point3DMDServerPluginInfo.C +++ b/databases/Point3D/Point3DMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Point3D_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Point3D_GetMDServerInfo() { return new Point3DMDServerPluginInfo; } diff --git a/databases/Point3D/Point3DPluginInfo.C b/databases/Point3D/Point3DPluginInfo.C index d63368a95d4..4ca9d57c665 100644 --- a/databases/Point3D/Point3DPluginInfo.C +++ b/databases/Point3D/Point3DPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *Point3DVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Point3D_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Point3D_GetGeneralInfo() { return new Point3DGeneralPluginInfo; } diff --git a/databases/ProteinDataBank/ProteinDataBankEnginePluginInfo.C b/databases/ProteinDataBank/ProteinDataBankEnginePluginInfo.C index 1d29b9b20f1..6501ab026e8 100644 --- a/databases/ProteinDataBank/ProteinDataBankEnginePluginInfo.C +++ b/databases/ProteinDataBank/ProteinDataBankEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo ProteinDataBank_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* ProteinDataBank_GetEngineInfo() { return new ProteinDataBankEnginePluginInfo; } diff --git a/databases/ProteinDataBank/ProteinDataBankMDServerPluginInfo.C b/databases/ProteinDataBank/ProteinDataBankMDServerPluginInfo.C index cf76db2e779..4cde6f14fd9 100644 --- a/databases/ProteinDataBank/ProteinDataBankMDServerPluginInfo.C +++ b/databases/ProteinDataBank/ProteinDataBankMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo ProteinDataBank_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* ProteinDataBank_GetMDServerInfo() { return new ProteinDataBankMDServerPluginInfo; } diff --git a/databases/ProteinDataBank/ProteinDataBankPluginInfo.C b/databases/ProteinDataBank/ProteinDataBankPluginInfo.C index 8b76b6aed70..c21649be270 100644 --- a/databases/ProteinDataBank/ProteinDataBankPluginInfo.C +++ b/databases/ProteinDataBank/ProteinDataBankPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *ProteinDataBankVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo ProteinDataBank_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* ProteinDataBank_GetGeneralInfo() { return new ProteinDataBankGeneralPluginInfo; } diff --git a/databases/RAW/RAWEnginePluginInfo.C b/databases/RAW/RAWEnginePluginInfo.C index cf60c6f7726..ff312e1bd7a 100644 --- a/databases/RAW/RAWEnginePluginInfo.C +++ b/databases/RAW/RAWEnginePluginInfo.C @@ -39,10 +39,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo RAW_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -53,7 +49,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* RAW_GetEngineInfo() { return new RAWEnginePluginInfo; } diff --git a/databases/RAW/RAWMDServerPluginInfo.C b/databases/RAW/RAWMDServerPluginInfo.C index d2908a8d8e2..def58a2efb9 100644 --- a/databases/RAW/RAWMDServerPluginInfo.C +++ b/databases/RAW/RAWMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo RAW_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* RAW_GetMDServerInfo() { return new RAWMDServerPluginInfo; } diff --git a/databases/RAW/RAWPluginInfo.C b/databases/RAW/RAWPluginInfo.C index 92557a98327..ed5fc4dfea8 100644 --- a/databases/RAW/RAWPluginInfo.C +++ b/databases/RAW/RAWPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *RAWVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo RAW_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* RAW_GetGeneralInfo() { return new RAWGeneralPluginInfo; } diff --git a/databases/Rect/RectEnginePluginInfo.C b/databases/Rect/RectEnginePluginInfo.C index d7e880d1448..bddbe05daf7 100644 --- a/databases/Rect/RectEnginePluginInfo.C +++ b/databases/Rect/RectEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Rect_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Rect_GetEngineInfo() { return new RectEnginePluginInfo; } diff --git a/databases/Rect/RectMDServerPluginInfo.C b/databases/Rect/RectMDServerPluginInfo.C index 05c8705d664..ef5dbaee38d 100644 --- a/databases/Rect/RectMDServerPluginInfo.C +++ b/databases/Rect/RectMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Rect_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Rect_GetMDServerInfo() { return new RectMDServerPluginInfo; } diff --git a/databases/Rect/RectPluginInfo.C b/databases/Rect/RectPluginInfo.C index 4d209a2720a..1706eecfaf1 100644 --- a/databases/Rect/RectPluginInfo.C +++ b/databases/Rect/RectPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *RectVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Rect_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Rect_GetGeneralInfo() { return new RectGeneralPluginInfo; } diff --git a/databases/S3D/S3DEnginePluginInfo.C b/databases/S3D/S3DEnginePluginInfo.C index 3b188c20e00..bd003d710f6 100644 --- a/databases/S3D/S3DEnginePluginInfo.C +++ b/databases/S3D/S3DEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo S3D_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* S3D_GetEngineInfo() { return new S3DEnginePluginInfo; } diff --git a/databases/S3D/S3DMDServerPluginInfo.C b/databases/S3D/S3DMDServerPluginInfo.C index 16808017619..4f6478ec8e5 100644 --- a/databases/S3D/S3DMDServerPluginInfo.C +++ b/databases/S3D/S3DMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo S3D_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* S3D_GetMDServerInfo() { return new S3DMDServerPluginInfo; } diff --git a/databases/S3D/S3DPluginInfo.C b/databases/S3D/S3DPluginInfo.C index 0917aad3641..5d51ee4a68f 100644 --- a/databases/S3D/S3DPluginInfo.C +++ b/databases/S3D/S3DPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *S3DVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo S3D_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* S3D_GetGeneralInfo() { return new S3DGeneralPluginInfo; } diff --git a/databases/SAMI/SAMIEnginePluginInfo.C b/databases/SAMI/SAMIEnginePluginInfo.C index b8ca5bccdf3..f43d69630b6 100644 --- a/databases/SAMI/SAMIEnginePluginInfo.C +++ b/databases/SAMI/SAMIEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo SAMI_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* SAMI_GetEngineInfo() { return new SAMIEnginePluginInfo; } diff --git a/databases/SAMI/SAMIMDServerPluginInfo.C b/databases/SAMI/SAMIMDServerPluginInfo.C index a44027e77c9..9dff26fc5a2 100644 --- a/databases/SAMI/SAMIMDServerPluginInfo.C +++ b/databases/SAMI/SAMIMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo SAMI_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* SAMI_GetMDServerInfo() { return new SAMIMDServerPluginInfo; } diff --git a/databases/SAMI/SAMIPluginInfo.C b/databases/SAMI/SAMIPluginInfo.C index a6ee1e15753..a86f71706ec 100644 --- a/databases/SAMI/SAMIPluginInfo.C +++ b/databases/SAMI/SAMIPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *SAMIVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo SAMI_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* SAMI_GetGeneralInfo() { return new SAMIGeneralPluginInfo; } diff --git a/databases/SAMRAI/SAMRAIEnginePluginInfo.C b/databases/SAMRAI/SAMRAIEnginePluginInfo.C index 0ef6c5fbdc8..85d6c6abfd9 100644 --- a/databases/SAMRAI/SAMRAIEnginePluginInfo.C +++ b/databases/SAMRAI/SAMRAIEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo SAMRAI_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* SAMRAI_GetEngineInfo() { return new SAMRAIEnginePluginInfo; } diff --git a/databases/SAMRAI/SAMRAIMDServerPluginInfo.C b/databases/SAMRAI/SAMRAIMDServerPluginInfo.C index b8c510a1846..316f81b297e 100644 --- a/databases/SAMRAI/SAMRAIMDServerPluginInfo.C +++ b/databases/SAMRAI/SAMRAIMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo SAMRAI_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* SAMRAI_GetMDServerInfo() { return new SAMRAIMDServerPluginInfo; } diff --git a/databases/SAMRAI/SAMRAIPluginInfo.C b/databases/SAMRAI/SAMRAIPluginInfo.C index 572d0d0bf11..4d2444c6eaa 100644 --- a/databases/SAMRAI/SAMRAIPluginInfo.C +++ b/databases/SAMRAI/SAMRAIPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *SAMRAIVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo SAMRAI_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* SAMRAI_GetGeneralInfo() { return new SAMRAIGeneralPluginInfo; } diff --git a/databases/SAR/SAREnginePluginInfo.C b/databases/SAR/SAREnginePluginInfo.C index 2924111aeec..57fef3b8aca 100644 --- a/databases/SAR/SAREnginePluginInfo.C +++ b/databases/SAR/SAREnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo SAR_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* SAR_GetEngineInfo() { return new SAREnginePluginInfo; } diff --git a/databases/SAR/SARMDServerPluginInfo.C b/databases/SAR/SARMDServerPluginInfo.C index 78e10c3d835..50d3cc3b533 100644 --- a/databases/SAR/SARMDServerPluginInfo.C +++ b/databases/SAR/SARMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo SAR_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* SAR_GetMDServerInfo() { return new SARMDServerPluginInfo; } diff --git a/databases/SAR/SARPluginInfo.C b/databases/SAR/SARPluginInfo.C index 2bf21eb10f1..146ae821304 100644 --- a/databases/SAR/SARPluginInfo.C +++ b/databases/SAR/SARPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *SARVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo SAR_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* SAR_GetGeneralInfo() { return new SARGeneralPluginInfo; } diff --git a/databases/SAS/SASEnginePluginInfo.C b/databases/SAS/SASEnginePluginInfo.C index 5a9d982c417..e1d293d8794 100644 --- a/databases/SAS/SASEnginePluginInfo.C +++ b/databases/SAS/SASEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo SAS_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* SAS_GetEngineInfo() { return new SASEnginePluginInfo; } diff --git a/databases/SAS/SASMDServerPluginInfo.C b/databases/SAS/SASMDServerPluginInfo.C index 709e76958e3..9978e858a51 100644 --- a/databases/SAS/SASMDServerPluginInfo.C +++ b/databases/SAS/SASMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo SAS_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* SAS_GetMDServerInfo() { return new SASMDServerPluginInfo; } diff --git a/databases/SAS/SASPluginInfo.C b/databases/SAS/SASPluginInfo.C index 1308b2e6327..0dc42d150fa 100644 --- a/databases/SAS/SASPluginInfo.C +++ b/databases/SAS/SASPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *SASVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo SAS_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* SAS_GetGeneralInfo() { return new SASGeneralPluginInfo; } diff --git a/databases/STL/STLEnginePluginInfo.C b/databases/STL/STLEnginePluginInfo.C index 1147c45f89f..ae641b2cddc 100644 --- a/databases/STL/STLEnginePluginInfo.C +++ b/databases/STL/STLEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo STL_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* STL_GetEngineInfo() { return new STLEnginePluginInfo; } diff --git a/databases/STL/STLMDServerPluginInfo.C b/databases/STL/STLMDServerPluginInfo.C index 281a20fc067..f67f34288f4 100644 --- a/databases/STL/STLMDServerPluginInfo.C +++ b/databases/STL/STLMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo STL_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* STL_GetMDServerInfo() { return new STLMDServerPluginInfo; } diff --git a/databases/STL/STLPluginInfo.C b/databases/STL/STLPluginInfo.C index 9a1949d985e..0f2e12dd17f 100644 --- a/databases/STL/STLPluginInfo.C +++ b/databases/STL/STLPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *STLVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo STL_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* STL_GetGeneralInfo() { return new STLGeneralPluginInfo; } diff --git a/databases/Shapefile/ShapefileEnginePluginInfo.C b/databases/Shapefile/ShapefileEnginePluginInfo.C index 91879835e3d..0ec7461bacd 100644 --- a/databases/Shapefile/ShapefileEnginePluginInfo.C +++ b/databases/Shapefile/ShapefileEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Shapefile_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Shapefile_GetEngineInfo() { return new ShapefileEnginePluginInfo; } diff --git a/databases/Shapefile/ShapefileMDServerPluginInfo.C b/databases/Shapefile/ShapefileMDServerPluginInfo.C index dc7649c7d3a..2d05d2f92f6 100644 --- a/databases/Shapefile/ShapefileMDServerPluginInfo.C +++ b/databases/Shapefile/ShapefileMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Shapefile_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Shapefile_GetMDServerInfo() { return new ShapefileMDServerPluginInfo; } diff --git a/databases/Shapefile/ShapefilePluginInfo.C b/databases/Shapefile/ShapefilePluginInfo.C index 12a43143d1b..a2d4a7231d5 100644 --- a/databases/Shapefile/ShapefilePluginInfo.C +++ b/databases/Shapefile/ShapefilePluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *ShapefileVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Shapefile_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Shapefile_GetGeneralInfo() { return new ShapefileGeneralPluginInfo; } diff --git a/databases/Silo/SiloCommonPluginInfo.C b/databases/Silo/SiloCommonPluginInfo.C index 14cc3a05d41..02b8510bb6b 100644 --- a/databases/Silo/SiloCommonPluginInfo.C +++ b/databases/Silo/SiloCommonPluginInfo.C @@ -36,18 +36,11 @@ * *****************************************************************************/ -#include - #include #include #include #include #include -#include -#include - -using namespace SiloDBOptions; -using std::string; // **************************************************************************** // Method: SiloCommonPluginInfo::GetDatabaseType @@ -55,8 +48,8 @@ using std::string; // Purpose: // Returns the type of a Silo database. // -// Programmer: meredith -- generated by xml2info -// Creation: Tue Feb 22 14:45:32 PST 2005 +// Programmer: generated by xml2info +// Creation: omitted // // **************************************************************************** DatabaseType @@ -66,7 +59,7 @@ SiloCommonPluginInfo::GetDatabaseType() } // **************************************************************************** -// Method: SiloCommonPluginInfo::SetUpSiloDatabase +// Method: SiloCommonPluginInfo::SetupDatabase // // Purpose: // Sets up a Silo database. @@ -78,8 +71,8 @@ SiloCommonPluginInfo::GetDatabaseType() // // Returns: A Silo database from list. // -// Programmer: meredith -- generated by xml2info -// Creation: Tue Feb 22 14:45:32 PST 2005 +// Programmer: generated by xml2info +// Creation: omitted // // **************************************************************************** avtDatabase * @@ -96,99 +89,35 @@ SiloCommonPluginInfo::SetupDatabase(const char *const *list, return new avtGenericDatabase(inter); } +// **************************************************************************** +// Method: SiloCommonPluginInfo::GetReadOptions +// +// Purpose: +// Gets the read options. +// +// Programmer: generated by xml2info +// Creation: omitted +// +// **************************************************************************** + DBOptionsAttributes * SiloCommonPluginInfo::GetReadOptions() const { return GetSiloReadOptions(); } - -DBOptionsAttributes * -SiloCommonPluginInfo::GetWriteOptions() const -{ - return GetSiloWriteOptions(); -} - // **************************************************************************** -// Method: SiloCommonPluginInfo::SetReadOptions +// Method: SiloCommonPluginInfo::GetWriteOptions +// +// Purpose: +// Gets the write options. // -// Purpose: Override default method so can provide a way of handling obsolete -// options. +// Programmer: generated by xml2info +// Creation: omitted // -// Programmer: Mark C. Miller -// Creation: Mon Mar 16 23:32:25 PDT 2009 // **************************************************************************** -void -SiloCommonPluginInfo::SetReadOptions(DBOptionsAttributes *opts) -{ - DBOptionsAttributes *defaultReadOptions = GetReadOptions(); - - for (int i = 0; i < opts->GetNumberOfOptions(); i++) - { - string optname = opts->GetName(i); - - // We only care about handling obsolete options here - if (!opts->IsObsolete(optname) && !defaultReadOptions->IsObsolete(optname)) - continue; - if (optname == SILO_RDOPT_IGNORE_SEXTS2) - { - int enumval = -1; - for (int j = 0; j < opts->GetNumberOfOptions(); j++) - { - if (opts->GetName(j) == SILO_RDOPT_IGNORE_SEXTS) - { - enumval = opts->GetEnum(SILO_RDOPT_IGNORE_SEXTS); - break; - } - } - if (enumval == -1 || enumval == 3) // Undef - { - debug1 << "Using old option \"" << SILO_RDOPT_IGNORE_SEXTS2 - << "\" to set new option \"" << SILO_RDOPT_IGNORE_SEXTS; - if (opts->GetBool(SILO_RDOPT_IGNORE_SEXTS2)) - { - debug1 << "\" to Always" << endl; - opts->SetEnum(SILO_RDOPT_IGNORE_SEXTS, 0); // Always - } - else - { - debug1 << "\" to Never" << endl; - opts->SetEnum(SILO_RDOPT_IGNORE_SEXTS, 2); // Never - } - opts->SetEnumStrings(SILO_RDOPT_IGNORE_SEXTS, defaultReadOptions->GetEnumStrings(SILO_RDOPT_IGNORE_SEXTS)); - } - } - else if (optname == SILO_RDOPT_IGNORE_DEXTS2) - { - int enumval = -1; - for (int j = 0; j < opts->GetNumberOfOptions(); j++) - { - if (opts->GetName(j) == SILO_RDOPT_IGNORE_DEXTS) - { - enumval = opts->GetEnum(SILO_RDOPT_IGNORE_DEXTS); - break; - } - } - if (enumval == -1 || enumval == 3) // Undef - { - debug1 << "Using old option \"" << SILO_RDOPT_IGNORE_DEXTS2 - << "\" to set new option \"" << SILO_RDOPT_IGNORE_DEXTS; - if (opts->GetBool(SILO_RDOPT_IGNORE_DEXTS2)) - { - debug1 << "\" to Always" << endl; - opts->SetEnum(SILO_RDOPT_IGNORE_DEXTS, 0); // Always - } - else - { - debug1 << "\" to Never" << endl; - opts->SetEnum(SILO_RDOPT_IGNORE_DEXTS, 2); // Never - } - opts->SetEnumStrings(SILO_RDOPT_IGNORE_DEXTS, defaultReadOptions->GetEnumStrings(SILO_RDOPT_IGNORE_DEXTS)); - } - } - } - - delete defaultReadOptions; - - readOptions = opts; +DBOptionsAttributes * +SiloCommonPluginInfo::GetWriteOptions() const +{ + return GetSiloWriteOptions(); } diff --git a/databases/Silo/SiloEnginePluginInfo.C b/databases/Silo/SiloEnginePluginInfo.C index 80bad6a585d..bb3f25d5837 100644 --- a/databases/Silo/SiloEnginePluginInfo.C +++ b/databases/Silo/SiloEnginePluginInfo.C @@ -39,10 +39,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Silo_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -53,7 +49,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Silo_GetEngineInfo() { return new SiloEnginePluginInfo; } diff --git a/databases/Silo/SiloMDServerPluginInfo.C b/databases/Silo/SiloMDServerPluginInfo.C index 7fc2cbebb61..48fc6bbde5a 100644 --- a/databases/Silo/SiloMDServerPluginInfo.C +++ b/databases/Silo/SiloMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Silo_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Silo_GetMDServerInfo() { return new SiloMDServerPluginInfo; } diff --git a/databases/Silo/SiloPluginInfo.C b/databases/Silo/SiloPluginInfo.C index 3162b58805e..a9755578220 100644 --- a/databases/Silo/SiloPluginInfo.C +++ b/databases/Silo/SiloPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *SiloVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Silo_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Silo_GetGeneralInfo() { return new SiloGeneralPluginInfo; } diff --git a/databases/Silo/SiloPluginInfo.h b/databases/Silo/SiloPluginInfo.h index b8ae4c5bf02..9fbff878c96 100644 --- a/databases/Silo/SiloPluginInfo.h +++ b/databases/Silo/SiloPluginInfo.h @@ -47,7 +47,6 @@ class avtDatabase; class avtDatabaseWriter; -class DBOptionsAttributes; // **************************************************************************** // Class: SiloDatabasePluginInfo @@ -57,8 +56,8 @@ class DBOptionsAttributes; // Portions are separated into pieces relevant to the appropriate // components of VisIt. // -// Programmer: miller -- generated by xml2info -// Creation: Fri Aug 3 22:28:26 PST 2007 +// Programmer: generated by xml2info +// Creation: omitted // // Modifications: // @@ -81,10 +80,8 @@ class SiloCommonPluginInfo : public virtual CommonDatabasePluginInfo, public vir virtual DatabaseType GetDatabaseType(); virtual avtDatabase *SetupDatabase(const char * const *list, int nList, int nBlock); - virtual DBOptionsAttributes *GetReadOptions() const; virtual DBOptionsAttributes *GetWriteOptions() const; - virtual void SetReadOptions(DBOptionsAttributes *); }; class SiloMDServerPluginInfo : public virtual MDServerDatabasePluginInfo, public virtual SiloCommonPluginInfo diff --git a/databases/SimV1/SimV1EnginePluginInfo.C b/databases/SimV1/SimV1EnginePluginInfo.C index 73140c5fe61..c9617322ce7 100644 --- a/databases/SimV1/SimV1EnginePluginInfo.C +++ b/databases/SimV1/SimV1EnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo SimV1_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* SimV1_GetEngineInfo() { return new SimV1EnginePluginInfo; } diff --git a/databases/SimV1/SimV1MDServerPluginInfo.C b/databases/SimV1/SimV1MDServerPluginInfo.C index 47cc427cc81..e3d26287013 100644 --- a/databases/SimV1/SimV1MDServerPluginInfo.C +++ b/databases/SimV1/SimV1MDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo SimV1_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* SimV1_GetMDServerInfo() { return new SimV1MDServerPluginInfo; } diff --git a/databases/SimV1/SimV1PluginInfo.C b/databases/SimV1/SimV1PluginInfo.C index 5837e506c94..7f8d028747d 100644 --- a/databases/SimV1/SimV1PluginInfo.C +++ b/databases/SimV1/SimV1PluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *SimV1VisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo SimV1_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* SimV1_GetGeneralInfo() { return new SimV1GeneralPluginInfo; } diff --git a/databases/SimV1Writer/SimV1WriterEnginePluginInfo.C b/databases/SimV1Writer/SimV1WriterEnginePluginInfo.C index d712f698d06..2549c5aa48b 100644 --- a/databases/SimV1Writer/SimV1WriterEnginePluginInfo.C +++ b/databases/SimV1Writer/SimV1WriterEnginePluginInfo.C @@ -39,10 +39,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo SimV1Writer_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -53,7 +49,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* SimV1Writer_GetEngineInfo() { return new SimV1WriterEnginePluginInfo; } diff --git a/databases/SimV1Writer/SimV1WriterMDServerPluginInfo.C b/databases/SimV1Writer/SimV1WriterMDServerPluginInfo.C index 82bb8df5dd2..468e26f5c71 100644 --- a/databases/SimV1Writer/SimV1WriterMDServerPluginInfo.C +++ b/databases/SimV1Writer/SimV1WriterMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo SimV1Writer_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* SimV1Writer_GetMDServerInfo() { return new SimV1WriterMDServerPluginInfo; } diff --git a/databases/SimV1Writer/SimV1WriterPluginInfo.C b/databases/SimV1Writer/SimV1WriterPluginInfo.C index ca8dfd3305c..270497beb8b 100644 --- a/databases/SimV1Writer/SimV1WriterPluginInfo.C +++ b/databases/SimV1Writer/SimV1WriterPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *SimV1WriterVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo SimV1Writer_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* SimV1Writer_GetGeneralInfo() { return new SimV1WriterGeneralPluginInfo; } diff --git a/databases/SimV2/SimV2EnginePluginInfo.C b/databases/SimV2/SimV2EnginePluginInfo.C index e692b7f7269..65083ad8e22 100644 --- a/databases/SimV2/SimV2EnginePluginInfo.C +++ b/databases/SimV2/SimV2EnginePluginInfo.C @@ -39,10 +39,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo SimV2_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -53,7 +49,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* SimV2_GetEngineInfo() { return new SimV2EnginePluginInfo; } diff --git a/databases/SimV2/SimV2MDServerPluginInfo.C b/databases/SimV2/SimV2MDServerPluginInfo.C index 538ee06a264..3d7e0307011 100644 --- a/databases/SimV2/SimV2MDServerPluginInfo.C +++ b/databases/SimV2/SimV2MDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo SimV2_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* SimV2_GetMDServerInfo() { return new SimV2MDServerPluginInfo; } diff --git a/databases/SimV2/SimV2PluginInfo.C b/databases/SimV2/SimV2PluginInfo.C index 3184a91a262..ba8a40cc00a 100644 --- a/databases/SimV2/SimV2PluginInfo.C +++ b/databases/SimV2/SimV2PluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *SimV2VisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo SimV2_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* SimV2_GetGeneralInfo() { return new SimV2GeneralPluginInfo; } diff --git a/databases/Spheral/SpheralEnginePluginInfo.C b/databases/Spheral/SpheralEnginePluginInfo.C index 9347c39ce3b..bbe5957bf08 100644 --- a/databases/Spheral/SpheralEnginePluginInfo.C +++ b/databases/Spheral/SpheralEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Spheral_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Spheral_GetEngineInfo() { return new SpheralEnginePluginInfo; } diff --git a/databases/Spheral/SpheralMDServerPluginInfo.C b/databases/Spheral/SpheralMDServerPluginInfo.C index 13ff0d38d9c..064e1224da0 100644 --- a/databases/Spheral/SpheralMDServerPluginInfo.C +++ b/databases/Spheral/SpheralMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Spheral_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Spheral_GetMDServerInfo() { return new SpheralMDServerPluginInfo; } diff --git a/databases/Spheral/SpheralPluginInfo.C b/databases/Spheral/SpheralPluginInfo.C index f320fcf2104..656c2e53aba 100644 --- a/databases/Spheral/SpheralPluginInfo.C +++ b/databases/Spheral/SpheralPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *SpheralVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Spheral_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Spheral_GetGeneralInfo() { return new SpheralGeneralPluginInfo; } diff --git a/databases/StreamGhostTest/StreamGhostTestEnginePluginInfo.C b/databases/StreamGhostTest/StreamGhostTestEnginePluginInfo.C index 8df77c55495..36a0e296107 100644 --- a/databases/StreamGhostTest/StreamGhostTestEnginePluginInfo.C +++ b/databases/StreamGhostTest/StreamGhostTestEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo StreamGhostTest_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* StreamGhostTest_GetEngineInfo() { return new StreamGhostTestEnginePluginInfo; } diff --git a/databases/StreamGhostTest/StreamGhostTestMDServerPluginInfo.C b/databases/StreamGhostTest/StreamGhostTestMDServerPluginInfo.C index fcc884568b1..7920f4b72a2 100644 --- a/databases/StreamGhostTest/StreamGhostTestMDServerPluginInfo.C +++ b/databases/StreamGhostTest/StreamGhostTestMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo StreamGhostTest_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* StreamGhostTest_GetMDServerInfo() { return new StreamGhostTestMDServerPluginInfo; } diff --git a/databases/StreamGhostTest/StreamGhostTestPluginInfo.C b/databases/StreamGhostTest/StreamGhostTestPluginInfo.C index fed40df2f39..266fbd98207 100644 --- a/databases/StreamGhostTest/StreamGhostTestPluginInfo.C +++ b/databases/StreamGhostTest/StreamGhostTestPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *StreamGhostTestVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo StreamGhostTest_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* StreamGhostTest_GetGeneralInfo() { return new StreamGhostTestGeneralPluginInfo; } diff --git a/databases/TFT/TFTEnginePluginInfo.C b/databases/TFT/TFTEnginePluginInfo.C index 2f9cf3244f9..6fcf290d411 100644 --- a/databases/TFT/TFTEnginePluginInfo.C +++ b/databases/TFT/TFTEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo TFT_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* TFT_GetEngineInfo() { return new TFTEnginePluginInfo; } diff --git a/databases/TFT/TFTMDServerPluginInfo.C b/databases/TFT/TFTMDServerPluginInfo.C index 310a9422e5b..cda8c056e72 100644 --- a/databases/TFT/TFTMDServerPluginInfo.C +++ b/databases/TFT/TFTMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo TFT_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* TFT_GetMDServerInfo() { return new TFTMDServerPluginInfo; } diff --git a/databases/TFT/TFTPluginInfo.C b/databases/TFT/TFTPluginInfo.C index 7094f495ab6..9626da8b2b4 100644 --- a/databases/TFT/TFTPluginInfo.C +++ b/databases/TFT/TFTPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *TFTVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo TFT_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* TFT_GetGeneralInfo() { return new TFTGeneralPluginInfo; } diff --git a/databases/TSurf/TSurfEnginePluginInfo.C b/databases/TSurf/TSurfEnginePluginInfo.C index 3f60ff08621..95b00d5c3b3 100644 --- a/databases/TSurf/TSurfEnginePluginInfo.C +++ b/databases/TSurf/TSurfEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo TSurf_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* TSurf_GetEngineInfo() { return new TSurfEnginePluginInfo; } diff --git a/databases/TSurf/TSurfMDServerPluginInfo.C b/databases/TSurf/TSurfMDServerPluginInfo.C index 6505782b244..e9ec818dc2f 100644 --- a/databases/TSurf/TSurfMDServerPluginInfo.C +++ b/databases/TSurf/TSurfMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo TSurf_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* TSurf_GetMDServerInfo() { return new TSurfMDServerPluginInfo; } diff --git a/databases/TSurf/TSurfPluginInfo.C b/databases/TSurf/TSurfPluginInfo.C index 1ec2d359f3b..729493f44b6 100644 --- a/databases/TSurf/TSurfPluginInfo.C +++ b/databases/TSurf/TSurfPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *TSurfVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo TSurf_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* TSurf_GetGeneralInfo() { return new TSurfGeneralPluginInfo; } diff --git a/databases/Tecplot/TecplotEnginePluginInfo.C b/databases/Tecplot/TecplotEnginePluginInfo.C index f64c6ba2e71..4b30f866826 100644 --- a/databases/Tecplot/TecplotEnginePluginInfo.C +++ b/databases/Tecplot/TecplotEnginePluginInfo.C @@ -39,10 +39,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Tecplot_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -53,7 +49,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Tecplot_GetEngineInfo() { return new TecplotEnginePluginInfo; } diff --git a/databases/Tecplot/TecplotMDServerPluginInfo.C b/databases/Tecplot/TecplotMDServerPluginInfo.C index 0f8f4cdfb2c..a38ad6b11e0 100644 --- a/databases/Tecplot/TecplotMDServerPluginInfo.C +++ b/databases/Tecplot/TecplotMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Tecplot_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Tecplot_GetMDServerInfo() { return new TecplotMDServerPluginInfo; } diff --git a/databases/Tecplot/TecplotPluginInfo.C b/databases/Tecplot/TecplotPluginInfo.C index 8023c176d17..678cf1b01da 100644 --- a/databases/Tecplot/TecplotPluginInfo.C +++ b/databases/Tecplot/TecplotPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *TecplotVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Tecplot_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Tecplot_GetGeneralInfo() { return new TecplotGeneralPluginInfo; } diff --git a/databases/Tetrad/TetradEnginePluginInfo.C b/databases/Tetrad/TetradEnginePluginInfo.C index 2ab61c86e43..91cea6b51cf 100644 --- a/databases/Tetrad/TetradEnginePluginInfo.C +++ b/databases/Tetrad/TetradEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Tetrad_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Tetrad_GetEngineInfo() { return new TetradEnginePluginInfo; } diff --git a/databases/Tetrad/TetradMDServerPluginInfo.C b/databases/Tetrad/TetradMDServerPluginInfo.C index 07439bd70a9..21d1f60d8ad 100644 --- a/databases/Tetrad/TetradMDServerPluginInfo.C +++ b/databases/Tetrad/TetradMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Tetrad_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Tetrad_GetMDServerInfo() { return new TetradMDServerPluginInfo; } diff --git a/databases/Tetrad/TetradPluginInfo.C b/databases/Tetrad/TetradPluginInfo.C index 91846a04798..6c5ce536b60 100644 --- a/databases/Tetrad/TetradPluginInfo.C +++ b/databases/Tetrad/TetradPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *TetradVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Tetrad_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Tetrad_GetGeneralInfo() { return new TetradGeneralPluginInfo; } diff --git a/databases/TimeVaryingExodus/TimeVaryingExodusEnginePluginInfo.C b/databases/TimeVaryingExodus/TimeVaryingExodusEnginePluginInfo.C index 5bd17fd2d41..663e63aa743 100644 --- a/databases/TimeVaryingExodus/TimeVaryingExodusEnginePluginInfo.C +++ b/databases/TimeVaryingExodus/TimeVaryingExodusEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo TimeVaryingExodus_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* TimeVaryingExodus_GetEngineInfo() { return new TimeVaryingExodusEnginePluginInfo; } diff --git a/databases/TimeVaryingExodus/TimeVaryingExodusMDServerPluginInfo.C b/databases/TimeVaryingExodus/TimeVaryingExodusMDServerPluginInfo.C index 1120f6c2a52..fc7e64930af 100644 --- a/databases/TimeVaryingExodus/TimeVaryingExodusMDServerPluginInfo.C +++ b/databases/TimeVaryingExodus/TimeVaryingExodusMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo TimeVaryingExodus_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* TimeVaryingExodus_GetMDServerInfo() { return new TimeVaryingExodusMDServerPluginInfo; } diff --git a/databases/TimeVaryingExodus/TimeVaryingExodusPluginInfo.C b/databases/TimeVaryingExodus/TimeVaryingExodusPluginInfo.C index d401bc575d6..6b60e4ada80 100644 --- a/databases/TimeVaryingExodus/TimeVaryingExodusPluginInfo.C +++ b/databases/TimeVaryingExodus/TimeVaryingExodusPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *TimeVaryingExodusVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo TimeVaryingExodus_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* TimeVaryingExodus_GetGeneralInfo() { return new TimeVaryingExodusGeneralPluginInfo; } diff --git a/databases/UNIC/UNICEnginePluginInfo.C b/databases/UNIC/UNICEnginePluginInfo.C index 79b04c57dba..94d656e720e 100644 --- a/databases/UNIC/UNICEnginePluginInfo.C +++ b/databases/UNIC/UNICEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo UNIC_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* UNIC_GetEngineInfo() { return new UNICEnginePluginInfo; } diff --git a/databases/UNIC/UNICMDServerPluginInfo.C b/databases/UNIC/UNICMDServerPluginInfo.C index 2d1709cab13..4f7d43a2c73 100644 --- a/databases/UNIC/UNICMDServerPluginInfo.C +++ b/databases/UNIC/UNICMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo UNIC_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* UNIC_GetMDServerInfo() { return new UNICMDServerPluginInfo; } diff --git a/databases/UNIC/UNICPluginInfo.C b/databases/UNIC/UNICPluginInfo.C index 44aca4cd6e5..51fdeaec0e1 100644 --- a/databases/UNIC/UNICPluginInfo.C +++ b/databases/UNIC/UNICPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *UNICVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo UNIC_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* UNIC_GetGeneralInfo() { return new UNICGeneralPluginInfo; } diff --git a/databases/VASP/VASPEnginePluginInfo.C b/databases/VASP/VASPEnginePluginInfo.C index a451de099a0..4fe7ecdac76 100644 --- a/databases/VASP/VASPEnginePluginInfo.C +++ b/databases/VASP/VASPEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo VASP_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* VASP_GetEngineInfo() { return new VASPEnginePluginInfo; } diff --git a/databases/VASP/VASPMDServerPluginInfo.C b/databases/VASP/VASPMDServerPluginInfo.C index 79acdd58e9e..08fea77283e 100644 --- a/databases/VASP/VASPMDServerPluginInfo.C +++ b/databases/VASP/VASPMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo VASP_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* VASP_GetMDServerInfo() { return new VASPMDServerPluginInfo; } diff --git a/databases/VASP/VASPPluginInfo.C b/databases/VASP/VASPPluginInfo.C index fb2cf13ae53..904b5d607a2 100644 --- a/databases/VASP/VASPPluginInfo.C +++ b/databases/VASP/VASPPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *VASPVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo VASP_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* VASP_GetGeneralInfo() { return new VASPGeneralPluginInfo; } diff --git a/databases/VLI/VLIEnginePluginInfo.C b/databases/VLI/VLIEnginePluginInfo.C index 9cce54eacf8..5df50d9cf14 100644 --- a/databases/VLI/VLIEnginePluginInfo.C +++ b/databases/VLI/VLIEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo VLI_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* VLI_GetEngineInfo() { return new VLIEnginePluginInfo; } diff --git a/databases/VLI/VLIMDServerPluginInfo.C b/databases/VLI/VLIMDServerPluginInfo.C index e6edc187a78..65b33dcd71c 100644 --- a/databases/VLI/VLIMDServerPluginInfo.C +++ b/databases/VLI/VLIMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo VLI_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* VLI_GetMDServerInfo() { return new VLIMDServerPluginInfo; } diff --git a/databases/VLI/VLIPluginInfo.C b/databases/VLI/VLIPluginInfo.C index 1598fc3db59..303221dfb39 100644 --- a/databases/VLI/VLIPluginInfo.C +++ b/databases/VLI/VLIPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *VLIVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo VLI_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* VLI_GetGeneralInfo() { return new VLIGeneralPluginInfo; } diff --git a/databases/VTK/VTKEnginePluginInfo.C b/databases/VTK/VTKEnginePluginInfo.C index 21f11fe92bc..e362b642235 100644 --- a/databases/VTK/VTKEnginePluginInfo.C +++ b/databases/VTK/VTKEnginePluginInfo.C @@ -39,10 +39,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo VTK_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -53,7 +49,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* VTK_GetEngineInfo() { return new VTKEnginePluginInfo; } diff --git a/databases/VTK/VTKMDServerPluginInfo.C b/databases/VTK/VTKMDServerPluginInfo.C index c580386e6fb..4bcd7b0d0f2 100644 --- a/databases/VTK/VTKMDServerPluginInfo.C +++ b/databases/VTK/VTKMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo VTK_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* VTK_GetMDServerInfo() { return new VTKMDServerPluginInfo; } diff --git a/databases/VTK/VTKPluginInfo.C b/databases/VTK/VTKPluginInfo.C index 46c9bffa44c..58c6a3dac1c 100644 --- a/databases/VTK/VTKPluginInfo.C +++ b/databases/VTK/VTKPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *VTKVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo VTK_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* VTK_GetGeneralInfo() { return new VTKGeneralPluginInfo; } diff --git a/databases/ViSUS/ViSUSEnginePluginInfo.C b/databases/ViSUS/ViSUSEnginePluginInfo.C index 3a83d6f6eb3..e2bc28c720b 100644 --- a/databases/ViSUS/ViSUSEnginePluginInfo.C +++ b/databases/ViSUS/ViSUSEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo ViSUS_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* ViSUS_GetEngineInfo() { return new ViSUSEnginePluginInfo; } diff --git a/databases/ViSUS/ViSUSMDServerPluginInfo.C b/databases/ViSUS/ViSUSMDServerPluginInfo.C index debf28562a6..9981793cc0c 100644 --- a/databases/ViSUS/ViSUSMDServerPluginInfo.C +++ b/databases/ViSUS/ViSUSMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo ViSUS_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* ViSUS_GetMDServerInfo() { return new ViSUSMDServerPluginInfo; } diff --git a/databases/ViSUS/ViSUSPluginInfo.C b/databases/ViSUS/ViSUSPluginInfo.C index 7ebe8693c7a..814695667ca 100644 --- a/databases/ViSUS/ViSUSPluginInfo.C +++ b/databases/ViSUS/ViSUSPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *ViSUSVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo ViSUS_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* ViSUS_GetGeneralInfo() { return new ViSUSGeneralPluginInfo; } diff --git a/databases/Vis5D/Vis5DEnginePluginInfo.C b/databases/Vis5D/Vis5DEnginePluginInfo.C index 0a67bd8e636..5fcb7c94232 100644 --- a/databases/Vis5D/Vis5DEnginePluginInfo.C +++ b/databases/Vis5D/Vis5DEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Vis5D_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Vis5D_GetEngineInfo() { return new Vis5DEnginePluginInfo; } diff --git a/databases/Vis5D/Vis5DMDServerPluginInfo.C b/databases/Vis5D/Vis5DMDServerPluginInfo.C index dc29f14c0f6..a7cedb123db 100644 --- a/databases/Vis5D/Vis5DMDServerPluginInfo.C +++ b/databases/Vis5D/Vis5DMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Vis5D_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Vis5D_GetMDServerInfo() { return new Vis5DMDServerPluginInfo; } diff --git a/databases/Vis5D/Vis5DPluginInfo.C b/databases/Vis5D/Vis5DPluginInfo.C index 37fb69c84ab..4ee06a11f0d 100644 --- a/databases/Vis5D/Vis5DPluginInfo.C +++ b/databases/Vis5D/Vis5DPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *Vis5DVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Vis5D_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Vis5D_GetGeneralInfo() { return new Vis5DGeneralPluginInfo; } diff --git a/databases/Vista/VistaEnginePluginInfo.C b/databases/Vista/VistaEnginePluginInfo.C index b427898867e..024b37e37ff 100644 --- a/databases/Vista/VistaEnginePluginInfo.C +++ b/databases/Vista/VistaEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Vista_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Vista_GetEngineInfo() { return new VistaEnginePluginInfo; } diff --git a/databases/Vista/VistaMDServerPluginInfo.C b/databases/Vista/VistaMDServerPluginInfo.C index 2edf6c30bd5..d00376c2e13 100644 --- a/databases/Vista/VistaMDServerPluginInfo.C +++ b/databases/Vista/VistaMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Vista_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Vista_GetMDServerInfo() { return new VistaMDServerPluginInfo; } diff --git a/databases/Vista/VistaPluginInfo.C b/databases/Vista/VistaPluginInfo.C index c3a332c058c..f1298514273 100644 --- a/databases/Vista/VistaPluginInfo.C +++ b/databases/Vista/VistaPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *VistaVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Vista_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Vista_GetGeneralInfo() { return new VistaGeneralPluginInfo; } diff --git a/databases/Vs/VsEnginePluginInfo.C b/databases/Vs/VsEnginePluginInfo.C index f32d3b5f638..779bb9aa904 100644 --- a/databases/Vs/VsEnginePluginInfo.C +++ b/databases/Vs/VsEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo Vs_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" EngineDatabasePluginInfo* GetEngineInfo() +extern "C" EngineDatabasePluginInfo* Vs_GetEngineInfo() { return new VsEnginePluginInfo; } diff --git a/databases/Vs/VsMDServerPluginInfo.C b/databases/Vs/VsMDServerPluginInfo.C index 8b3dde6cd33..c26cbe13358 100644 --- a/databases/Vs/VsMDServerPluginInfo.C +++ b/databases/Vs/VsMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Vs_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" MDServerDatabasePluginInfo* Vs_GetMDServerInfo() { return new VsMDServerPluginInfo; } diff --git a/databases/Vs/VsPluginInfo.C b/databases/Vs/VsPluginInfo.C index d89cda09fe4..60a29e51c44 100644 --- a/databases/Vs/VsPluginInfo.C +++ b/databases/Vs/VsPluginInfo.C @@ -46,26 +46,7 @@ #include #include -//Visit 2.0.0 and later use VISIT_VERSION instead of VERSION -#ifdef VISIT_VERSION -//VISIT 2.0.0 code - #if defined(__APPLE__) - extern "C" const char *VsVisItPluginVersion = VISIT_VERSION; - #else - extern "C" const char *VisItPluginVersion = VISIT_VERSION; - #endif -#else -//Visit 1.11.2 and earlier code - #if defined(__APPLE__) - extern "C" const char *VsVisItPluginVersion = VERSION; - #else - extern "C" const char *VisItPluginVersion = VERSION; - #endif -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Vs_GetGeneralInfo -#endif +extern "C" const char *VsVisItPluginVersion = VISIT_VERSION; // **************************************************************************** // Function: GetGeneralInfo @@ -77,7 +58,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" GeneralDatabasePluginInfo* Vs_GetGeneralInfo() { return new VsGeneralPluginInfo; } diff --git a/databases/WavefrontOBJ/WavefrontOBJEnginePluginInfo.C b/databases/WavefrontOBJ/WavefrontOBJEnginePluginInfo.C index bf0cca54ba8..adec51e136a 100644 --- a/databases/WavefrontOBJ/WavefrontOBJEnginePluginInfo.C +++ b/databases/WavefrontOBJ/WavefrontOBJEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo WavefrontOBJ_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* WavefrontOBJ_GetEngineInfo() { return new WavefrontOBJEnginePluginInfo; } diff --git a/databases/WavefrontOBJ/WavefrontOBJMDServerPluginInfo.C b/databases/WavefrontOBJ/WavefrontOBJMDServerPluginInfo.C index 62d5e55f894..c109af89644 100644 --- a/databases/WavefrontOBJ/WavefrontOBJMDServerPluginInfo.C +++ b/databases/WavefrontOBJ/WavefrontOBJMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo WavefrontOBJ_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* WavefrontOBJ_GetMDServerInfo() { return new WavefrontOBJMDServerPluginInfo; } diff --git a/databases/WavefrontOBJ/WavefrontOBJPluginInfo.C b/databases/WavefrontOBJ/WavefrontOBJPluginInfo.C index d8cfbc44d8e..40aa176b391 100644 --- a/databases/WavefrontOBJ/WavefrontOBJPluginInfo.C +++ b/databases/WavefrontOBJ/WavefrontOBJPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *WavefrontOBJVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo WavefrontOBJ_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* WavefrontOBJ_GetGeneralInfo() { return new WavefrontOBJGeneralPluginInfo; } diff --git a/databases/XDMF/XDMFEnginePluginInfo.C b/databases/XDMF/XDMFEnginePluginInfo.C index 443df7e3cdc..48365d692aa 100644 --- a/databases/XDMF/XDMFEnginePluginInfo.C +++ b/databases/XDMF/XDMFEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo XDMF_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* XDMF_GetEngineInfo() { return new XDMFEnginePluginInfo; } diff --git a/databases/XDMF/XDMFMDServerPluginInfo.C b/databases/XDMF/XDMFMDServerPluginInfo.C index a045e1c7295..26c949ab3d0 100644 --- a/databases/XDMF/XDMFMDServerPluginInfo.C +++ b/databases/XDMF/XDMFMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo XDMF_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* XDMF_GetMDServerInfo() { return new XDMFMDServerPluginInfo; } diff --git a/databases/XDMF/XDMFPluginInfo.C b/databases/XDMF/XDMFPluginInfo.C index e71371d3af5..626e3018463 100644 --- a/databases/XDMF/XDMFPluginInfo.C +++ b/databases/XDMF/XDMFPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *XDMFVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo XDMF_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* XDMF_GetGeneralInfo() { return new XDMFGeneralPluginInfo; } diff --git a/databases/XYZ/XYZEnginePluginInfo.C b/databases/XYZ/XYZEnginePluginInfo.C index f9826a8f204..c0ac83a5a8e 100644 --- a/databases/XYZ/XYZEnginePluginInfo.C +++ b/databases/XYZ/XYZEnginePluginInfo.C @@ -39,10 +39,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo XYZ_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -53,7 +49,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* XYZ_GetEngineInfo() { return new XYZEnginePluginInfo; } diff --git a/databases/XYZ/XYZMDServerPluginInfo.C b/databases/XYZ/XYZMDServerPluginInfo.C index 467b7fcba2e..10be239563d 100644 --- a/databases/XYZ/XYZMDServerPluginInfo.C +++ b/databases/XYZ/XYZMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo XYZ_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* XYZ_GetMDServerInfo() { return new XYZMDServerPluginInfo; } diff --git a/databases/XYZ/XYZPluginInfo.C b/databases/XYZ/XYZPluginInfo.C index 1db9db43c45..7b758d18af9 100644 --- a/databases/XYZ/XYZPluginInfo.C +++ b/databases/XYZ/XYZPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *XYZVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo XYZ_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* XYZ_GetGeneralInfo() { return new XYZGeneralPluginInfo; } diff --git a/databases/Xmdv/XmdvEnginePluginInfo.C b/databases/Xmdv/XmdvEnginePluginInfo.C index e3b1adc1ae8..6b6aea8c777 100644 --- a/databases/Xmdv/XmdvEnginePluginInfo.C +++ b/databases/Xmdv/XmdvEnginePluginInfo.C @@ -39,10 +39,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Xmdv_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -53,7 +49,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* Xmdv_GetEngineInfo() { return new XmdvEnginePluginInfo; } diff --git a/databases/Xmdv/XmdvMDServerPluginInfo.C b/databases/Xmdv/XmdvMDServerPluginInfo.C index f75d4595438..ef91aca1bd3 100644 --- a/databases/Xmdv/XmdvMDServerPluginInfo.C +++ b/databases/Xmdv/XmdvMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo Xmdv_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* Xmdv_GetMDServerInfo() { return new XmdvMDServerPluginInfo; } diff --git a/databases/Xmdv/XmdvPluginInfo.C b/databases/Xmdv/XmdvPluginInfo.C index 90cee53f924..5eccd1578f5 100644 --- a/databases/Xmdv/XmdvPluginInfo.C +++ b/databases/Xmdv/XmdvPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *XmdvVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Xmdv_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* Xmdv_GetGeneralInfo() { return new XmdvGeneralPluginInfo; } diff --git a/databases/ZeusMP/ZeusMPEnginePluginInfo.C b/databases/ZeusMP/ZeusMPEnginePluginInfo.C index bfbe13b823a..db3de8c7d79 100644 --- a/databases/ZeusMP/ZeusMPEnginePluginInfo.C +++ b/databases/ZeusMP/ZeusMPEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo ZeusMP_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* ZeusMP_GetEngineInfo() { return new ZeusMPEnginePluginInfo; } diff --git a/databases/ZeusMP/ZeusMPMDServerPluginInfo.C b/databases/ZeusMP/ZeusMPMDServerPluginInfo.C index 60c65edb737..e8ea2a99ab0 100644 --- a/databases/ZeusMP/ZeusMPMDServerPluginInfo.C +++ b/databases/ZeusMP/ZeusMPMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo ZeusMP_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* ZeusMP_GetMDServerInfo() { return new ZeusMPMDServerPluginInfo; } diff --git a/databases/ZeusMP/ZeusMPPluginInfo.C b/databases/ZeusMP/ZeusMPPluginInfo.C index 592d9244ff4..da511a1b29c 100644 --- a/databases/ZeusMP/ZeusMPPluginInfo.C +++ b/databases/ZeusMP/ZeusMPPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *ZeusMPVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo ZeusMP_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* ZeusMP_GetGeneralInfo() { return new ZeusMPGeneralPluginInfo; } diff --git a/databases/ZipWrapper/ZipWrapperEnginePluginInfo.C b/databases/ZipWrapper/ZipWrapperEnginePluginInfo.C index dee99b7f6bd..af7130ebde8 100644 --- a/databases/ZipWrapper/ZipWrapperEnginePluginInfo.C +++ b/databases/ZipWrapper/ZipWrapperEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo ZipWrapper_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* ZipWrapper_GetEngineInfo() { return new ZipWrapperEnginePluginInfo; } diff --git a/databases/ZipWrapper/ZipWrapperMDServerPluginInfo.C b/databases/ZipWrapper/ZipWrapperMDServerPluginInfo.C index ebbae1076bd..f49d111e036 100644 --- a/databases/ZipWrapper/ZipWrapperMDServerPluginInfo.C +++ b/databases/ZipWrapper/ZipWrapperMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo ZipWrapper_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* ZipWrapper_GetMDServerInfo() { return new ZipWrapperMDServerPluginInfo; } diff --git a/databases/ZipWrapper/ZipWrapperPluginInfo.C b/databases/ZipWrapper/ZipWrapperPluginInfo.C index a58e6d35ecc..e941b88764f 100644 --- a/databases/ZipWrapper/ZipWrapperPluginInfo.C +++ b/databases/ZipWrapper/ZipWrapperPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *ZipWrapperVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo ZipWrapper_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* ZipWrapper_GetGeneralInfo() { return new ZipWrapperGeneralPluginInfo; } diff --git a/databases/paraDIS/paraDISEnginePluginInfo.C b/databases/paraDIS/paraDISEnginePluginInfo.C index 91704ea3a2e..075e32ce17a 100644 --- a/databases/paraDIS/paraDISEnginePluginInfo.C +++ b/databases/paraDIS/paraDISEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo paraDIS_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* paraDIS_GetEngineInfo() { return new paraDISEnginePluginInfo; } diff --git a/databases/paraDIS/paraDISMDServerPluginInfo.C b/databases/paraDIS/paraDISMDServerPluginInfo.C index 3ce2d9b9141..7ca4aa6a730 100644 --- a/databases/paraDIS/paraDISMDServerPluginInfo.C +++ b/databases/paraDIS/paraDISMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo paraDIS_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* paraDIS_GetMDServerInfo() { return new paraDISMDServerPluginInfo; } diff --git a/databases/paraDIS/paraDISPluginInfo.C b/databases/paraDIS/paraDISPluginInfo.C index 9f38008c648..d059d2e4893 100644 --- a/databases/paraDIS/paraDISPluginInfo.C +++ b/databases/paraDIS/paraDISPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *paraDISVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo paraDIS_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* paraDIS_GetGeneralInfo() { return new paraDISGeneralPluginInfo; } diff --git a/databases/paraDIS_tecplot/paraDIS_tecplotEnginePluginInfo.C b/databases/paraDIS_tecplot/paraDIS_tecplotEnginePluginInfo.C index 0cfcc8afe6c..aafb6b7c9ef 100644 --- a/databases/paraDIS_tecplot/paraDIS_tecplotEnginePluginInfo.C +++ b/databases/paraDIS_tecplot/paraDIS_tecplotEnginePluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetEngineInfo paraDIS_tecplot_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo() +extern "C" DBP_EXPORT EngineDatabasePluginInfo* paraDIS_tecplot_GetEngineInfo() { return new paraDIS_tecplotEnginePluginInfo; } diff --git a/databases/paraDIS_tecplot/paraDIS_tecplotMDServerPluginInfo.C b/databases/paraDIS_tecplot/paraDIS_tecplotMDServerPluginInfo.C index 7c655e9756e..4fcc0437355 100644 --- a/databases/paraDIS_tecplot/paraDIS_tecplotMDServerPluginInfo.C +++ b/databases/paraDIS_tecplot/paraDIS_tecplotMDServerPluginInfo.C @@ -38,10 +38,6 @@ #include -#if defined(__APPLE__) -#define GetMDServerInfo paraDIS_tecplot_GetMDServerInfo -#endif - // **************************************************************************** // Function: GetMDServerInfo // @@ -52,7 +48,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo() +extern "C" DBP_EXPORT MDServerDatabasePluginInfo* paraDIS_tecplot_GetMDServerInfo() { return new paraDIS_tecplotMDServerPluginInfo; } diff --git a/databases/paraDIS_tecplot/paraDIS_tecplotPluginInfo.C b/databases/paraDIS_tecplot/paraDIS_tecplotPluginInfo.C index 907fc9e5176..8351483e361 100644 --- a/databases/paraDIS_tecplot/paraDIS_tecplotPluginInfo.C +++ b/databases/paraDIS_tecplot/paraDIS_tecplotPluginInfo.C @@ -43,15 +43,7 @@ #include #include -#if defined(__APPLE__) extern "C" DBP_EXPORT const char *paraDIS_tecplotVisItPluginVersion = VISIT_VERSION; -#else -extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo paraDIS_tecplot_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -63,7 +55,7 @@ extern "C" DBP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo() +extern "C" DBP_EXPORT GeneralDatabasePluginInfo* paraDIS_tecplot_GetGeneralInfo() { return new paraDIS_tecplotGeneralPluginInfo; } diff --git a/engine/Makefile.in b/engine/Makefile.in index ff074a8d8f9..5ddffe8c981 100644 --- a/engine/Makefile.in +++ b/engine/Makefile.in @@ -46,6 +46,9 @@ # Brad Whitlock, Wed Nov 4 12:08:53 PST 2009 # I removed parstate lib. # +# Hank Childs, Thu Nov 12 13:30:06 PST 2009 +# Added ssl directory for static links. +# ############################################################################## @SET_MAKE@ @@ -53,9 +56,10 @@ @DIRTARGETS@ @MPI_CC@ @MPI_CXX@ +STATIC_LINK=ssl # subdirectory `main' must be last. -SUBDIRS=rpc proxy main +SUBDIRS=rpc proxy @STATIC_LINK@ main message: @echo diff --git a/engine/main/Makefile.in b/engine/main/Makefile.in index c7603e7b5e7..84738e3804c 100644 --- a/engine/main/Makefile.in +++ b/engine/main/Makefile.in @@ -292,6 +292,9 @@ # Brad Whitlock, Wed Nov 4 12:13:28 PST 2009 # I moved MPIXfer to this directory. # +# Hank Childs, Tue Nov 10 05:18:33 PST 2009 +# Reorganize libraries to help with static linking. +# ############################################################################## ## @@ -301,28 +304,38 @@ @VARIABLES@ @MPI_CC@ @MPI_CXX@ +STATIC_LINK=-lenginessl \ + -L../../plugins/databases -lESiloDatabase_ser -lEVTKDatabase_ser \ + -L../../plugins/operators -lEBoundaryOpOperator_ser -lEBoxOperator_ser -lEClipOperator_ser -lEConeOperator_ser -lECoordSwapOperator_ser -lECreateBondsOperator_ser -lECylinderOperator_ser -lEDeferExpressionOperator_ser -lEDisplaceOperator_ser -lEDualMeshOperator_ser -lEElevateOperator_ser -lEExternalSurfaceOperator_ser -lEIndexSelectOperator_ser -lEInverseGhostZoneOperator_ser -lEIsosurfaceOperator_ser -lEIsovolumeOperator_ser -lELineoutOperator_ser -lEOnionPeelOperator_ser -lEPDFOperator_ser -lEPersistentParticlesOperator_ser -lEProjectOperator_ser -lEReflectOperator_ser -lEReplicateOperator_ser -lEResampleOperator_ser -lERevolveOperator_ser -lESliceOperator_ser -lESphereSliceOperator_ser -lEThreeSliceOperator_ser -lEThresholdOperator_ser -lETransformOperator_ser -lETubeOperator_ser \ + -L../../plugins/plots -lEBoundaryPlot_ser -lEContourPlot_ser -lECurvePlot_ser -lEFilledBoundaryPlot_ser -lEHistogramPlot_ser -lELabelPlot_ser -lEMeshPlot_ser -lEMoleculePlot_ser -lEMultiCurvePlot_ser -lEParallelCoordinatesPlot_ser -lEPseudocolorPlot_ser -lEScatterPlot_ser -lESpreadsheetPlot_ser -lEStreamlinePlot_ser -lESubsetPlot_ser -lESurfacePlot_ser -lETensorPlot_ser -lETruecolorPlot_ser -lEVectorPlot_ser -lEVolumePlot_ser +STATIC_LINK_PAR=-lenginessl \ + -L../../plugins/databases -lESiloDatabase_par -lEVTKDatabase_par \ + -L../../plugins/operators -lEBoundaryOpOperator_par -lEBoxOperator_par -lEClipOperator_par -lEConeOperator_par -lECoordSwapOperator_par -lECreateBondsOperator_par -lECylinderOperator_par -lEDeferExpressionOperator_par -lEDisplaceOperator_par -lEDualMeshOperator_par -lEElevateOperator_par -lEExternalSurfaceOperator_par -lEIndexSelectOperator_par -lEInverseGhostZoneOperator_par -lEIsosurfaceOperator_par -lEIsovolumeOperator_par -lELineoutOperator_par -lEOnionPeelOperator_par -lEPDFOperator_par -lEPersistentParticlesOperator_par -lEProjectOperator_par -lEReflectOperator_par -lEReplicateOperator_par -lEResampleOperator_par -lERevolveOperator_par -lESliceOperator_par -lESphereSliceOperator_par -lEThreeSliceOperator_par -lEThresholdOperator_par -lETransformOperator_par -lETubeOperator_par \ + -L../../plugins/plots -lEBoundaryPlot_par -lEContourPlot_par -lECurvePlot_par -lEFilledBoundaryPlot_par -lEHistogramPlot_par -lELabelPlot_par -lEMeshPlot_par -lEMoleculePlot_par -lEMultiCurvePlot_par -lEParallelCoordinatesPlot_par -lEPseudocolorPlot_par -lEScatterPlot_par -lESpreadsheetPlot_par -lEStreamlinePlot_par -lESubsetPlot_par -lESurfacePlot_par -lETensorPlot_par -lETruecolorPlot_par -lEVectorPlot_par -lEVolumePlot_par + +STATIC_LINK_DBS=$(SILO_LIB) LIB=libengine CPPFLAGS= -I@tmpinc@ @ENGINE_CPPFLAGS@ @PLATFORM_CPPFLAGS@ @CPPFLAGS@ \ -I. -I../../include/visit -DENGINE_MAIN_EXPORTS -COMMONLIBS=-L../../lib -lplugin -lavtview \ +COMMONLIBS=-L../../lib -lavtview \ -lvisit_vtk -llightweight_visit_vtk \ - -lenginerpc -lutility -lmisc -lcomm -lstate \ - -ldbatts -lavtexceptions -lexpr -lexpr -lparser -lvisit_verdict \ + -lenginerpc -lcomm -lmisc -ldbatts -lstate -lutility \ + -lavtexceptions -lexpr -lparser -lvisit_verdict \ $(VISIT_VTK_LDFLAGS) -SERLIBS=$(COMMONLIBS) -lviswindow_ser -lplotter_ser -lmir_ser -lavtwriter_ser \ - -lavtddf_ser -lavtivp_ser -lavtmath_ser -lavtshapelets_ser -ldatabase_ser -lquery_ser \ - -lexpressions_ser -lavtfilters_ser -lpipeline_ser \ - $(GLEW_LIBS) @VTKQT_LIBS@ $(VTK_LIBS) $(MESA_LIBS) $(GL_LIBS) $(X_LIBS) $(ZLIB_LIB) \ +SERLIBS=-lplugin @STATIC_LINK@ -lviswindow_ser -lexpressions_ser -lplotter_ser -lavtwriter_ser \ + -lavtddf_ser -ldatabase_ser -lmir_ser -lquery_ser -lavtshapelets_ser \ + -lavtfilters_ser -lavtivp_ser -lpipeline_ser -lavtmath_ser \ + $(COMMONLIBS) $(GLEW_LIBS) @VTKQT_LIBS@ $(VTK_LIBS) $(MESA_LIBS) @STATIC_LINK_DBS@ $(GL_LIBS) $(X_LIBS) $(ZLIB_LIB) \ @LIBS@ @PTHREAD_LIB@ @TCMALLOC_LIB@ -PARLIBS=$(COMMONLIBS) -lviswindow_par -lplotter_par -lmir_par -lavtwriter_par \ - -lavtddf_par -lavtivp_par -lavtmath_par -lavtshapelets_par -ldatabase_par -lquery_par\ - -lexpressions_par -lavtfilters_par -lpipeline_par \ - $(GLEW_LIBS) @VTKQT_LIBS@ $(VTK_LIBS) $(MESA_LIBS) $(GL_LIBS) $(X_LIBS) \ +PARLIBS=-lplugin @STATIC_LINK_PAR@ -lviswindow_par -lexpressions_par -lplotter_par -lavtwriter_par \ + -lavtddf_par -ldatabase_par -lmir_par -lquery_par -lavtshapelets_par \ + -lavtfilters_par -lavtivp_par -lpipeline_par -lavtmath_par \ + $(COMMONLIBS) $(GLEW_LIBS) @VTKQT_LIBS@ $(VTK_LIBS) $(MESA_LIBS) @STATIC_LINK_DBS@ $(GL_LIBS) $(X_LIBS) \ $(ZLIB_LIB) @LIBS@ @PTHREAD_LIB@ $(MPI_LIBS) @TCMALLOC_LIB@ @LIBCOGNOMEN@ SERLIBDEP=../../lib/libplugin.@SHLIB_LIBEXT@ ../../lib/libplotter_ser.@SHLIB_LIBEXT@ \ diff --git a/engine/ssl/EngineStaticSymbolLocator.C b/engine/ssl/EngineStaticSymbolLocator.C new file mode 100644 index 00000000000..72d877bcd4e --- /dev/null +++ b/engine/ssl/EngineStaticSymbolLocator.C @@ -0,0 +1,320 @@ +/***************************************************************************** +* +* Copyright (c) 2000 - 2009, Lawrence Livermore National Security, LLC +* Produced at the Lawrence Livermore National Laboratory +* LLNL-CODE-400124 +* All rights reserved. +* +* This file is part of VisIt. For details, see https://visit.llnl.gov/. The +* full copyright notice is contained in the file COPYRIGHT located at the root +* of the VisIt distribution or at http://www.llnl.gov/visit/copyright.html. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* - Redistributions of source code must retain the above copyright notice, +* this list of conditions and the disclaimer below. +* - Redistributions in binary form must reproduce the above copyright notice, +* this list of conditions and the disclaimer (as noted below) in the +* documentation and/or other materials provided with the distribution. +* - Neither the name of the LLNS/LLNL nor the names of its contributors may +* be used to endorse or promote products derived from this software without +* specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL SECURITY, +* LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. +* +*****************************************************************************/ + +#include +#include + +#include + +class GeneralDatabasePluginInfo; +class EngineDatabasePluginInfo; +class GeneralPlotPluginInfo; +class EnginePlotPluginInfo; +class GeneralOperatorPluginInfo; +class EngineOperatorPluginInfo; + +#define DECLARE_DATABASE(X) \ + extern const char *X##VisItPluginVersion; \ + extern "C" GeneralDatabasePluginInfo *X##_GetGeneralInfo(void); \ + extern "C" EngineDatabasePluginInfo *X##_GetEngineInfo(void); + +#define DECLARE_OPERATOR(X) \ + extern const char *X##VisItPluginVersion; \ + extern "C" GeneralOperatorPluginInfo *X##_GetGeneralInfo(void); \ + extern "C" EngineOperatorPluginInfo *X##_GetEngineInfo(void); + +#define DECLARE_PLOT(X) \ + extern const char *X##VisItPluginVersion; \ + extern "C" GeneralPlotPluginInfo *X##_GetGeneralInfo(void); \ + extern "C" EnginePlotPluginInfo *X##_GetEngineInfo(void); + +DECLARE_PLOT(Boundary) +DECLARE_PLOT(Contour) +DECLARE_PLOT(Curve) +DECLARE_PLOT(FilledBoundary) +DECLARE_PLOT(Histogram) +DECLARE_PLOT(Label) +DECLARE_PLOT(Mesh) +DECLARE_PLOT(Molecule) +DECLARE_PLOT(MultiCurve) +DECLARE_PLOT(ParallelCoordinates) +DECLARE_PLOT(Pseudocolor) +DECLARE_PLOT(Scatter) +DECLARE_PLOT(Spreadsheet) +DECLARE_PLOT(Streamline) +DECLARE_PLOT(Subset) +DECLARE_PLOT(Surface) +DECLARE_PLOT(Tensor) +DECLARE_PLOT(Truecolor) +DECLARE_PLOT(Vector) +DECLARE_PLOT(Volume) + +DECLARE_OPERATOR(BoundaryOp) +DECLARE_OPERATOR(Box) +DECLARE_OPERATOR(Clip) +DECLARE_OPERATOR(Cone) +DECLARE_OPERATOR(CoordSwap) +DECLARE_OPERATOR(CreateBonds) +DECLARE_OPERATOR(Cylinder) +DECLARE_OPERATOR(DeferExpression) +DECLARE_OPERATOR(Displace) +DECLARE_OPERATOR(DualMesh) +DECLARE_OPERATOR(Elevate) +DECLARE_OPERATOR(ExternalSurface) +DECLARE_OPERATOR(IndexSelect) +DECLARE_OPERATOR(InverseGhostZone) +DECLARE_OPERATOR(Isosurface) +DECLARE_OPERATOR(Isovolume) +DECLARE_OPERATOR(Lineout) +DECLARE_OPERATOR(OnionPeel) +DECLARE_OPERATOR(PDF) +DECLARE_OPERATOR(PersistentParticles) +DECLARE_OPERATOR(Project) +DECLARE_OPERATOR(Reflect) +DECLARE_OPERATOR(Replicate) +DECLARE_OPERATOR(Resample) +DECLARE_OPERATOR(Revolve) +DECLARE_OPERATOR(Slice) +DECLARE_OPERATOR(SphereSlice) +DECLARE_OPERATOR(ThreeSlice) +DECLARE_OPERATOR(Threshold) +DECLARE_OPERATOR(Transform) +DECLARE_OPERATOR(Tube) + +DECLARE_DATABASE(Silo) +DECLARE_DATABASE(VTK) + +#define CHECK_PLUGIN(X) \ + { \ + std::string thisPlugin = #X; \ + std::string combined = thisPlugin + "VisItPluginVersion"; \ + if (sym == combined) \ + return (void *) &X##VisItPluginVersion; \ + combined = thisPlugin + "_GetGeneralInfo"; \ + if (sym == combined) \ + return (void *) &X##_GetGeneralInfo; \ + combined = thisPlugin + "_GetEngineInfo"; \ + if (sym == combined) \ + return (void *) &X##_GetEngineInfo; \ + } + +void * +fake_dlsym(const std::string &sym) +{ + debug1 << "Asked for " << sym << endl; + + CHECK_PLUGIN(Boundary) + CHECK_PLUGIN(Contour) + CHECK_PLUGIN(Curve) + CHECK_PLUGIN(FilledBoundary) + CHECK_PLUGIN(Histogram) + CHECK_PLUGIN(Label) + CHECK_PLUGIN(Mesh) + CHECK_PLUGIN(Molecule) + CHECK_PLUGIN(MultiCurve) + CHECK_PLUGIN(ParallelCoordinates) + CHECK_PLUGIN(Pseudocolor) + CHECK_PLUGIN(Scatter) + CHECK_PLUGIN(Spreadsheet) + CHECK_PLUGIN(Streamline) + CHECK_PLUGIN(Subset) + CHECK_PLUGIN(Surface) + CHECK_PLUGIN(Tensor) + CHECK_PLUGIN(Truecolor) + CHECK_PLUGIN(Vector) + CHECK_PLUGIN(Volume) + + CHECK_PLUGIN(BoundaryOp) + CHECK_PLUGIN(Box) + CHECK_PLUGIN(Clip) + CHECK_PLUGIN(Cone) + CHECK_PLUGIN(CoordSwap) + CHECK_PLUGIN(CreateBonds) + CHECK_PLUGIN(Cylinder) + CHECK_PLUGIN(DeferExpression) + CHECK_PLUGIN(Displace) + CHECK_PLUGIN(DualMesh) + CHECK_PLUGIN(Elevate) + CHECK_PLUGIN(ExternalSurface) + CHECK_PLUGIN(IndexSelect) + CHECK_PLUGIN(InverseGhostZone) + CHECK_PLUGIN(Isosurface) + CHECK_PLUGIN(Isovolume) + CHECK_PLUGIN(Lineout) + CHECK_PLUGIN(OnionPeel) + CHECK_PLUGIN(PDF) + CHECK_PLUGIN(PersistentParticles) + CHECK_PLUGIN(Project) + CHECK_PLUGIN(Reflect) + CHECK_PLUGIN(Replicate) + CHECK_PLUGIN(Resample) + CHECK_PLUGIN(Revolve) + CHECK_PLUGIN(Slice) + CHECK_PLUGIN(SphereSlice) + CHECK_PLUGIN(ThreeSlice) + CHECK_PLUGIN(Threshold) + CHECK_PLUGIN(Transform) + CHECK_PLUGIN(Tube) + + CHECK_PLUGIN(Silo) + CHECK_PLUGIN(VTK) + + debug1 << "fake_dlsym can't find symbol " << sym << endl; + return NULL; +} + + +#ifdef PARALLEL + + #define ADD_DATABASE_PLUGIN(X) { std::string thisPlugin = #X; \ + std::pair p("", "libE"+thisPlugin+"Database_par.a"); libs.push_back(p); \ + std::pair p2("", "libI"+thisPlugin+"Database.a"); libs.push_back(p2); \ + } + +#else + + #define ADD_DATABASE_PLUGIN(X) { std::string thisPlugin = #X; \ + std::pair p("", "libE"+thisPlugin+"Database_ser.a"); libs.push_back(p); \ + std::pair p2("", "libI"+thisPlugin+"Database.a"); libs.push_back(p2); \ + } + +#endif + +#ifdef PARALLEL + + #define ADD_OPERATOR_PLUGIN(X) { std::string thisPlugin = #X; \ + std::pair p("", "libE"+thisPlugin+"Operator_par.a"); libs.push_back(p); \ + std::pair p2("", "libI"+thisPlugin+"Operator.a"); libs.push_back(p2); \ + } + +#else + + #define ADD_OPERATOR_PLUGIN(X) { std::string thisPlugin = #X; \ + std::pair p("", "libE"+thisPlugin+"Operator_ser.a"); libs.push_back(p); \ + std::pair p2("", "libI"+thisPlugin+"Operator.a"); libs.push_back(p2); \ + } + +#endif + +#ifdef PARALLEL + + #define ADD_PLOT_PLUGIN(X) { std::string thisPlugin = #X; \ + std::pair p("", "libE"+thisPlugin+"Plot_par.a"); libs.push_back(p); \ + std::pair p2("", "libI"+thisPlugin+"Plot.a"); libs.push_back(p2); \ + } + +#else + + #define ADD_PLOT_PLUGIN(X) { std::string thisPlugin = #X; \ + std::pair p("", "libE"+thisPlugin+"Plot_ser.a"); libs.push_back(p); \ + std::pair p2("", "libI"+thisPlugin+"Plot.a"); libs.push_back(p2); \ + } + +#endif + +void +StaticGetSupportedLibs(std::vector > &libs, + const std::string &pluginType) +{ + if (pluginType == "plot") + { + ADD_PLOT_PLUGIN(Boundary) + ADD_PLOT_PLUGIN(Contour) + ADD_PLOT_PLUGIN(Curve) + ADD_PLOT_PLUGIN(FilledBoundary) + ADD_PLOT_PLUGIN(Histogram) + ADD_PLOT_PLUGIN(Label) + ADD_PLOT_PLUGIN(Mesh) + ADD_PLOT_PLUGIN(Molecule) + ADD_PLOT_PLUGIN(MultiCurve) + ADD_PLOT_PLUGIN(ParallelCoordinates) + ADD_PLOT_PLUGIN(Pseudocolor) + ADD_PLOT_PLUGIN(Scatter) + ADD_PLOT_PLUGIN(Spreadsheet) + ADD_PLOT_PLUGIN(Streamline) + ADD_PLOT_PLUGIN(Subset) + ADD_PLOT_PLUGIN(Surface) + ADD_PLOT_PLUGIN(Tensor) + ADD_PLOT_PLUGIN(Truecolor) + ADD_PLOT_PLUGIN(Vector) + ADD_PLOT_PLUGIN(Volume) + } + + if (pluginType == "operator") + { + ADD_OPERATOR_PLUGIN(BoundaryOp) + ADD_OPERATOR_PLUGIN(Box) + ADD_OPERATOR_PLUGIN(Clip) + ADD_OPERATOR_PLUGIN(Cone) + ADD_OPERATOR_PLUGIN(CoordSwap) + ADD_OPERATOR_PLUGIN(CreateBonds) + ADD_OPERATOR_PLUGIN(Cylinder) + ADD_OPERATOR_PLUGIN(DeferExpression) + ADD_OPERATOR_PLUGIN(Displace) + ADD_OPERATOR_PLUGIN(DualMesh) + ADD_OPERATOR_PLUGIN(Elevate) + ADD_OPERATOR_PLUGIN(ExternalSurface) + ADD_OPERATOR_PLUGIN(IndexSelect) + ADD_OPERATOR_PLUGIN(InverseGhostZone) + ADD_OPERATOR_PLUGIN(Isosurface) + ADD_OPERATOR_PLUGIN(Isovolume) + ADD_OPERATOR_PLUGIN(Lineout) + ADD_OPERATOR_PLUGIN(OnionPeel) + ADD_OPERATOR_PLUGIN(PDF) + ADD_OPERATOR_PLUGIN(PersistentParticles) + ADD_OPERATOR_PLUGIN(Project) + ADD_OPERATOR_PLUGIN(Reflect) + ADD_OPERATOR_PLUGIN(Replicate) + ADD_OPERATOR_PLUGIN(Resample) + ADD_OPERATOR_PLUGIN(Revolve) + ADD_OPERATOR_PLUGIN(Slice) + ADD_OPERATOR_PLUGIN(SphereSlice) + ADD_OPERATOR_PLUGIN(ThreeSlice) + ADD_OPERATOR_PLUGIN(Threshold) + ADD_OPERATOR_PLUGIN(Transform) + ADD_OPERATOR_PLUGIN(Tube) + } + + if (pluginType == "database") + { + ADD_DATABASE_PLUGIN(Silo) + ADD_DATABASE_PLUGIN(VTK) + } +} + + diff --git a/engine/ssl/Makefile.in b/engine/ssl/Makefile.in new file mode 100644 index 00000000000..1a530116ee7 --- /dev/null +++ b/engine/ssl/Makefile.in @@ -0,0 +1,75 @@ +# Copyright (c) 2000 - 2009 +# Lawrence Livermore National Security, LLC +# Produced at the Lawrence Livermore National Laboratory +# LLNL-CODE-400124 +# All rights reserved. +# +# This file is part of VisIt. For details, see https://visit.llnl.gov/. The +# full copyright notice is contained in the file COPYRIGHT located at the root +# of the VisIt distribution or at https://visit.llnl.gov/copyright.html. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# - Redistributions of source code must retain the above copyright notice, +# this list of conditions and the disclaimer below. +# - Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the disclaimer (as noted below) in the +# documentation and/or other materials provided with the distribution. +# - Neither the name of the LLNS/LLNL nor the names of its contributors may be +# used to endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL SECURITY, +# LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Modifications: +# +# Hank Childs, Thu Nov 12 12:58:59 PST 2009 +# Created. +# +############################################################################## + +## +## Programs and options... +## +@SET_MAKE@ +@VARIABLES@ + +CXXFLAGS=@CXXFLAGS@ -I. -I../../include/visit +CPPFLAGS:=@CPPFLAGS@ $(CPPFLAGS) -DENGINE_SSL_EXPORTS + +## +## Files... +## +SRC=EngineStaticSymbolLocator.C +HDR= +OBJ=$(SRC:.C=.o) +LIB=libenginessl +LIBS_FOR_MACOSX_PREBINDING= +LIBS= + + +## +## Standard targets... +## +all: $(LIBSHARED) + +clean: + $(RM) $(LIBSHARED) + $(RM) $(OBJ) + +## +## Automatic dependency stuff +## +@TARGETS@ +@LIBTARGETS@ diff --git a/include/visit-config.h.in b/include/visit-config.h.in index ffa8d453e1a..944e396dab1 100644 --- a/include/visit-config.h.in +++ b/include/visit-config.h.in @@ -244,6 +244,9 @@ /* Define if we want to use VisIt's no-spin BCast. */ #undef VISIT_USE_NOSPIN_BCAST +/* Preprocessor directive for a static link */ +#undef STATIC + /* Define VISIT_USE_PTY if we want to use PTYs. */ #undef VISIT_USE_PTY diff --git a/launcher/main/Makefile.in b/launcher/main/Makefile.in index 11af79ffd14..bef11ebe371 100644 --- a/launcher/main/Makefile.in +++ b/launcher/main/Makefile.in @@ -48,6 +48,9 @@ # script uses. It was working in most places, because it was not defined, # but TACC's machines define INCLUDE as an environment variable. # +# Hank Childs, Tue Nov 10 05:47:15 PST 2009 +# Add path for linking (-L../../lib). +# ############################################################################## ## @@ -56,7 +59,7 @@ @SET_MAKE@ @VARIABLES@ -LIBS=-lvclrpc -lstate -lcomm -lmisc -lutility -lavtexceptions @LIBS@ @PTHREAD_LIB@ +LIBS=-L../../lib -lvclrpc -lstate -lcomm -lmisc -lutility -lavtexceptions @LIBS@ @PTHREAD_LIB@ LIBDEP= CPPFLAGS=@CPPFLAGS@ @PLATFORM_CPPFLAGS@ CXXFLAGS=@CXXFLAGS@ -I. -I../../include -I../../include/visit diff --git a/mdserver/Makefile.in b/mdserver/Makefile.in index 0b4f7b1dd3f..8b07097429e 100644 --- a/mdserver/Makefile.in +++ b/mdserver/Makefile.in @@ -40,6 +40,9 @@ # Sean Ahern, Mon Jun 10 16:38:09 PDT 2002 # Gutted while moving things to a central location. # +# Hank Childs, Thu Nov 12 13:30:06 PST 2009 +# Added ssl directory for static links. +# ############################################################################## @SET_MAKE@ @@ -47,9 +50,10 @@ @DIRTARGETS@ @MPI_CC@ @MPI_CXX@ +STATIC_LINK=ssl # subdirectory `main' must be last. -SUBDIRS=rpc proxy main +SUBDIRS=rpc proxy @STATIC_LINK@ main message: @echo diff --git a/mdserver/main/Makefile.in b/mdserver/main/Makefile.in index a8c46618702..f25fc308c9c 100644 --- a/mdserver/main/Makefile.in +++ b/mdserver/main/Makefile.in @@ -198,8 +198,9 @@ # Tom Fogal, Thu Jul 2 01:58:08 MDT 2009 # Add comm exports, since we catch an exception thrown by comm. # -# Hank Childs, Wed Nov 11 20:39:57 PST 2009 -# Added $(ZLIB_LIB). +# Hank Childs, Tue Nov 10 05:47:15 PST 2009 +# Add path for linking (-L../../lib). Also re-order libraries for static +# linking. # ############################################################################## @@ -210,17 +211,21 @@ @VARIABLES@ PREBIND_LIBS=-lvisit_vtk +STATIC_LINK=-lmdserverssl \ + -L../../plugins/databases -lMSiloDatabase -lMVTKDatabase +STATIC_LINK_DBS=$(SILO_LIB) -LIBS= \ +LIBS=-L../../lib \ + -lplugin \ + @STATIC_LINK@ \ + -ldatabase_ser \ + -lpipeline_ser \ + -ldbatts \ -lexpr \ -lparser \ - -lplugin \ -lmdserverrpc \ -lavtmath_ser \ - -lpipeline_ser \ - -ldatabase_ser \ -lmir_ser \ - -ldbatts \ -lavtexceptions \ -lstate \ -lcomm \ @@ -230,8 +235,8 @@ LIBS= \ -lvisit_verdict \ @VTK_LIGHTWEIGHT_LIBS@ \ @PREBIND_LIBS@ \ + @STATIC_LINK_DBS@ \ @LIBS@ \ - $(ZLIB_LIB) \ @PTHREAD_LIB@ LIBDEP= CPPFLAGS=@CPPFLAGS@ @PLATFORM_CPPFLAGS@ -DMDSERVER_MAIN_EXPORTS -DCOMM_EXPORTS @@ -289,7 +294,7 @@ quantify: $(LIBDEP) $(OBJ) quantify $(CXX) -o $(tmpbin)/mdserver $(LDFLAGS) $(OBJ) $(LIBS) $(tmpbin)/testmds: $(LIBDEP) $(TESTOBJ) - $(CXX) -o $@ $(LDFLAGS) $(TESTOBJ) $(LIBS) -lmdserverproxy -lproxybase + $(CXX) -o $@ $(LDFLAGS) $(TESTOBJ) -lmdserverproxy -lproxybase $(LIBS) install_bin: $(tmpbin)/mdserver $(INSTALL) $(tmpbin)/mdserver $(bindir) diff --git a/mdserver/ssl/MDServerStaticSymbolLocator.C b/mdserver/ssl/MDServerStaticSymbolLocator.C new file mode 100644 index 00000000000..b4562736782 --- /dev/null +++ b/mdserver/ssl/MDServerStaticSymbolLocator.C @@ -0,0 +1,98 @@ +/***************************************************************************** +* +* Copyright (c) 2000 - 2009, Lawrence Livermore National Security, LLC +* Produced at the Lawrence Livermore National Laboratory +* LLNL-CODE-400124 +* All rights reserved. +* +* This file is part of VisIt. For details, see https://visit.llnl.gov/. The +* full copyright notice is contained in the file COPYRIGHT located at the root +* of the VisIt distribution or at http://www.llnl.gov/visit/copyright.html. +* +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that the following conditions are met: +* +* - Redistributions of source code must retain the above copyright notice, +* this list of conditions and the disclaimer below. +* - Redistributions in binary form must reproduce the above copyright notice, +* this list of conditions and the disclaimer (as noted below) in the +* documentation and/or other materials provided with the distribution. +* - Neither the name of the LLNS/LLNL nor the names of its contributors may +* be used to endorse or promote products derived from this software without +* specific prior written permission. +* +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +* ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL SECURITY, +* LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY +* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +* DAMAGE. +* +*****************************************************************************/ + +#include +#include + +#include + +class GeneralDatabasePluginInfo; +class MDServerDatabasePluginInfo; + +#define DECLARE_DATABASE(X) \ + extern const char *X##VisItPluginVersion; \ + extern "C" GeneralDatabasePluginInfo *X##_GetGeneralInfo(void); \ + extern "C" MDServerDatabasePluginInfo *X##_GetMDServerInfo(void); + + +DECLARE_DATABASE(Silo) +DECLARE_DATABASE(VTK) + +#define CHECK_PLUGIN(X) \ + { \ + std::string thisPlugin = #X; \ + std::string combined = thisPlugin + "VisItPluginVersion"; \ + if (sym == combined) \ + return (void *) &X##VisItPluginVersion; \ + combined = thisPlugin + "_GetGeneralInfo"; \ + if (sym == combined) \ + return (void *) &X##_GetGeneralInfo; \ + combined = thisPlugin + "_GetMDServerInfo"; \ + if (sym == combined) \ + return (void *) &X##_GetMDServerInfo; \ + } + +void * +fake_dlsym(const std::string &sym) +{ + debug1 << "Asked for " << sym << endl; + + CHECK_PLUGIN(Silo) + CHECK_PLUGIN(VTK) + + debug1 << "fake_dlsym can't find symbol " << sym << endl; + return NULL; +} + +#define ADD_PLUGIN(X) { std::string thisPlugin = #X; \ + std::pair p("", "libM"+thisPlugin+"Database_ser.a"); libs.push_back(p); \ + std::pair p2("", "libI"+thisPlugin+"Database_ser.a"); libs.push_back(p2); \ +} + +void +StaticGetSupportedLibs(std::vector > &libs, + const std::string &pluginType) +{ + if (pluginType == "Database") + { + ADD_PLUGIN(Silo); + ADD_PLUGIN(VTK); + } +} + + diff --git a/mdserver/ssl/Makefile.in b/mdserver/ssl/Makefile.in new file mode 100644 index 00000000000..8d3a444dfbc --- /dev/null +++ b/mdserver/ssl/Makefile.in @@ -0,0 +1,75 @@ +# Copyright (c) 2000 - 2009 +# Lawrence Livermore National Security, LLC +# Produced at the Lawrence Livermore National Laboratory +# LLNL-CODE-400124 +# All rights reserved. +# +# This file is part of VisIt. For details, see https://visit.llnl.gov/. The +# full copyright notice is contained in the file COPYRIGHT located at the root +# of the VisIt distribution or at https://visit.llnl.gov/copyright.html. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# - Redistributions of source code must retain the above copyright notice, +# this list of conditions and the disclaimer below. +# - Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the disclaimer (as noted below) in the +# documentation and/or other materials provided with the distribution. +# - Neither the name of the LLNS/LLNL nor the names of its contributors may be +# used to endorse or promote products derived from this software without +# specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL SECURITY, +# LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Modifications: +# +# Hank Childs, Thu Nov 12 12:58:59 PST 2009 +# Created. +# +############################################################################## + +## +## Programs and options... +## +@SET_MAKE@ +@VARIABLES@ + +CXXFLAGS=@CXXFLAGS@ -I. -I../../include/visit +CPPFLAGS:=@CPPFLAGS@ $(CPPFLAGS) -DMDSERVER_SSL_EXPORTS + +## +## Files... +## +SRC=MDServerStaticSymbolLocator.C +HDR= +OBJ=$(SRC:.C=.o) +LIB=libmdserverssl +LIBS_FOR_MACOSX_PREBINDING= +LIBS= + + +## +## Standard targets... +## +all: $(LIBSHARED) + +clean: + $(RM) $(LIBSHARED) + $(RM) $(OBJ) + +## +## Automatic dependency stuff +## +@TARGETS@ +@LIBTARGETS@ diff --git a/operators/BoundaryOp/BoundaryOpEnginePluginInfo.C b/operators/BoundaryOp/BoundaryOpEnginePluginInfo.C index e9e081471ba..64828406268 100644 --- a/operators/BoundaryOp/BoundaryOpEnginePluginInfo.C +++ b/operators/BoundaryOp/BoundaryOpEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo BoundaryOp_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* BoundaryOp_GetEngineInfo() { return new BoundaryOpEnginePluginInfo; } diff --git a/operators/BoundaryOp/BoundaryOpGUIPluginInfo.C b/operators/BoundaryOp/BoundaryOpGUIPluginInfo.C index 30600e85bc9..739394cd734 100644 --- a/operators/BoundaryOp/BoundaryOpGUIPluginInfo.C +++ b/operators/BoundaryOp/BoundaryOpGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo BoundaryOp_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* BoundaryOp_GetGUIInfo() { return new BoundaryOpGUIPluginInfo; } diff --git a/operators/BoundaryOp/BoundaryOpPluginInfo.C b/operators/BoundaryOp/BoundaryOpPluginInfo.C index 1134a37d1d4..24a34ddb195 100644 --- a/operators/BoundaryOp/BoundaryOpPluginInfo.C +++ b/operators/BoundaryOp/BoundaryOpPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *BoundaryOpVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo BoundaryOp_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* BoundaryOp_GetGeneralInfo() { return new BoundaryOpGeneralPluginInfo; } diff --git a/operators/BoundaryOp/BoundaryOpScriptingPluginInfo.C b/operators/BoundaryOp/BoundaryOpScriptingPluginInfo.C index 21f9a679f1d..85b0e9cd18d 100644 --- a/operators/BoundaryOp/BoundaryOpScriptingPluginInfo.C +++ b/operators/BoundaryOp/BoundaryOpScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo BoundaryOp_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* BoundaryOp_GetScriptingInfo() { return new BoundaryOpScriptingPluginInfo; } diff --git a/operators/BoundaryOp/BoundaryOpViewerPluginInfo.C b/operators/BoundaryOp/BoundaryOpViewerPluginInfo.C index 8d92ef15836..14c472057a8 100644 --- a/operators/BoundaryOp/BoundaryOpViewerPluginInfo.C +++ b/operators/BoundaryOp/BoundaryOpViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo BoundaryOp_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* BoundaryOp_GetViewerInfo() { BoundaryOpViewerPluginInfo::InitializeGlobalObjects(); return new BoundaryOpViewerPluginInfo; diff --git a/operators/Box/BoxEnginePluginInfo.C b/operators/Box/BoxEnginePluginInfo.C index 129593eef2d..67f33a5bf83 100644 --- a/operators/Box/BoxEnginePluginInfo.C +++ b/operators/Box/BoxEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Box_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Box_GetEngineInfo() { return new BoxEnginePluginInfo; } diff --git a/operators/Box/BoxGUIPluginInfo.C b/operators/Box/BoxGUIPluginInfo.C index 5a7eee790a7..8246feaa3d6 100644 --- a/operators/Box/BoxGUIPluginInfo.C +++ b/operators/Box/BoxGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Box_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Box_GetGUIInfo() { return new BoxGUIPluginInfo; } diff --git a/operators/Box/BoxPluginInfo.C b/operators/Box/BoxPluginInfo.C index 47b8167501d..4e38968a536 100644 --- a/operators/Box/BoxPluginInfo.C +++ b/operators/Box/BoxPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *BoxVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Box_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Box_GetGeneralInfo() { return new BoxGeneralPluginInfo; } diff --git a/operators/Box/BoxScriptingPluginInfo.C b/operators/Box/BoxScriptingPluginInfo.C index 4c83f1843ba..720da3c0f59 100644 --- a/operators/Box/BoxScriptingPluginInfo.C +++ b/operators/Box/BoxScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Box_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Box_GetScriptingInfo() { return new BoxScriptingPluginInfo; } diff --git a/operators/Box/BoxViewerPluginInfo.C b/operators/Box/BoxViewerPluginInfo.C index 9b16fe01ac3..b8d72e3de1a 100644 --- a/operators/Box/BoxViewerPluginInfo.C +++ b/operators/Box/BoxViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Box_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Box_GetViewerInfo() { BoxViewerPluginInfo::InitializeGlobalObjects(); return new BoxViewerPluginInfo; diff --git a/operators/Clip/ClipEnginePluginInfo.C b/operators/Clip/ClipEnginePluginInfo.C index 8c3643e0804..f1ff11b5ea4 100644 --- a/operators/Clip/ClipEnginePluginInfo.C +++ b/operators/Clip/ClipEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Clip_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Clip_GetEngineInfo() { return new ClipEnginePluginInfo; } diff --git a/operators/Clip/ClipGUIPluginInfo.C b/operators/Clip/ClipGUIPluginInfo.C index 1c102c0c9f8..cbc83341211 100644 --- a/operators/Clip/ClipGUIPluginInfo.C +++ b/operators/Clip/ClipGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Clip_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Clip_GetGUIInfo() { return new ClipGUIPluginInfo; } diff --git a/operators/Clip/ClipPluginInfo.C b/operators/Clip/ClipPluginInfo.C index 05725fb0b2d..07ac3abfc23 100644 --- a/operators/Clip/ClipPluginInfo.C +++ b/operators/Clip/ClipPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *ClipVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Clip_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Clip_GetGeneralInfo() { return new ClipGeneralPluginInfo; } diff --git a/operators/Clip/ClipScriptingPluginInfo.C b/operators/Clip/ClipScriptingPluginInfo.C index 0eb8400d8cd..6c227551ceb 100644 --- a/operators/Clip/ClipScriptingPluginInfo.C +++ b/operators/Clip/ClipScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Clip_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Clip_GetScriptingInfo() { return new ClipScriptingPluginInfo; } diff --git a/operators/Clip/ClipViewerPluginInfo.C b/operators/Clip/ClipViewerPluginInfo.C index 1563a8a2130..105e0ae61e1 100644 --- a/operators/Clip/ClipViewerPluginInfo.C +++ b/operators/Clip/ClipViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Clip_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Clip_GetViewerInfo() { ClipViewerPluginInfo::InitializeGlobalObjects(); return new ClipViewerPluginInfo; diff --git a/operators/Cone/ConeEnginePluginInfo.C b/operators/Cone/ConeEnginePluginInfo.C index 0c37bd1daa9..695cb427941 100644 --- a/operators/Cone/ConeEnginePluginInfo.C +++ b/operators/Cone/ConeEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Cone_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Cone_GetEngineInfo() { return new ConeEnginePluginInfo; } diff --git a/operators/Cone/ConeGUIPluginInfo.C b/operators/Cone/ConeGUIPluginInfo.C index f56032b65ce..97662ff1112 100644 --- a/operators/Cone/ConeGUIPluginInfo.C +++ b/operators/Cone/ConeGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Cone_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Cone_GetGUIInfo() { return new ConeGUIPluginInfo; } diff --git a/operators/Cone/ConePluginInfo.C b/operators/Cone/ConePluginInfo.C index 95a9ab0d7d7..139f6a4641d 100644 --- a/operators/Cone/ConePluginInfo.C +++ b/operators/Cone/ConePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *ConeVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Cone_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Cone_GetGeneralInfo() { return new ConeGeneralPluginInfo; } diff --git a/operators/Cone/ConeScriptingPluginInfo.C b/operators/Cone/ConeScriptingPluginInfo.C index b7e633acb24..cef9eec42cc 100644 --- a/operators/Cone/ConeScriptingPluginInfo.C +++ b/operators/Cone/ConeScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Cone_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Cone_GetScriptingInfo() { return new ConeScriptingPluginInfo; } diff --git a/operators/Cone/ConeViewerPluginInfo.C b/operators/Cone/ConeViewerPluginInfo.C index 2eb01aab86b..562bbde3caf 100644 --- a/operators/Cone/ConeViewerPluginInfo.C +++ b/operators/Cone/ConeViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Cone_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Cone_GetViewerInfo() { ConeViewerPluginInfo::InitializeGlobalObjects(); return new ConeViewerPluginInfo; diff --git a/operators/ConnCompReduce/ConnCompReduceEnginePluginInfo.C b/operators/ConnCompReduce/ConnCompReduceEnginePluginInfo.C index 1c5763ec2de..78296e809db 100644 --- a/operators/ConnCompReduce/ConnCompReduceEnginePluginInfo.C +++ b/operators/ConnCompReduce/ConnCompReduceEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo ConnCompReduce_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* ConnCompReduce_GetEngineInfo() { return new ConnCompReduceEnginePluginInfo; } diff --git a/operators/ConnCompReduce/ConnCompReduceGUIPluginInfo.C b/operators/ConnCompReduce/ConnCompReduceGUIPluginInfo.C index af8e52eb0ae..bdf3530d22f 100644 --- a/operators/ConnCompReduce/ConnCompReduceGUIPluginInfo.C +++ b/operators/ConnCompReduce/ConnCompReduceGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo ConnCompReduce_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* ConnCompReduce_GetGUIInfo() { return new ConnCompReduceGUIPluginInfo; } diff --git a/operators/ConnCompReduce/ConnCompReducePluginInfo.C b/operators/ConnCompReduce/ConnCompReducePluginInfo.C index f188b8512fa..ac5496f1325 100644 --- a/operators/ConnCompReduce/ConnCompReducePluginInfo.C +++ b/operators/ConnCompReduce/ConnCompReducePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *ConnCompReduceVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo ConnCompReduce_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* ConnCompReduce_GetGeneralInfo() { return new ConnCompReduceGeneralPluginInfo; } diff --git a/operators/ConnCompReduce/ConnCompReduceScriptingPluginInfo.C b/operators/ConnCompReduce/ConnCompReduceScriptingPluginInfo.C index 12a961f04b8..ecb0b2ae500 100644 --- a/operators/ConnCompReduce/ConnCompReduceScriptingPluginInfo.C +++ b/operators/ConnCompReduce/ConnCompReduceScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo ConnCompReduce_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* ConnCompReduce_GetScriptingInfo() { return new ConnCompReduceScriptingPluginInfo; } diff --git a/operators/ConnCompReduce/ConnCompReduceViewerPluginInfo.C b/operators/ConnCompReduce/ConnCompReduceViewerPluginInfo.C index 2ee293d757d..acceb20e079 100644 --- a/operators/ConnCompReduce/ConnCompReduceViewerPluginInfo.C +++ b/operators/ConnCompReduce/ConnCompReduceViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo ConnCompReduce_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* ConnCompReduce_GetViewerInfo() { ConnCompReduceViewerPluginInfo::InitializeGlobalObjects(); return new ConnCompReduceViewerPluginInfo; diff --git a/operators/Context/ContextEnginePluginInfo.C b/operators/Context/ContextEnginePluginInfo.C index e2b208b894d..00c027a3c8d 100644 --- a/operators/Context/ContextEnginePluginInfo.C +++ b/operators/Context/ContextEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Context_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Context_GetEngineInfo() { return new ContextEnginePluginInfo; } diff --git a/operators/Context/ContextGUIPluginInfo.C b/operators/Context/ContextGUIPluginInfo.C index 37059293acb..5acf609b5ae 100644 --- a/operators/Context/ContextGUIPluginInfo.C +++ b/operators/Context/ContextGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Context_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Context_GetGUIInfo() { return new ContextGUIPluginInfo; } diff --git a/operators/Context/ContextPluginInfo.C b/operators/Context/ContextPluginInfo.C index bf541014cbc..bc3c2a99b8e 100644 --- a/operators/Context/ContextPluginInfo.C +++ b/operators/Context/ContextPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *ContextVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Context_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Context_GetGeneralInfo() { return new ContextGeneralPluginInfo; } diff --git a/operators/Context/ContextScriptingPluginInfo.C b/operators/Context/ContextScriptingPluginInfo.C index 97cc56a4271..47088af8d7c 100644 --- a/operators/Context/ContextScriptingPluginInfo.C +++ b/operators/Context/ContextScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Context_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Context_GetScriptingInfo() { return new ContextScriptingPluginInfo; } diff --git a/operators/Context/ContextViewerPluginInfo.C b/operators/Context/ContextViewerPluginInfo.C index f4ee6a8a253..710e23da87e 100644 --- a/operators/Context/ContextViewerPluginInfo.C +++ b/operators/Context/ContextViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Context_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Context_GetViewerInfo() { ContextViewerPluginInfo::InitializeGlobalObjects(); return new ContextViewerPluginInfo; diff --git a/operators/CoordSwap/CoordSwapEnginePluginInfo.C b/operators/CoordSwap/CoordSwapEnginePluginInfo.C index 28965af593c..794f5321786 100644 --- a/operators/CoordSwap/CoordSwapEnginePluginInfo.C +++ b/operators/CoordSwap/CoordSwapEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo CoordSwap_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* CoordSwap_GetEngineInfo() { return new CoordSwapEnginePluginInfo; } diff --git a/operators/CoordSwap/CoordSwapGUIPluginInfo.C b/operators/CoordSwap/CoordSwapGUIPluginInfo.C index 1b1430b7a03..2540499de36 100644 --- a/operators/CoordSwap/CoordSwapGUIPluginInfo.C +++ b/operators/CoordSwap/CoordSwapGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo CoordSwap_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* CoordSwap_GetGUIInfo() { return new CoordSwapGUIPluginInfo; } diff --git a/operators/CoordSwap/CoordSwapPluginInfo.C b/operators/CoordSwap/CoordSwapPluginInfo.C index 7a9342558cd..ef0417de83c 100644 --- a/operators/CoordSwap/CoordSwapPluginInfo.C +++ b/operators/CoordSwap/CoordSwapPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *CoordSwapVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo CoordSwap_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* CoordSwap_GetGeneralInfo() { return new CoordSwapGeneralPluginInfo; } diff --git a/operators/CoordSwap/CoordSwapScriptingPluginInfo.C b/operators/CoordSwap/CoordSwapScriptingPluginInfo.C index 27f0e5daa63..108cad159ad 100644 --- a/operators/CoordSwap/CoordSwapScriptingPluginInfo.C +++ b/operators/CoordSwap/CoordSwapScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo CoordSwap_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* CoordSwap_GetScriptingInfo() { return new CoordSwapScriptingPluginInfo; } diff --git a/operators/CoordSwap/CoordSwapViewerPluginInfo.C b/operators/CoordSwap/CoordSwapViewerPluginInfo.C index 726d336f77b..203801ece73 100644 --- a/operators/CoordSwap/CoordSwapViewerPluginInfo.C +++ b/operators/CoordSwap/CoordSwapViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo CoordSwap_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* CoordSwap_GetViewerInfo() { CoordSwapViewerPluginInfo::InitializeGlobalObjects(); return new CoordSwapViewerPluginInfo; diff --git a/operators/CracksClipper/CracksClipperEnginePluginInfo.C b/operators/CracksClipper/CracksClipperEnginePluginInfo.C index 003099e13f3..0825d443e59 100644 --- a/operators/CracksClipper/CracksClipperEnginePluginInfo.C +++ b/operators/CracksClipper/CracksClipperEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo CracksClipper_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* CracksClipper_GetEngineInfo() { return new CracksClipperEnginePluginInfo; } diff --git a/operators/CracksClipper/CracksClipperGUIPluginInfo.C b/operators/CracksClipper/CracksClipperGUIPluginInfo.C index 2ee82080ae1..589eb0fe656 100644 --- a/operators/CracksClipper/CracksClipperGUIPluginInfo.C +++ b/operators/CracksClipper/CracksClipperGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo CracksClipper_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* CracksClipper_GetGUIInfo() { return new CracksClipperGUIPluginInfo; } diff --git a/operators/CracksClipper/CracksClipperPluginInfo.C b/operators/CracksClipper/CracksClipperPluginInfo.C index 6b4e301ec80..e9992fb7959 100644 --- a/operators/CracksClipper/CracksClipperPluginInfo.C +++ b/operators/CracksClipper/CracksClipperPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *CracksClipperVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo CracksClipper_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* CracksClipper_GetGeneralInfo() { return new CracksClipperGeneralPluginInfo; } diff --git a/operators/CracksClipper/CracksClipperScriptingPluginInfo.C b/operators/CracksClipper/CracksClipperScriptingPluginInfo.C index b2f9cb785b1..8e02d870185 100644 --- a/operators/CracksClipper/CracksClipperScriptingPluginInfo.C +++ b/operators/CracksClipper/CracksClipperScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo CracksClipper_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* CracksClipper_GetScriptingInfo() { return new CracksClipperScriptingPluginInfo; } diff --git a/operators/CracksClipper/CracksClipperViewerPluginInfo.C b/operators/CracksClipper/CracksClipperViewerPluginInfo.C index 3a03ca221d2..24a4e6248de 100644 --- a/operators/CracksClipper/CracksClipperViewerPluginInfo.C +++ b/operators/CracksClipper/CracksClipperViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo CracksClipper_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* CracksClipper_GetViewerInfo() { CracksClipperViewerPluginInfo::InitializeGlobalObjects(); return new CracksClipperViewerPluginInfo; diff --git a/operators/CreateBonds/CreateBondsEnginePluginInfo.C b/operators/CreateBonds/CreateBondsEnginePluginInfo.C index 929d384640a..8cf3317471f 100644 --- a/operators/CreateBonds/CreateBondsEnginePluginInfo.C +++ b/operators/CreateBonds/CreateBondsEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo CreateBonds_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* CreateBonds_GetEngineInfo() { return new CreateBondsEnginePluginInfo; } diff --git a/operators/CreateBonds/CreateBondsGUIPluginInfo.C b/operators/CreateBonds/CreateBondsGUIPluginInfo.C index 3da3e937153..9216cbcf2d1 100644 --- a/operators/CreateBonds/CreateBondsGUIPluginInfo.C +++ b/operators/CreateBonds/CreateBondsGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo CreateBonds_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* CreateBonds_GetGUIInfo() { return new CreateBondsGUIPluginInfo; } diff --git a/operators/CreateBonds/CreateBondsPluginInfo.C b/operators/CreateBonds/CreateBondsPluginInfo.C index 9cbfa575faf..1b4a88732dd 100644 --- a/operators/CreateBonds/CreateBondsPluginInfo.C +++ b/operators/CreateBonds/CreateBondsPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *CreateBondsVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo CreateBonds_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* CreateBonds_GetGeneralInfo() { return new CreateBondsGeneralPluginInfo; } diff --git a/operators/CreateBonds/CreateBondsScriptingPluginInfo.C b/operators/CreateBonds/CreateBondsScriptingPluginInfo.C index d61dde0f876..de876932af8 100644 --- a/operators/CreateBonds/CreateBondsScriptingPluginInfo.C +++ b/operators/CreateBonds/CreateBondsScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo CreateBonds_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* CreateBonds_GetScriptingInfo() { return new CreateBondsScriptingPluginInfo; } diff --git a/operators/CreateBonds/CreateBondsViewerPluginInfo.C b/operators/CreateBonds/CreateBondsViewerPluginInfo.C index bd8f4c2bb3c..bd932d357fd 100644 --- a/operators/CreateBonds/CreateBondsViewerPluginInfo.C +++ b/operators/CreateBonds/CreateBondsViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo CreateBonds_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* CreateBonds_GetViewerInfo() { CreateBondsViewerPluginInfo::InitializeGlobalObjects(); return new CreateBondsViewerPluginInfo; diff --git a/operators/Cylinder/CylinderEnginePluginInfo.C b/operators/Cylinder/CylinderEnginePluginInfo.C index 116402e1834..26597b78cfb 100644 --- a/operators/Cylinder/CylinderEnginePluginInfo.C +++ b/operators/Cylinder/CylinderEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Cylinder_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Cylinder_GetEngineInfo() { return new CylinderEnginePluginInfo; } diff --git a/operators/Cylinder/CylinderGUIPluginInfo.C b/operators/Cylinder/CylinderGUIPluginInfo.C index 4f1932c3f7a..d58fc8f8a65 100644 --- a/operators/Cylinder/CylinderGUIPluginInfo.C +++ b/operators/Cylinder/CylinderGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Cylinder_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Cylinder_GetGUIInfo() { return new CylinderGUIPluginInfo; } diff --git a/operators/Cylinder/CylinderPluginInfo.C b/operators/Cylinder/CylinderPluginInfo.C index 42116496b7f..178a26700b7 100644 --- a/operators/Cylinder/CylinderPluginInfo.C +++ b/operators/Cylinder/CylinderPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *CylinderVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Cylinder_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Cylinder_GetGeneralInfo() { return new CylinderGeneralPluginInfo; } diff --git a/operators/Cylinder/CylinderScriptingPluginInfo.C b/operators/Cylinder/CylinderScriptingPluginInfo.C index fe491505dea..e55b20ff22c 100644 --- a/operators/Cylinder/CylinderScriptingPluginInfo.C +++ b/operators/Cylinder/CylinderScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Cylinder_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Cylinder_GetScriptingInfo() { return new CylinderScriptingPluginInfo; } diff --git a/operators/Cylinder/CylinderViewerPluginInfo.C b/operators/Cylinder/CylinderViewerPluginInfo.C index 1c6da2b0aa8..5c8ee08d66b 100644 --- a/operators/Cylinder/CylinderViewerPluginInfo.C +++ b/operators/Cylinder/CylinderViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Cylinder_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Cylinder_GetViewerInfo() { CylinderViewerPluginInfo::InitializeGlobalObjects(); return new CylinderViewerPluginInfo; diff --git a/operators/Decimate/DecimateEnginePluginInfo.C b/operators/Decimate/DecimateEnginePluginInfo.C index 081abc292d7..c19bd216336 100644 --- a/operators/Decimate/DecimateEnginePluginInfo.C +++ b/operators/Decimate/DecimateEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Decimate_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Decimate_GetEngineInfo() { return new DecimateEnginePluginInfo; } diff --git a/operators/Decimate/DecimateGUIPluginInfo.C b/operators/Decimate/DecimateGUIPluginInfo.C index 8d722ffcbf8..e6a978350ad 100644 --- a/operators/Decimate/DecimateGUIPluginInfo.C +++ b/operators/Decimate/DecimateGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Decimate_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Decimate_GetGUIInfo() { return new DecimateGUIPluginInfo; } diff --git a/operators/Decimate/DecimatePluginInfo.C b/operators/Decimate/DecimatePluginInfo.C index b0363b9a9fe..82378f23c53 100644 --- a/operators/Decimate/DecimatePluginInfo.C +++ b/operators/Decimate/DecimatePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *DecimateVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Decimate_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Decimate_GetGeneralInfo() { return new DecimateGeneralPluginInfo; } diff --git a/operators/Decimate/DecimateScriptingPluginInfo.C b/operators/Decimate/DecimateScriptingPluginInfo.C index 3aab3fcab04..73b55b26f0e 100644 --- a/operators/Decimate/DecimateScriptingPluginInfo.C +++ b/operators/Decimate/DecimateScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Decimate_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Decimate_GetScriptingInfo() { return new DecimateScriptingPluginInfo; } diff --git a/operators/Decimate/DecimateViewerPluginInfo.C b/operators/Decimate/DecimateViewerPluginInfo.C index 374fc5c2b8a..ec5e00cf68e 100644 --- a/operators/Decimate/DecimateViewerPluginInfo.C +++ b/operators/Decimate/DecimateViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Decimate_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Decimate_GetViewerInfo() { DecimateViewerPluginInfo::InitializeGlobalObjects(); return new DecimateViewerPluginInfo; diff --git a/operators/DeferExpression/DeferExpressionEnginePluginInfo.C b/operators/DeferExpression/DeferExpressionEnginePluginInfo.C index 0cbb7f4c35b..46c26f0a7d5 100644 --- a/operators/DeferExpression/DeferExpressionEnginePluginInfo.C +++ b/operators/DeferExpression/DeferExpressionEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo DeferExpression_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* DeferExpression_GetEngineInfo() { return new DeferExpressionEnginePluginInfo; } diff --git a/operators/DeferExpression/DeferExpressionGUIPluginInfo.C b/operators/DeferExpression/DeferExpressionGUIPluginInfo.C index c3b0480e246..61788d9caf5 100644 --- a/operators/DeferExpression/DeferExpressionGUIPluginInfo.C +++ b/operators/DeferExpression/DeferExpressionGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo DeferExpression_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* DeferExpression_GetGUIInfo() { return new DeferExpressionGUIPluginInfo; } diff --git a/operators/DeferExpression/DeferExpressionPluginInfo.C b/operators/DeferExpression/DeferExpressionPluginInfo.C index 30f78bed13c..af17f0c8a73 100644 --- a/operators/DeferExpression/DeferExpressionPluginInfo.C +++ b/operators/DeferExpression/DeferExpressionPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *DeferExpressionVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo DeferExpression_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* DeferExpression_GetGeneralInfo() { return new DeferExpressionGeneralPluginInfo; } diff --git a/operators/DeferExpression/DeferExpressionScriptingPluginInfo.C b/operators/DeferExpression/DeferExpressionScriptingPluginInfo.C index 832683e8d5c..0fe0bac5cea 100644 --- a/operators/DeferExpression/DeferExpressionScriptingPluginInfo.C +++ b/operators/DeferExpression/DeferExpressionScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo DeferExpression_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* DeferExpression_GetScriptingInfo() { return new DeferExpressionScriptingPluginInfo; } diff --git a/operators/DeferExpression/DeferExpressionViewerPluginInfo.C b/operators/DeferExpression/DeferExpressionViewerPluginInfo.C index d088ecd7efd..f77ce2ac6d6 100644 --- a/operators/DeferExpression/DeferExpressionViewerPluginInfo.C +++ b/operators/DeferExpression/DeferExpressionViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo DeferExpression_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* DeferExpression_GetViewerInfo() { DeferExpressionViewerPluginInfo::InitializeGlobalObjects(); return new DeferExpressionViewerPluginInfo; diff --git a/operators/DeformSphereGlyph/DeformSphereGlyphEnginePluginInfo.C b/operators/DeformSphereGlyph/DeformSphereGlyphEnginePluginInfo.C index 154cf78bd57..e190b019426 100644 --- a/operators/DeformSphereGlyph/DeformSphereGlyphEnginePluginInfo.C +++ b/operators/DeformSphereGlyph/DeformSphereGlyphEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo DeformSphereGlyph_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* DeformSphereGlyph_GetEngineInfo() { return new DeformSphereGlyphEnginePluginInfo; } diff --git a/operators/DeformSphereGlyph/DeformSphereGlyphGUIPluginInfo.C b/operators/DeformSphereGlyph/DeformSphereGlyphGUIPluginInfo.C index 7ff984962de..0145d35e800 100644 --- a/operators/DeformSphereGlyph/DeformSphereGlyphGUIPluginInfo.C +++ b/operators/DeformSphereGlyph/DeformSphereGlyphGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo DeformSphereGlyph_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* DeformSphereGlyph_GetGUIInfo() { return new DeformSphereGlyphGUIPluginInfo; } diff --git a/operators/DeformSphereGlyph/DeformSphereGlyphPluginInfo.C b/operators/DeformSphereGlyph/DeformSphereGlyphPluginInfo.C index e14793cccc6..ecc545961ea 100644 --- a/operators/DeformSphereGlyph/DeformSphereGlyphPluginInfo.C +++ b/operators/DeformSphereGlyph/DeformSphereGlyphPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *DeformSphereGlyphVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo DeformSphereGlyph_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* DeformSphereGlyph_GetGeneralInfo() { return new DeformSphereGlyphGeneralPluginInfo; } diff --git a/operators/DeformSphereGlyph/DeformSphereGlyphScriptingPluginInfo.C b/operators/DeformSphereGlyph/DeformSphereGlyphScriptingPluginInfo.C index 39b3728d879..d69294f78d8 100644 --- a/operators/DeformSphereGlyph/DeformSphereGlyphScriptingPluginInfo.C +++ b/operators/DeformSphereGlyph/DeformSphereGlyphScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo DeformSphereGlyph_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* DeformSphereGlyph_GetScriptingInfo() { return new DeformSphereGlyphScriptingPluginInfo; } diff --git a/operators/DeformSphereGlyph/DeformSphereGlyphViewerPluginInfo.C b/operators/DeformSphereGlyph/DeformSphereGlyphViewerPluginInfo.C index 4b9455638b8..a6811cf3cfa 100644 --- a/operators/DeformSphereGlyph/DeformSphereGlyphViewerPluginInfo.C +++ b/operators/DeformSphereGlyph/DeformSphereGlyphViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo DeformSphereGlyph_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* DeformSphereGlyph_GetViewerInfo() { DeformSphereGlyphViewerPluginInfo::InitializeGlobalObjects(); return new DeformSphereGlyphViewerPluginInfo; diff --git a/operators/Delaunay/DelaunayEnginePluginInfo.C b/operators/Delaunay/DelaunayEnginePluginInfo.C index 610a16c3af9..0d5a4ca7db1 100644 --- a/operators/Delaunay/DelaunayEnginePluginInfo.C +++ b/operators/Delaunay/DelaunayEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Delaunay_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Delaunay_GetEngineInfo() { return new DelaunayEnginePluginInfo; } diff --git a/operators/Delaunay/DelaunayGUIPluginInfo.C b/operators/Delaunay/DelaunayGUIPluginInfo.C index c0ca5f44a90..d04beb4b9c6 100644 --- a/operators/Delaunay/DelaunayGUIPluginInfo.C +++ b/operators/Delaunay/DelaunayGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Delaunay_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Delaunay_GetGUIInfo() { return new DelaunayGUIPluginInfo; } diff --git a/operators/Delaunay/DelaunayPluginInfo.C b/operators/Delaunay/DelaunayPluginInfo.C index 4a68a3736fa..f77ba698180 100644 --- a/operators/Delaunay/DelaunayPluginInfo.C +++ b/operators/Delaunay/DelaunayPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *DelaunayVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Delaunay_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Delaunay_GetGeneralInfo() { return new DelaunayGeneralPluginInfo; } diff --git a/operators/Delaunay/DelaunayScriptingPluginInfo.C b/operators/Delaunay/DelaunayScriptingPluginInfo.C index e5ed65f8c26..eed87b92040 100644 --- a/operators/Delaunay/DelaunayScriptingPluginInfo.C +++ b/operators/Delaunay/DelaunayScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Delaunay_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Delaunay_GetScriptingInfo() { return new DelaunayScriptingPluginInfo; } diff --git a/operators/Delaunay/DelaunayViewerPluginInfo.C b/operators/Delaunay/DelaunayViewerPluginInfo.C index d610bd4fc1c..6de97c10b35 100644 --- a/operators/Delaunay/DelaunayViewerPluginInfo.C +++ b/operators/Delaunay/DelaunayViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Delaunay_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Delaunay_GetViewerInfo() { DelaunayViewerPluginInfo::InitializeGlobalObjects(); return new DelaunayViewerPluginInfo; diff --git a/operators/Displace/DisplaceEnginePluginInfo.C b/operators/Displace/DisplaceEnginePluginInfo.C index 8a30f09fd65..08d834e2c08 100644 --- a/operators/Displace/DisplaceEnginePluginInfo.C +++ b/operators/Displace/DisplaceEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Displace_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Displace_GetEngineInfo() { return new DisplaceEnginePluginInfo; } diff --git a/operators/Displace/DisplaceGUIPluginInfo.C b/operators/Displace/DisplaceGUIPluginInfo.C index af799bed373..fb95afd452b 100644 --- a/operators/Displace/DisplaceGUIPluginInfo.C +++ b/operators/Displace/DisplaceGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Displace_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Displace_GetGUIInfo() { return new DisplaceGUIPluginInfo; } diff --git a/operators/Displace/DisplacePluginInfo.C b/operators/Displace/DisplacePluginInfo.C index 4170640062e..5e027a361aa 100644 --- a/operators/Displace/DisplacePluginInfo.C +++ b/operators/Displace/DisplacePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *DisplaceVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Displace_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Displace_GetGeneralInfo() { return new DisplaceGeneralPluginInfo; } diff --git a/operators/Displace/DisplaceScriptingPluginInfo.C b/operators/Displace/DisplaceScriptingPluginInfo.C index 113ee888ae3..17555ee8836 100644 --- a/operators/Displace/DisplaceScriptingPluginInfo.C +++ b/operators/Displace/DisplaceScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Displace_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Displace_GetScriptingInfo() { return new DisplaceScriptingPluginInfo; } diff --git a/operators/Displace/DisplaceViewerPluginInfo.C b/operators/Displace/DisplaceViewerPluginInfo.C index 125b657cb8f..517685787fd 100644 --- a/operators/Displace/DisplaceViewerPluginInfo.C +++ b/operators/Displace/DisplaceViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Displace_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Displace_GetViewerInfo() { DisplaceViewerPluginInfo::InitializeGlobalObjects(); return new DisplaceViewerPluginInfo; diff --git a/operators/DualMesh/DualMeshEnginePluginInfo.C b/operators/DualMesh/DualMeshEnginePluginInfo.C index 390c970193e..12298e79a5d 100644 --- a/operators/DualMesh/DualMeshEnginePluginInfo.C +++ b/operators/DualMesh/DualMeshEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo DualMesh_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* DualMesh_GetEngineInfo() { return new DualMeshEnginePluginInfo; } diff --git a/operators/DualMesh/DualMeshGUIPluginInfo.C b/operators/DualMesh/DualMeshGUIPluginInfo.C index 9cec8771648..ec55c597b8f 100644 --- a/operators/DualMesh/DualMeshGUIPluginInfo.C +++ b/operators/DualMesh/DualMeshGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo DualMesh_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* DualMesh_GetGUIInfo() { return new DualMeshGUIPluginInfo; } diff --git a/operators/DualMesh/DualMeshPluginInfo.C b/operators/DualMesh/DualMeshPluginInfo.C index ab3cac21a08..d16c866f27e 100644 --- a/operators/DualMesh/DualMeshPluginInfo.C +++ b/operators/DualMesh/DualMeshPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *DualMeshVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo DualMesh_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* DualMesh_GetGeneralInfo() { return new DualMeshGeneralPluginInfo; } diff --git a/operators/DualMesh/DualMeshScriptingPluginInfo.C b/operators/DualMesh/DualMeshScriptingPluginInfo.C index 7da5acbb2ca..70576320e9d 100644 --- a/operators/DualMesh/DualMeshScriptingPluginInfo.C +++ b/operators/DualMesh/DualMeshScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo DualMesh_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* DualMesh_GetScriptingInfo() { return new DualMeshScriptingPluginInfo; } diff --git a/operators/DualMesh/DualMeshViewerPluginInfo.C b/operators/DualMesh/DualMeshViewerPluginInfo.C index b6d44da84c1..1b33115cd13 100644 --- a/operators/DualMesh/DualMeshViewerPluginInfo.C +++ b/operators/DualMesh/DualMeshViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo DualMesh_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* DualMesh_GetViewerInfo() { DualMeshViewerPluginInfo::InitializeGlobalObjects(); return new DualMeshViewerPluginInfo; diff --git a/operators/Edge/EdgeEnginePluginInfo.C b/operators/Edge/EdgeEnginePluginInfo.C index 3321320f8a0..62e6d187418 100644 --- a/operators/Edge/EdgeEnginePluginInfo.C +++ b/operators/Edge/EdgeEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Edge_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Edge_GetEngineInfo() { return new EdgeEnginePluginInfo; } diff --git a/operators/Edge/EdgeGUIPluginInfo.C b/operators/Edge/EdgeGUIPluginInfo.C index f8e080f541a..fe4c14d5b59 100644 --- a/operators/Edge/EdgeGUIPluginInfo.C +++ b/operators/Edge/EdgeGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Edge_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Edge_GetGUIInfo() { return new EdgeGUIPluginInfo; } diff --git a/operators/Edge/EdgePluginInfo.C b/operators/Edge/EdgePluginInfo.C index 7d274463e2b..63085d8ff79 100644 --- a/operators/Edge/EdgePluginInfo.C +++ b/operators/Edge/EdgePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *EdgeVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Edge_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Edge_GetGeneralInfo() { return new EdgeGeneralPluginInfo; } diff --git a/operators/Edge/EdgeScriptingPluginInfo.C b/operators/Edge/EdgeScriptingPluginInfo.C index f5ef6ee512f..0d1f1c91f78 100644 --- a/operators/Edge/EdgeScriptingPluginInfo.C +++ b/operators/Edge/EdgeScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Edge_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Edge_GetScriptingInfo() { return new EdgeScriptingPluginInfo; } diff --git a/operators/Edge/EdgeViewerPluginInfo.C b/operators/Edge/EdgeViewerPluginInfo.C index 746c9582e31..e84cce70a80 100644 --- a/operators/Edge/EdgeViewerPluginInfo.C +++ b/operators/Edge/EdgeViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Edge_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Edge_GetViewerInfo() { EdgeViewerPluginInfo::InitializeGlobalObjects(); return new EdgeViewerPluginInfo; diff --git a/operators/Elevate/ElevateEnginePluginInfo.C b/operators/Elevate/ElevateEnginePluginInfo.C index 743ceabb439..4700047b2ba 100644 --- a/operators/Elevate/ElevateEnginePluginInfo.C +++ b/operators/Elevate/ElevateEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Elevate_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Elevate_GetEngineInfo() { return new ElevateEnginePluginInfo; } diff --git a/operators/Elevate/ElevateGUIPluginInfo.C b/operators/Elevate/ElevateGUIPluginInfo.C index 055a18aef28..99dcbee9d5b 100644 --- a/operators/Elevate/ElevateGUIPluginInfo.C +++ b/operators/Elevate/ElevateGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Elevate_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Elevate_GetGUIInfo() { return new ElevateGUIPluginInfo; } diff --git a/operators/Elevate/ElevatePluginInfo.C b/operators/Elevate/ElevatePluginInfo.C index 849c97a2e64..b6ddf3a8acb 100644 --- a/operators/Elevate/ElevatePluginInfo.C +++ b/operators/Elevate/ElevatePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *ElevateVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Elevate_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Elevate_GetGeneralInfo() { return new ElevateGeneralPluginInfo; } diff --git a/operators/Elevate/ElevateScriptingPluginInfo.C b/operators/Elevate/ElevateScriptingPluginInfo.C index 04232477f7e..0faeec58ac9 100644 --- a/operators/Elevate/ElevateScriptingPluginInfo.C +++ b/operators/Elevate/ElevateScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Elevate_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Elevate_GetScriptingInfo() { return new ElevateScriptingPluginInfo; } diff --git a/operators/Elevate/ElevateViewerPluginInfo.C b/operators/Elevate/ElevateViewerPluginInfo.C index 9aa8d547d03..ae914ed76e3 100644 --- a/operators/Elevate/ElevateViewerPluginInfo.C +++ b/operators/Elevate/ElevateViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Elevate_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Elevate_GetViewerInfo() { ElevateViewerPluginInfo::InitializeGlobalObjects(); return new ElevateViewerPluginInfo; diff --git a/operators/ExternalSurface/ExternalSurfaceEnginePluginInfo.C b/operators/ExternalSurface/ExternalSurfaceEnginePluginInfo.C index 71929c91052..121a57095f0 100644 --- a/operators/ExternalSurface/ExternalSurfaceEnginePluginInfo.C +++ b/operators/ExternalSurface/ExternalSurfaceEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo ExternalSurface_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* ExternalSurface_GetEngineInfo() { return new ExternalSurfaceEnginePluginInfo; } diff --git a/operators/ExternalSurface/ExternalSurfaceGUIPluginInfo.C b/operators/ExternalSurface/ExternalSurfaceGUIPluginInfo.C index d81d491d2dc..defda3f951f 100644 --- a/operators/ExternalSurface/ExternalSurfaceGUIPluginInfo.C +++ b/operators/ExternalSurface/ExternalSurfaceGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo ExternalSurface_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* ExternalSurface_GetGUIInfo() { return new ExternalSurfaceGUIPluginInfo; } diff --git a/operators/ExternalSurface/ExternalSurfacePluginInfo.C b/operators/ExternalSurface/ExternalSurfacePluginInfo.C index ffe8176814d..6fcf2a5d336 100644 --- a/operators/ExternalSurface/ExternalSurfacePluginInfo.C +++ b/operators/ExternalSurface/ExternalSurfacePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *ExternalSurfaceVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo ExternalSurface_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* ExternalSurface_GetGeneralInfo() { return new ExternalSurfaceGeneralPluginInfo; } diff --git a/operators/ExternalSurface/ExternalSurfaceScriptingPluginInfo.C b/operators/ExternalSurface/ExternalSurfaceScriptingPluginInfo.C index 7785ba6ccce..8d1098890a3 100644 --- a/operators/ExternalSurface/ExternalSurfaceScriptingPluginInfo.C +++ b/operators/ExternalSurface/ExternalSurfaceScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo ExternalSurface_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* ExternalSurface_GetScriptingInfo() { return new ExternalSurfaceScriptingPluginInfo; } diff --git a/operators/ExternalSurface/ExternalSurfaceViewerPluginInfo.C b/operators/ExternalSurface/ExternalSurfaceViewerPluginInfo.C index 032fb84a5c0..59455320267 100644 --- a/operators/ExternalSurface/ExternalSurfaceViewerPluginInfo.C +++ b/operators/ExternalSurface/ExternalSurfaceViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo ExternalSurface_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* ExternalSurface_GetViewerInfo() { ExternalSurfaceViewerPluginInfo::InitializeGlobalObjects(); return new ExternalSurfaceViewerPluginInfo; diff --git a/operators/IndexSelect/IndexSelectEnginePluginInfo.C b/operators/IndexSelect/IndexSelectEnginePluginInfo.C index a1e401e3a10..a5945770875 100644 --- a/operators/IndexSelect/IndexSelectEnginePluginInfo.C +++ b/operators/IndexSelect/IndexSelectEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo IndexSelect_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* IndexSelect_GetEngineInfo() { return new IndexSelectEnginePluginInfo; } diff --git a/operators/IndexSelect/IndexSelectGUIPluginInfo.C b/operators/IndexSelect/IndexSelectGUIPluginInfo.C index fa433d86129..c928f911469 100644 --- a/operators/IndexSelect/IndexSelectGUIPluginInfo.C +++ b/operators/IndexSelect/IndexSelectGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo IndexSelect_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* IndexSelect_GetGUIInfo() { return new IndexSelectGUIPluginInfo; } diff --git a/operators/IndexSelect/IndexSelectPluginInfo.C b/operators/IndexSelect/IndexSelectPluginInfo.C index 42950341dc8..c4f73c5e785 100644 --- a/operators/IndexSelect/IndexSelectPluginInfo.C +++ b/operators/IndexSelect/IndexSelectPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *IndexSelectVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo IndexSelect_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* IndexSelect_GetGeneralInfo() { return new IndexSelectGeneralPluginInfo; } diff --git a/operators/IndexSelect/IndexSelectScriptingPluginInfo.C b/operators/IndexSelect/IndexSelectScriptingPluginInfo.C index 87ce43e1c60..77bd491f600 100644 --- a/operators/IndexSelect/IndexSelectScriptingPluginInfo.C +++ b/operators/IndexSelect/IndexSelectScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo IndexSelect_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* IndexSelect_GetScriptingInfo() { return new IndexSelectScriptingPluginInfo; } diff --git a/operators/IndexSelect/IndexSelectViewerPluginInfo.C b/operators/IndexSelect/IndexSelectViewerPluginInfo.C index e5a02e765f9..a1324c5bf2c 100644 --- a/operators/IndexSelect/IndexSelectViewerPluginInfo.C +++ b/operators/IndexSelect/IndexSelectViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo IndexSelect_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* IndexSelect_GetViewerInfo() { IndexSelectViewerPluginInfo::InitializeGlobalObjects(); return new IndexSelectViewerPluginInfo; diff --git a/operators/InverseGhostZone/InverseGhostZoneEnginePluginInfo.C b/operators/InverseGhostZone/InverseGhostZoneEnginePluginInfo.C index 7d28af18b59..b91d45a59e2 100644 --- a/operators/InverseGhostZone/InverseGhostZoneEnginePluginInfo.C +++ b/operators/InverseGhostZone/InverseGhostZoneEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo InverseGhostZone_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* InverseGhostZone_GetEngineInfo() { return new InverseGhostZoneEnginePluginInfo; } diff --git a/operators/InverseGhostZone/InverseGhostZoneGUIPluginInfo.C b/operators/InverseGhostZone/InverseGhostZoneGUIPluginInfo.C index 660e215e204..ec8850be919 100644 --- a/operators/InverseGhostZone/InverseGhostZoneGUIPluginInfo.C +++ b/operators/InverseGhostZone/InverseGhostZoneGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo InverseGhostZone_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* InverseGhostZone_GetGUIInfo() { return new InverseGhostZoneGUIPluginInfo; } diff --git a/operators/InverseGhostZone/InverseGhostZonePluginInfo.C b/operators/InverseGhostZone/InverseGhostZonePluginInfo.C index d85050f0bb2..e2700cc86d5 100644 --- a/operators/InverseGhostZone/InverseGhostZonePluginInfo.C +++ b/operators/InverseGhostZone/InverseGhostZonePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *InverseGhostZoneVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo InverseGhostZone_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* InverseGhostZone_GetGeneralInfo() { return new InverseGhostZoneGeneralPluginInfo; } diff --git a/operators/InverseGhostZone/InverseGhostZoneScriptingPluginInfo.C b/operators/InverseGhostZone/InverseGhostZoneScriptingPluginInfo.C index 2db5edf4ab8..6a747cbce49 100644 --- a/operators/InverseGhostZone/InverseGhostZoneScriptingPluginInfo.C +++ b/operators/InverseGhostZone/InverseGhostZoneScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo InverseGhostZone_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* InverseGhostZone_GetScriptingInfo() { return new InverseGhostZoneScriptingPluginInfo; } diff --git a/operators/InverseGhostZone/InverseGhostZoneViewerPluginInfo.C b/operators/InverseGhostZone/InverseGhostZoneViewerPluginInfo.C index 0ffda2a2aed..2ba4ac7ebed 100644 --- a/operators/InverseGhostZone/InverseGhostZoneViewerPluginInfo.C +++ b/operators/InverseGhostZone/InverseGhostZoneViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo InverseGhostZone_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* InverseGhostZone_GetViewerInfo() { InverseGhostZoneViewerPluginInfo::InitializeGlobalObjects(); return new InverseGhostZoneViewerPluginInfo; diff --git a/operators/Isosurface/IsosurfaceEnginePluginInfo.C b/operators/Isosurface/IsosurfaceEnginePluginInfo.C index c84e6108d03..00257cd1cb4 100644 --- a/operators/Isosurface/IsosurfaceEnginePluginInfo.C +++ b/operators/Isosurface/IsosurfaceEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Isosurface_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Isosurface_GetEngineInfo() { return new IsosurfaceEnginePluginInfo; } diff --git a/operators/Isosurface/IsosurfaceGUIPluginInfo.C b/operators/Isosurface/IsosurfaceGUIPluginInfo.C index 6443cd64d13..17c00f73501 100644 --- a/operators/Isosurface/IsosurfaceGUIPluginInfo.C +++ b/operators/Isosurface/IsosurfaceGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Isosurface_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Isosurface_GetGUIInfo() { return new IsosurfaceGUIPluginInfo; } diff --git a/operators/Isosurface/IsosurfacePluginInfo.C b/operators/Isosurface/IsosurfacePluginInfo.C index e9eb3fa3d02..8f95553142b 100644 --- a/operators/Isosurface/IsosurfacePluginInfo.C +++ b/operators/Isosurface/IsosurfacePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *IsosurfaceVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Isosurface_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Isosurface_GetGeneralInfo() { return new IsosurfaceGeneralPluginInfo; } diff --git a/operators/Isosurface/IsosurfaceScriptingPluginInfo.C b/operators/Isosurface/IsosurfaceScriptingPluginInfo.C index 5e348e020bc..5d76af23b0a 100644 --- a/operators/Isosurface/IsosurfaceScriptingPluginInfo.C +++ b/operators/Isosurface/IsosurfaceScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Isosurface_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Isosurface_GetScriptingInfo() { return new IsosurfaceScriptingPluginInfo; } diff --git a/operators/Isosurface/IsosurfaceViewerPluginInfo.C b/operators/Isosurface/IsosurfaceViewerPluginInfo.C index a151110b076..b53aa4efc73 100644 --- a/operators/Isosurface/IsosurfaceViewerPluginInfo.C +++ b/operators/Isosurface/IsosurfaceViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Isosurface_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Isosurface_GetViewerInfo() { IsosurfaceViewerPluginInfo::InitializeGlobalObjects(); return new IsosurfaceViewerPluginInfo; diff --git a/operators/Isovolume/IsovolumeEnginePluginInfo.C b/operators/Isovolume/IsovolumeEnginePluginInfo.C index 97dc61a7d95..6d7d9d9478b 100644 --- a/operators/Isovolume/IsovolumeEnginePluginInfo.C +++ b/operators/Isovolume/IsovolumeEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Isovolume_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Isovolume_GetEngineInfo() { return new IsovolumeEnginePluginInfo; } diff --git a/operators/Isovolume/IsovolumeGUIPluginInfo.C b/operators/Isovolume/IsovolumeGUIPluginInfo.C index 5aeeb9cc4b5..b786d959c9c 100644 --- a/operators/Isovolume/IsovolumeGUIPluginInfo.C +++ b/operators/Isovolume/IsovolumeGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Isovolume_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Isovolume_GetGUIInfo() { return new IsovolumeGUIPluginInfo; } diff --git a/operators/Isovolume/IsovolumePluginInfo.C b/operators/Isovolume/IsovolumePluginInfo.C index e43256c3f20..d984bdd6f7b 100644 --- a/operators/Isovolume/IsovolumePluginInfo.C +++ b/operators/Isovolume/IsovolumePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *IsovolumeVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Isovolume_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Isovolume_GetGeneralInfo() { return new IsovolumeGeneralPluginInfo; } diff --git a/operators/Isovolume/IsovolumeScriptingPluginInfo.C b/operators/Isovolume/IsovolumeScriptingPluginInfo.C index 241b634ea95..0c6b415f43d 100644 --- a/operators/Isovolume/IsovolumeScriptingPluginInfo.C +++ b/operators/Isovolume/IsovolumeScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Isovolume_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Isovolume_GetScriptingInfo() { return new IsovolumeScriptingPluginInfo; } diff --git a/operators/Isovolume/IsovolumeViewerPluginInfo.C b/operators/Isovolume/IsovolumeViewerPluginInfo.C index 849078a58d6..f0d32dd409c 100644 --- a/operators/Isovolume/IsovolumeViewerPluginInfo.C +++ b/operators/Isovolume/IsovolumeViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Isovolume_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Isovolume_GetViewerInfo() { IsovolumeViewerPluginInfo::InitializeGlobalObjects(); return new IsovolumeViewerPluginInfo; diff --git a/operators/LineSurface/LineSurfaceEnginePluginInfo.C b/operators/LineSurface/LineSurfaceEnginePluginInfo.C index 0247681ee78..aa480c7a988 100644 --- a/operators/LineSurface/LineSurfaceEnginePluginInfo.C +++ b/operators/LineSurface/LineSurfaceEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo LineSurface_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* LineSurface_GetEngineInfo() { return new LineSurfaceEnginePluginInfo; } diff --git a/operators/LineSurface/LineSurfaceGUIPluginInfo.C b/operators/LineSurface/LineSurfaceGUIPluginInfo.C index c104cba4670..cfa3b94c7da 100644 --- a/operators/LineSurface/LineSurfaceGUIPluginInfo.C +++ b/operators/LineSurface/LineSurfaceGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo LineSurface_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* LineSurface_GetGUIInfo() { return new LineSurfaceGUIPluginInfo; } diff --git a/operators/LineSurface/LineSurfacePluginInfo.C b/operators/LineSurface/LineSurfacePluginInfo.C index 16199ed68e2..0f2258a4a2e 100644 --- a/operators/LineSurface/LineSurfacePluginInfo.C +++ b/operators/LineSurface/LineSurfacePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *LineSurfaceVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo LineSurface_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* LineSurface_GetGeneralInfo() { return new LineSurfaceGeneralPluginInfo; } diff --git a/operators/LineSurface/LineSurfaceScriptingPluginInfo.C b/operators/LineSurface/LineSurfaceScriptingPluginInfo.C index 2db98e460f9..d6fa78c5ca6 100644 --- a/operators/LineSurface/LineSurfaceScriptingPluginInfo.C +++ b/operators/LineSurface/LineSurfaceScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo LineSurface_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* LineSurface_GetScriptingInfo() { return new LineSurfaceScriptingPluginInfo; } diff --git a/operators/LineSurface/LineSurfaceViewerPluginInfo.C b/operators/LineSurface/LineSurfaceViewerPluginInfo.C index ee769b49b12..f1cb4bc3bae 100644 --- a/operators/LineSurface/LineSurfaceViewerPluginInfo.C +++ b/operators/LineSurface/LineSurfaceViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo LineSurface_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* LineSurface_GetViewerInfo() { LineSurfaceViewerPluginInfo::InitializeGlobalObjects(); return new LineSurfaceViewerPluginInfo; diff --git a/operators/Lineout/LineoutEnginePluginInfo.C b/operators/Lineout/LineoutEnginePluginInfo.C index 987f6eab136..3171b512e7f 100644 --- a/operators/Lineout/LineoutEnginePluginInfo.C +++ b/operators/Lineout/LineoutEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Lineout_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Lineout_GetEngineInfo() { return new LineoutEnginePluginInfo; } diff --git a/operators/Lineout/LineoutGUIPluginInfo.C b/operators/Lineout/LineoutGUIPluginInfo.C index d166dad19f7..6088cfbfc6b 100644 --- a/operators/Lineout/LineoutGUIPluginInfo.C +++ b/operators/Lineout/LineoutGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Lineout_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Lineout_GetGUIInfo() { return new LineoutGUIPluginInfo; } diff --git a/operators/Lineout/LineoutPluginInfo.C b/operators/Lineout/LineoutPluginInfo.C index cb6385f6779..50f8cfcebe5 100644 --- a/operators/Lineout/LineoutPluginInfo.C +++ b/operators/Lineout/LineoutPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *LineoutVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Lineout_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Lineout_GetGeneralInfo() { return new LineoutGeneralPluginInfo; } diff --git a/operators/Lineout/LineoutScriptingPluginInfo.C b/operators/Lineout/LineoutScriptingPluginInfo.C index a15db456f42..06f9e31b110 100644 --- a/operators/Lineout/LineoutScriptingPluginInfo.C +++ b/operators/Lineout/LineoutScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Lineout_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Lineout_GetScriptingInfo() { return new LineoutScriptingPluginInfo; } diff --git a/operators/Lineout/LineoutViewerPluginInfo.C b/operators/Lineout/LineoutViewerPluginInfo.C index de92f851a08..3858e8a8a56 100644 --- a/operators/Lineout/LineoutViewerPluginInfo.C +++ b/operators/Lineout/LineoutViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Lineout_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Lineout_GetViewerInfo() { LineoutViewerPluginInfo::InitializeGlobalObjects(); return new LineoutViewerPluginInfo; diff --git a/operators/Merge/MergeEnginePluginInfo.C b/operators/Merge/MergeEnginePluginInfo.C index 8120e2b0d85..d06d30b17ae 100644 --- a/operators/Merge/MergeEnginePluginInfo.C +++ b/operators/Merge/MergeEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Merge_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Merge_GetEngineInfo() { return new MergeEnginePluginInfo; } diff --git a/operators/Merge/MergeGUIPluginInfo.C b/operators/Merge/MergeGUIPluginInfo.C index 3b3f46402b1..b57b1d0d160 100644 --- a/operators/Merge/MergeGUIPluginInfo.C +++ b/operators/Merge/MergeGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Merge_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Merge_GetGUIInfo() { return new MergeGUIPluginInfo; } diff --git a/operators/Merge/MergePluginInfo.C b/operators/Merge/MergePluginInfo.C index 7520f06b755..8050e64b8a1 100644 --- a/operators/Merge/MergePluginInfo.C +++ b/operators/Merge/MergePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *MergeVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Merge_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Merge_GetGeneralInfo() { return new MergeGeneralPluginInfo; } diff --git a/operators/Merge/MergeScriptingPluginInfo.C b/operators/Merge/MergeScriptingPluginInfo.C index 609ec5a7268..7301a2ed038 100644 --- a/operators/Merge/MergeScriptingPluginInfo.C +++ b/operators/Merge/MergeScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Merge_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Merge_GetScriptingInfo() { return new MergeScriptingPluginInfo; } diff --git a/operators/Merge/MergeViewerPluginInfo.C b/operators/Merge/MergeViewerPluginInfo.C index 46d1d37693c..3223f8c9fbf 100644 --- a/operators/Merge/MergeViewerPluginInfo.C +++ b/operators/Merge/MergeViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Merge_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Merge_GetViewerInfo() { MergeViewerPluginInfo::InitializeGlobalObjects(); return new MergeViewerPluginInfo; diff --git a/operators/MetricThreshold/MetricThresholdEnginePluginInfo.C b/operators/MetricThreshold/MetricThresholdEnginePluginInfo.C index e56c09be057..72078496329 100644 --- a/operators/MetricThreshold/MetricThresholdEnginePluginInfo.C +++ b/operators/MetricThreshold/MetricThresholdEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo MetricThreshold_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* MetricThreshold_GetEngineInfo() { return new MetricThresholdEnginePluginInfo; } diff --git a/operators/MetricThreshold/MetricThresholdGUIPluginInfo.C b/operators/MetricThreshold/MetricThresholdGUIPluginInfo.C index 5b695a78ef5..165a3a3d86d 100644 --- a/operators/MetricThreshold/MetricThresholdGUIPluginInfo.C +++ b/operators/MetricThreshold/MetricThresholdGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo MetricThreshold_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* MetricThreshold_GetGUIInfo() { return new MetricThresholdGUIPluginInfo; } diff --git a/operators/MetricThreshold/MetricThresholdPluginInfo.C b/operators/MetricThreshold/MetricThresholdPluginInfo.C index ee5a913f56e..526f9d9c118 100644 --- a/operators/MetricThreshold/MetricThresholdPluginInfo.C +++ b/operators/MetricThreshold/MetricThresholdPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *MetricThresholdVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo MetricThreshold_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* MetricThreshold_GetGeneralInfo() { return new MetricThresholdGeneralPluginInfo; } diff --git a/operators/MetricThreshold/MetricThresholdScriptingPluginInfo.C b/operators/MetricThreshold/MetricThresholdScriptingPluginInfo.C index fdda3002119..5ac010d5e39 100644 --- a/operators/MetricThreshold/MetricThresholdScriptingPluginInfo.C +++ b/operators/MetricThreshold/MetricThresholdScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo MetricThreshold_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* MetricThreshold_GetScriptingInfo() { return new MetricThresholdScriptingPluginInfo; } diff --git a/operators/MetricThreshold/MetricThresholdViewerPluginInfo.C b/operators/MetricThreshold/MetricThresholdViewerPluginInfo.C index 6f335555a62..1f749e399b4 100644 --- a/operators/MetricThreshold/MetricThresholdViewerPluginInfo.C +++ b/operators/MetricThreshold/MetricThresholdViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo MetricThreshold_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* MetricThreshold_GetViewerInfo() { MetricThresholdViewerPluginInfo::InitializeGlobalObjects(); return new MetricThresholdViewerPluginInfo; diff --git a/operators/OnionPeel/OnionPeelEnginePluginInfo.C b/operators/OnionPeel/OnionPeelEnginePluginInfo.C index 512c7bcbe26..43960b3e958 100644 --- a/operators/OnionPeel/OnionPeelEnginePluginInfo.C +++ b/operators/OnionPeel/OnionPeelEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo OnionPeel_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* OnionPeel_GetEngineInfo() { return new OnionPeelEnginePluginInfo; } diff --git a/operators/OnionPeel/OnionPeelGUIPluginInfo.C b/operators/OnionPeel/OnionPeelGUIPluginInfo.C index 697b5098817..82aeec081bc 100644 --- a/operators/OnionPeel/OnionPeelGUIPluginInfo.C +++ b/operators/OnionPeel/OnionPeelGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo OnionPeel_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* OnionPeel_GetGUIInfo() { return new OnionPeelGUIPluginInfo; } diff --git a/operators/OnionPeel/OnionPeelPluginInfo.C b/operators/OnionPeel/OnionPeelPluginInfo.C index 022a561d2d8..9f60d6530aa 100644 --- a/operators/OnionPeel/OnionPeelPluginInfo.C +++ b/operators/OnionPeel/OnionPeelPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *OnionPeelVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo OnionPeel_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* OnionPeel_GetGeneralInfo() { return new OnionPeelGeneralPluginInfo; } diff --git a/operators/OnionPeel/OnionPeelScriptingPluginInfo.C b/operators/OnionPeel/OnionPeelScriptingPluginInfo.C index 855d48c1717..65d9c04a298 100644 --- a/operators/OnionPeel/OnionPeelScriptingPluginInfo.C +++ b/operators/OnionPeel/OnionPeelScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo OnionPeel_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* OnionPeel_GetScriptingInfo() { return new OnionPeelScriptingPluginInfo; } diff --git a/operators/OnionPeel/OnionPeelViewerPluginInfo.C b/operators/OnionPeel/OnionPeelViewerPluginInfo.C index df6cae54ddb..eaaf44ebe22 100644 --- a/operators/OnionPeel/OnionPeelViewerPluginInfo.C +++ b/operators/OnionPeel/OnionPeelViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo OnionPeel_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* OnionPeel_GetViewerInfo() { OnionPeelViewerPluginInfo::InitializeGlobalObjects(); return new OnionPeelViewerPluginInfo; diff --git a/operators/PDF/PDFEnginePluginInfo.C b/operators/PDF/PDFEnginePluginInfo.C index aa3218d81af..372b23772eb 100644 --- a/operators/PDF/PDFEnginePluginInfo.C +++ b/operators/PDF/PDFEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo PDF_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* PDF_GetEngineInfo() { return new PDFEnginePluginInfo; } diff --git a/operators/PDF/PDFGUIPluginInfo.C b/operators/PDF/PDFGUIPluginInfo.C index fe4da034a7e..e4290a42986 100644 --- a/operators/PDF/PDFGUIPluginInfo.C +++ b/operators/PDF/PDFGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo PDF_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* PDF_GetGUIInfo() { return new PDFGUIPluginInfo; } diff --git a/operators/PDF/PDFPluginInfo.C b/operators/PDF/PDFPluginInfo.C index 5712678b02e..0b115235f10 100644 --- a/operators/PDF/PDFPluginInfo.C +++ b/operators/PDF/PDFPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *PDFVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo PDF_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* PDF_GetGeneralInfo() { return new PDFGeneralPluginInfo; } diff --git a/operators/PDF/PDFScriptingPluginInfo.C b/operators/PDF/PDFScriptingPluginInfo.C index 5960fe68957..de740ac79fc 100644 --- a/operators/PDF/PDFScriptingPluginInfo.C +++ b/operators/PDF/PDFScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo PDF_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* PDF_GetScriptingInfo() { return new PDFScriptingPluginInfo; } diff --git a/operators/PDF/PDFViewerPluginInfo.C b/operators/PDF/PDFViewerPluginInfo.C index 58305edd4e2..7232e951a93 100644 --- a/operators/PDF/PDFViewerPluginInfo.C +++ b/operators/PDF/PDFViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo PDF_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* PDF_GetViewerInfo() { PDFViewerPluginInfo::InitializeGlobalObjects(); return new PDFViewerPluginInfo; diff --git a/operators/PersistentParticles/PersistentParticlesEnginePluginInfo.C b/operators/PersistentParticles/PersistentParticlesEnginePluginInfo.C index f298ac8b638..e9063aef036 100644 --- a/operators/PersistentParticles/PersistentParticlesEnginePluginInfo.C +++ b/operators/PersistentParticles/PersistentParticlesEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo PersistentParticles_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* PersistentParticles_GetEngineInfo() { return new PersistentParticlesEnginePluginInfo; } diff --git a/operators/PersistentParticles/PersistentParticlesGUIPluginInfo.C b/operators/PersistentParticles/PersistentParticlesGUIPluginInfo.C index e88a48f5ee0..21bf316f803 100644 --- a/operators/PersistentParticles/PersistentParticlesGUIPluginInfo.C +++ b/operators/PersistentParticles/PersistentParticlesGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo PersistentParticles_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* PersistentParticles_GetGUIInfo() { return new PersistentParticlesGUIPluginInfo; } diff --git a/operators/PersistentParticles/PersistentParticlesPluginInfo.C b/operators/PersistentParticles/PersistentParticlesPluginInfo.C index 5024c9da1de..77457231823 100644 --- a/operators/PersistentParticles/PersistentParticlesPluginInfo.C +++ b/operators/PersistentParticles/PersistentParticlesPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *PersistentParticlesVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo PersistentParticles_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* PersistentParticles_GetGeneralInfo() { return new PersistentParticlesGeneralPluginInfo; } diff --git a/operators/PersistentParticles/PersistentParticlesScriptingPluginInfo.C b/operators/PersistentParticles/PersistentParticlesScriptingPluginInfo.C index f11299b0788..2c250c2cd04 100644 --- a/operators/PersistentParticles/PersistentParticlesScriptingPluginInfo.C +++ b/operators/PersistentParticles/PersistentParticlesScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo PersistentParticles_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* PersistentParticles_GetScriptingInfo() { return new PersistentParticlesScriptingPluginInfo; } diff --git a/operators/PersistentParticles/PersistentParticlesViewerPluginInfo.C b/operators/PersistentParticles/PersistentParticlesViewerPluginInfo.C index 30f311cb941..1668ec3da92 100644 --- a/operators/PersistentParticles/PersistentParticlesViewerPluginInfo.C +++ b/operators/PersistentParticles/PersistentParticlesViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo PersistentParticles_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* PersistentParticles_GetViewerInfo() { PersistentParticlesViewerPluginInfo::InitializeGlobalObjects(); return new PersistentParticlesViewerPluginInfo; diff --git a/operators/Project/ProjectEnginePluginInfo.C b/operators/Project/ProjectEnginePluginInfo.C index 8535236caf2..9e10b85a76b 100644 --- a/operators/Project/ProjectEnginePluginInfo.C +++ b/operators/Project/ProjectEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Project_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Project_GetEngineInfo() { return new ProjectEnginePluginInfo; } diff --git a/operators/Project/ProjectGUIPluginInfo.C b/operators/Project/ProjectGUIPluginInfo.C index e95b0f4d2ea..03e65331859 100644 --- a/operators/Project/ProjectGUIPluginInfo.C +++ b/operators/Project/ProjectGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Project_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Project_GetGUIInfo() { return new ProjectGUIPluginInfo; } diff --git a/operators/Project/ProjectPluginInfo.C b/operators/Project/ProjectPluginInfo.C index 22949d68eb9..e3bf2d7b1c3 100644 --- a/operators/Project/ProjectPluginInfo.C +++ b/operators/Project/ProjectPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *ProjectVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Project_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Project_GetGeneralInfo() { return new ProjectGeneralPluginInfo; } diff --git a/operators/Project/ProjectScriptingPluginInfo.C b/operators/Project/ProjectScriptingPluginInfo.C index 5100cd50ad2..00d89708b8a 100644 --- a/operators/Project/ProjectScriptingPluginInfo.C +++ b/operators/Project/ProjectScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Project_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Project_GetScriptingInfo() { return new ProjectScriptingPluginInfo; } diff --git a/operators/Project/ProjectViewerPluginInfo.C b/operators/Project/ProjectViewerPluginInfo.C index 77b8edc7c8f..ad55ec436e6 100644 --- a/operators/Project/ProjectViewerPluginInfo.C +++ b/operators/Project/ProjectViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Project_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Project_GetViewerInfo() { ProjectViewerPluginInfo::InitializeGlobalObjects(); return new ProjectViewerPluginInfo; diff --git a/operators/Reflect/ReflectEnginePluginInfo.C b/operators/Reflect/ReflectEnginePluginInfo.C index 31cc64dfd88..731b86ccf8a 100644 --- a/operators/Reflect/ReflectEnginePluginInfo.C +++ b/operators/Reflect/ReflectEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Reflect_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Reflect_GetEngineInfo() { return new ReflectEnginePluginInfo; } diff --git a/operators/Reflect/ReflectGUIPluginInfo.C b/operators/Reflect/ReflectGUIPluginInfo.C index 93e01514cc8..ff51419f337 100644 --- a/operators/Reflect/ReflectGUIPluginInfo.C +++ b/operators/Reflect/ReflectGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Reflect_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Reflect_GetGUIInfo() { return new ReflectGUIPluginInfo; } diff --git a/operators/Reflect/ReflectPluginInfo.C b/operators/Reflect/ReflectPluginInfo.C index 973f8f71317..a15d59b86f5 100644 --- a/operators/Reflect/ReflectPluginInfo.C +++ b/operators/Reflect/ReflectPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *ReflectVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Reflect_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Reflect_GetGeneralInfo() { return new ReflectGeneralPluginInfo; } diff --git a/operators/Reflect/ReflectScriptingPluginInfo.C b/operators/Reflect/ReflectScriptingPluginInfo.C index 5744376d533..b66e8247085 100644 --- a/operators/Reflect/ReflectScriptingPluginInfo.C +++ b/operators/Reflect/ReflectScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Reflect_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Reflect_GetScriptingInfo() { return new ReflectScriptingPluginInfo; } diff --git a/operators/Reflect/ReflectViewerPluginInfo.C b/operators/Reflect/ReflectViewerPluginInfo.C index aea2a5157a9..7eb920fea52 100644 --- a/operators/Reflect/ReflectViewerPluginInfo.C +++ b/operators/Reflect/ReflectViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Reflect_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Reflect_GetViewerInfo() { ReflectViewerPluginInfo::InitializeGlobalObjects(); return new ReflectViewerPluginInfo; diff --git a/operators/RemoveCells/RemoveCellsEnginePluginInfo.C b/operators/RemoveCells/RemoveCellsEnginePluginInfo.C index 1281887c2e5..6befdcebb65 100644 --- a/operators/RemoveCells/RemoveCellsEnginePluginInfo.C +++ b/operators/RemoveCells/RemoveCellsEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo RemoveCells_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* RemoveCells_GetEngineInfo() { return new RemoveCellsEnginePluginInfo; } diff --git a/operators/RemoveCells/RemoveCellsGUIPluginInfo.C b/operators/RemoveCells/RemoveCellsGUIPluginInfo.C index eb4b9ac8323..33c4e59cf81 100644 --- a/operators/RemoveCells/RemoveCellsGUIPluginInfo.C +++ b/operators/RemoveCells/RemoveCellsGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo RemoveCells_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* RemoveCells_GetGUIInfo() { return new RemoveCellsGUIPluginInfo; } diff --git a/operators/RemoveCells/RemoveCellsPluginInfo.C b/operators/RemoveCells/RemoveCellsPluginInfo.C index 1ef15bf0eeb..856a5635b23 100644 --- a/operators/RemoveCells/RemoveCellsPluginInfo.C +++ b/operators/RemoveCells/RemoveCellsPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *RemoveCellsVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo RemoveCells_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* RemoveCells_GetGeneralInfo() { return new RemoveCellsGeneralPluginInfo; } diff --git a/operators/RemoveCells/RemoveCellsScriptingPluginInfo.C b/operators/RemoveCells/RemoveCellsScriptingPluginInfo.C index 2ae58155d1f..4a2dfe2f09f 100644 --- a/operators/RemoveCells/RemoveCellsScriptingPluginInfo.C +++ b/operators/RemoveCells/RemoveCellsScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo RemoveCells_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* RemoveCells_GetScriptingInfo() { return new RemoveCellsScriptingPluginInfo; } diff --git a/operators/RemoveCells/RemoveCellsViewerPluginInfo.C b/operators/RemoveCells/RemoveCellsViewerPluginInfo.C index 3442afbb06c..63874de8f3f 100644 --- a/operators/RemoveCells/RemoveCellsViewerPluginInfo.C +++ b/operators/RemoveCells/RemoveCellsViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo RemoveCells_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* RemoveCells_GetViewerInfo() { RemoveCellsViewerPluginInfo::InitializeGlobalObjects(); return new RemoveCellsViewerPluginInfo; diff --git a/operators/Replicate/ReplicateEnginePluginInfo.C b/operators/Replicate/ReplicateEnginePluginInfo.C index 49e9083691e..0cac5a99def 100644 --- a/operators/Replicate/ReplicateEnginePluginInfo.C +++ b/operators/Replicate/ReplicateEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Replicate_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Replicate_GetEngineInfo() { return new ReplicateEnginePluginInfo; } diff --git a/operators/Replicate/ReplicateGUIPluginInfo.C b/operators/Replicate/ReplicateGUIPluginInfo.C index 1859d609e70..7c603a3c305 100644 --- a/operators/Replicate/ReplicateGUIPluginInfo.C +++ b/operators/Replicate/ReplicateGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Replicate_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Replicate_GetGUIInfo() { return new ReplicateGUIPluginInfo; } diff --git a/operators/Replicate/ReplicatePluginInfo.C b/operators/Replicate/ReplicatePluginInfo.C index 3763dfee6d6..2f749b70e88 100644 --- a/operators/Replicate/ReplicatePluginInfo.C +++ b/operators/Replicate/ReplicatePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *ReplicateVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Replicate_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Replicate_GetGeneralInfo() { return new ReplicateGeneralPluginInfo; } diff --git a/operators/Replicate/ReplicateScriptingPluginInfo.C b/operators/Replicate/ReplicateScriptingPluginInfo.C index 40397c80663..b03517fbcfa 100644 --- a/operators/Replicate/ReplicateScriptingPluginInfo.C +++ b/operators/Replicate/ReplicateScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Replicate_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Replicate_GetScriptingInfo() { return new ReplicateScriptingPluginInfo; } diff --git a/operators/Replicate/ReplicateViewerPluginInfo.C b/operators/Replicate/ReplicateViewerPluginInfo.C index 3cf6596d26f..74ce96c3aec 100644 --- a/operators/Replicate/ReplicateViewerPluginInfo.C +++ b/operators/Replicate/ReplicateViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Replicate_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Replicate_GetViewerInfo() { ReplicateViewerPluginInfo::InitializeGlobalObjects(); return new ReplicateViewerPluginInfo; diff --git a/operators/Resample/ResampleEnginePluginInfo.C b/operators/Resample/ResampleEnginePluginInfo.C index c5737d87a7e..47e7978bece 100644 --- a/operators/Resample/ResampleEnginePluginInfo.C +++ b/operators/Resample/ResampleEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Resample_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Resample_GetEngineInfo() { return new ResampleEnginePluginInfo; } diff --git a/operators/Resample/ResampleGUIPluginInfo.C b/operators/Resample/ResampleGUIPluginInfo.C index 2d883687321..10db6b846f2 100644 --- a/operators/Resample/ResampleGUIPluginInfo.C +++ b/operators/Resample/ResampleGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Resample_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Resample_GetGUIInfo() { return new ResampleGUIPluginInfo; } diff --git a/operators/Resample/ResamplePluginInfo.C b/operators/Resample/ResamplePluginInfo.C index a969cd2fe46..b23717ed70f 100644 --- a/operators/Resample/ResamplePluginInfo.C +++ b/operators/Resample/ResamplePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *ResampleVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Resample_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Resample_GetGeneralInfo() { return new ResampleGeneralPluginInfo; } diff --git a/operators/Resample/ResampleScriptingPluginInfo.C b/operators/Resample/ResampleScriptingPluginInfo.C index 9611ff91501..143316583a9 100644 --- a/operators/Resample/ResampleScriptingPluginInfo.C +++ b/operators/Resample/ResampleScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Resample_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Resample_GetScriptingInfo() { return new ResampleScriptingPluginInfo; } diff --git a/operators/Resample/ResampleViewerPluginInfo.C b/operators/Resample/ResampleViewerPluginInfo.C index c008c7a1db3..ce6c36a40de 100644 --- a/operators/Resample/ResampleViewerPluginInfo.C +++ b/operators/Resample/ResampleViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Resample_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Resample_GetViewerInfo() { ResampleViewerPluginInfo::InitializeGlobalObjects(); return new ResampleViewerPluginInfo; diff --git a/operators/Revolve/RevolveEnginePluginInfo.C b/operators/Revolve/RevolveEnginePluginInfo.C index b95dc829c62..5dc3e998f85 100644 --- a/operators/Revolve/RevolveEnginePluginInfo.C +++ b/operators/Revolve/RevolveEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Revolve_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Revolve_GetEngineInfo() { return new RevolveEnginePluginInfo; } diff --git a/operators/Revolve/RevolveGUIPluginInfo.C b/operators/Revolve/RevolveGUIPluginInfo.C index 25c4533b5c6..5ddedf47e9c 100644 --- a/operators/Revolve/RevolveGUIPluginInfo.C +++ b/operators/Revolve/RevolveGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Revolve_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Revolve_GetGUIInfo() { return new RevolveGUIPluginInfo; } diff --git a/operators/Revolve/RevolvePluginInfo.C b/operators/Revolve/RevolvePluginInfo.C index 7e2852cf722..9a526c91d69 100644 --- a/operators/Revolve/RevolvePluginInfo.C +++ b/operators/Revolve/RevolvePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *RevolveVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Revolve_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Revolve_GetGeneralInfo() { return new RevolveGeneralPluginInfo; } diff --git a/operators/Revolve/RevolveScriptingPluginInfo.C b/operators/Revolve/RevolveScriptingPluginInfo.C index df62b267161..6883fba2c51 100644 --- a/operators/Revolve/RevolveScriptingPluginInfo.C +++ b/operators/Revolve/RevolveScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Revolve_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Revolve_GetScriptingInfo() { return new RevolveScriptingPluginInfo; } diff --git a/operators/Revolve/RevolveViewerPluginInfo.C b/operators/Revolve/RevolveViewerPluginInfo.C index d5d6ea95b6c..8748b852adc 100644 --- a/operators/Revolve/RevolveViewerPluginInfo.C +++ b/operators/Revolve/RevolveViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Revolve_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Revolve_GetViewerInfo() { RevolveViewerPluginInfo::InitializeGlobalObjects(); return new RevolveViewerPluginInfo; diff --git a/operators/SiloDump/SiloDumpEnginePluginInfo.C b/operators/SiloDump/SiloDumpEnginePluginInfo.C index 13f13decaf8..49eeb3b9aff 100644 --- a/operators/SiloDump/SiloDumpEnginePluginInfo.C +++ b/operators/SiloDump/SiloDumpEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo SiloDump_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* SiloDump_GetEngineInfo() { return new SiloDumpEnginePluginInfo; } diff --git a/operators/SiloDump/SiloDumpGUIPluginInfo.C b/operators/SiloDump/SiloDumpGUIPluginInfo.C index a6802d07fda..54f8d583867 100644 --- a/operators/SiloDump/SiloDumpGUIPluginInfo.C +++ b/operators/SiloDump/SiloDumpGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo SiloDump_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* SiloDump_GetGUIInfo() { return new SiloDumpGUIPluginInfo; } diff --git a/operators/SiloDump/SiloDumpPluginInfo.C b/operators/SiloDump/SiloDumpPluginInfo.C index e6e423e9283..95950f37010 100644 --- a/operators/SiloDump/SiloDumpPluginInfo.C +++ b/operators/SiloDump/SiloDumpPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *SiloDumpVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo SiloDump_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* SiloDump_GetGeneralInfo() { return new SiloDumpGeneralPluginInfo; } diff --git a/operators/SiloDump/SiloDumpScriptingPluginInfo.C b/operators/SiloDump/SiloDumpScriptingPluginInfo.C index 99c5f42ea98..e7c31d29fa5 100644 --- a/operators/SiloDump/SiloDumpScriptingPluginInfo.C +++ b/operators/SiloDump/SiloDumpScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo SiloDump_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* SiloDump_GetScriptingInfo() { return new SiloDumpScriptingPluginInfo; } diff --git a/operators/SiloDump/SiloDumpViewerPluginInfo.C b/operators/SiloDump/SiloDumpViewerPluginInfo.C index 83a40eda378..c8d89097f30 100644 --- a/operators/SiloDump/SiloDumpViewerPluginInfo.C +++ b/operators/SiloDump/SiloDumpViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo SiloDump_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* SiloDump_GetViewerInfo() { SiloDumpViewerPluginInfo::InitializeGlobalObjects(); return new SiloDumpViewerPluginInfo; diff --git a/operators/Slice/SliceEnginePluginInfo.C b/operators/Slice/SliceEnginePluginInfo.C index dd54a1369b9..4828bf4a709 100644 --- a/operators/Slice/SliceEnginePluginInfo.C +++ b/operators/Slice/SliceEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Slice_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Slice_GetEngineInfo() { return new SliceEnginePluginInfo; } diff --git a/operators/Slice/SliceGUIPluginInfo.C b/operators/Slice/SliceGUIPluginInfo.C index d91ad44235a..2ddeb8690b3 100644 --- a/operators/Slice/SliceGUIPluginInfo.C +++ b/operators/Slice/SliceGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Slice_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Slice_GetGUIInfo() { return new SliceGUIPluginInfo; } diff --git a/operators/Slice/SlicePluginInfo.C b/operators/Slice/SlicePluginInfo.C index d9c91594632..0cf32c7f897 100644 --- a/operators/Slice/SlicePluginInfo.C +++ b/operators/Slice/SlicePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *SliceVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Slice_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Slice_GetGeneralInfo() { return new SliceGeneralPluginInfo; } diff --git a/operators/Slice/SliceScriptingPluginInfo.C b/operators/Slice/SliceScriptingPluginInfo.C index a5ab9f8ba02..4749227e3c3 100644 --- a/operators/Slice/SliceScriptingPluginInfo.C +++ b/operators/Slice/SliceScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Slice_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Slice_GetScriptingInfo() { return new SliceScriptingPluginInfo; } diff --git a/operators/Slice/SliceViewerPluginInfo.C b/operators/Slice/SliceViewerPluginInfo.C index 5eec60843a6..eab08e1ef61 100644 --- a/operators/Slice/SliceViewerPluginInfo.C +++ b/operators/Slice/SliceViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Slice_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Slice_GetViewerInfo() { SliceViewerPluginInfo::InitializeGlobalObjects(); return new SliceViewerPluginInfo; diff --git a/operators/Smooth/SmoothEnginePluginInfo.C b/operators/Smooth/SmoothEnginePluginInfo.C index 2dbc58c4bc8..003a5020d66 100644 --- a/operators/Smooth/SmoothEnginePluginInfo.C +++ b/operators/Smooth/SmoothEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Smooth_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Smooth_GetEngineInfo() { return new SmoothEnginePluginInfo; } diff --git a/operators/Smooth/SmoothGUIPluginInfo.C b/operators/Smooth/SmoothGUIPluginInfo.C index 0029cee4e71..044a00e8b16 100644 --- a/operators/Smooth/SmoothGUIPluginInfo.C +++ b/operators/Smooth/SmoothGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Smooth_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Smooth_GetGUIInfo() { return new SmoothGUIPluginInfo; } diff --git a/operators/Smooth/SmoothPluginInfo.C b/operators/Smooth/SmoothPluginInfo.C index b25ca42cc4c..7646b7c0e58 100644 --- a/operators/Smooth/SmoothPluginInfo.C +++ b/operators/Smooth/SmoothPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *SmoothVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Smooth_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Smooth_GetGeneralInfo() { return new SmoothGeneralPluginInfo; } diff --git a/operators/Smooth/SmoothScriptingPluginInfo.C b/operators/Smooth/SmoothScriptingPluginInfo.C index 05b062d53a6..bfb60c23dff 100644 --- a/operators/Smooth/SmoothScriptingPluginInfo.C +++ b/operators/Smooth/SmoothScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Smooth_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Smooth_GetScriptingInfo() { return new SmoothScriptingPluginInfo; } diff --git a/operators/Smooth/SmoothViewerPluginInfo.C b/operators/Smooth/SmoothViewerPluginInfo.C index 41f08b0e16d..eab826ce6f2 100644 --- a/operators/Smooth/SmoothViewerPluginInfo.C +++ b/operators/Smooth/SmoothViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Smooth_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Smooth_GetViewerInfo() { SmoothViewerPluginInfo::InitializeGlobalObjects(); return new SmoothViewerPluginInfo; diff --git a/operators/SphereSlice/SphereSliceEnginePluginInfo.C b/operators/SphereSlice/SphereSliceEnginePluginInfo.C index e21ce0c4b72..312ef34db47 100644 --- a/operators/SphereSlice/SphereSliceEnginePluginInfo.C +++ b/operators/SphereSlice/SphereSliceEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo SphereSlice_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* SphereSlice_GetEngineInfo() { return new SphereSliceEnginePluginInfo; } diff --git a/operators/SphereSlice/SphereSliceGUIPluginInfo.C b/operators/SphereSlice/SphereSliceGUIPluginInfo.C index 3df31fd9a42..276098e18c6 100644 --- a/operators/SphereSlice/SphereSliceGUIPluginInfo.C +++ b/operators/SphereSlice/SphereSliceGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo SphereSlice_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* SphereSlice_GetGUIInfo() { return new SphereSliceGUIPluginInfo; } diff --git a/operators/SphereSlice/SphereSlicePluginInfo.C b/operators/SphereSlice/SphereSlicePluginInfo.C index 6aefe05b31e..79b2b014a66 100644 --- a/operators/SphereSlice/SphereSlicePluginInfo.C +++ b/operators/SphereSlice/SphereSlicePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *SphereSliceVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo SphereSlice_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* SphereSlice_GetGeneralInfo() { return new SphereSliceGeneralPluginInfo; } diff --git a/operators/SphereSlice/SphereSliceScriptingPluginInfo.C b/operators/SphereSlice/SphereSliceScriptingPluginInfo.C index e28207e9043..8fdbbc862a8 100644 --- a/operators/SphereSlice/SphereSliceScriptingPluginInfo.C +++ b/operators/SphereSlice/SphereSliceScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo SphereSlice_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* SphereSlice_GetScriptingInfo() { return new SphereSliceScriptingPluginInfo; } diff --git a/operators/SphereSlice/SphereSliceViewerPluginInfo.C b/operators/SphereSlice/SphereSliceViewerPluginInfo.C index 48455369696..26a79edb76b 100644 --- a/operators/SphereSlice/SphereSliceViewerPluginInfo.C +++ b/operators/SphereSlice/SphereSliceViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo SphereSlice_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* SphereSlice_GetViewerInfo() { SphereSliceViewerPluginInfo::InitializeGlobalObjects(); return new SphereSliceViewerPluginInfo; diff --git a/operators/SubdivideQuads/SubdivideQuadsEnginePluginInfo.C b/operators/SubdivideQuads/SubdivideQuadsEnginePluginInfo.C index 18a106d12ac..b73cd9e2a26 100644 --- a/operators/SubdivideQuads/SubdivideQuadsEnginePluginInfo.C +++ b/operators/SubdivideQuads/SubdivideQuadsEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo SubdivideQuads_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* SubdivideQuads_GetEngineInfo() { return new SubdivideQuadsEnginePluginInfo; } diff --git a/operators/SubdivideQuads/SubdivideQuadsGUIPluginInfo.C b/operators/SubdivideQuads/SubdivideQuadsGUIPluginInfo.C index 36c4fc605c9..d7abbf094b9 100644 --- a/operators/SubdivideQuads/SubdivideQuadsGUIPluginInfo.C +++ b/operators/SubdivideQuads/SubdivideQuadsGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo SubdivideQuads_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* SubdivideQuads_GetGUIInfo() { return new SubdivideQuadsGUIPluginInfo; } diff --git a/operators/SubdivideQuads/SubdivideQuadsPluginInfo.C b/operators/SubdivideQuads/SubdivideQuadsPluginInfo.C index 6c351557cea..253aa33fc0a 100644 --- a/operators/SubdivideQuads/SubdivideQuadsPluginInfo.C +++ b/operators/SubdivideQuads/SubdivideQuadsPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *SubdivideQuadsVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo SubdivideQuads_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* SubdivideQuads_GetGeneralInfo() { return new SubdivideQuadsGeneralPluginInfo; } diff --git a/operators/SubdivideQuads/SubdivideQuadsScriptingPluginInfo.C b/operators/SubdivideQuads/SubdivideQuadsScriptingPluginInfo.C index 16ec923b137..fc5f8e94aad 100644 --- a/operators/SubdivideQuads/SubdivideQuadsScriptingPluginInfo.C +++ b/operators/SubdivideQuads/SubdivideQuadsScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo SubdivideQuads_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* SubdivideQuads_GetScriptingInfo() { return new SubdivideQuadsScriptingPluginInfo; } diff --git a/operators/SubdivideQuads/SubdivideQuadsViewerPluginInfo.C b/operators/SubdivideQuads/SubdivideQuadsViewerPluginInfo.C index bb7adcadf2e..8749d5af0c9 100644 --- a/operators/SubdivideQuads/SubdivideQuadsViewerPluginInfo.C +++ b/operators/SubdivideQuads/SubdivideQuadsViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo SubdivideQuads_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* SubdivideQuads_GetViewerInfo() { SubdivideQuadsViewerPluginInfo::InitializeGlobalObjects(); return new SubdivideQuadsViewerPluginInfo; diff --git a/operators/SurfCompPrep/SurfCompPrepEnginePluginInfo.C b/operators/SurfCompPrep/SurfCompPrepEnginePluginInfo.C index 4df4b944e2f..d68aefd8d11 100644 --- a/operators/SurfCompPrep/SurfCompPrepEnginePluginInfo.C +++ b/operators/SurfCompPrep/SurfCompPrepEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo SurfCompPrep_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* SurfCompPrep_GetEngineInfo() { return new SurfCompPrepEnginePluginInfo; } diff --git a/operators/SurfCompPrep/SurfCompPrepGUIPluginInfo.C b/operators/SurfCompPrep/SurfCompPrepGUIPluginInfo.C index b6037ce7263..876be8d3a34 100644 --- a/operators/SurfCompPrep/SurfCompPrepGUIPluginInfo.C +++ b/operators/SurfCompPrep/SurfCompPrepGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo SurfCompPrep_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* SurfCompPrep_GetGUIInfo() { return new SurfCompPrepGUIPluginInfo; } diff --git a/operators/SurfCompPrep/SurfCompPrepPluginInfo.C b/operators/SurfCompPrep/SurfCompPrepPluginInfo.C index 9e725b35534..6cecedfc782 100644 --- a/operators/SurfCompPrep/SurfCompPrepPluginInfo.C +++ b/operators/SurfCompPrep/SurfCompPrepPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *SurfCompPrepVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo SurfCompPrep_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* SurfCompPrep_GetGeneralInfo() { return new SurfCompPrepGeneralPluginInfo; } diff --git a/operators/SurfCompPrep/SurfCompPrepScriptingPluginInfo.C b/operators/SurfCompPrep/SurfCompPrepScriptingPluginInfo.C index 537b2cc8736..18bceb5f182 100644 --- a/operators/SurfCompPrep/SurfCompPrepScriptingPluginInfo.C +++ b/operators/SurfCompPrep/SurfCompPrepScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo SurfCompPrep_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* SurfCompPrep_GetScriptingInfo() { return new SurfCompPrepScriptingPluginInfo; } diff --git a/operators/SurfCompPrep/SurfCompPrepViewerPluginInfo.C b/operators/SurfCompPrep/SurfCompPrepViewerPluginInfo.C index 5b717723e86..831de538570 100644 --- a/operators/SurfCompPrep/SurfCompPrepViewerPluginInfo.C +++ b/operators/SurfCompPrep/SurfCompPrepViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo SurfCompPrep_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* SurfCompPrep_GetViewerInfo() { SurfCompPrepViewerPluginInfo::InitializeGlobalObjects(); return new SurfCompPrepViewerPluginInfo; diff --git a/operators/ThreeSlice/ThreeSliceEnginePluginInfo.C b/operators/ThreeSlice/ThreeSliceEnginePluginInfo.C index 08046234223..f169f71d07a 100644 --- a/operators/ThreeSlice/ThreeSliceEnginePluginInfo.C +++ b/operators/ThreeSlice/ThreeSliceEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo ThreeSlice_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* ThreeSlice_GetEngineInfo() { return new ThreeSliceEnginePluginInfo; } diff --git a/operators/ThreeSlice/ThreeSliceGUIPluginInfo.C b/operators/ThreeSlice/ThreeSliceGUIPluginInfo.C index 5620b992ea1..ca219db5b0b 100644 --- a/operators/ThreeSlice/ThreeSliceGUIPluginInfo.C +++ b/operators/ThreeSlice/ThreeSliceGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo ThreeSlice_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* ThreeSlice_GetGUIInfo() { return new ThreeSliceGUIPluginInfo; } diff --git a/operators/ThreeSlice/ThreeSlicePluginInfo.C b/operators/ThreeSlice/ThreeSlicePluginInfo.C index 226ae5a217b..1d23e344c44 100644 --- a/operators/ThreeSlice/ThreeSlicePluginInfo.C +++ b/operators/ThreeSlice/ThreeSlicePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *ThreeSliceVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo ThreeSlice_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* ThreeSlice_GetGeneralInfo() { return new ThreeSliceGeneralPluginInfo; } diff --git a/operators/ThreeSlice/ThreeSliceScriptingPluginInfo.C b/operators/ThreeSlice/ThreeSliceScriptingPluginInfo.C index bcae2793f0b..c864382d33b 100644 --- a/operators/ThreeSlice/ThreeSliceScriptingPluginInfo.C +++ b/operators/ThreeSlice/ThreeSliceScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo ThreeSlice_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* ThreeSlice_GetScriptingInfo() { return new ThreeSliceScriptingPluginInfo; } diff --git a/operators/ThreeSlice/ThreeSliceViewerPluginInfo.C b/operators/ThreeSlice/ThreeSliceViewerPluginInfo.C index 7a5eeff300d..01299c83e74 100644 --- a/operators/ThreeSlice/ThreeSliceViewerPluginInfo.C +++ b/operators/ThreeSlice/ThreeSliceViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo ThreeSlice_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* ThreeSlice_GetViewerInfo() { ThreeSliceViewerPluginInfo::InitializeGlobalObjects(); return new ThreeSliceViewerPluginInfo; diff --git a/operators/Threshold/ThresholdEnginePluginInfo.C b/operators/Threshold/ThresholdEnginePluginInfo.C index 26b6db7707d..966d3a8e366 100644 --- a/operators/Threshold/ThresholdEnginePluginInfo.C +++ b/operators/Threshold/ThresholdEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Threshold_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Threshold_GetEngineInfo() { return new ThresholdEnginePluginInfo; } diff --git a/operators/Threshold/ThresholdGUIPluginInfo.C b/operators/Threshold/ThresholdGUIPluginInfo.C index 928777105e6..00912d0feee 100644 --- a/operators/Threshold/ThresholdGUIPluginInfo.C +++ b/operators/Threshold/ThresholdGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Threshold_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Threshold_GetGUIInfo() { return new ThresholdGUIPluginInfo; } diff --git a/operators/Threshold/ThresholdPluginInfo.C b/operators/Threshold/ThresholdPluginInfo.C index c50f0d62e2e..b19f4f0896e 100644 --- a/operators/Threshold/ThresholdPluginInfo.C +++ b/operators/Threshold/ThresholdPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *ThresholdVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Threshold_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Threshold_GetGeneralInfo() { return new ThresholdGeneralPluginInfo; } diff --git a/operators/Threshold/ThresholdScriptingPluginInfo.C b/operators/Threshold/ThresholdScriptingPluginInfo.C index 2f3f81f07b1..7981353de04 100644 --- a/operators/Threshold/ThresholdScriptingPluginInfo.C +++ b/operators/Threshold/ThresholdScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Threshold_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Threshold_GetScriptingInfo() { return new ThresholdScriptingPluginInfo; } diff --git a/operators/Threshold/ThresholdViewerPluginInfo.C b/operators/Threshold/ThresholdViewerPluginInfo.C index 850a66cabc4..52a9faab4cb 100644 --- a/operators/Threshold/ThresholdViewerPluginInfo.C +++ b/operators/Threshold/ThresholdViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Threshold_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Threshold_GetViewerInfo() { ThresholdViewerPluginInfo::InitializeGlobalObjects(); return new ThresholdViewerPluginInfo; diff --git a/operators/TraceHistory/TraceHistoryEnginePluginInfo.C b/operators/TraceHistory/TraceHistoryEnginePluginInfo.C index f2ca52543bc..2a46feeef0a 100644 --- a/operators/TraceHistory/TraceHistoryEnginePluginInfo.C +++ b/operators/TraceHistory/TraceHistoryEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo TraceHistory_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* TraceHistory_GetEngineInfo() { return new TraceHistoryEnginePluginInfo; } diff --git a/operators/TraceHistory/TraceHistoryGUIPluginInfo.C b/operators/TraceHistory/TraceHistoryGUIPluginInfo.C index 0ad5ca5f920..e93ab917ae0 100644 --- a/operators/TraceHistory/TraceHistoryGUIPluginInfo.C +++ b/operators/TraceHistory/TraceHistoryGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo TraceHistory_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* TraceHistory_GetGUIInfo() { return new TraceHistoryGUIPluginInfo; } diff --git a/operators/TraceHistory/TraceHistoryPluginInfo.C b/operators/TraceHistory/TraceHistoryPluginInfo.C index 3b2253cb38d..9a263c6697f 100644 --- a/operators/TraceHistory/TraceHistoryPluginInfo.C +++ b/operators/TraceHistory/TraceHistoryPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *TraceHistoryVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo TraceHistory_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* TraceHistory_GetGeneralInfo() { return new TraceHistoryGeneralPluginInfo; } diff --git a/operators/TraceHistory/TraceHistoryScriptingPluginInfo.C b/operators/TraceHistory/TraceHistoryScriptingPluginInfo.C index aa3b85cdf0f..05d03dd5ff2 100644 --- a/operators/TraceHistory/TraceHistoryScriptingPluginInfo.C +++ b/operators/TraceHistory/TraceHistoryScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo TraceHistory_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* TraceHistory_GetScriptingInfo() { return new TraceHistoryScriptingPluginInfo; } diff --git a/operators/TraceHistory/TraceHistoryViewerPluginInfo.C b/operators/TraceHistory/TraceHistoryViewerPluginInfo.C index 0667dced6df..27bc1551e5b 100644 --- a/operators/TraceHistory/TraceHistoryViewerPluginInfo.C +++ b/operators/TraceHistory/TraceHistoryViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo TraceHistory_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* TraceHistory_GetViewerInfo() { TraceHistoryViewerPluginInfo::InitializeGlobalObjects(); return new TraceHistoryViewerPluginInfo; diff --git a/operators/Transform/TransformEnginePluginInfo.C b/operators/Transform/TransformEnginePluginInfo.C index 113d5fc00b4..eb551477815 100644 --- a/operators/Transform/TransformEnginePluginInfo.C +++ b/operators/Transform/TransformEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Transform_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Transform_GetEngineInfo() { return new TransformEnginePluginInfo; } diff --git a/operators/Transform/TransformGUIPluginInfo.C b/operators/Transform/TransformGUIPluginInfo.C index a8a9d940d69..bd655665e3d 100644 --- a/operators/Transform/TransformGUIPluginInfo.C +++ b/operators/Transform/TransformGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Transform_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Transform_GetGUIInfo() { return new TransformGUIPluginInfo; } diff --git a/operators/Transform/TransformPluginInfo.C b/operators/Transform/TransformPluginInfo.C index fe48685dde1..62b739c99a4 100644 --- a/operators/Transform/TransformPluginInfo.C +++ b/operators/Transform/TransformPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *TransformVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Transform_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Transform_GetGeneralInfo() { return new TransformGeneralPluginInfo; } diff --git a/operators/Transform/TransformScriptingPluginInfo.C b/operators/Transform/TransformScriptingPluginInfo.C index ac62ec58f8b..968c588184a 100644 --- a/operators/Transform/TransformScriptingPluginInfo.C +++ b/operators/Transform/TransformScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Transform_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Transform_GetScriptingInfo() { return new TransformScriptingPluginInfo; } diff --git a/operators/Transform/TransformViewerPluginInfo.C b/operators/Transform/TransformViewerPluginInfo.C index ce0331d9080..0bbfbda9b47 100644 --- a/operators/Transform/TransformViewerPluginInfo.C +++ b/operators/Transform/TransformViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Transform_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Transform_GetViewerInfo() { TransformViewerPluginInfo::InitializeGlobalObjects(); return new TransformViewerPluginInfo; diff --git a/operators/TriangulateRegularPoints/TriangulateRegularPointsEnginePluginInfo.C b/operators/TriangulateRegularPoints/TriangulateRegularPointsEnginePluginInfo.C index 81e4c936005..5d435b0bdad 100644 --- a/operators/TriangulateRegularPoints/TriangulateRegularPointsEnginePluginInfo.C +++ b/operators/TriangulateRegularPoints/TriangulateRegularPointsEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo TriangulateRegularPoints_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* TriangulateRegularPoints_GetEngineInfo() { return new TriangulateRegularPointsEnginePluginInfo; } diff --git a/operators/TriangulateRegularPoints/TriangulateRegularPointsGUIPluginInfo.C b/operators/TriangulateRegularPoints/TriangulateRegularPointsGUIPluginInfo.C index 49fbbc2b306..c70c829cb1e 100644 --- a/operators/TriangulateRegularPoints/TriangulateRegularPointsGUIPluginInfo.C +++ b/operators/TriangulateRegularPoints/TriangulateRegularPointsGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo TriangulateRegularPoints_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* TriangulateRegularPoints_GetGUIInfo() { return new TriangulateRegularPointsGUIPluginInfo; } diff --git a/operators/TriangulateRegularPoints/TriangulateRegularPointsPluginInfo.C b/operators/TriangulateRegularPoints/TriangulateRegularPointsPluginInfo.C index b38d7a35aa9..9971fbb5b2c 100644 --- a/operators/TriangulateRegularPoints/TriangulateRegularPointsPluginInfo.C +++ b/operators/TriangulateRegularPoints/TriangulateRegularPointsPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *TriangulateRegularPointsVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo TriangulateRegularPoints_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* TriangulateRegularPoints_GetGeneralInfo() { return new TriangulateRegularPointsGeneralPluginInfo; } diff --git a/operators/TriangulateRegularPoints/TriangulateRegularPointsScriptingPluginInfo.C b/operators/TriangulateRegularPoints/TriangulateRegularPointsScriptingPluginInfo.C index 2ad3bf34f40..23e8c23eaef 100644 --- a/operators/TriangulateRegularPoints/TriangulateRegularPointsScriptingPluginInfo.C +++ b/operators/TriangulateRegularPoints/TriangulateRegularPointsScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo TriangulateRegularPoints_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* TriangulateRegularPoints_GetScriptingInfo() { return new TriangulateRegularPointsScriptingPluginInfo; } diff --git a/operators/TriangulateRegularPoints/TriangulateRegularPointsViewerPluginInfo.C b/operators/TriangulateRegularPoints/TriangulateRegularPointsViewerPluginInfo.C index d76ae28592e..7ead036f281 100644 --- a/operators/TriangulateRegularPoints/TriangulateRegularPointsViewerPluginInfo.C +++ b/operators/TriangulateRegularPoints/TriangulateRegularPointsViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo TriangulateRegularPoints_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* TriangulateRegularPoints_GetViewerInfo() { TriangulateRegularPointsViewerPluginInfo::InitializeGlobalObjects(); return new TriangulateRegularPointsViewerPluginInfo; diff --git a/operators/Tube/TubeEnginePluginInfo.C b/operators/Tube/TubeEnginePluginInfo.C index 14d9ec19459..9c26dc8616b 100644 --- a/operators/Tube/TubeEnginePluginInfo.C +++ b/operators/Tube/TubeEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Tube_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* Tube_GetEngineInfo() { return new TubeEnginePluginInfo; } diff --git a/operators/Tube/TubeGUIPluginInfo.C b/operators/Tube/TubeGUIPluginInfo.C index 0ceb4e6e38c..09f0b4dc608 100644 --- a/operators/Tube/TubeGUIPluginInfo.C +++ b/operators/Tube/TubeGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Tube_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* Tube_GetGUIInfo() { return new TubeGUIPluginInfo; } diff --git a/operators/Tube/TubePluginInfo.C b/operators/Tube/TubePluginInfo.C index a411360c112..f01f810805e 100644 --- a/operators/Tube/TubePluginInfo.C +++ b/operators/Tube/TubePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *TubeVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Tube_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* Tube_GetGeneralInfo() { return new TubeGeneralPluginInfo; } diff --git a/operators/Tube/TubeScriptingPluginInfo.C b/operators/Tube/TubeScriptingPluginInfo.C index 2a6c111fc89..fdfd3987184 100644 --- a/operators/Tube/TubeScriptingPluginInfo.C +++ b/operators/Tube/TubeScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Tube_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* Tube_GetScriptingInfo() { return new TubeScriptingPluginInfo; } diff --git a/operators/Tube/TubeViewerPluginInfo.C b/operators/Tube/TubeViewerPluginInfo.C index 2a3d16ee596..054e425956f 100644 --- a/operators/Tube/TubeViewerPluginInfo.C +++ b/operators/Tube/TubeViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Tube_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* Tube_GetViewerInfo() { TubeViewerPluginInfo::InitializeGlobalObjects(); return new TubeViewerPluginInfo; diff --git a/operators/ZoneDump/ZoneDumpEnginePluginInfo.C b/operators/ZoneDump/ZoneDumpEnginePluginInfo.C index 0324fe195d8..469c3a6e0a2 100644 --- a/operators/ZoneDump/ZoneDumpEnginePluginInfo.C +++ b/operators/ZoneDump/ZoneDumpEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo ZoneDump_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo() +extern "C" OP_EXPORT EngineOperatorPluginInfo* ZoneDump_GetEngineInfo() { return new ZoneDumpEnginePluginInfo; } diff --git a/operators/ZoneDump/ZoneDumpGUIPluginInfo.C b/operators/ZoneDump/ZoneDumpGUIPluginInfo.C index 784f409f1d6..3c117ee2e22 100644 --- a/operators/ZoneDump/ZoneDumpGUIPluginInfo.C +++ b/operators/ZoneDump/ZoneDumpGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo ZoneDump_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo() +extern "C" OP_EXPORT GUIOperatorPluginInfo* ZoneDump_GetGUIInfo() { return new ZoneDumpGUIPluginInfo; } diff --git a/operators/ZoneDump/ZoneDumpPluginInfo.C b/operators/ZoneDump/ZoneDumpPluginInfo.C index 39ab190c6ef..722d621082c 100644 --- a/operators/ZoneDump/ZoneDumpPluginInfo.C +++ b/operators/ZoneDump/ZoneDumpPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" OP_EXPORT const char *ZoneDumpVisItPluginVersion = VISIT_VERSION; -#else -extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo ZoneDump_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" OP_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo() +extern "C" OP_EXPORT GeneralOperatorPluginInfo* ZoneDump_GetGeneralInfo() { return new ZoneDumpGeneralPluginInfo; } diff --git a/operators/ZoneDump/ZoneDumpScriptingPluginInfo.C b/operators/ZoneDump/ZoneDumpScriptingPluginInfo.C index 1072f3e106f..6b87f606d1b 100644 --- a/operators/ZoneDump/ZoneDumpScriptingPluginInfo.C +++ b/operators/ZoneDump/ZoneDumpScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo ZoneDump_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo() +extern "C" OP_EXPORT ScriptingOperatorPluginInfo* ZoneDump_GetScriptingInfo() { return new ZoneDumpScriptingPluginInfo; } diff --git a/operators/ZoneDump/ZoneDumpViewerPluginInfo.C b/operators/ZoneDump/ZoneDumpViewerPluginInfo.C index 3d14b940e9d..02f77d7dd72 100644 --- a/operators/ZoneDump/ZoneDumpViewerPluginInfo.C +++ b/operators/ZoneDump/ZoneDumpViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo ZoneDump_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo() +extern "C" OP_EXPORT ViewerOperatorPluginInfo* ZoneDump_GetViewerInfo() { ZoneDumpViewerPluginInfo::InitializeGlobalObjects(); return new ZoneDumpViewerPluginInfo; diff --git a/plots/Boundary/BoundaryEnginePluginInfo.C b/plots/Boundary/BoundaryEnginePluginInfo.C index a4429e250e1..618d11de8a7 100644 --- a/plots/Boundary/BoundaryEnginePluginInfo.C +++ b/plots/Boundary/BoundaryEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Boundary_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Boundary_GetEngineInfo() { return new BoundaryEnginePluginInfo; } diff --git a/plots/Boundary/BoundaryGUIPluginInfo.C b/plots/Boundary/BoundaryGUIPluginInfo.C index da35d33ee6d..9cd07933e13 100644 --- a/plots/Boundary/BoundaryGUIPluginInfo.C +++ b/plots/Boundary/BoundaryGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Boundary_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Boundary_GetGUIInfo() { return new BoundaryGUIPluginInfo; } diff --git a/plots/Boundary/BoundaryPluginInfo.C b/plots/Boundary/BoundaryPluginInfo.C index eb6dd83f17d..068f52285b7 100644 --- a/plots/Boundary/BoundaryPluginInfo.C +++ b/plots/Boundary/BoundaryPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *BoundaryVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Boundary_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Boundary_GetGeneralInfo() { return new BoundaryGeneralPluginInfo; } diff --git a/plots/Boundary/BoundaryScriptingPluginInfo.C b/plots/Boundary/BoundaryScriptingPluginInfo.C index 8d75d47b3e8..be830f55994 100644 --- a/plots/Boundary/BoundaryScriptingPluginInfo.C +++ b/plots/Boundary/BoundaryScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Boundary_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Boundary_GetScriptingInfo() { return new BoundaryScriptingPluginInfo; } diff --git a/plots/Boundary/BoundaryViewerPluginInfo.C b/plots/Boundary/BoundaryViewerPluginInfo.C index a148186e2e3..9c81219d98d 100644 --- a/plots/Boundary/BoundaryViewerPluginInfo.C +++ b/plots/Boundary/BoundaryViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Boundary_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Boundary_GetViewerInfo() { BoundaryViewerPluginInfo::InitializeGlobalObjects(); return new BoundaryViewerPluginInfo; diff --git a/plots/Contour/ContourEnginePluginInfo.C b/plots/Contour/ContourEnginePluginInfo.C index 08f86caa3a5..474a34776a9 100644 --- a/plots/Contour/ContourEnginePluginInfo.C +++ b/plots/Contour/ContourEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Contour_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Contour_GetEngineInfo() { return new ContourEnginePluginInfo; } diff --git a/plots/Contour/ContourGUIPluginInfo.C b/plots/Contour/ContourGUIPluginInfo.C index 6056ea2aed2..f4548f17462 100644 --- a/plots/Contour/ContourGUIPluginInfo.C +++ b/plots/Contour/ContourGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Contour_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Contour_GetGUIInfo() { return new ContourGUIPluginInfo; } diff --git a/plots/Contour/ContourPluginInfo.C b/plots/Contour/ContourPluginInfo.C index 38f8b8cbbcc..723ea36fdbc 100644 --- a/plots/Contour/ContourPluginInfo.C +++ b/plots/Contour/ContourPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *ContourVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Contour_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Contour_GetGeneralInfo() { return new ContourGeneralPluginInfo; } diff --git a/plots/Contour/ContourScriptingPluginInfo.C b/plots/Contour/ContourScriptingPluginInfo.C index 51d8bc8871c..b17c17b7e6a 100644 --- a/plots/Contour/ContourScriptingPluginInfo.C +++ b/plots/Contour/ContourScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Contour_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Contour_GetScriptingInfo() { return new ContourScriptingPluginInfo; } diff --git a/plots/Contour/ContourViewerPluginInfo.C b/plots/Contour/ContourViewerPluginInfo.C index 01604f5bdbd..51c2ea8b339 100644 --- a/plots/Contour/ContourViewerPluginInfo.C +++ b/plots/Contour/ContourViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Contour_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Contour_GetViewerInfo() { ContourViewerPluginInfo::InitializeGlobalObjects(); return new ContourViewerPluginInfo; diff --git a/plots/Curve/CurveEnginePluginInfo.C b/plots/Curve/CurveEnginePluginInfo.C index 736bda23820..4b820f99345 100644 --- a/plots/Curve/CurveEnginePluginInfo.C +++ b/plots/Curve/CurveEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Curve_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Curve_GetEngineInfo() { return new CurveEnginePluginInfo; } diff --git a/plots/Curve/CurveGUIPluginInfo.C b/plots/Curve/CurveGUIPluginInfo.C index dd4571de35e..406f46692eb 100644 --- a/plots/Curve/CurveGUIPluginInfo.C +++ b/plots/Curve/CurveGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Curve_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Curve_GetGUIInfo() { return new CurveGUIPluginInfo; } diff --git a/plots/Curve/CurvePluginInfo.C b/plots/Curve/CurvePluginInfo.C index 02de84a27f8..f2236b6f047 100644 --- a/plots/Curve/CurvePluginInfo.C +++ b/plots/Curve/CurvePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *CurveVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Curve_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Curve_GetGeneralInfo() { return new CurveGeneralPluginInfo; } diff --git a/plots/Curve/CurveScriptingPluginInfo.C b/plots/Curve/CurveScriptingPluginInfo.C index dba45bfbb2c..5df97d7c0a7 100644 --- a/plots/Curve/CurveScriptingPluginInfo.C +++ b/plots/Curve/CurveScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Curve_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Curve_GetScriptingInfo() { return new CurveScriptingPluginInfo; } diff --git a/plots/Curve/CurveViewerPluginInfo.C b/plots/Curve/CurveViewerPluginInfo.C index bd37e6c8077..1b826c44659 100644 --- a/plots/Curve/CurveViewerPluginInfo.C +++ b/plots/Curve/CurveViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Curve_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Curve_GetViewerInfo() { CurveViewerPluginInfo::InitializeGlobalObjects(); return new CurveViewerPluginInfo; diff --git a/plots/FilledBoundary/FilledBoundaryEnginePluginInfo.C b/plots/FilledBoundary/FilledBoundaryEnginePluginInfo.C index 367c831917a..2f8b4e6dbbc 100644 --- a/plots/FilledBoundary/FilledBoundaryEnginePluginInfo.C +++ b/plots/FilledBoundary/FilledBoundaryEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo FilledBoundary_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* FilledBoundary_GetEngineInfo() { return new FilledBoundaryEnginePluginInfo; } diff --git a/plots/FilledBoundary/FilledBoundaryGUIPluginInfo.C b/plots/FilledBoundary/FilledBoundaryGUIPluginInfo.C index 66cb54e65cf..b35f936a177 100644 --- a/plots/FilledBoundary/FilledBoundaryGUIPluginInfo.C +++ b/plots/FilledBoundary/FilledBoundaryGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo FilledBoundary_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* FilledBoundary_GetGUIInfo() { return new FilledBoundaryGUIPluginInfo; } diff --git a/plots/FilledBoundary/FilledBoundaryPluginInfo.C b/plots/FilledBoundary/FilledBoundaryPluginInfo.C index 3f280c36793..9e76a0a7b69 100644 --- a/plots/FilledBoundary/FilledBoundaryPluginInfo.C +++ b/plots/FilledBoundary/FilledBoundaryPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *FilledBoundaryVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo FilledBoundary_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* FilledBoundary_GetGeneralInfo() { return new FilledBoundaryGeneralPluginInfo; } diff --git a/plots/FilledBoundary/FilledBoundaryScriptingPluginInfo.C b/plots/FilledBoundary/FilledBoundaryScriptingPluginInfo.C index 35102991953..a0ad0a4e4a0 100644 --- a/plots/FilledBoundary/FilledBoundaryScriptingPluginInfo.C +++ b/plots/FilledBoundary/FilledBoundaryScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo FilledBoundary_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* FilledBoundary_GetScriptingInfo() { return new FilledBoundaryScriptingPluginInfo; } diff --git a/plots/FilledBoundary/FilledBoundaryViewerPluginInfo.C b/plots/FilledBoundary/FilledBoundaryViewerPluginInfo.C index c4594be6d51..424d6e3d219 100644 --- a/plots/FilledBoundary/FilledBoundaryViewerPluginInfo.C +++ b/plots/FilledBoundary/FilledBoundaryViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo FilledBoundary_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* FilledBoundary_GetViewerInfo() { FilledBoundaryViewerPluginInfo::InitializeGlobalObjects(); return new FilledBoundaryViewerPluginInfo; diff --git a/plots/Histogram/HistogramEnginePluginInfo.C b/plots/Histogram/HistogramEnginePluginInfo.C index d25964a3443..3e8303fedd7 100644 --- a/plots/Histogram/HistogramEnginePluginInfo.C +++ b/plots/Histogram/HistogramEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Histogram_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Histogram_GetEngineInfo() { return new HistogramEnginePluginInfo; } diff --git a/plots/Histogram/HistogramGUIPluginInfo.C b/plots/Histogram/HistogramGUIPluginInfo.C index adcee1d49cc..810c61708ec 100644 --- a/plots/Histogram/HistogramGUIPluginInfo.C +++ b/plots/Histogram/HistogramGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Histogram_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Histogram_GetGUIInfo() { return new HistogramGUIPluginInfo; } diff --git a/plots/Histogram/HistogramPluginInfo.C b/plots/Histogram/HistogramPluginInfo.C index 7d5a5859088..befd5a7e367 100644 --- a/plots/Histogram/HistogramPluginInfo.C +++ b/plots/Histogram/HistogramPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *HistogramVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Histogram_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Histogram_GetGeneralInfo() { return new HistogramGeneralPluginInfo; } diff --git a/plots/Histogram/HistogramScriptingPluginInfo.C b/plots/Histogram/HistogramScriptingPluginInfo.C index f1fc212745e..1f5ecef1eca 100644 --- a/plots/Histogram/HistogramScriptingPluginInfo.C +++ b/plots/Histogram/HistogramScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Histogram_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Histogram_GetScriptingInfo() { return new HistogramScriptingPluginInfo; } diff --git a/plots/Histogram/HistogramViewerPluginInfo.C b/plots/Histogram/HistogramViewerPluginInfo.C index 59d05581a76..d3845fbe6da 100644 --- a/plots/Histogram/HistogramViewerPluginInfo.C +++ b/plots/Histogram/HistogramViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Histogram_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Histogram_GetViewerInfo() { HistogramViewerPluginInfo::InitializeGlobalObjects(); return new HistogramViewerPluginInfo; diff --git a/plots/Kerbel/KerbelEnginePluginInfo.C b/plots/Kerbel/KerbelEnginePluginInfo.C index 62e3a6e604f..4f1ae296c78 100644 --- a/plots/Kerbel/KerbelEnginePluginInfo.C +++ b/plots/Kerbel/KerbelEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Kerbel_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Kerbel_GetEngineInfo() { return new KerbelEnginePluginInfo; } diff --git a/plots/Kerbel/KerbelGUIPluginInfo.C b/plots/Kerbel/KerbelGUIPluginInfo.C index df6fa230042..c260c87bc9a 100644 --- a/plots/Kerbel/KerbelGUIPluginInfo.C +++ b/plots/Kerbel/KerbelGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Kerbel_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Kerbel_GetGUIInfo() { return new KerbelGUIPluginInfo; } diff --git a/plots/Kerbel/KerbelPluginInfo.C b/plots/Kerbel/KerbelPluginInfo.C index 1eeff18b598..841f92888bd 100644 --- a/plots/Kerbel/KerbelPluginInfo.C +++ b/plots/Kerbel/KerbelPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *KerbelVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Kerbel_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Kerbel_GetGeneralInfo() { return new KerbelGeneralPluginInfo; } diff --git a/plots/Kerbel/KerbelScriptingPluginInfo.C b/plots/Kerbel/KerbelScriptingPluginInfo.C index 6d47c75ba52..4af1de1a884 100644 --- a/plots/Kerbel/KerbelScriptingPluginInfo.C +++ b/plots/Kerbel/KerbelScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Kerbel_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Kerbel_GetScriptingInfo() { return new KerbelScriptingPluginInfo; } diff --git a/plots/Kerbel/KerbelViewerPluginInfo.C b/plots/Kerbel/KerbelViewerPluginInfo.C index 56cd97bfe0e..2e478b932e7 100644 --- a/plots/Kerbel/KerbelViewerPluginInfo.C +++ b/plots/Kerbel/KerbelViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Kerbel_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Kerbel_GetViewerInfo() { KerbelViewerPluginInfo::InitializeGlobalObjects(); return new KerbelViewerPluginInfo; diff --git a/plots/Label/LabelEnginePluginInfo.C b/plots/Label/LabelEnginePluginInfo.C index 06150490b6b..1b93a617938 100644 --- a/plots/Label/LabelEnginePluginInfo.C +++ b/plots/Label/LabelEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Label_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Label_GetEngineInfo() { return new LabelEnginePluginInfo; } diff --git a/plots/Label/LabelGUIPluginInfo.C b/plots/Label/LabelGUIPluginInfo.C index 1f790fdfd1f..cd869ae4793 100644 --- a/plots/Label/LabelGUIPluginInfo.C +++ b/plots/Label/LabelGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Label_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Label_GetGUIInfo() { return new LabelGUIPluginInfo; } diff --git a/plots/Label/LabelPluginInfo.C b/plots/Label/LabelPluginInfo.C index 2a9d61a46c2..6644d86f26b 100644 --- a/plots/Label/LabelPluginInfo.C +++ b/plots/Label/LabelPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *LabelVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Label_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Label_GetGeneralInfo() { return new LabelGeneralPluginInfo; } diff --git a/plots/Label/LabelScriptingPluginInfo.C b/plots/Label/LabelScriptingPluginInfo.C index 63045108aac..a96b153de06 100644 --- a/plots/Label/LabelScriptingPluginInfo.C +++ b/plots/Label/LabelScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Label_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Label_GetScriptingInfo() { return new LabelScriptingPluginInfo; } diff --git a/plots/Label/LabelViewerPluginInfo.C b/plots/Label/LabelViewerPluginInfo.C index f757ae2d51f..5d129855216 100644 --- a/plots/Label/LabelViewerPluginInfo.C +++ b/plots/Label/LabelViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Label_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Label_GetViewerInfo() { LabelViewerPluginInfo::InitializeGlobalObjects(); return new LabelViewerPluginInfo; diff --git a/plots/Mesh/MeshEnginePluginInfo.C b/plots/Mesh/MeshEnginePluginInfo.C index 326d2201e58..b2b5c870aa3 100644 --- a/plots/Mesh/MeshEnginePluginInfo.C +++ b/plots/Mesh/MeshEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Mesh_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Mesh_GetEngineInfo() { return new MeshEnginePluginInfo; } diff --git a/plots/Mesh/MeshGUIPluginInfo.C b/plots/Mesh/MeshGUIPluginInfo.C index 9a86a6cced5..23c2b56bc83 100644 --- a/plots/Mesh/MeshGUIPluginInfo.C +++ b/plots/Mesh/MeshGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Mesh_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Mesh_GetGUIInfo() { return new MeshGUIPluginInfo; } diff --git a/plots/Mesh/MeshPluginInfo.C b/plots/Mesh/MeshPluginInfo.C index ba7ee8ff5c5..1013254dd12 100644 --- a/plots/Mesh/MeshPluginInfo.C +++ b/plots/Mesh/MeshPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *MeshVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Mesh_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Mesh_GetGeneralInfo() { return new MeshGeneralPluginInfo; } diff --git a/plots/Mesh/MeshScriptingPluginInfo.C b/plots/Mesh/MeshScriptingPluginInfo.C index 73cdbfe6ae0..6eef087003b 100644 --- a/plots/Mesh/MeshScriptingPluginInfo.C +++ b/plots/Mesh/MeshScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Mesh_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Mesh_GetScriptingInfo() { return new MeshScriptingPluginInfo; } diff --git a/plots/Mesh/MeshViewerPluginInfo.C b/plots/Mesh/MeshViewerPluginInfo.C index 3df142330d7..e4934668db9 100644 --- a/plots/Mesh/MeshViewerPluginInfo.C +++ b/plots/Mesh/MeshViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Mesh_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Mesh_GetViewerInfo() { MeshViewerPluginInfo::InitializeGlobalObjects(); return new MeshViewerPluginInfo; diff --git a/plots/Molecule/MoleculeEnginePluginInfo.C b/plots/Molecule/MoleculeEnginePluginInfo.C index 18a6b910a36..1b101a47771 100644 --- a/plots/Molecule/MoleculeEnginePluginInfo.C +++ b/plots/Molecule/MoleculeEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Molecule_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Molecule_GetEngineInfo() { return new MoleculeEnginePluginInfo; } diff --git a/plots/Molecule/MoleculeGUIPluginInfo.C b/plots/Molecule/MoleculeGUIPluginInfo.C index 1a2dbe97658..dc468a98cd9 100644 --- a/plots/Molecule/MoleculeGUIPluginInfo.C +++ b/plots/Molecule/MoleculeGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Molecule_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Molecule_GetGUIInfo() { return new MoleculeGUIPluginInfo; } diff --git a/plots/Molecule/MoleculePluginInfo.C b/plots/Molecule/MoleculePluginInfo.C index 35e50bf5b28..5aa18407499 100644 --- a/plots/Molecule/MoleculePluginInfo.C +++ b/plots/Molecule/MoleculePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *MoleculeVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Molecule_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Molecule_GetGeneralInfo() { return new MoleculeGeneralPluginInfo; } diff --git a/plots/Molecule/MoleculeScriptingPluginInfo.C b/plots/Molecule/MoleculeScriptingPluginInfo.C index 45bdbb005b7..ce3459c7597 100644 --- a/plots/Molecule/MoleculeScriptingPluginInfo.C +++ b/plots/Molecule/MoleculeScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Molecule_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Molecule_GetScriptingInfo() { return new MoleculeScriptingPluginInfo; } diff --git a/plots/Molecule/MoleculeViewerPluginInfo.C b/plots/Molecule/MoleculeViewerPluginInfo.C index 261ea873a28..b1407b6e74c 100644 --- a/plots/Molecule/MoleculeViewerPluginInfo.C +++ b/plots/Molecule/MoleculeViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Molecule_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Molecule_GetViewerInfo() { MoleculeViewerPluginInfo::InitializeGlobalObjects(); return new MoleculeViewerPluginInfo; diff --git a/plots/MultiCurve/MultiCurveEnginePluginInfo.C b/plots/MultiCurve/MultiCurveEnginePluginInfo.C index 36755cc3433..3133aecd0b3 100644 --- a/plots/MultiCurve/MultiCurveEnginePluginInfo.C +++ b/plots/MultiCurve/MultiCurveEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo MultiCurve_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* MultiCurve_GetEngineInfo() { return new MultiCurveEnginePluginInfo; } diff --git a/plots/MultiCurve/MultiCurveGUIPluginInfo.C b/plots/MultiCurve/MultiCurveGUIPluginInfo.C index 48f55d13b3b..adb31471674 100644 --- a/plots/MultiCurve/MultiCurveGUIPluginInfo.C +++ b/plots/MultiCurve/MultiCurveGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo MultiCurve_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* MultiCurve_GetGUIInfo() { return new MultiCurveGUIPluginInfo; } diff --git a/plots/MultiCurve/MultiCurvePluginInfo.C b/plots/MultiCurve/MultiCurvePluginInfo.C index a9ed02842b8..bab9ec762e0 100644 --- a/plots/MultiCurve/MultiCurvePluginInfo.C +++ b/plots/MultiCurve/MultiCurvePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *MultiCurveVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo MultiCurve_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* MultiCurve_GetGeneralInfo() { return new MultiCurveGeneralPluginInfo; } diff --git a/plots/MultiCurve/MultiCurveScriptingPluginInfo.C b/plots/MultiCurve/MultiCurveScriptingPluginInfo.C index e599331268e..822b236b7ea 100644 --- a/plots/MultiCurve/MultiCurveScriptingPluginInfo.C +++ b/plots/MultiCurve/MultiCurveScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo MultiCurve_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* MultiCurve_GetScriptingInfo() { return new MultiCurveScriptingPluginInfo; } diff --git a/plots/MultiCurve/MultiCurveViewerPluginInfo.C b/plots/MultiCurve/MultiCurveViewerPluginInfo.C index 1b7549803e0..11bd9eed219 100644 --- a/plots/MultiCurve/MultiCurveViewerPluginInfo.C +++ b/plots/MultiCurve/MultiCurveViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo MultiCurve_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* MultiCurve_GetViewerInfo() { MultiCurveViewerPluginInfo::InitializeGlobalObjects(); return new MultiCurveViewerPluginInfo; diff --git a/plots/ParallelCoordinates/ParallelCoordinatesEnginePluginInfo.C b/plots/ParallelCoordinates/ParallelCoordinatesEnginePluginInfo.C index 6a9e1a03b7b..256f5095cf4 100644 --- a/plots/ParallelCoordinates/ParallelCoordinatesEnginePluginInfo.C +++ b/plots/ParallelCoordinates/ParallelCoordinatesEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo ParallelCoordinates_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* ParallelCoordinates_GetEngineInfo() { return new ParallelCoordinatesEnginePluginInfo; } diff --git a/plots/ParallelCoordinates/ParallelCoordinatesGUIPluginInfo.C b/plots/ParallelCoordinates/ParallelCoordinatesGUIPluginInfo.C index 4f6ce35948d..76c899ca9e6 100644 --- a/plots/ParallelCoordinates/ParallelCoordinatesGUIPluginInfo.C +++ b/plots/ParallelCoordinates/ParallelCoordinatesGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo ParallelCoordinates_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* ParallelCoordinates_GetGUIInfo() { return new ParallelCoordinatesGUIPluginInfo; } diff --git a/plots/ParallelCoordinates/ParallelCoordinatesPluginInfo.C b/plots/ParallelCoordinates/ParallelCoordinatesPluginInfo.C index af2f5db0553..e769bf6bb5f 100644 --- a/plots/ParallelCoordinates/ParallelCoordinatesPluginInfo.C +++ b/plots/ParallelCoordinates/ParallelCoordinatesPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *ParallelCoordinatesVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo ParallelCoordinates_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* ParallelCoordinates_GetGeneralInfo() { return new ParallelCoordinatesGeneralPluginInfo; } diff --git a/plots/ParallelCoordinates/ParallelCoordinatesScriptingPluginInfo.C b/plots/ParallelCoordinates/ParallelCoordinatesScriptingPluginInfo.C index 2e4263bc031..a50a43f5167 100644 --- a/plots/ParallelCoordinates/ParallelCoordinatesScriptingPluginInfo.C +++ b/plots/ParallelCoordinates/ParallelCoordinatesScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo ParallelCoordinates_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* ParallelCoordinates_GetScriptingInfo() { return new ParallelCoordinatesScriptingPluginInfo; } diff --git a/plots/ParallelCoordinates/ParallelCoordinatesViewerPluginInfo.C b/plots/ParallelCoordinates/ParallelCoordinatesViewerPluginInfo.C index 6c3a5a3614a..c67c8209f64 100644 --- a/plots/ParallelCoordinates/ParallelCoordinatesViewerPluginInfo.C +++ b/plots/ParallelCoordinates/ParallelCoordinatesViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo ParallelCoordinates_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* ParallelCoordinates_GetViewerInfo() { ParallelCoordinatesViewerPluginInfo::InitializeGlobalObjects(); return new ParallelCoordinatesViewerPluginInfo; diff --git a/plots/Poincare/PoincareEnginePluginInfo.C b/plots/Poincare/PoincareEnginePluginInfo.C index 2c26df7fd65..3f6c4732d04 100644 --- a/plots/Poincare/PoincareEnginePluginInfo.C +++ b/plots/Poincare/PoincareEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Poincare_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Poincare_GetEngineInfo() { return new PoincareEnginePluginInfo; } diff --git a/plots/Poincare/PoincareGUIPluginInfo.C b/plots/Poincare/PoincareGUIPluginInfo.C index e477d8438b5..ae16bab74d3 100644 --- a/plots/Poincare/PoincareGUIPluginInfo.C +++ b/plots/Poincare/PoincareGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Poincare_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Poincare_GetGUIInfo() { return new PoincareGUIPluginInfo; } diff --git a/plots/Poincare/PoincarePluginInfo.C b/plots/Poincare/PoincarePluginInfo.C index 89eb54e020f..a9ee486f29d 100644 --- a/plots/Poincare/PoincarePluginInfo.C +++ b/plots/Poincare/PoincarePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *PoincareVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Poincare_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Poincare_GetGeneralInfo() { return new PoincareGeneralPluginInfo; } diff --git a/plots/Poincare/PoincareScriptingPluginInfo.C b/plots/Poincare/PoincareScriptingPluginInfo.C index a0620dad6b3..b9670ec836a 100644 --- a/plots/Poincare/PoincareScriptingPluginInfo.C +++ b/plots/Poincare/PoincareScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Poincare_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Poincare_GetScriptingInfo() { return new PoincareScriptingPluginInfo; } diff --git a/plots/Poincare/PoincareViewerPluginInfo.C b/plots/Poincare/PoincareViewerPluginInfo.C index 617f5108c41..5b40a090f72 100644 --- a/plots/Poincare/PoincareViewerPluginInfo.C +++ b/plots/Poincare/PoincareViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Poincare_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Poincare_GetViewerInfo() { PoincareViewerPluginInfo::InitializeGlobalObjects(); return new PoincareViewerPluginInfo; diff --git a/plots/Pseudocolor/PseudocolorEnginePluginInfo.C b/plots/Pseudocolor/PseudocolorEnginePluginInfo.C index accbd97fc66..25e6cd27392 100644 --- a/plots/Pseudocolor/PseudocolorEnginePluginInfo.C +++ b/plots/Pseudocolor/PseudocolorEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Pseudocolor_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Pseudocolor_GetEngineInfo() { return new PseudocolorEnginePluginInfo; } diff --git a/plots/Pseudocolor/PseudocolorGUIPluginInfo.C b/plots/Pseudocolor/PseudocolorGUIPluginInfo.C index fd43f7c226b..8a59aeb1f6a 100644 --- a/plots/Pseudocolor/PseudocolorGUIPluginInfo.C +++ b/plots/Pseudocolor/PseudocolorGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Pseudocolor_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Pseudocolor_GetGUIInfo() { return new PseudocolorGUIPluginInfo; } diff --git a/plots/Pseudocolor/PseudocolorPluginInfo.C b/plots/Pseudocolor/PseudocolorPluginInfo.C index 824452ea880..af5a5ae7c00 100644 --- a/plots/Pseudocolor/PseudocolorPluginInfo.C +++ b/plots/Pseudocolor/PseudocolorPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *PseudocolorVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Pseudocolor_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Pseudocolor_GetGeneralInfo() { return new PseudocolorGeneralPluginInfo; } diff --git a/plots/Pseudocolor/PseudocolorScriptingPluginInfo.C b/plots/Pseudocolor/PseudocolorScriptingPluginInfo.C index 0dfa0bc1acd..95b5cd61b67 100644 --- a/plots/Pseudocolor/PseudocolorScriptingPluginInfo.C +++ b/plots/Pseudocolor/PseudocolorScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Pseudocolor_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Pseudocolor_GetScriptingInfo() { return new PseudocolorScriptingPluginInfo; } diff --git a/plots/Pseudocolor/PseudocolorViewerPluginInfo.C b/plots/Pseudocolor/PseudocolorViewerPluginInfo.C index ae5a99614c2..27f39d521a6 100644 --- a/plots/Pseudocolor/PseudocolorViewerPluginInfo.C +++ b/plots/Pseudocolor/PseudocolorViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Pseudocolor_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Pseudocolor_GetViewerInfo() { PseudocolorViewerPluginInfo::InitializeGlobalObjects(); return new PseudocolorViewerPluginInfo; diff --git a/plots/Scatter/ScatterEnginePluginInfo.C b/plots/Scatter/ScatterEnginePluginInfo.C index 7f5138330f8..3078c6ddaf2 100644 --- a/plots/Scatter/ScatterEnginePluginInfo.C +++ b/plots/Scatter/ScatterEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Scatter_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Scatter_GetEngineInfo() { return new ScatterEnginePluginInfo; } diff --git a/plots/Scatter/ScatterGUIPluginInfo.C b/plots/Scatter/ScatterGUIPluginInfo.C index 80b4b14a8bf..f4703815172 100644 --- a/plots/Scatter/ScatterGUIPluginInfo.C +++ b/plots/Scatter/ScatterGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Scatter_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Scatter_GetGUIInfo() { return new ScatterGUIPluginInfo; } diff --git a/plots/Scatter/ScatterPluginInfo.C b/plots/Scatter/ScatterPluginInfo.C index 493db545e5e..f277de88787 100644 --- a/plots/Scatter/ScatterPluginInfo.C +++ b/plots/Scatter/ScatterPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *ScatterVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Scatter_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Scatter_GetGeneralInfo() { return new ScatterGeneralPluginInfo; } diff --git a/plots/Scatter/ScatterPluginInfo.h b/plots/Scatter/ScatterPluginInfo.h index 7ea248392e1..23f6755437d 100644 --- a/plots/Scatter/ScatterPluginInfo.h +++ b/plots/Scatter/ScatterPluginInfo.h @@ -37,7 +37,7 @@ *****************************************************************************/ // ************************************************************************* // -// ScatterPluginInfo.h // +// ScatterPluginInfo.h // // ************************************************************************* // #ifndef SCATTER_PLUGIN_INFO_H diff --git a/plots/Scatter/ScatterScriptingPluginInfo.C b/plots/Scatter/ScatterScriptingPluginInfo.C index 94f83a3bb7f..52325abb9f7 100644 --- a/plots/Scatter/ScatterScriptingPluginInfo.C +++ b/plots/Scatter/ScatterScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Scatter_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Scatter_GetScriptingInfo() { return new ScatterScriptingPluginInfo; } diff --git a/plots/Scatter/ScatterViewerPluginInfo.C b/plots/Scatter/ScatterViewerPluginInfo.C index 748e7d5ce16..73fe071d846 100644 --- a/plots/Scatter/ScatterViewerPluginInfo.C +++ b/plots/Scatter/ScatterViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Scatter_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Scatter_GetViewerInfo() { ScatterViewerPluginInfo::InitializeGlobalObjects(); return new ScatterViewerPluginInfo; diff --git a/plots/Spreadsheet/SpreadsheetEnginePluginInfo.C b/plots/Spreadsheet/SpreadsheetEnginePluginInfo.C index 36fbc3e404d..ae07e9d29f5 100644 --- a/plots/Spreadsheet/SpreadsheetEnginePluginInfo.C +++ b/plots/Spreadsheet/SpreadsheetEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Spreadsheet_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Spreadsheet_GetEngineInfo() { return new SpreadsheetEnginePluginInfo; } diff --git a/plots/Spreadsheet/SpreadsheetGUIPluginInfo.C b/plots/Spreadsheet/SpreadsheetGUIPluginInfo.C index 5dfe28c036a..33e26530f5b 100644 --- a/plots/Spreadsheet/SpreadsheetGUIPluginInfo.C +++ b/plots/Spreadsheet/SpreadsheetGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Spreadsheet_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Spreadsheet_GetGUIInfo() { return new SpreadsheetGUIPluginInfo; } diff --git a/plots/Spreadsheet/SpreadsheetPluginInfo.C b/plots/Spreadsheet/SpreadsheetPluginInfo.C index f27e2cebd38..34e3c80ed0b 100644 --- a/plots/Spreadsheet/SpreadsheetPluginInfo.C +++ b/plots/Spreadsheet/SpreadsheetPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *SpreadsheetVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Spreadsheet_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Spreadsheet_GetGeneralInfo() { return new SpreadsheetGeneralPluginInfo; } diff --git a/plots/Spreadsheet/SpreadsheetScriptingPluginInfo.C b/plots/Spreadsheet/SpreadsheetScriptingPluginInfo.C index 384b5662da8..86ffa888a41 100644 --- a/plots/Spreadsheet/SpreadsheetScriptingPluginInfo.C +++ b/plots/Spreadsheet/SpreadsheetScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Spreadsheet_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Spreadsheet_GetScriptingInfo() { return new SpreadsheetScriptingPluginInfo; } diff --git a/plots/Spreadsheet/SpreadsheetViewerPluginInfo.C b/plots/Spreadsheet/SpreadsheetViewerPluginInfo.C index 7c72c24e232..9cf381d93bc 100644 --- a/plots/Spreadsheet/SpreadsheetViewerPluginInfo.C +++ b/plots/Spreadsheet/SpreadsheetViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Spreadsheet_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Spreadsheet_GetViewerInfo() { SpreadsheetViewerPluginInfo::InitializeGlobalObjects(); return new SpreadsheetViewerPluginInfo; diff --git a/plots/Streamline/StreamlineEnginePluginInfo.C b/plots/Streamline/StreamlineEnginePluginInfo.C index 597134bd464..c8ebdde9e7d 100644 --- a/plots/Streamline/StreamlineEnginePluginInfo.C +++ b/plots/Streamline/StreamlineEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Streamline_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Streamline_GetEngineInfo() { return new StreamlineEnginePluginInfo; } diff --git a/plots/Streamline/StreamlineGUIPluginInfo.C b/plots/Streamline/StreamlineGUIPluginInfo.C index 6d2074dd23b..820d3fd06aa 100644 --- a/plots/Streamline/StreamlineGUIPluginInfo.C +++ b/plots/Streamline/StreamlineGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Streamline_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Streamline_GetGUIInfo() { return new StreamlineGUIPluginInfo; } diff --git a/plots/Streamline/StreamlinePluginInfo.C b/plots/Streamline/StreamlinePluginInfo.C index e5164984e2d..fe77da6706a 100644 --- a/plots/Streamline/StreamlinePluginInfo.C +++ b/plots/Streamline/StreamlinePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *StreamlineVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Streamline_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Streamline_GetGeneralInfo() { return new StreamlineGeneralPluginInfo; } diff --git a/plots/Streamline/StreamlineScriptingPluginInfo.C b/plots/Streamline/StreamlineScriptingPluginInfo.C index 7095a3dd3f1..623c0cd3468 100644 --- a/plots/Streamline/StreamlineScriptingPluginInfo.C +++ b/plots/Streamline/StreamlineScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Streamline_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Streamline_GetScriptingInfo() { return new StreamlineScriptingPluginInfo; } diff --git a/plots/Streamline/StreamlineViewerPluginInfo.C b/plots/Streamline/StreamlineViewerPluginInfo.C index be5b1603369..ca27c714282 100644 --- a/plots/Streamline/StreamlineViewerPluginInfo.C +++ b/plots/Streamline/StreamlineViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Streamline_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Streamline_GetViewerInfo() { StreamlineViewerPluginInfo::InitializeGlobalObjects(); return new StreamlineViewerPluginInfo; diff --git a/plots/Subset/SubsetEnginePluginInfo.C b/plots/Subset/SubsetEnginePluginInfo.C index f52fe9f7bf5..fd4695b7d72 100644 --- a/plots/Subset/SubsetEnginePluginInfo.C +++ b/plots/Subset/SubsetEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Subset_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Subset_GetEngineInfo() { return new SubsetEnginePluginInfo; } diff --git a/plots/Subset/SubsetGUIPluginInfo.C b/plots/Subset/SubsetGUIPluginInfo.C index 8bc51b6a154..e6517801c36 100644 --- a/plots/Subset/SubsetGUIPluginInfo.C +++ b/plots/Subset/SubsetGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Subset_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Subset_GetGUIInfo() { return new SubsetGUIPluginInfo; } diff --git a/plots/Subset/SubsetPluginInfo.C b/plots/Subset/SubsetPluginInfo.C index 0a118156c54..8feabffd72d 100644 --- a/plots/Subset/SubsetPluginInfo.C +++ b/plots/Subset/SubsetPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *SubsetVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Subset_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Subset_GetGeneralInfo() { return new SubsetGeneralPluginInfo; } diff --git a/plots/Subset/SubsetScriptingPluginInfo.C b/plots/Subset/SubsetScriptingPluginInfo.C index 28ebe289eb3..136730eca16 100644 --- a/plots/Subset/SubsetScriptingPluginInfo.C +++ b/plots/Subset/SubsetScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Subset_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Subset_GetScriptingInfo() { return new SubsetScriptingPluginInfo; } diff --git a/plots/Subset/SubsetViewerPluginInfo.C b/plots/Subset/SubsetViewerPluginInfo.C index f7dd65f0957..c970390b550 100644 --- a/plots/Subset/SubsetViewerPluginInfo.C +++ b/plots/Subset/SubsetViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Subset_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Subset_GetViewerInfo() { SubsetViewerPluginInfo::InitializeGlobalObjects(); return new SubsetViewerPluginInfo; diff --git a/plots/Surface/SurfaceEnginePluginInfo.C b/plots/Surface/SurfaceEnginePluginInfo.C index 4ed867e1cbc..81e7bf0f8b3 100644 --- a/plots/Surface/SurfaceEnginePluginInfo.C +++ b/plots/Surface/SurfaceEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Surface_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Surface_GetEngineInfo() { return new SurfaceEnginePluginInfo; } diff --git a/plots/Surface/SurfaceGUIPluginInfo.C b/plots/Surface/SurfaceGUIPluginInfo.C index e76f5abde9d..dd0045637bd 100644 --- a/plots/Surface/SurfaceGUIPluginInfo.C +++ b/plots/Surface/SurfaceGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Surface_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Surface_GetGUIInfo() { return new SurfaceGUIPluginInfo; } diff --git a/plots/Surface/SurfacePluginInfo.C b/plots/Surface/SurfacePluginInfo.C index 963e6e5cbd4..a1f30569a80 100644 --- a/plots/Surface/SurfacePluginInfo.C +++ b/plots/Surface/SurfacePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *SurfaceVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Surface_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Surface_GetGeneralInfo() { return new SurfaceGeneralPluginInfo; } diff --git a/plots/Surface/SurfaceScriptingPluginInfo.C b/plots/Surface/SurfaceScriptingPluginInfo.C index 3f505986470..51623492916 100644 --- a/plots/Surface/SurfaceScriptingPluginInfo.C +++ b/plots/Surface/SurfaceScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Surface_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Surface_GetScriptingInfo() { return new SurfaceScriptingPluginInfo; } diff --git a/plots/Surface/SurfaceViewerPluginInfo.C b/plots/Surface/SurfaceViewerPluginInfo.C index 09e39e7218f..4a3319a20c4 100644 --- a/plots/Surface/SurfaceViewerPluginInfo.C +++ b/plots/Surface/SurfaceViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Surface_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Surface_GetViewerInfo() { SurfaceViewerPluginInfo::InitializeGlobalObjects(); return new SurfaceViewerPluginInfo; diff --git a/plots/Tensor/TensorEnginePluginInfo.C b/plots/Tensor/TensorEnginePluginInfo.C index b853bc29305..72283a06bc5 100644 --- a/plots/Tensor/TensorEnginePluginInfo.C +++ b/plots/Tensor/TensorEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Tensor_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Tensor_GetEngineInfo() { return new TensorEnginePluginInfo; } diff --git a/plots/Tensor/TensorGUIPluginInfo.C b/plots/Tensor/TensorGUIPluginInfo.C index 90d1899dfdf..c7a7c7002f1 100644 --- a/plots/Tensor/TensorGUIPluginInfo.C +++ b/plots/Tensor/TensorGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Tensor_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Tensor_GetGUIInfo() { return new TensorGUIPluginInfo; } diff --git a/plots/Tensor/TensorPluginInfo.C b/plots/Tensor/TensorPluginInfo.C index f815bec684e..700de8536c0 100644 --- a/plots/Tensor/TensorPluginInfo.C +++ b/plots/Tensor/TensorPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *TensorVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Tensor_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Tensor_GetGeneralInfo() { return new TensorGeneralPluginInfo; } diff --git a/plots/Tensor/TensorScriptingPluginInfo.C b/plots/Tensor/TensorScriptingPluginInfo.C index f63e6aa2e06..c63160a834a 100644 --- a/plots/Tensor/TensorScriptingPluginInfo.C +++ b/plots/Tensor/TensorScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Tensor_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Tensor_GetScriptingInfo() { return new TensorScriptingPluginInfo; } diff --git a/plots/Tensor/TensorViewerPluginInfo.C b/plots/Tensor/TensorViewerPluginInfo.C index 3311aa9dde8..b140d461048 100644 --- a/plots/Tensor/TensorViewerPluginInfo.C +++ b/plots/Tensor/TensorViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Tensor_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Tensor_GetViewerInfo() { TensorViewerPluginInfo::InitializeGlobalObjects(); return new TensorViewerPluginInfo; diff --git a/plots/Topology/TopologyEnginePluginInfo.C b/plots/Topology/TopologyEnginePluginInfo.C index a3efb87119c..1363999abc6 100644 --- a/plots/Topology/TopologyEnginePluginInfo.C +++ b/plots/Topology/TopologyEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Topology_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Topology_GetEngineInfo() { return new TopologyEnginePluginInfo; } diff --git a/plots/Topology/TopologyGUIPluginInfo.C b/plots/Topology/TopologyGUIPluginInfo.C index 3bfc296a0dd..b57f747e29e 100644 --- a/plots/Topology/TopologyGUIPluginInfo.C +++ b/plots/Topology/TopologyGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Topology_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Topology_GetGUIInfo() { return new TopologyGUIPluginInfo; } diff --git a/plots/Topology/TopologyPluginInfo.C b/plots/Topology/TopologyPluginInfo.C index c66ca419424..5bcb1dd1937 100644 --- a/plots/Topology/TopologyPluginInfo.C +++ b/plots/Topology/TopologyPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *TopologyVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Topology_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Topology_GetGeneralInfo() { return new TopologyGeneralPluginInfo; } diff --git a/plots/Topology/TopologyScriptingPluginInfo.C b/plots/Topology/TopologyScriptingPluginInfo.C index b92bea444b3..acf4d1fda8c 100644 --- a/plots/Topology/TopologyScriptingPluginInfo.C +++ b/plots/Topology/TopologyScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Topology_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Topology_GetScriptingInfo() { return new TopologyScriptingPluginInfo; } diff --git a/plots/Topology/TopologyViewerPluginInfo.C b/plots/Topology/TopologyViewerPluginInfo.C index 09696da27a1..dcd25dcd7f8 100644 --- a/plots/Topology/TopologyViewerPluginInfo.C +++ b/plots/Topology/TopologyViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Topology_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Topology_GetViewerInfo() { TopologyViewerPluginInfo::InitializeGlobalObjects(); return new TopologyViewerPluginInfo; diff --git a/plots/Truecolor/TruecolorEnginePluginInfo.C b/plots/Truecolor/TruecolorEnginePluginInfo.C index df6f2231313..f2fee4bd076 100644 --- a/plots/Truecolor/TruecolorEnginePluginInfo.C +++ b/plots/Truecolor/TruecolorEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Truecolor_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Truecolor_GetEngineInfo() { return new TruecolorEnginePluginInfo; } diff --git a/plots/Truecolor/TruecolorGUIPluginInfo.C b/plots/Truecolor/TruecolorGUIPluginInfo.C index cd0f8a78173..c7b9b74be12 100644 --- a/plots/Truecolor/TruecolorGUIPluginInfo.C +++ b/plots/Truecolor/TruecolorGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Truecolor_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Truecolor_GetGUIInfo() { return new TruecolorGUIPluginInfo; } diff --git a/plots/Truecolor/TruecolorPluginInfo.C b/plots/Truecolor/TruecolorPluginInfo.C index 6692d447a24..c7848ff08c5 100644 --- a/plots/Truecolor/TruecolorPluginInfo.C +++ b/plots/Truecolor/TruecolorPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *TruecolorVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Truecolor_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Truecolor_GetGeneralInfo() { return new TruecolorGeneralPluginInfo; } diff --git a/plots/Truecolor/TruecolorScriptingPluginInfo.C b/plots/Truecolor/TruecolorScriptingPluginInfo.C index 05868fcb626..4aff70c66cc 100644 --- a/plots/Truecolor/TruecolorScriptingPluginInfo.C +++ b/plots/Truecolor/TruecolorScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Truecolor_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Truecolor_GetScriptingInfo() { return new TruecolorScriptingPluginInfo; } diff --git a/plots/Truecolor/TruecolorViewerPluginInfo.C b/plots/Truecolor/TruecolorViewerPluginInfo.C index ed4f50b53e6..68b6682dbee 100644 --- a/plots/Truecolor/TruecolorViewerPluginInfo.C +++ b/plots/Truecolor/TruecolorViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Truecolor_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Truecolor_GetViewerInfo() { TruecolorViewerPluginInfo::InitializeGlobalObjects(); return new TruecolorViewerPluginInfo; diff --git a/plots/Vector/VectorEnginePluginInfo.C b/plots/Vector/VectorEnginePluginInfo.C index af621dadbed..71d6e7b51d7 100644 --- a/plots/Vector/VectorEnginePluginInfo.C +++ b/plots/Vector/VectorEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Vector_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Vector_GetEngineInfo() { return new VectorEnginePluginInfo; } diff --git a/plots/Vector/VectorGUIPluginInfo.C b/plots/Vector/VectorGUIPluginInfo.C index f3405f2d553..0366d9c2298 100644 --- a/plots/Vector/VectorGUIPluginInfo.C +++ b/plots/Vector/VectorGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Vector_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Vector_GetGUIInfo() { return new VectorGUIPluginInfo; } diff --git a/plots/Vector/VectorPluginInfo.C b/plots/Vector/VectorPluginInfo.C index 5d7d703429e..ce9b1f3afa3 100644 --- a/plots/Vector/VectorPluginInfo.C +++ b/plots/Vector/VectorPluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *VectorVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Vector_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Vector_GetGeneralInfo() { return new VectorGeneralPluginInfo; } diff --git a/plots/Vector/VectorScriptingPluginInfo.C b/plots/Vector/VectorScriptingPluginInfo.C index 4e70b5d588a..0b60ecb5144 100644 --- a/plots/Vector/VectorScriptingPluginInfo.C +++ b/plots/Vector/VectorScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Vector_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Vector_GetScriptingInfo() { return new VectorScriptingPluginInfo; } diff --git a/plots/Vector/VectorViewerPluginInfo.C b/plots/Vector/VectorViewerPluginInfo.C index e65f6f149a1..993ce44bdff 100644 --- a/plots/Vector/VectorViewerPluginInfo.C +++ b/plots/Vector/VectorViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Vector_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Vector_GetViewerInfo() { VectorViewerPluginInfo::InitializeGlobalObjects(); return new VectorViewerPluginInfo; diff --git a/plots/Volume/VolumeEnginePluginInfo.C b/plots/Volume/VolumeEnginePluginInfo.C index 02922b1fcc4..c500da83c09 100644 --- a/plots/Volume/VolumeEnginePluginInfo.C +++ b/plots/Volume/VolumeEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo Volume_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* Volume_GetEngineInfo() { return new VolumeEnginePluginInfo; } diff --git a/plots/Volume/VolumeGUIPluginInfo.C b/plots/Volume/VolumeGUIPluginInfo.C index 459d575d7ba..8740c9f86e5 100644 --- a/plots/Volume/VolumeGUIPluginInfo.C +++ b/plots/Volume/VolumeGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo Volume_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* Volume_GetGUIInfo() { return new VolumeGUIPluginInfo; } diff --git a/plots/Volume/VolumePluginInfo.C b/plots/Volume/VolumePluginInfo.C index 1674742f637..5666d5ed0a4 100644 --- a/plots/Volume/VolumePluginInfo.C +++ b/plots/Volume/VolumePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *VolumeVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo Volume_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* Volume_GetGeneralInfo() { return new VolumeGeneralPluginInfo; } diff --git a/plots/Volume/VolumeScriptingPluginInfo.C b/plots/Volume/VolumeScriptingPluginInfo.C index a4898684864..60ecbc36b64 100644 --- a/plots/Volume/VolumeScriptingPluginInfo.C +++ b/plots/Volume/VolumeScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo Volume_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* Volume_GetScriptingInfo() { return new VolumeScriptingPluginInfo; } diff --git a/plots/Volume/VolumeViewerPluginInfo.C b/plots/Volume/VolumeViewerPluginInfo.C index 53229203ceb..c9896603932 100644 --- a/plots/Volume/VolumeViewerPluginInfo.C +++ b/plots/Volume/VolumeViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo Volume_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* Volume_GetViewerInfo() { VolumeViewerPluginInfo::InitializeGlobalObjects(); return new VolumeViewerPluginInfo; diff --git a/plots/WellBore/WellBoreEnginePluginInfo.C b/plots/WellBore/WellBoreEnginePluginInfo.C index e6f4b08932a..cd6cb342282 100644 --- a/plots/WellBore/WellBoreEnginePluginInfo.C +++ b/plots/WellBore/WellBoreEnginePluginInfo.C @@ -43,10 +43,6 @@ #include #include -#if defined(__APPLE__) -#define GetEngineInfo WellBore_GetEngineInfo -#endif - // **************************************************************************** // Function: GetEngineInfo // @@ -57,7 +53,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo() +extern "C" PLOT_EXPORT EnginePlotPluginInfo* WellBore_GetEngineInfo() { return new WellBoreEnginePluginInfo; } diff --git a/plots/WellBore/WellBoreGUIPluginInfo.C b/plots/WellBore/WellBoreGUIPluginInfo.C index baf66e7f353..7a6ea56fb13 100644 --- a/plots/WellBore/WellBoreGUIPluginInfo.C +++ b/plots/WellBore/WellBoreGUIPluginInfo.C @@ -45,10 +45,6 @@ #include #include -#if defined(__APPLE__) -#define GetGUIInfo WellBore_GetGUIInfo -#endif - // **************************************************************************** // Function: GetGUIInfo // @@ -59,7 +55,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo() +extern "C" PLOT_EXPORT GUIPlotPluginInfo* WellBore_GetGUIInfo() { return new WellBoreGUIPluginInfo; } diff --git a/plots/WellBore/WellBorePluginInfo.C b/plots/WellBore/WellBorePluginInfo.C index 0d7e8f039ec..4124932d7fc 100644 --- a/plots/WellBore/WellBorePluginInfo.C +++ b/plots/WellBore/WellBorePluginInfo.C @@ -44,15 +44,7 @@ #include #include -#if defined(__APPLE__) extern "C" PLOT_EXPORT const char *WellBoreVisItPluginVersion = VISIT_VERSION; -#else -extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; -#endif - -#if defined(__APPLE__) -#define GetGeneralInfo WellBore_GetGeneralInfo -#endif // **************************************************************************** // Function: GetGeneralInfo @@ -64,7 +56,7 @@ extern "C" PLOT_EXPORT const char *VisItPluginVersion = VISIT_VERSION; // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo() +extern "C" PLOT_EXPORT GeneralPlotPluginInfo* WellBore_GetGeneralInfo() { return new WellBoreGeneralPluginInfo; } diff --git a/plots/WellBore/WellBoreScriptingPluginInfo.C b/plots/WellBore/WellBoreScriptingPluginInfo.C index d718f50840f..c1787de783e 100644 --- a/plots/WellBore/WellBoreScriptingPluginInfo.C +++ b/plots/WellBore/WellBoreScriptingPluginInfo.C @@ -42,10 +42,6 @@ #include #include -#if defined(__APPLE__) -#define GetScriptingInfo WellBore_GetScriptingInfo -#endif - // **************************************************************************** // Function: GetScriptingInfo // @@ -56,7 +52,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo() +extern "C" PLOT_EXPORT ScriptingPlotPluginInfo* WellBore_GetScriptingInfo() { return new WellBoreScriptingPluginInfo; } diff --git a/plots/WellBore/WellBoreViewerPluginInfo.C b/plots/WellBore/WellBoreViewerPluginInfo.C index 683d022ab84..b99b2769bbe 100644 --- a/plots/WellBore/WellBoreViewerPluginInfo.C +++ b/plots/WellBore/WellBoreViewerPluginInfo.C @@ -44,10 +44,6 @@ #include #include -#if defined(__APPLE__) -#define GetViewerInfo WellBore_GetViewerInfo -#endif - // **************************************************************************** // Function: GetViewerInfo // @@ -58,7 +54,7 @@ // Creation: omitted // // **************************************************************************** -extern "C" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo() +extern "C" PLOT_EXPORT ViewerPlotPluginInfo* WellBore_GetViewerInfo() { WellBoreViewerPluginInfo::InitializeGlobalObjects(); return new WellBoreViewerPluginInfo; diff --git a/third_party_builtin/Makefile.in b/third_party_builtin/Makefile.in index 3f7682ae15d..37d0e4d72d3 100644 --- a/third_party_builtin/Makefile.in +++ b/third_party_builtin/Makefile.in @@ -66,6 +66,9 @@ # Brad Whitlock, Wed Jun 3 15:43:54 PST 2009 # I added engine only build options. # +# Hank Childs, Thu Nov 12 14:17:14 PST 2009 +# Add support for static builds. +# ############################################################################## @SET_MAKE@ @@ -81,6 +84,7 @@ ALLSUBDIRS_ENGINE_ONLY=zlib glew bilib slivr bow cognomen tuvok verdict SUBDIRS_SERVER_COMPONENTS_ONLY=$(SUBDIRS_ENGINE_ONLY) ALLSUBDIRS_SERVER_COMPONENTS_ONLY=$(ALLSUBDIRS_ENGINE_ONLY) +SUBDIRS_STATIC_LINK=$(SUBDIRS_ENGINE_ONLY) SUBDIRS_STD=@BUILD_MESA_STUB@ @BUILD_ZLIB@ @BUILD_GLEW@ @BUILD_BILIB@ \ @BUILD_SLIVR@ @BUILD_COGNOMEN@ @BUILD_TUVOK@ bow verdict diff --git a/tools/xml/GenerateInfo.h b/tools/xml/GenerateInfo.h index 8457cc169d6..58fa0ff4f6a 100644 --- a/tools/xml/GenerateInfo.h +++ b/tools/xml/GenerateInfo.h @@ -184,6 +184,14 @@ // Tom Fogal, Wed Jul 1 23:46:57 MDT 2009 // Make sure to export interface symbols. // +// Hank Childs, Thu Nov 12 15:51:05 PST 2009 +// Removed the specialized function naming from AddMacOSXMacro and made that +// behavior be used all the time. Before this change: every plugin had +// its own VisItVersionString, GetGeneralInfo, etc, and only on Mac's would +// it be Pseudocolor_VisItVersionString, Pseudocolor_GetGeneralInfo, etc. +// Now we have Pseudocolor_VisItVersionString, Pseudocolor_GetGeneralInfo, +// etc., all the time. This is needed for static builds. +// // **************************************************************************** class InfoGeneratorPlugin : public Plugin @@ -705,19 +713,9 @@ class InfoGeneratorPlugin : public Plugin void AddVersion(QTextStream &c) { c << "#include " << endl; - c << "#if defined(__APPLE__)" << endl; c << "extern \"C\" " << Export(type.toStdString()) << " const char *"<name<<".h>" << endl; c << endl; AddVersion(c); - AddMacOSXMacro(c, "General"); c << "// ****************************************************************************" << endl; c << "// Function: GetGeneralInfo" << endl; c << "//" << endl; @@ -742,11 +739,11 @@ class InfoGeneratorPlugin : public Plugin c << "//" << endl; c << "// ****************************************************************************" << endl; if (type=="operator") - c << "extern \"C\" OP_EXPORT GeneralOperatorPluginInfo* GetGeneralInfo()" << endl; + c << "extern \"C\" OP_EXPORT GeneralOperatorPluginInfo* " << name <<"_GetGeneralInfo()" << endl; else if (type=="plot") - c << "extern \"C\" PLOT_EXPORT GeneralPlotPluginInfo* GetGeneralInfo()" << endl; + c << "extern \"C\" PLOT_EXPORT GeneralPlotPluginInfo* " << name << "_GetGeneralInfo()" << endl; else if (type=="database") - c << "extern \"C\" DBP_EXPORT GeneralDatabasePluginInfo* GetGeneralInfo()" << endl; + c << "extern \"C\" DBP_EXPORT GeneralDatabasePluginInfo* " << name << "_GetGeneralInfo()" << endl; c << "{" << endl; c << " return new "<" << endl; c << endl; - AddMacOSXMacro(c, "GUI"); c << "// ****************************************************************************" << endl; c << "// Function: GetGUIInfo" << endl; c << "//" << endl; @@ -1164,9 +1160,9 @@ class InfoGeneratorPlugin : public Plugin c << "//" << endl; c << "// ****************************************************************************" << endl; if (type=="operator") - c << "extern \"C\" OP_EXPORT GUIOperatorPluginInfo* GetGUIInfo()" << endl; + c << "extern \"C\" OP_EXPORT GUIOperatorPluginInfo* " << name << "_GetGUIInfo()" << endl; else if (type=="plot") - c << "extern \"C\" PLOT_EXPORT GUIPlotPluginInfo* GetGUIInfo()" << endl; + c << "extern \"C\" PLOT_EXPORT GUIPlotPluginInfo* " << name << "_GetGUIInfo()" << endl; c << "{" << endl; c << " return new "<" << endl; c << endl; - AddMacOSXMacro(c, "Viewer"); c << "// ****************************************************************************" << endl; c << "// Function: GetViewerInfo" << endl; c << "//" << endl; @@ -1359,9 +1354,9 @@ class InfoGeneratorPlugin : public Plugin c << "//" << endl; c << "// ****************************************************************************" << endl; if (type=="operator") - c << "extern \"C\" OP_EXPORT ViewerOperatorPluginInfo* GetViewerInfo()" << endl; + c << "extern \"C\" OP_EXPORT ViewerOperatorPluginInfo* " << name << "_GetViewerInfo()" << endl; else if (type=="plot") - c << "extern \"C\" PLOT_EXPORT ViewerPlotPluginInfo* GetViewerInfo()" << endl; + c << "extern \"C\" PLOT_EXPORT ViewerPlotPluginInfo* " << name << "_GetViewerInfo()" << endl; c << "{" << endl; c << " "<" << endl; c << "" << endl; - AddMacOSXMacro(c, "MDServer"); c << "// ****************************************************************************" << endl; c << "// Function: GetMDServerInfo" << endl; c << "//" << endl; @@ -1740,7 +1734,7 @@ class InfoGeneratorPlugin : public Plugin c << "// Creation: omitted" << endl; c << "//" << endl; c << "// ****************************************************************************" << endl; - c << "extern \"C\" DBP_EXPORT MDServerDatabasePluginInfo* GetMDServerInfo()" << endl; + c << "extern \"C\" DBP_EXPORT MDServerDatabasePluginInfo* " << name << "_GetMDServerInfo()" << endl; c << "{" << endl; c << " return new "<" << endl; c << "" << endl; - AddMacOSXMacro(c, "Engine"); c << "// ****************************************************************************" << endl; c << "// Function: GetEngineInfo" << endl; c << "//" << endl; @@ -1773,7 +1766,7 @@ class InfoGeneratorPlugin : public Plugin c << "// Creation: omitted" << endl; c << "//" << endl; c << "// ****************************************************************************" << endl; - c << "extern \"C\" DBP_EXPORT EngineDatabasePluginInfo* GetEngineInfo()" << endl; + c << "extern \"C\" DBP_EXPORT EngineDatabasePluginInfo* " << name << "_GetEngineInfo()" << endl; c << "{" << endl; c << " return new "<" << endl; c << endl; - AddMacOSXMacro(c, "Engine"); c << "// ****************************************************************************" << endl; c << "// Function: GetEngineInfo" << endl; c << "//" << endl; @@ -1834,9 +1826,9 @@ class InfoGeneratorPlugin : public Plugin c << "//" << endl; c << "// ****************************************************************************" << endl; if (type=="operator") - c << "extern \"C\" OP_EXPORT EngineOperatorPluginInfo* GetEngineInfo()" << endl; + c << "extern \"C\" OP_EXPORT EngineOperatorPluginInfo* " << name << "_GetEngineInfo()" << endl; else if (type=="plot") - c << "extern \"C\" PLOT_EXPORT EnginePlotPluginInfo* GetEngineInfo()" << endl; + c << "extern \"C\" PLOT_EXPORT EnginePlotPluginInfo* " << name << "_GetEngineInfo()" << endl; c << "{" << endl; c << " return new "<name<<".h>" << endl; c << "#include <"<" << endl; c << "" << endl; - AddMacOSXMacro(c, "Scripting"); c << "// ****************************************************************************" << endl; c << "// Function: GetScriptingInfo" << endl; c << "//" << endl; @@ -1920,9 +1911,9 @@ class InfoGeneratorPlugin : public Plugin c << "//" << endl; c << "// ****************************************************************************" << endl; if(type=="plot") - c << "extern \"C\" PLOT_EXPORT ScriptingPlotPluginInfo* GetScriptingInfo()" << endl; + c << "extern \"C\" PLOT_EXPORT ScriptingPlotPluginInfo* " << name << "_GetScriptingInfo()" << endl; else if(type == "operator") - c << "extern \"C\" OP_EXPORT ScriptingOperatorPluginInfo* GetScriptingInfo()" << endl; + c << "extern \"C\" OP_EXPORT ScriptingOperatorPluginInfo* " << name << "_GetScriptingInfo()" << endl; c << "{" << endl; c << " return new "<