--- ../../include/mk4.h Sun Nov 4 23:42:02 2001 +++ mk4.h Tue Nov 6 10:15:26 2001 @@ -182,17 +182,17 @@ typedef long t4_i32; // if longs aren't 64b, then they are 32b #endif -#if q4_LONG64 // choose a way to represent 64b integers +///#if q4_LONG64 // choose a way to represent 64b integers typedef long t4_i64; -#elif defined (LONG_LONG) -typedef LONG_LONG t4_i64; -#elif HAVE_LONG_LONG -typedef long long t4_i64; -#else -struct t4_i64 { long l1; long l2; }; -bool operator== (const t4_i64 a_, const t4_i64 b_); -bool operator< (const t4_i64 a_, const t4_i64 b_); -#endif +///#elif defined (LONG_LONG) +///typedef LONG_LONG t4_i64; +///#elif HAVE_LONG_LONG +///typedef long long t4_i64; +///#else +///struct t4_i64 { long l1; long l2; }; +///bool operator== (const t4_i64 a_, const t4_i64 b_); +///bool operator< (const t4_i64 a_, const t4_i64 b_); +///#endif //--------------------------------------------------------------------------- @@ -211,7 +211,7 @@ ~c4_View (); c4_View& operator= (const c4_View&); - c4_Persist* Persist() const; // added 16-11-2000 to simplify c4_Storage +/// c4_Persist* Persist() const; // added 16-11-2000 to simplify c4_Storage /* Getting / setting the number of rows */ int GetSize() const; @@ -454,10 +454,10 @@ class c4_Bytes { - union { - t4_byte _buffer [16]; - double _aligner; // on a Sparc, the int below wasn't enough... - }; +/// union { +/// t4_byte _buffer [16]; +/// double _aligner; // on a Sparc, the int below wasn't enough... +/// }; t4_byte* _contents; int _size; @@ -799,6 +799,7 @@ // Insertion and removal of entries is allowed, but could take linear time. // A reference count is maintained to decide when the object should go away. +#if 0 class c4_Sequence { /// Reference count @@ -889,6 +890,7 @@ c4_Sequence (const c4_Sequence&); // not implemented void operator= (const c4_Sequence&); // not implemented }; +#endif //--------------------------------------------------------------------------- /// A reference is used to get or set typed data, using derived classes. @@ -937,7 +939,7 @@ /// Constructor c4_IntRef (const c4_Reference&); /// Get the value as integer - operator t4_i32 () const; +/// operator t4_i32 () const; /// Set the value to the specified integer c4_IntRef& operator= (t4_i32); }; @@ -951,7 +953,7 @@ /// Constructor c4_LongRef (const c4_Reference&); /// Get the value as long int - operator t4_i64 () const; +/// operator t4_i64 () const; /// Set the value to the specified long int c4_LongRef& operator= (t4_i64); }; @@ -963,7 +965,7 @@ /// Constructor c4_FloatRef (const c4_Reference&); /// Get the value as floating point - operator double () const; +/// operator double () const; /// Set the value to the specified floating point c4_FloatRef& operator= (double); }; @@ -975,7 +977,7 @@ /// Constructor c4_DoubleRef (const c4_Reference&); /// Get the value as floating point - operator double () const; +/// operator double () const; /// Set the value to the specified floating point c4_DoubleRef& operator= (double); }; @@ -989,7 +991,7 @@ /// Constructor c4_BytesRef (const c4_Reference&); /// Get the value as binary object - operator c4_Bytes () const; +/// operator c4_Bytes () const; /// Set the value to the specified binary object c4_BytesRef& operator= (const c4_Bytes&); @@ -1006,7 +1008,7 @@ /// Constructor c4_StringRef (const c4_Reference&); /// Get the value as string - operator const char* () const; +/// operator const char* () const; /// Set the value to the specified string c4_StringRef& operator= (const char*); }; @@ -1018,7 +1020,7 @@ /// Constructor c4_ViewRef (const c4_Reference&); /// Get the value as view - operator c4_View () const; +/// operator c4_View () const; /// Set the value to the specified view c4_ViewRef& operator= (const c4_View&); };