Changeset 657 for trunk/src2/core

Timestamp:

Apr 3, 2007 12:23:28 PM (17 years ago)

Author:

dkearney

Message:

cleaned up all the compile time warnings in core rappture2 objects

Location:

trunk/src2/core

Files:

• Makefile.in (modified) (1 diff)
• Ptr.h (modified) (1 diff)
• RpBuffer.cc (modified) (1 diff)
• RpBuffer.h (modified) (1 diff)
• RpField1D.cc (modified) (3 diffs)
• RpField1D.h (modified) (1 diff)
• RpFieldPrism3D.cc (modified) (2 diffs)
• RpFieldPrism3D.h (modified) (1 diff)
• RpFieldRect3D.cc (modified) (1 diff)
• RpFieldRect3D.h (modified) (1 diff)
• RpFieldTri2D.h (modified) (1 diff)
• RpMesh1D.cc (modified) (5 diffs)
• RpMesh1D.h (modified) (1 diff)
• RpMeshPrism3D.cc (modified) (1 diff)
• RpMeshRect3D.cc (modified) (1 diff)
• RpMeshTri2D.cc (modified) (6 diffs)
• RpNode.h (modified) (4 diffs)
• RpSerialBuffer.cc (modified) (10 diffs)
• RpSerializable.h (modified) (1 diff)
• RpSerializer.cc (modified) (3 diffs)
• RpSerializer.h (modified) (1 diff)

trunk/src2/core/Makefile.in

@@ -128 +128 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-# should use librappture2.a or $(LDFLAGS)  but this uses RpOutcome.o
-viz: viz.o libviz.a
+viz: viz.o librappture2.a
         $(CXX) $(CFLAGS) -o viz $^
 

trunk/src2/core/Ptr.h

@@ -137 +137 @@
 {
     if (_pc) {
-        return _pc->pointer();
+        return (Type*)_pc->pointer();
     }
     return NULL;

trunk/src2/core/RpBuffer.cc

@@ -1 +1 @@
 /*
  * ======================================================================
- *  Rappture::RpBuffer
+ *  Rappture::Buffer
  *
  *  AUTHOR:  Derrick Kearney, Purdue University

trunk/src2/core/RpBuffer.h

@@ -1 +1 @@
 /*
  * ======================================================================
- *  Rappture::RpBuffer
+ *  Rappture::Buffer
  *
  *  AUTHOR:  Derrick Kearney, Purdue University

trunk/src2/core/RpField1D.cc

@@ -56 +56 @@
     _meshPtr = field._meshPtr;
     _counter = field._counter;
+    return *this;
 }
 
@@ -133 +134 @@
         define(nodeId, y);
     }
+    return 0;
 }
 
@@ -146 +148 @@
         if (y > _vmax) { _vmax = y; }
     }
+    return 0;
 }
 

trunk/src2/core/RpField1D.h

@@ -18 +18 @@
 #define RAPPTURE_FIELD1D_H
 
-#include "RpPtr.h"
+#include "rappture2.h"
 #include "RpMesh1D.h"
 

trunk/src2/core/RpFieldPrism3D.cc

@@ -76 +76 @@
 FieldPrism3D::define(int nodeId, double f)
 {
-    while (_valuelist.size() <= nodeId) {
+    while (_valuelist.size() <= (unsigned int)nodeId) {
         _valuelist.push_back(NAN);
     }
@@ -93 +93 @@
 FieldPrism3D::value(double x, double y, double z, double outside) const
 {
-    double f0, f1, fy0, fy1, fz0, fz1;
-
     if (!_meshPtr.isNull()) {
         CellPrism3D cell = _meshPtr->locate(Node3D(x,y,z));

trunk/src2/core/RpFieldPrism3D.h

@@ -19 +19 @@
 #include <math.h>
 #include <vector>
-#include "RpPtr.h"
+#include "rappture2.h"
 #include "RpMeshPrism3D.h"
 

trunk/src2/core/RpFieldRect3D.cc

@@ -104 +104 @@
 FieldRect3D::define(int nodeId, double f)
 {
-    while (_valuelist.size() < nodeId) {
+    while (_valuelist.size() < (unsigned int)(nodeId)) {
         _valuelist.push_back(NAN);
     }

trunk/src2/core/RpFieldRect3D.h

@@ -19 +19 @@
 #include <math.h>
 #include <vector>
-#include "RpPtr.h"
+#include "rappture2.h"
 #include "RpMeshRect3D.h"
 

trunk/src2/core/RpFieldTri2D.h

@@ -19 +19 @@
 #include <math.h>
 #include <vector>
-#include "RpPtr.h"
+#include "rappture2.h"
 #include "RpMeshTri2D.h"
 

trunk/src2/core/RpMesh1D.cc

@@ -104 +104 @@
     _id2node = mesh._id2node;
     _id2nodeDirty = mesh._id2nodeDirty;
+    return *this;
 }
 
@@ -151 +152 @@
 {
     if (!_id2nodeDirty) {
-        if (nodeId < _id2node.size()) {
+        if ((unsigned int) nodeId < _id2node.size()) {
             int n = _id2node[nodeId];
             _nodelist.erase( _nodelist.begin()+n );
@@ -165 +166 @@
     }
     _id2nodeDirty = 1;
+    return *this;
 }
 
@@ -183 +185 @@
             }
             // last node in interval?
-            else if (n+1 < _nodelist.size() && node.x() == _nodelist[n+1].x()) {
+            else if (  ( (unsigned int)(n+1) < _nodelist.size())
+                    && ( node.x() == _nodelist[n+1].x()) ) {
                 _nodelist.erase( _nodelist.begin()+n+1 );
                 _id2nodeDirty = 1;
@@ -199 +202 @@
     _counter = 0;
     _id2nodeDirty = 0;
+    return *this;
 }
 

trunk/src2/core/RpMesh1D.h

@@ -75 +75 @@
     int _counter;                   // auto counter for node IDs
 
+    std::deque<int> _id2node;       // maps node Id => index in _nodelist
     int _id2nodeDirty;              // non-zero => _id2node needs to be rebuilt
-    std::deque<int> _id2node;       // maps node Id => index in _nodelist
 
     // methods for serializing/deserializing version 'A'

trunk/src2/core/RpMeshPrism3D.cc

@@ -109 +109 @@
     _xymesh = mesh._xymesh;
     _zmesh  = mesh._zmesh;
+    return *this;
 }
 

trunk/src2/core/RpMeshRect3D.cc

@@ -112 +112 @@
     _axis[1] = mesh._axis[1];
     _axis[2] = mesh._axis[2];
+    return *this;
 }
 

trunk/src2/core/RpMeshTri2D.cc

@@ -169 +169 @@
     _id2node = mesh._id2node;
     _lastLocate.clear();
+    return *this;
 }
 
@@ -208 +209 @@
     if (!_id2nodeDirty) {
         // id2node map up to date?  then keep it up to date
-        if (node.id() >= _id2node.size()) {
+        if ((unsigned int)node.id() >= _id2node.size()) {
             int newsize = 2*_id2node.size();
             for (int i=_id2node.size(); i < newsize; i++) {
@@ -277 +278 @@
     _id2node.assign(100, -1);
     _lastLocate.clear();
+    return *this;
 }
 
@@ -288 +290 @@
 MeshTri2D::atNode(int pos)
 {
-    assert(pos >= 0 && pos < _nodelist.size());
+    assert(pos >= 0 && (unsigned int)(pos) < _nodelist.size());
     return _nodelist.at(pos);
 }
@@ -301 +303 @@
 MeshTri2D::atCell(int pos)
 {
-    assert(pos >= 0 && pos < _celllist.size());
+    assert(pos >= 0 && (unsigned int)(pos) < _celllist.size());
 
     Tri2D& cell = _celllist[pos];
@@ -401 +403 @@
     nonconst->_rebuildNodeIdMap();
 
-    if (nodeId < _id2node.size()) {
+    if ((unsigned int)nodeId < _id2node.size()) {
         int n = _id2node[nodeId];
         if (n >= 0) {

trunk/src2/core/RpNode.h

@@ -32 +32 @@
     virtual int dimensionality() const = 0;
 
+    virtual ~Node();
+
 private:
     int _id;  // node identifier (used for fields)
@@ -44 +46 @@
     virtual double x() const { return _x; }
     virtual double x(double newval) { _x = newval; return _x; }
+
+    virtual ~Node1D();
 
 private:
@@ -60 +64 @@
     virtual double x(double newval) { _x = newval; return _x; }
     virtual double y(double newval) { _y = newval; return _y; }
+
+    virtual ~Node2D();
 
 private:
@@ -80 +86 @@
     virtual double z(double newval) { _z = newval; return _z; }
 
+    virtual ~Node3D();
+
 private:
     double _x;  // x-coordinate

trunk/src2/core/RpSerialBuffer.cc

@@ -16 +16 @@
 #ifdef BIGENDIAN
 #  define ENDIAN_FOR_LOOP(var,size)  \
-     for (int var=size-1; var >= 0; var--)
+     for (var=size-1; var >= 0; var--)
 #else
 #  define ENDIAN_FOR_LOOP(var,size)  \
-     for (int var=0; var < size; var++)
+     for (var=0; var < size; var++)
 #endif
 
@@ -67 +67 @@
     _buffer = sb._buffer;
     _pos = 0;  // auto-rewind
+    return *this;
 }
 
@@ -117 +118 @@
 {
     char *ptr = (char*)(&ival);
+    unsigned int i = 0;
 
     ENDIAN_FOR_LOOP(i, sizeof(int)) {
@@ -128 +130 @@
 {
     char *ptr = (char*)(&dval);
+    unsigned int i = 0;
 
     ENDIAN_FOR_LOOP(i, sizeof(double)) {
@@ -164 +167 @@
 SerialBuffer::atEnd() const
 {
-    return (_pos >= _buffer.size());
+    return ((unsigned int)_pos >= _buffer.size());
 }
 
@@ -171 +174 @@
 {
     char c = '\0';
-    if (_pos < _buffer.size()) {
+    if ((unsigned int)_pos < _buffer.size()) {
         c = _buffer[_pos++];
     }
@@ -182 +185 @@
     int ival = 0;
     char *ptr = (char*)(&ival);
+    unsigned int i = 0;
 
     ENDIAN_FOR_LOOP(i, sizeof(int)) {
-        if (_pos < _buffer.size()) {
+        if ((unsigned int)_pos < _buffer.size()) {
             ptr[i] = _buffer[_pos++];
         }
@@ -196 +200 @@
     double dval = 0;
     char *ptr = (char*)(&dval);
+    unsigned int i = 0;
 
     ENDIAN_FOR_LOOP(i, sizeof(double)) {
-        if (_pos < _buffer.size()) {
+        if ((unsigned int)_pos < _buffer.size()) {
             ptr[i] = _buffer[_pos++];
         }
@@ -210 +215 @@
     std::string sval;
     char c;
-    while (_pos < _buffer.size()) {
+    while ((unsigned int)_pos < _buffer.size()) {
         c = _buffer[_pos++];
         if (c == '\0') {
@@ -228 +233 @@
 
     nbytes = readInt();
-    while (_pos < _buffer.size() && nbytes-- > 0) {
+    while ((unsigned int)_pos < _buffer.size() && nbytes-- > 0) {
         bval.push_back( _buffer[_pos++] );
     }

trunk/src2/core/RpSerializable.h

@@ -17 +17 @@
 #include <string>
 #include <map>
-#include "RpPtr.h"
-#include "RpOutcome.h"
+#include "rappture2.h"
 #include "RpSerialBuffer.h"
 

trunk/src2/core/RpSerializer.cc

@@ -100 +100 @@
 
     // write out each object in the list, in order
-    for (int i=0; i < _idlist.size(); i++) {
+    for (unsigned int i=0; i < _idlist.size(); i++) {
         const char* id = _idlist.at(i);
         Ptr<Serializable> objPtr = _id2obj[id];
@@ -121 +121 @@
 {
     Serializer *nonconst = (Serializer*)this;
-    assert(pos >= 0 && pos < _idlist.size());
+    assert(pos >= 0 && (unsigned int)pos < _idlist.size());
 
     std::string id(_idlist[pos]);
@@ -132 +132 @@
     _id2obj.clear();
     _idlist.clear();
+    return *this;
 }
 

trunk/src2/core/RpSerializer.h

@@ -20 +20 @@
 
 #include <map>
-#include "RpPtr.h"
-#include "RpOutcome.h"
+#include "rappture2.h"
 #include "RpSerialBuffer.h"
 #include "RpSerializable.h"