Commit d93a5ae8 authored by hrchilds's avatar hrchilds

Update from September 28, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@331 18c085ea-50e0-402c-830e-de6fd14e8384
parent 0f90756f
......@@ -330,6 +330,9 @@ $0 = shift @ARGV;
# Added help for "-timing". Added the "-env" option. Added
# "-h" and "--help" as valid arguments to priunt the help text.
#
# Brad Whitlock, Fri Sep 24 11:03:03 PDT 2004
# I made the xml2projectfile program be an option.
#
###############################################################################
......@@ -392,6 +395,7 @@ USAGE: visit [arguments]
-xml2avt Run the XML plugin AVT generator
-xml2info Run the XML plugin dynamic info generator
-xml2makefile Run the XML plugin Makefile generator
-xml2projectfile Run the XML plugin Windows project file generator
-xml2python Run the XML plugin Pthon generator
-xml2window Run the XML plugin GUI window generator
-xml2java Run the XML plugin Java generator
......@@ -545,6 +549,7 @@ while (scalar(@ARGV) > 0) {
elsif ($arg eq "-xml2avt") { $exe_name = "xml2avt"; }
elsif ($arg eq "-xml2info") { $exe_name = "xml2info"; }
elsif ($arg eq "-xml2makefile") { $exe_name = "xml2makefile"; }
elsif ($arg eq "-xml2projectfile") { $exe_name = "xml2projectfile"; }
elsif ($arg eq "-xml2plugin") { $exe_name = "xml2plugin"; }
elsif ($arg eq "-xml2python") { $exe_name = "xml2python"; }
elsif ($arg eq "-xml2window") { $exe_name = "xml2window"; }
......
......@@ -1222,6 +1222,9 @@ ConfigManager::ReadField(DataNode *parentNode, const std::string &tagName,
// I changed how the config file names are determined on Windows so
// they can be opened in Notepad by double-clicking.
//
// Brad Whitlock, Fri Sep 24 13:46:10 PST 2004
// I fixed a memory overwrite on Windows.
//
// ****************************************************************************
char *
......@@ -1269,7 +1272,7 @@ ConfigManager::GetDefaultConfigFile(const char *filename, const char *home)
}
else
{
retval = new char[filenameLength + 1];
retval = new char[filenameLength + 1 + 4];
sprintf(retval, "%s.ini", configFileName);
}
#else
......
......@@ -3521,6 +3521,9 @@ avtGenericDatabase::ReadDataset(avtDatasetCollection &ds, vector<int> &domains,
// Hank Childs, Sat Aug 14 06:41:00 PDT 2004
// Allow for ghost nodes to be created. Put real work in subroutines.
//
// Brad Whitlock, Thu Sep 16 11:04:57 PDT 2004
// Removed a stray semicolon.
//
// ****************************************************************************
bool
......@@ -3621,7 +3624,7 @@ avtGenericDatabase::CommunicateGhosts(avtGhostDataType ghostType,
visitTimer->StopTimer(portion2, "Time to actually communicate ghost data");
bool madeGhosts = s;
if (madeGhosts);
if (madeGhosts)
{
//
// This will tell everything downstream that we have created ghost
......
......@@ -145,6 +145,10 @@ avtUnstructuredPointBoundaries::CheckGenerated(int d1, int d2)
// Programmer: Akira Haddox
// Creation: August 11, 2003
//
// Modifications:
// Brad Whitlock, Thu Sep 16 10:55:38 PDT 2004
// I added separate Windows coding to make it work with the MSVC6 compiler.
//
// ****************************************************************************
void
......@@ -206,9 +210,18 @@ avtUnstructuredPointBoundaries::Generate(vector<int> domainNum,
}
vector<int> givenCells, givenPoints;
#if defined(_WIN32) && defined(USING_MSVC6)
for(std::set<int>::const_iterator cell_it = cells.begin();
cell_it != cells.end(); ++cell_it)
givenCells.push_back(*cell_it);
for(std::set<int>::const_iterator point_it = points.begin();
point_it != points.end(); ++point_it)
givenPoints.push_back(*point_it);
#else
givenCells.assign(cells.begin(), cells.end());
givenPoints.assign(points.begin(), points.end());
#endif
// sendDom gives to recvDom with point filter on.
SetGivenCellsAndPoints(sendDom, recvDom, givenCells,
givenPoints, true);
......
......@@ -4,7 +4,7 @@
#ifndef AVT_GHOST_DATA_H
#define AVT_GHOST_DATA_H
#include <pipeline_exports.h>
typedef enum
{
......
......@@ -16,6 +16,8 @@
#pragma warning(disable:4275)
// Turn off warning about identifier truncation
#pragma warning(disable:4786)
// Turn off warning about forcing value to bool 'true' or 'false'
#pragma warning(disable:4800)
#endif
#else
#define PIPELINE_API
......
......@@ -16,10 +16,51 @@ using std::getline;
#include <avtDatabase.h>
#include <avtDatabaseMetaData.h>
#include <Expression.h>
#include <DebugStream.h>
#include <InvalidFilesException.h>
#include <InvalidVariableException.h>
#if defined(_WIN32) && defined(USING_MSVC6)
//
// Don't use std::getline because it requires the STL version of the input
// stream libraries, which we're not using with MSVC 6.0.
//
ifstream &
getline(ifstream &in, string &buffer)
{
char tmp[4096];
in.getline(tmp, 4096);
buffer = tmp;
return in;
}
void
READ_STRING(ifstream &in, std::string &buffer)
{
bool keepReading = true;
char tmp[4096];
int index = 0;
do
{
in.get(tmp[index]);
if(index < 4096 && tmp[index] != ' ')
++index;
else
keepReading = false;
} while (keepReading);
tmp[index] = '\0';
debug4 << "READ_STRING=" << buffer.c_str() << endl;
buffer = tmp;
}
#else
//
// Regular case. Use the code as it was originally written.
//
using std::getline;
#define READ_STRING(I, S) (I) >> (S)
#endif
// ****************************************************************************
// Method: avtDune constructor
......@@ -130,7 +171,7 @@ avtDuneFileFormat::avtDuneFileFormat(const char *filename)
if (buffer.find(massD) != string::npos) {
spart = string_substr(buffer, massD, rparen, needSpace);
if (density.find(lastMatname) != density.end()) {
cerr << "already have a " << lastMatname << endl;
cerr << "already have a " << lastMatname.c_str() << endl;
}
density[lastMatname] = fortranDoubleToCDouble(spart);
}
......@@ -204,7 +245,7 @@ avtDuneFileFormat::avtDuneFileFormat(const char *filename)
if (buffer.find(massD) != string::npos) {
spart = string_substr(buffer, massD, rparen, needSpace);
if (density.find(lastMatname) != density.end()) {
cerr << "already have a " << lastMatname << endl;
debug4 << "already have a " << lastMatname.c_str() << endl;
}
density[lastMatname] = fortranDoubleToCDouble(spart);
}
......@@ -256,13 +297,13 @@ avtDuneFileFormat::avtDuneFileFormat(const char *filename)
}
if (!matInfo.empty()) {
for (map<string, struct matInfoStruct>::iterator cur = matInfo.begin();
for (std::map<string, struct matInfoStruct>::iterator cur = matInfo.begin();
cur != matInfo.end();
++cur) {
if ((*cur).second.massDensity == -1) {
if (density.find((*cur).second.name) == density.end()) {
cerr << "can't find a density for "
<< (*cur).second.name << endl;
debug4 << "can't find a density for "
<< (*cur).second.name.c_str() << endl;
}
else {
(*cur).second.massDensity = density[(*cur).second.name];
......@@ -428,7 +469,8 @@ avtDuneFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
//
// Here's the call that tells the meta-data object that we have a var:
//
for (int i = 0; i < svarname.size(); i++) {
int i;
for (i = 0; i < svarname.size(); i++) {
AddScalarVarToMetaData(md, svarname[i], mesh_for_this_var, cent);
}
//
......@@ -451,7 +493,7 @@ avtDuneFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
//
// Here's the call that tells the meta-data object that we have a var:
//
for (int i = 0; i < vvarname.size(); i++) {
for (i = 0; i < vvarname.size(); i++) {
AddVectorVarToMetaData(md, vvarname[i], mesh_for_this_var, cent,
vector_dim);
}
......@@ -547,11 +589,12 @@ avtDuneFileFormat::GetMesh(int timestate, const char *meshname)
vtkpoints->SetNumberOfPoints(nparticles);
float *pts = (float *) vtkpoints->GetVoidPointer(0);
for (int i = 0; i < coordinates.size(); i++) {
int i;
for (i = 0; i < coordinates.size(); i++) {
pts[i] = coordinates[i];
}
for (int i = 0; i < nparticles; i++) {
for (i = 0; i < nparticles; i++) {
vtkIdType part[3] = {i, i, i};
dataset->InsertNextCell(VTK_VERTEX, 3, part);
}
......@@ -698,9 +741,10 @@ avtDuneFileFormat::GetVectorVar(int timestate, const char *varname)
for (int i = 0 ; i < ntuples ; i++)
{
for (int j = 0 ; j < ncomps ; j++)
int j;
for (j = 0 ; j < ncomps ; j++)
one_entry[j] = data[i*3 + j];
for (int j = ncomps ; j < ucomps ; j++)
for (j = ncomps ; j < ucomps ; j++)
one_entry[j] = 0.;
rv->SetTuple(i, one_entry);
}
......@@ -790,12 +834,13 @@ avtDuneFileFormat::ReadDuneData(const int timestate) {
const int fields = 11;
string fragment[fields];
int i,j;
switch (ftype) {
case TECPLOT:
for (int i = 0; i < nparticles; i++) {
for (int j = 0; j < fields; j++) {
ifile >> fragment[j];
for (i = 0; i < nparticles; i++) {
for (j = 0; j < fields; j++) {
READ_STRING(ifile, fragment[j]);
if (fragment[j].length()) {
bool more = true;
......@@ -820,7 +865,7 @@ avtDuneFileFormat::ReadDuneData(const int timestate) {
//impulseTime[i] = atof(fragment[14].c_str());
impulseTime[i] = 0.0;
mass[i] = 4./3. * pi * pow(radius[i], 3);
for (int j = 0; j < 3; j++) {
for (j = 0; j < 3; j++) {
coordinates[i*3 + j] = atof(fragment[2 + j].c_str());
velocities[i*3 + j] = atof(fragment[5 + j].c_str());
angularVelocities[i*3 + j] = atof(fragment[8 + j].c_str());
......@@ -855,7 +900,7 @@ avtDuneFileFormat::ReadDuneData(const int timestate) {
if (buffer.find(tag) != string::npos) {
spart = string_substr(buffer, tag, quote, noSpace);
struct matInfoStruct matTemp;
map<string, struct matInfoStruct>::iterator cur = matInfo.find(spart);
std::map<string, struct matInfoStruct>::iterator cur = matInfo.find(spart);
if (cur != matInfo.end()) {
rho = (*cur).second.massDensity;
}
......@@ -865,7 +910,7 @@ avtDuneFileFormat::ReadDuneData(const int timestate) {
mass[np] = rho * 4.0/3.0 * pi * pow(radius[np], 3.0);
}
if (buffer.find(x) != string::npos) {
for (int i = 0; i < 3; i++) {
for (i = 0; i < 3; i++) {
if (i == 0) {
bcp = buffer.find(x) + x.length() + 1;
}
......@@ -884,7 +929,7 @@ avtDuneFileFormat::ReadDuneData(const int timestate) {
}
if (buffer.find(v) != string::npos &&
buffer.find(vi) == string::npos) {
for (int i = 0; i < 3; i++) {
for (i = 0; i < 3; i++) {
if (i == 0) {
bcp = buffer.find(v) + v.length() + 1;
}
......@@ -902,7 +947,7 @@ avtDuneFileFormat::ReadDuneData(const int timestate) {
}
}
if (buffer.find(w) != string::npos) {
for (int i = 0; i < 3; i++) {
for (i = 0; i < 3; i++) {
if (i == 0) {
bcp = buffer.find(w) + w.length() + 1;
}
......@@ -931,7 +976,7 @@ avtDuneFileFormat::ReadDuneData(const int timestate) {
getline(ifile, buffer);
}
if (buffer.find(vi) != string::npos) {
for (int i = 0; i < 3; i++) {
for (i = 0; i < 3; i++) {
if (i == 0) {
bcp = buffer.find(vi) + vi.length() + 1;
}
......@@ -956,8 +1001,8 @@ avtDuneFileFormat::ReadDuneData(const int timestate) {
EXCEPTION1(InvalidFilesException, fname.c_str());
}
for (int i = 0; i < nparticles; i++) {
for (int j = 0; j < 3; j++) {
for (i = 0; i < nparticles; i++) {
for (j = 0; j < 3; j++) {
totalVelocities[i*3 + j] = velocities[i*3 + j] +
angularVelocities[i*3 + j] +
impulseVelocities[i*3 + j];
......
......@@ -1023,7 +1023,7 @@ avtPixieFileFormat::ReadVariableFromFile(int timestate, const std::string &varna
else
{
debug4 << "avtPixieFileFormat::ReadVariableFromFile: The variable "
<< varname << " was in a native format that we're not "
<< varname.c_str() << " was in a native format that we're not "
"supporting." << endl;
}
......@@ -1367,7 +1367,7 @@ avtPixieFileFormat::GetVariableList(hid_t group, const char *name,
info->This->variables.find(varName) == info->This->variables.end())
{
info->This->variables[varName] = varInfo;
debug4 << "Adding variable \"" << varName
debug4 << "Adding variable \"" << varName.c_str()
<< "\" for file variable: \""
<< varInfo.fileVarName.c_str() << "\"" << endl;
}
......
......@@ -183,7 +183,7 @@ avtSAMRAIFileFormat::avtSAMRAIFileFormat(const char *fname)
spec_var_names = 0;
h5files = new hid_t[MAX_FILES];
for (int i = 0 ; i < MAX_FILES ; i++)
for (i = 0 ; i < MAX_FILES ; i++)
{
h5files[i] = -1;
}
......@@ -608,8 +608,8 @@ avtSAMRAIFileFormat::ReadMesh(int patch)
}
// compute logical size in each dimension of this patch
int dimensions[] = {1, 1, 1};
for (int i=0; i<dim; i++) {
int i, dimensions[] = {1, 1, 1};
for (i=0; i<dim; i++) {
dimensions[i] = patch_extents[patch].upper[i] -
patch_extents[patch].lower[i] + 2 +
2 * num_ghosts[i];
......@@ -621,7 +621,6 @@ avtSAMRAIFileFormat::ReadMesh(int patch)
// compute physical origin and cell-spacing
float spacing[] = {0, 0, 0};
float origin[] = {0, 0, 0};
int i;
for (i=0; i<dim; i++) {
spacing[i] = dx[level * 3 + i];
origin[i] = patch_extents[patch].xlo[i] -
......@@ -736,9 +735,9 @@ avtSAMRAIFileFormat::ReadMesh(int patch)
//
vtkIntArray *arr = vtkIntArray::New();
arr->SetNumberOfTuples(3);
for (int i=0; i<dim; i++)
for (i=0; i<dim; i++)
arr->SetValue(i, patch_extents[patch].lower[i] - num_ghosts[i]);
for (int i=dim; i<3; i++)
for (i=dim; i<3; i++)
arr->SetValue(i, 0);
arr->SetName("base_index");
retval->GetFieldData()->AddArray(arr);
......@@ -1974,7 +1973,7 @@ avtSAMRAIFileFormat::GetAuxiliaryData(const char *var, int patch,
// Method: avtSAMRAIFileFormat::PopulateIOInformation
//
// Purpose:
// Popolates IO Information Hints
// Populates IO Information Hints
//
// Programmer: Mark C. Miller
// Creation: August 19. 2004
......@@ -2004,7 +2003,8 @@ avtSAMRAIFileFormat::PopulateIOInformation(avtIOInformation &ioInfo)
// create an initial vector for each file cluster
//
vector< vector<int> > groups;
for (int i = 0; i < num_clusters; i++)
int i;
for (i = 0; i < num_clusters; i++)
{
vector<int> dummy;
groups.push_back(dummy);
......@@ -2013,7 +2013,7 @@ avtSAMRAIFileFormat::PopulateIOInformation(avtIOInformation &ioInfo)
//
// use the patch map and stick each patch into its respective cluster group
//
for (int i = 0; i < num_patches; i++)
for (i = 0; i < num_patches; i++)
{
int clusterNum = patch_map[i].file_cluster_number;
groups[clusterNum].push_back(i);
......
#include <StringHelpers.h>
#include <sys/types.h>
#if defined(_WIN32)
#include <win32-regex.h>
#else
#include <regex.h>
#endif
#include <stdlib.h>
#include <string>
#include <vector>
......
......@@ -3,7 +3,11 @@
#include <ctype.h>
#include <string.h>
#include <sys/types.h>
#if defined(_WIN32)
#include <win32-regex.h>
#else
#include <regex.h>
#endif
#include <VisitALE.h>
......
......@@ -271,10 +271,12 @@ avtVistaAle3dFileFormat::FreeUpResources(void)
// Creation: Tue Feb 17 19:19:07 PST 2004
//
// Modifications:
//
// Mark C. Miller, Wed May 19 10:56:11 PDT 2004
// Added support for 2D meshes
//
// Brad Whitlock, Mon Sep 20 09:58:27 PDT 2004
// Fixed so it builds on Windows.
//
// ****************************************************************************
void
......@@ -307,7 +309,7 @@ avtVistaAle3dFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
if (pieceGroups.size() > 1)
{
cerr << "WARNING!!! Found more than one candidate group of domains" << endl;
cerr << " Using group named \"" << groupNames[0] << "\"" << endl;
cerr << " Using group named \"" << groupNames[0].c_str() << "\"" << endl;
// rebuild the list of pieceNodes using only the group we've chosen
numPieces = 0;
......@@ -446,7 +448,7 @@ avtVistaAle3dFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
// Ok, now run through the map and find which fields were counted exactly
// numPieces time and which were less (there should not be any that occured
// more than numPieces times)
map<string, IMVal<int,0> >::const_iterator mi;
std::map<string, IMVal<int,0> >::const_iterator mi;
for (mi = fieldMap.begin(); mi != fieldMap.end(); mi++)
{
if (mi->second.val == numPieces)
......@@ -788,10 +790,12 @@ avtVistaAle3dFileFormat::GetMaterial(int domain, const char *var)
// Creation: Tue Feb 17 19:19:07 PST 2004
//
// Modifications:
//
// Mark C. Miller, Wed May 19 10:56:11 PDT 2004
// Added support for 2D meshes
//
// Brad Whitlock, Mon Sep 20 09:59:39 PDT 2004
// Fixed so it builds on Windows.
//
// ****************************************************************************
vtkDataSet *
......@@ -885,7 +889,7 @@ avtVistaAle3dFileFormat::GetMesh(int domain, const char *meshname)
const double *coords0 = coords[0];
const double *coords1 = coords[1];
const double *coords2 = coords[2];
for (int i = 0 ; i < numNodes; i++)
for (i = 0 ; i < numNodes; i++)
{
*tmp++ = *coords0++;
*tmp++ = *coords1++;
......
......@@ -279,7 +279,7 @@ avtVistaDiabloFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
if (pieceGroups.size() > 1)
{
cerr << "WARNING!!! Found more than one candidate group of domains" << endl;
cerr << " Using group named \"" << groupNames[0] << "\"" << endl;
cerr << " Using group named \"" << groupNames[0].c_str() << "\"" << endl;
// rebuild the list of pieceNodes using only the group we've chosen
delete [] pieceNodes;
......@@ -573,7 +573,7 @@ avtVistaDiabloFileFormat::GetMesh(int domain, const char *meshname)
const double *coords0 = coords[0];
const double *coords1 = coords[1];
const double *coords2 = coords[2];
for (int i = 0 ; i < numNodes; i++)
for (i = 0 ; i < numNodes; i++)
{
*tmp++ = *coords0++;
*tmp++ = *coords1++;
......
This diff is collapsed.
This diff is collapsed.
No preview for this file type
......@@ -76,6 +76,9 @@
# Kathleen Bonnell, Wed Mar 31 11:23:22 PST 2004
# Added QueryOverTime state object.
#
# Brad Whitlock, Tue Sep 28 09:04:01 PDT 2004
# Added InteractorAttributes so the library builds again.
#
##############################################################################
##
......@@ -117,6 +120,7 @@ HostProfile.java \
HostProfileList.java \
IncompatibleSecurityTokenException.java \
IncompatibleVersionException.java \
InteractorAttributes.java \
KeyframeAttributes.java \
LightAttributes.java \
LightList.java \
......
......@@ -4,10 +4,7 @@
#include <avtMesa3DTextureVolumeRenderer.h>
#if !defined(_WIN32) || (defined(_WIN32) && defined(USING_MSVC7))
// Don't do this on windows yet until we figure it out.
#include <GL/gl_mangle.h>
#endif
#define avtOpenGL3DTextureVolumeRenderer avtMesa3DTextureVolumeRenderer
......
......@@ -36,6 +36,11 @@
// Jeremy Meredith, Wed Aug 25 11:57:08 PDT 2004
// Added the concept of an engine-only or everything-but-the-engine plugin.
//
// Brad Whitlock, Wed Sep 22 16:11:54 PST 2004
// I fixed a bug with how some database plugins were named. I also fixed
// some minor errors that caused confusing build failures when building
// in Debug mode with MSVC6.0.
//
// ****************************************************************************
class ProjectFileGeneratorPlugin
......@@ -560,11 +565,15 @@ protected:
out << "# PROP Intermediate_Dir \"Debug\"" << endl;
out << "# PROP Ignore_Export_Lib 0" << endl;
out << "# PROP Target_Dir \"\"" << endl;
out << "# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D \"WIN32\" /D \"_DEBUG\" /D \"_WINDOWS\" /D \"_MBCS\" /D \"_USRDLL\" /YX /FD /GZ /c" << endl;
out << "# ADD CPP /nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I \"..\\..\\visit\\" << pluginType << "\\" << name << "\" /D \"WIN32\" /D \"_DEBUG\" /D \"_WINDOWS\" /D \"_MBCS\" /D \"_USRDLL\" /D \"USING_MSVC6\" ";
QString debugDef("/D \"_DEBUG\" ");
if(pluginComponent == 'S')
debugDef = "";
out << "# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D \"WIN32\" " << debugDef<< "/D \"_WINDOWS\" /D \"_MBCS\" /D \"_USRDLL\" /YX /FD /GZ /c" << endl;
out << "# ADD CPP /nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I \"..\\..\\visit\\" << pluginType << "\\" << name << "\" /D \"WIN32\" " << debugDef << "/D \"_WINDOWS\" /D \"_MBCS\" /D \"_USRDLL\" /D \"USING_MSVC6\" ";
if(exports != "")
out << "/D \"" << exports << "\" " << endl;
out << "/D \"GENERAL_PLUGIN_EXPORTS\" /YX /FD /GZ /TP /c" << endl;
out << "/D \"" << exports << "\" ";
out << "/D \"GENERAL_PLUGIN_EXPORTS\" ";
out << "/YX /FD /GZ /TP /c" << endl;
out << "# ADD BASE MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32" << endl;
out << "# ADD MTL /nologo /D \"_DEBUG\" /mktyplib203 /win32" << endl;
out << "# ADD BASE RSC /l 0x409 /d \"_DEBUG\"" << endl;
......@@ -1759,7 +1768,7 @@ protected:
out << "\t\t\t<Tool" << endl;
out << "\t\t\t\tName=\"VCLinkerTool\"" << endl;
out << "\t\t\t\tAdditionalDependencies=\"odbc32.lib odbccp32.lib state.lib misc.lib plugin.lib pipeline_ser.lib dbatts.lib database_ser.lib avtexceptions.lib vtkCommon.lib\"" << endl;
out << "\t\t\t\tOutputFile=\"..\\..\\bin\\MSVC7.Net\\Release\\databases\\lib" << name << pluginType << ".dll\"" << endl;
out << "\t\t\t\tOutputFile=\"..\\..\\bin\\MSVC7.Net\\Release\\databases\\lib" << pluginType << name << "Database.dll\"" << endl;
out << "\t\t\t\tLinkIncremental=\"1\"" << endl;
out << "\t\t\t\tSuppressStartupBanner=\"TRUE\"" << endl;
out << "\t\t\t\tProgramDatabaseFile=\".\\Release\\" << name << pluginType << "\\" << name << pluginType << ".pdb\"" << endl;
......@@ -1825,7 +1834,7 @@ protected:
out << "\t\t\t<Tool" << endl;
out << "\t\t\t\tName=\"VCLinkerTool\"" << endl;
out << "\t\t\t\tAdditionalDependencies=\"odbc32.lib odbccp32.lib state.lib misc.lib plugin.lib pipeline_ser.lib dbatts.lib database_ser.lib avtexceptions.lib vtkCommon.lib\"" << endl;
out << "\t\t\t\tOutputFile=\"..\\..\\bin\\MSVC7.Net\\Debug\\databases\\lib" << name << pluginType << ".dll\"" << endl;
out << "\t\t\t\tOutputFile=\"..\\..\\bin\\MSVC7.Net\\Debug\\databases\\lib" << pluginType << name << "Database.dll\"" << endl;
out << "\t\t\t\tLinkIncremental=\"1\"" << endl;
out << "\t\t\t\tSuppressStartupBanner=\"TRUE\"" << endl;
out << "\t\t\t\tGenerateDebugInformation=\"TRUE\"" << endl;
......
......@@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef __vtkPolyDataRelevantPointsFilter_h
#define __vtkPolyDataRelevantPointsFilter_h
#include <visit_vtk_exports.h>
#include <visit_vtk_light_exports.h>
#include "vtkPolyDataToPolyDataFilter.h"
......@@ -65,7 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Moved unimplmented copy constructor and operator= to private section.