Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv8014/Include/SimData
Modified Files:
Tag: simdata
HashUtility.h HashUtility.i
Log Message:
hasht fixes, printf
Index: HashUtility.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/HashUtility.h,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** HashUtility.h 20 Jan 2003 23:06:47 -0000 1.1.2.5
--- HashUtility.h 21 Jan 2003 19:04:11 -0000 1.1.2.6
***************
*** 29,32 ****
--- 29,33 ----
#define __HASHUTILITY_H__
+ #include <string>
#include <iostream>
#include <SimData/hash_map.h>
***************
*** 92,95 ****
--- 93,97 ----
a = x.a; b = x.b;
}
+ std::string str() const;
};
***************
*** 155,167 ****
typedef HASH_MAP<hasht, ObjectProxyBase*, hasht_hash, hasht_eq> proxy_map;
-
- NAMESPACE_END // namespace simdata
-
-
- typedef SIMDATA(HashT) hasht;
-
extern std::ostream & operator<<(std::ostream &o, const hasht &x);
!
#endif // __HASHUTILITY_H__
--- 157,163 ----
typedef HASH_MAP<hasht, ObjectProxyBase*, hasht_hash, hasht_eq> proxy_map;
extern std::ostream & operator<<(std::ostream &o, const hasht &x);
! NAMESPACE_END // namespace simdata
#endif // __HASHUTILITY_H__
Index: HashUtility.i
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/HashUtility.i,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** HashUtility.i 20 Jan 2003 23:06:48 -0000 1.1.2.2
--- HashUtility.i 21 Jan 2003 19:04:12 -0000 1.1.2.3
***************
*** 9,14 ****
typedef unsigned char u1; /* unsigned 1-byte type */
- /* typedef unsigned long long u8; /* unsigned 8-byte type */
-
%rename(hash_string) SIMDATA(newhasht_cstring)(const char*);
--- 9,12 ----
***************
*** 16,51 ****
struct HashT {
! guint32 a, b;
! HashT() {
! a = b = 0;
! }
! HashT(guint32 x) {
! a = x; b = 0;
! }
! HashT(guint32 b_, guint32 a_) {
! a = a_; b = b_;
! }
! HashT(const HashT &x) {
! a = x.a; b = x.b;
! }
! bool operator ==(guint32 x) const {
! return (b == 0 && a == x);
! }
! bool operator !=(guint32 x) const {
! return (b != 0 || a != x);
! }
! bool operator ==(HashT const &x) const {
! return (b == x.b && a == x.a);
! }
! bool operator !=(HashT const &x) const {
! return (b != x.b || a != x.a);
! }
};
typedef HashT hasht;
-
- u4 newhash4_cstring(const char*);
HashT newhasht_cstring(const char*);
NAMESPACE_END
--- 14,31 ----
struct HashT {
! HashT();
! HashT(guint32 x);
! HashT(guint32 b_, guint32 a_);
! HashT(const HashT &x);
! bool operator ==(guint32 x) const;
! bool operator !=(guint32 x) const;
! bool operator ==(HashT const &x) const;
! bool operator !=(HashT const &x) const;
};
typedef HashT hasht;
HashT newhasht_cstring(const char*);
+
NAMESPACE_END
|
