Commit 3f465d18 authored by cyrush's avatar cyrush

fixed some aix build issues with libz and database plug in info

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@5214 18c085ea-50e0-402c-830e-de6fd14e8384
parent 836dc2e8
......@@ -47,7 +47,7 @@
#include <vtkRectilinearGrid.h>
// ****************************************************************************
// Class: avtShapeletDecompResult
// Class: avtShapeletDecompose
//
// Purpose:
// Decomposes an image into shapelet coefficents using the overlap
......
......@@ -81,7 +81,7 @@ extern "C" GeneralDatabasePluginInfo* GetGeneralInfo()
//
// ****************************************************************************
char *
const char *
Boxlib2DGeneralPluginInfo::GetName() const
{
return "Boxlib2D";
......@@ -100,7 +100,7 @@ Boxlib2DGeneralPluginInfo::GetName() const
//
// ****************************************************************************
char *
const char *
Boxlib2DGeneralPluginInfo::GetVersion() const
{
return "1.0";
......@@ -119,7 +119,7 @@ Boxlib2DGeneralPluginInfo::GetVersion() const
//
// ****************************************************************************
char *
const char *
Boxlib2DGeneralPluginInfo::GetID() const
{
return "Boxlib2D_1.0";
......
......@@ -66,9 +66,9 @@ class avtDatabaseWriter;
class Boxlib2DGeneralPluginInfo : public virtual GeneralDatabasePluginInfo
{
public:
virtual char *GetName() const;
virtual char *GetVersion() const;
virtual char *GetID() const;
virtual const char *GetName() const;
virtual const char *GetVersion() const;
virtual const char *GetID() const;
virtual bool EnabledByDefault() const;
virtual bool HasWriter() const;
virtual std::vector<std::string> GetDfltExtsFromGen() const;
......
......@@ -81,7 +81,7 @@ extern "C" GeneralDatabasePluginInfo* GetGeneralInfo()
//
// ****************************************************************************
char *
const char *
Boxlib3DGeneralPluginInfo::GetName() const
{
return "Boxlib3D";
......@@ -100,7 +100,7 @@ Boxlib3DGeneralPluginInfo::GetName() const
//
// ****************************************************************************
char *
const char *
Boxlib3DGeneralPluginInfo::GetVersion() const
{
return "1.0";
......@@ -119,7 +119,7 @@ Boxlib3DGeneralPluginInfo::GetVersion() const
//
// ****************************************************************************
char *
const char *
Boxlib3DGeneralPluginInfo::GetID() const
{
return "Boxlib3D_1.0";
......
......@@ -66,9 +66,9 @@ class avtDatabaseWriter;
class Boxlib3DGeneralPluginInfo : public virtual GeneralDatabasePluginInfo
{
public:
virtual char *GetName() const;
virtual char *GetVersion() const;
virtual char *GetID() const;
virtual const char *GetName() const;
virtual const char *GetVersion() const;
virtual const char *GetID() const;
virtual bool EnabledByDefault() const;
virtual bool HasWriter() const;
virtual std::vector<std::string> GetDfltExtsFromGen() const;
......
......@@ -63,6 +63,16 @@ void foogl(void)
GLfloat mad[] = {0.1, 0.5, 0.8, 1.0};
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mad);
}
// HACK: Needed to force linking of libz on AIX
#ifdef HAVE_LIBZ
#include <zlib.h>
void fooz(void)
{
zlibVersion();
}
#endif
#endif
//
// END HACK
......
......@@ -53,6 +53,17 @@
// Prototypes.
bool ProcessCommandLine(int argc, char *argv[]);
// HACK: Needed to force linking of libz on AIX
#ifdef AIX
#ifdef HAVE_LIBZ
#include <zlib.h>
void fooz(void)
{
zlibVersion();
}
#endif
#endif
// ****************************************************************************
// Function: main
//
......
......@@ -167,6 +167,9 @@
// added support for putting user functions in the .code file and having
// them take effect here.
//
// Cyrus Harrison, Thu Sep 18 13:39:40 PDT 2008
// Changed code generation to include const qualifers for database info.
//
// ****************************************************************************
class InfoGeneratorPlugin : public Plugin
......@@ -616,9 +619,9 @@ class InfoGeneratorPlugin : public Plugin
h << "class "<<name<<"GeneralPluginInfo : public virtual GeneralDatabasePluginInfo" << endl;
h << "{" << endl;
h << " public:" << endl;
h << " virtual char *GetName() const;" << endl;
h << " virtual char *GetVersion() const;" << endl;
h << " virtual char *GetID() const;" << endl;
h << " virtual const char *GetName() const;" << endl;
h << " virtual const char *GetVersion() const;" << endl;
h << " virtual const char *GetID() const;" << endl;
h << " virtual bool EnabledByDefault() const;" << endl;
h << " virtual bool HasWriter() const;" << endl;
h << " virtual std::vector<std::string> GetDfltExtsFromGen() const;" << endl;
......@@ -723,10 +726,7 @@ class InfoGeneratorPlugin : public Plugin
c << "//" << endl;
c << "// ****************************************************************************" << endl;
c << endl;
if(type == "database")
c << "char *" << endl; // For now...
else
c << "const char *" << endl;
c << "const char *" << endl;
c << name<<"GeneralPluginInfo::GetName() const" << endl;
c << "{" << endl;
c << " return \""<<name<<"\";" << endl;
......@@ -745,10 +745,7 @@ class InfoGeneratorPlugin : public Plugin
c << "//" << endl;
c << "// ****************************************************************************" << endl;
c << endl;
if(type == "database")
c << "char *" << endl; // For now...
else
c << "const char *" << endl;
c << "const char *" << endl;
c << name<<"GeneralPluginInfo::GetVersion() const" << endl;
c << "{" << endl;
c << " return \""<<version<<"\";" << endl;
......@@ -767,10 +764,7 @@ class InfoGeneratorPlugin : public Plugin
c << "//" << endl;
c << "// ****************************************************************************" << endl;
c << endl;
if(type == "database")
c << "char *" << endl; // For now...
else
c << "const char *" << endl;
c << "const char *" << endl;
c << name<<"GeneralPluginInfo::GetID() const" << endl;
c << "{" << endl;
c << " return \""<<name<<"_"<<version<<"\";" << endl;
......
Markdown is supported
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