Commit 94fb5b6c authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Fixing EXPORT macros for new modules.

Fixing export macros (and other header testingn failures).

Change-Id: Ib92aed44cd105f66abad99b88edccddb34ae9859
parent 7b3f0915
......@@ -22,6 +22,7 @@
#ifndef __vtkCompleteArrays_h
#define __vtkCompleteArrays_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkDataSetAlgorithm.h"
class vtkMultiProcessController;
......@@ -30,7 +31,7 @@ class vtkPVDataSetAttributesInformation;
class vtkDataSetAttributes;
class VTK_EXPORT vtkCompleteArrays : public vtkDataSetAlgorithm
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkCompleteArrays : public vtkDataSetAlgorithm
{
public:
vtkTypeMacro(vtkCompleteArrays,vtkDataSetAlgorithm);
......
......@@ -30,6 +30,7 @@
#ifndef __vtkMPIMToNSocketConnection_h
#define __vtkMPIMToNSocketConnection_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkObject.h"
class vtkMultiProcessController;
class vtkServerSocket;
......@@ -37,7 +38,7 @@ class vtkSocketCommunicator;
class vtkMPIMToNSocketConnectionPortInformation;
class vtkMPIMToNSocketConnectionInternals;
class VTK_EXPORT vtkMPIMToNSocketConnection : public vtkObject
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkMPIMToNSocketConnection : public vtkObject
{
public:
static vtkMPIMToNSocketConnection* New();
......
......@@ -21,12 +21,13 @@
#ifndef __vtkMPIMToNSocketConnectionPortInformation_h
#define __vtkMPIMToNSocketConnectionPortInformation_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkPVInformation.h"
class vtkMPIMToNSocketConnectionPortInformationInternals;
class VTK_EXPORT vtkMPIMToNSocketConnectionPortInformation : public vtkPVInformation
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkMPIMToNSocketConnectionPortInformation : public vtkPVInformation
{
public:
static vtkMPIMToNSocketConnectionPortInformation* New();
......
......@@ -22,11 +22,12 @@
#ifndef __vtkNetworkAccessManager_h
#define __vtkNetworkAccessManager_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkObject.h"
class vtkMultiProcessController;
class VTK_EXPORT vtkNetworkAccessManager : public vtkObject
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkNetworkAccessManager : public vtkObject
{
public:
vtkTypeMacro(vtkNetworkAccessManager, vtkObject);
......
......@@ -21,9 +21,10 @@
#ifndef __vtkPVAlgorithmPortsInformation_h
#define __vtkPVAlgorithmPortsInformation_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkPVInformation.h"
class VTK_EXPORT vtkPVAlgorithmPortsInformation : public vtkPVInformation
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVAlgorithmPortsInformation : public vtkPVInformation
{
public:
static vtkPVAlgorithmPortsInformation* New();
......
......@@ -24,12 +24,13 @@
#ifndef __vtkPVArrayInformation_h
#define __vtkPVArrayInformation_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkPVInformation.h"
class vtkClientServerStream;
class vtkStdString;
class vtkStringArray;
class VTK_EXPORT vtkPVArrayInformation : public vtkPVInformation
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVArrayInformation : public vtkPVInformation
{
public:
static vtkPVArrayInformation* New();
......
......@@ -21,9 +21,10 @@
#ifndef __vtkPVClassNameInformation_h
#define __vtkPVClassNameInformation_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkPVInformation.h"
class VTK_EXPORT vtkPVClassNameInformation : public vtkPVInformation
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVClassNameInformation : public vtkPVInformation
{
public:
static vtkPVClassNameInformation* New();
......
......@@ -23,6 +23,7 @@
#ifndef __vtkPVCompositeDataInformation_h
#define __vtkPVCompositeDataInformation_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkPVInformation.h"
class vtkPVDataInformation;
......@@ -30,7 +31,7 @@ class vtkPVDataInformation;
struct vtkPVCompositeDataInformationInternals;
//ETX
class VTK_EXPORT vtkPVCompositeDataInformation : public vtkPVInformation
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVCompositeDataInformation : public vtkPVInformation
{
public:
static vtkPVCompositeDataInformation* New();
......
......@@ -21,11 +21,12 @@
#ifndef __vtkPVCompositeDataInformationIterator_h
#define __vtkPVCompositeDataInformationIterator_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkObject.h"
class vtkPVDataInformation;
class VTK_EXPORT vtkPVCompositeDataInformationIterator : public vtkObject
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVCompositeDataInformationIterator : public vtkObject
{
public:
static vtkPVCompositeDataInformationIterator* New();
......
......@@ -27,6 +27,7 @@
#ifndef __vtkPVDataInformation_h
#define __vtkPVDataInformation_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkPVInformation.h"
class vtkCollection;
......@@ -42,7 +43,7 @@ class vtkPVDataSetAttributesInformation;
class vtkSelection;
class vtkTable;
class VTK_EXPORT vtkPVDataInformation : public vtkPVInformation
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVDataInformation : public vtkPVInformation
{
public:
static vtkPVDataInformation* New();
......
......@@ -23,6 +23,7 @@
#ifndef __vtkPVDataSetAttributesInformation_h
#define __vtkPVDataSetAttributesInformation_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkPVInformation.h"
#include "vtkDataSetAttributes.h" // needed for NUM_ATTRIBUTES
......@@ -32,7 +33,7 @@ class vtkFieldData;
class vtkPVArrayInformation;
class vtkGenericAttributeCollection;
class VTK_EXPORT vtkPVDataSetAttributesInformation : public vtkPVInformation
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVDataSetAttributesInformation : public vtkPVInformation
{
public:
static vtkPVDataSetAttributesInformation* New();
......
......@@ -23,9 +23,10 @@
#ifndef __vtkPVDataSizeInformation_h
#define __vtkPVDataSizeInformation_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkPVInformation.h"
class VTK_EXPORT vtkPVDataSizeInformation : public vtkPVInformation
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVDataSizeInformation : public vtkPVInformation
{
public:
static vtkPVDataSizeInformation* New();
......
......@@ -34,11 +34,12 @@
#ifndef __vtkPVExtractSelection_h
#define __vtkPVExtractSelection_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkExtractSelection.h"
class vtkSelectionNode;
class VTK_EXPORT vtkPVExtractSelection : public vtkExtractSelection
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVExtractSelection : public vtkExtractSelection
{
public:
vtkTypeMacro(vtkPVExtractSelection,vtkExtractSelection);
......
......@@ -22,11 +22,12 @@
#ifndef __vtkPVGenericAttributeInformation_h
#define __vtkPVGenericAttributeInformation_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkPVArrayInformation.h"
class vtkClientServerStream;
class VTK_EXPORT vtkPVGenericAttributeInformation : public vtkPVArrayInformation
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVGenericAttributeInformation : public vtkPVArrayInformation
{
public:
static vtkPVGenericAttributeInformation* New();
......
......@@ -19,12 +19,13 @@
#ifndef __vtkPVInformation_h
#define __vtkPVInformation_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkObject.h"
class vtkClientServerStream;
class vtkMultiProcessStream;
class VTK_EXPORT vtkPVInformation : public vtkObject
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVInformation : public vtkObject
{
public:
vtkTypeMacro(vtkPVInformation, vtkObject);
......
......@@ -21,9 +21,10 @@
#ifndef __vtkPVMPICommunicator_h
#define __vtkPVMPICommunicator_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkMPICommunicator.h"
class VTK_EXPORT vtkPVMPICommunicator : public vtkMPICommunicator
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVMPICommunicator : public vtkMPICommunicator
{
public:
static vtkPVMPICommunicator* New();
......
......@@ -21,11 +21,12 @@
#ifndef __vtkPVMultiClientsInformation_h
#define __vtkPVMultiClientsInformation_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkPVInformation.h"
class vtkClientServerStream;
class VTK_EXPORT vtkPVMultiClientsInformation : public vtkPVInformation
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVMultiClientsInformation : public vtkPVInformation
{
public:
static vtkPVMultiClientsInformation* New();
......
......@@ -22,11 +22,12 @@
#ifndef __vtkPVOptions_h
#define __vtkPVOptions_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkCommandOptions.h"
class vtkPVOptionsInternal;
class VTK_EXPORT vtkPVOptions : public vtkCommandOptions
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVOptions : public vtkCommandOptions
{
protected:
//BTX
......
......@@ -22,10 +22,11 @@
#ifndef __vtkPVOptionsXMLParser_h
#define __vtkPVOptionsXMLParser_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkCommandOptionsXMLParser.h"
class vtkCommandOptions;
class VTK_EXPORT vtkPVOptionsXMLParser : public vtkCommandOptionsXMLParser
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVOptionsXMLParser : public vtkCommandOptionsXMLParser
{
public:
static vtkPVOptionsXMLParser* New();
......
......@@ -25,6 +25,7 @@
#ifndef __vtkPVPlugin_h
#define __vtkPVPlugin_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkObject.h"
#include "vtkPVConfig.h" // needed for PARAVIEW_VERSION and CMAKE_CXX_COMPILER_ID
#include <vector>
......@@ -39,7 +40,7 @@
# define C_EXPORT extern "C"
#endif
class VTK_EXPORT vtkPVPlugin
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVPlugin
{
char* FileName;
void SetFileName(const char* filename);
......@@ -137,4 +138,5 @@ typedef vtkPVPlugin* (C_DECL *pv_plugin_query_instance_fptr)();
vtkPVPlugin::ImportPlugin(pv_plugin_instance_##PLUGIN());
#endif // __vtkPVPlugin_h
// VTK-HeaderTest-Exclude: vtkPVPlugin.h
......@@ -24,6 +24,7 @@
#ifndef __vtkPVPluginLoader_h
#define __vtkPVPluginLoader_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkObject.h"
class vtkIntArray;
......@@ -31,7 +32,7 @@ class vtkPVPlugin;
class vtkStringArray;
class vtkPVPlugin;
class VTK_EXPORT vtkPVPluginLoader : public vtkObject
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVPluginLoader : public vtkObject
{
public:
static vtkPVPluginLoader* New();
......
......@@ -24,13 +24,14 @@
#ifndef __vtkPVPluginTracker_h
#define __vtkPVPluginTracker_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkObject.h"
#include "vtkSmartPointer.h" // needed for vtkSmartPointer;
class vtkPVPlugin;
class vtkPVXMLElement;
class VTK_EXPORT vtkPVPluginTracker : public vtkObject
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVPluginTracker : public vtkObject
{
public:
static vtkPVPluginTracker* New();
......@@ -111,3 +112,5 @@ private:
};
#endif
// VTK-HeaderTest-Exclude: vtkPVPluginTracker.h
......@@ -21,9 +21,10 @@
#ifndef __vtkPVPluginsInformation_h
#define __vtkPVPluginsInformation_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkPVInformation.h"
class VTK_EXPORT vtkPVPluginsInformation : public vtkPVInformation
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVPluginsInformation : public vtkPVInformation
{
public:
static vtkPVPluginsInformation* New();
......
......@@ -36,13 +36,14 @@
#ifndef __vtkPVProgressHandler_h
#define __vtkPVProgressHandler_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkObject.h"
class vtkMPICommunicatorOpaqueRequest;
class vtkMultiProcessController;
class vtkPVSession;
class VTK_EXPORT vtkPVProgressHandler : public vtkObject
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVProgressHandler : public vtkObject
{
public:
static vtkPVProgressHandler* New();
......
......@@ -30,9 +30,10 @@
#ifndef __vtkPVPythonModule_h
#define __vtkPVPythonModule_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkObject.h"
class VTK_EXPORT vtkPVPythonModule : public vtkObject
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVPythonModule : public vtkObject
{
public:
vtkTypeMacro(vtkPVPythonModule, vtkObject);
......
......@@ -20,11 +20,12 @@
#ifndef __vtkPVPythonPluginInterface_h
#define __vtkPVPythonPluginInterface_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkObject.h"
#include <vector> // STL Header
#include <string> // STL Header
class VTK_EXPORT vtkPVPythonPluginInterface
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVPythonPluginInterface
{
public:
virtual ~vtkPVPythonPluginInterface();
......@@ -36,3 +37,4 @@ public:
#endif
// VTK-HeaderTest-Exclude: vtkPVPythonPluginInterface.h
......@@ -20,11 +20,12 @@
#ifndef __vtkPVSILInformation_h
#define __vtkPVSILInformation_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkPVInformation.h"
class vtkGraph;
class VTK_EXPORT vtkPVSILInformation : public vtkPVInformation
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVSILInformation : public vtkPVInformation
{
public:
static vtkPVSILInformation* New();
......
......@@ -22,12 +22,13 @@
#ifndef __vtkPVServerInformation_h
#define __vtkPVServerInformation_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkPVInformation.h"
class vtkClientServerStream;
class vtkPVServerOptionsInternals;
class VTK_EXPORT vtkPVServerInformation : public vtkPVInformation
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVServerInformation : public vtkPVInformation
{
public:
static vtkPVServerInformation* New();
......
......@@ -21,11 +21,12 @@
#ifndef __vtkPVServerManagerPluginInterface_h
#define __vtkPVServerManagerPluginInterface_h
#include "vtkPVClientServerCoreCoreModule.h" //needed for exports
#include "vtkClientServerInterpreterInitializer.h"
#include <vector> // STL Header
#include <string> // STL Header
class VTK_EXPORT vtkPVServerManagerPluginInterface
class VTKPVCLIENTSERVERCORECORE_EXPORT vtkPVServerManagerPluginInterface
{
public:
virtual ~vtkPVServerManagerPluginInterface();
......@@ -44,3 +45,4 @@ public: