Commit 720704ca authored by unknown's avatar unknown

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
parents 30aa4c8f 5ce8a9c9
...@@ -308,15 +308,6 @@ NdbRecAttr::arraySize() const ...@@ -308,15 +308,6 @@ NdbRecAttr::arraySize() const
return theArraySize; return theArraySize;
} }
inline
Int64
NdbRecAttr::int64_value() const
{
Int64 val;
memcpy(&val,theRef,8);
return val;
}
inline inline
Int32 Int32
NdbRecAttr::int32_value() const NdbRecAttr::int32_value() const
...@@ -338,15 +329,6 @@ NdbRecAttr::char_value() const ...@@ -338,15 +329,6 @@ NdbRecAttr::char_value() const
return *(char*)theRef; return *(char*)theRef;
} }
inline
Uint64
NdbRecAttr::u_64_value() const
{
Uint64 val;
memcpy(&val,theRef,8);
return val;
}
inline inline
Uint32 Uint32
NdbRecAttr::u_32_value() const NdbRecAttr::u_32_value() const
...@@ -368,24 +350,6 @@ NdbRecAttr::u_char_value() const ...@@ -368,24 +350,6 @@ NdbRecAttr::u_char_value() const
return *(Uint8*)theRef; return *(Uint8*)theRef;
} }
inline
float
NdbRecAttr::float_value() const
{
float val;
memcpy(&val,theRef,sizeof(val));
return val;
}
inline
double
NdbRecAttr::double_value() const
{
double val;
memcpy(&val,theRef,sizeof(val));
return val;
}
inline inline
void void
NdbRecAttr::release() NdbRecAttr::release()
......
...@@ -281,3 +281,35 @@ NdbOut& operator<<(NdbOut& out, const NdbRecAttr &r) ...@@ -281,3 +281,35 @@ NdbOut& operator<<(NdbOut& out, const NdbRecAttr &r)
return out; return out;
} }
Int64
NdbRecAttr::int64_value() const
{
Int64 val;
memcpy(&val,theRef,8);
return val;
}
Uint64
NdbRecAttr::u_64_value() const
{
Uint64 val;
memcpy(&val,theRef,8);
return val;
}
float
NdbRecAttr::float_value() const
{
float val;
memcpy(&val,theRef,sizeof(val));
return val;
}
double
NdbRecAttr::double_value() const
{
double val;
memcpy(&val,theRef,sizeof(val));
return val;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment