Commit c1b9f0e9 authored by bonnell's avatar bonnell
Browse files

Update xml files so that 'cstring' and 'climits' patch changes do not get lost...

Update xml files so that 'cstring' and 'climits' patch changes do not get lost on next regeneration, few source code changes for windows compiler.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@4148 18c085ea-50e0-402c-830e-de6fd14e8384
parent 346aa147
......@@ -38,7 +38,6 @@
#include <ColorAttribute.h>
#include <DataNode.h>
#include <cstring>
// **************************************************************************
......@@ -975,7 +974,7 @@ const char *ColorAttribute::TypeMapFormatString = "U";
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -999,7 +998,7 @@ ColorAttribute::ColorAttribute() :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -1026,7 +1025,7 @@ ColorAttribute::ColorAttribute(const ColorAttribute &obj) :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -1046,7 +1045,7 @@ ColorAttribute::~ColorAttribute()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -1075,7 +1074,7 @@ ColorAttribute::operator = (const ColorAttribute &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -1104,7 +1103,7 @@ ColorAttribute::operator == (const ColorAttribute &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -1125,7 +1124,7 @@ ColorAttribute::operator != (const ColorAttribute &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -1146,7 +1145,7 @@ ColorAttribute::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -1174,7 +1173,7 @@ ColorAttribute::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -1200,7 +1199,7 @@ ColorAttribute::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -1227,7 +1226,7 @@ ColorAttribute::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -1285,7 +1284,7 @@ ColorAttribute::CreateNode(DataNode *parentNode, bool, bool)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -1360,7 +1359,7 @@ ColorAttribute::SelectColor()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -1385,7 +1384,7 @@ ColorAttribute::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -1410,7 +1409,7 @@ ColorAttribute::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -1435,7 +1434,7 @@ ColorAttribute::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:34 PDT 2007
// Creation: omitted
//
// Modifications:
//
......
......@@ -48,4 +48,11 @@
</Function>
<Constant name="namedColors" member="false">
</Constant>
<Include file="source" quoted="false">
cstring
</Include>
</Attribute>
<Constant name="namedColors" member="false">
</Constant>
</Attribute>
......@@ -41,9 +41,8 @@
#include <stdio.h>
#include <float.h>
#include <avtTypes.h>
#include <PickVarInfo.h>
#include <cstring>
#include <PickVarInfo.h>
//
// Enum conversion methods for PickAttributes::PickType
......@@ -96,7 +95,7 @@ const char *PickAttributes::TypeMapFormatString = "s*bbbbbbbbbsbiiii*iissDDDDDDs
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -178,7 +177,7 @@ PickAttributes::PickAttributes() :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -300,7 +299,7 @@ PickAttributes::PickAttributes(const PickAttributes &obj) :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -324,7 +323,7 @@ PickAttributes::~PickAttributes()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -448,7 +447,7 @@ PickAttributes::operator = (const PickAttributes &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -576,7 +575,7 @@ PickAttributes::operator == (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -597,7 +596,7 @@ PickAttributes::operator != (const PickAttributes &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -618,7 +617,7 @@ PickAttributes::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -646,7 +645,7 @@ PickAttributes::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -672,7 +671,7 @@ PickAttributes::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -699,7 +698,7 @@ PickAttributes::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -785,7 +784,7 @@ PickAttributes::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -2235,7 +2234,7 @@ PickAttributes::SelectFloatFormat()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -2260,7 +2259,7 @@ PickAttributes::AddVarInfo(const PickVarInfo &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -2288,7 +2287,7 @@ PickAttributes::ClearVarInfos()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -2301,7 +2300,7 @@ PickAttributes::RemoveVarInfo(int index)
// Iterate through the vector "index" times.
for(int i = 0; i < index; ++i)
++pos;
if(pos != varInfo.end()) ++pos;
// If pos is still a valid iterator, remove that element.
if(pos != varInfo.end())
......@@ -2323,7 +2322,7 @@ PickAttributes::RemoveVarInfo(int index)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -2344,7 +2343,7 @@ PickAttributes::GetNumVarInfos() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -2365,7 +2364,7 @@ PickAttributes::GetVarInfo(int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -2386,7 +2385,7 @@ PickAttributes::GetVarInfo(int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -2407,7 +2406,7 @@ PickAttributes::operator [] (int i)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -2432,7 +2431,7 @@ PickAttributes::operator [] (int i) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -2522,7 +2521,7 @@ PickAttributes::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -2612,7 +2611,7 @@ PickAttributes::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -2702,7 +2701,7 @@ PickAttributes::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......
......@@ -230,4 +230,7 @@
<Include file="source" quoted="false">
avtTypes.h
</Include>
<Include file="source" quoted="false">
cstring
</Include>
</Attribute>
......@@ -39,7 +39,6 @@
#include <PickVarInfo.h>
#include <DataNode.h>
#include <stdio.h>
#include <cstring>
//
......@@ -92,7 +91,7 @@ const char *PickVarInfo::TypeMapFormatString = "sss*d*s*d*bisi*s*i*bs";
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -116,7 +115,7 @@ PickVarInfo::PickVarInfo() :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -152,7 +151,7 @@ PickVarInfo::PickVarInfo(const PickVarInfo &obj) :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -172,7 +171,7 @@ PickVarInfo::~PickVarInfo()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -210,7 +209,7 @@ PickVarInfo::operator = (const PickVarInfo &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -245,7 +244,7 @@ PickVarInfo::operator == (const PickVarInfo &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -266,7 +265,7 @@ PickVarInfo::operator != (const PickVarInfo &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -287,7 +286,7 @@ PickVarInfo::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -315,7 +314,7 @@ PickVarInfo::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -341,7 +340,7 @@ PickVarInfo::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -368,7 +367,7 @@ PickVarInfo::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -732,7 +731,7 @@ PickVarInfo::SelectFloatFormat()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -770,7 +769,7 @@ PickVarInfo::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -808,7 +807,7 @@ PickVarInfo::GetFieldType(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -846,7 +845,7 @@ PickVarInfo::GetFieldTypeName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:40 PDT 2007
// Creation: omitted
//
// Modifications:
//
......
......@@ -52,6 +52,9 @@
<Include file="source" quoted="false">
stdio.h
</Include>
<Include file="source" quoted="false">
cstring
</Include>
<Include file="header" quoted="true">
snprintf.h
</Include>
......
......@@ -39,7 +39,6 @@
#include <Point.h>
#include <DataNode.h>
#include <stdio.h>
#include <cstring>
//
......@@ -93,7 +92,7 @@ const char *Point::TypeMapFormatString = "s";
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -113,7 +112,7 @@ Point::Point() :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -136,7 +135,7 @@ Point::Point(const Point &obj) :
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -156,7 +155,7 @@ Point::~Point()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -181,7 +180,7 @@ Point::operator = (const Point &obj)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -203,7 +202,7 @@ Point::operator == (const Point &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -224,7 +223,7 @@ Point::operator != (const Point &obj) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -245,7 +244,7 @@ Point::TypeName() const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -273,7 +272,7 @@ Point::CopyAttributes(const AttributeGroup *atts)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -299,7 +298,7 @@ Point::CreateCompatible(const std::string &tname) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -326,7 +325,7 @@ Point::NewInstance(bool copy) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -351,7 +350,7 @@ Point::SelectAll()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -393,7 +392,7 @@ Point::CreateNode(DataNode *parentNode, bool completeSave, bool forceAdd)
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -465,7 +464,7 @@ Point::SelectValue()
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007
// Creation: omitted
//
// Modifications:
//
......@@ -490,7 +489,7 @@ Point::GetFieldName(int index) const
// Note: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 20 09:40:41 PDT 2007