Commit f8a94f70 authored by Dave DeMarle's avatar Dave DeMarle
Browse files

Merge branch 'fix-chemistry-shared-windows-build' into release

Change-Id: I7ace63c5e6f56da87419c1c6dc504ea07729e2a7
parents 02aac437 45b0c171
...@@ -35,7 +35,7 @@ public: ...@@ -35,7 +35,7 @@ public:
// Description: // Description:
// Returns the number of electrons in the molecule. // Returns the number of electrons in the molecule.
virtual unsigned int GetNumberOfElectrons() = 0; virtual vtkIdType GetNumberOfElectrons() = 0;
// Description: // Description:
// Returns the vtkImageData for the requested molecular orbital. // Returns the vtkImageData for the requested molecular orbital.
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
class vtkDataSet; class vtkDataSet;
class vtkMolecule; class vtkMolecule;
class VTK_FILTERING_EXPORT vtkMoleculeAlgorithm : public vtkAlgorithm class VTK_CHEMISTRY_EXPORT vtkMoleculeAlgorithm : public vtkAlgorithm
{ {
public: public:
static vtkMoleculeAlgorithm *New(); static vtkMoleculeAlgorithm *New();
......
...@@ -41,8 +41,8 @@ public: ...@@ -41,8 +41,8 @@ public:
// Description: // Description:
// Get/Set the number of electrons in the molecule. Needed for HOMO/LUMO // Get/Set the number of electrons in the molecule. Needed for HOMO/LUMO
// convenience functions // convenience functions
vtkGetMacro(NumberOfElectrons, unsigned int); vtkGetMacro(NumberOfElectrons, vtkIdType);
vtkSetMacro(NumberOfElectrons, unsigned int); vtkSetMacro(NumberOfElectrons, vtkIdType);
// Description: // Description:
// Get/Set the vtkImageData for the requested molecular orbital. // Get/Set the vtkImageData for the requested molecular orbital.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment