Changeset 38

Timestamp:

Aug 12, 2005, 5:39:09 PM (19 years ago)

Author:

dkearney

Message:

added inital data structures for rappture variable objects

Location:

trunk/include/core

Files:

• RpAbout.h (added)
• RpBoolean.h (added)
• RpChoice.h (added)
• RpDict.h (modified) (6 diffs)
• RpNumber.h (added)
• RpOption.h (added)
• RpString.h (added)
• RpUnits.h (modified) (1 diff)
• RpVariable.h (added)

trunk/include/core/RpDict.h

@@ -32 +32 @@
 
         // send the search iterator to the beginning of the hash table
-        virtual RpDictEntry<KeyType,ValType>* first();
+        /*virtual*/ RpDictEntry<KeyType,ValType>* first();
 
         // send the search iterator to the next element of the hash table
-        virtual RpDictEntry<KeyType,ValType>* next();
+        /*virtual*/ RpDictEntry<KeyType,ValType>* next();
 /*
         RpDictIterator(RpDict* table_Ptr)
@@ -195 +195 @@
         
         // checks table size
-        virtual const int size() const;
+        /*virtual*/ const int size() const;
 
         // insert new object into table
@@ -201 +201 @@
         // returns !0 on failure (object cannot be inserted or dne)
         //
-        virtual RpDict<KeyType,ValType>& 
+        /*virtual*/ RpDict<KeyType,ValType>& 
                         set(    KeyType& key, 
                                 ValType& value, 
@@ -208 +208 @@
         // find an RpUnits object that should exist in RpUnitsTable
         // 
-        virtual RpDictEntry<KeyType,ValType>& 
+        /*virtual*/ RpDictEntry<KeyType,ValType>& 
                         find( KeyType& key );
 
-        virtual RpDictEntry<KeyType,ValType>& operator[]( KeyType& key) 
+        /*virtual*/ RpDictEntry<KeyType,ValType>& operator[]( KeyType& key) 
         { 
             return find(key); 
@@ -218 +218 @@
         // clear the entire table
         // iterate through the table and call erase on each element
-        virtual RpDict<KeyType,ValType>& clear();
+        /*virtual*/ RpDict<KeyType,ValType>& clear();
 
         // get the nullEntry hash entry for initialization of references
-        virtual RpDictEntry<KeyType,ValType>& getNullEntry();
+        /*virtual*/ RpDictEntry<KeyType,ValType>& getNullEntry();
 
         // template <KeyType, ValType> friend class RpDictEntry;
@@ -258 +258 @@
 
         // destructor
-        virtual ~RpDict() 
+        /*virtual*/ ~RpDict() 
         {
             // probably need to delete all the entries as well

trunk/include/core/RpUnits.h

@@ -5 +5 @@
 #include <errno.h>
 
-#include "RpDict.h"
+#ifndef _RpDICT_H
+    #include "RpDict.h"
+#endif
+
 #include "RpUnitsStd.h"