swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-04 05:15:51 -04:00
Code Issues Projects Releases Wiki Activity

this is a more "clean" conversion to 64 bit than the type-fixups branch, which does borrow some elements from it but has far less find and replace...it is about 98-99% done, notes to follow later

Browse Source
This commit is contained in:
DarthArgus
2017-01-24 03:35:59 +00:00
parent 42b949c3dc
commit 36686348e9
458 changed files with 2282 additions and 2367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedDatabaseInterface/src_oci/DbBindableVarray.cpp
+7 -2
View File
@@ -138,6 +138,7 @@ bool BindableVarrayNumber::push_back(int value)
// ----------------------------------------------------------------------
#if not __x86_64__
bool BindableVarrayNumber::push_back(long int value)
{
OCINumber buffer;
@@ -153,9 +154,10 @@ bool BindableVarrayNumber::push_back(long int value)
return true;
}
#endif
// ----------------------------------------------------------------------
bool BindableVarrayNumber::push_back(int64 value)
bool BindableVarrayNumber::push_back(int64_t value)
{
OCINumber buffer;
@@ -230,6 +232,7 @@ bool BindableVarrayNumber::push_back(bool IsNULL, int value)
// ----------------------------------------------------------------------
#if not __x86_64__
bool BindableVarrayNumber::push_back(bool IsNULL, long int value)
{
OCINumber buffer;
@@ -254,9 +257,11 @@ bool BindableVarrayNumber::push_back(bool IsNULL, long int value)
return true;
}
#endif
// ----------------------------------------------------------------------
bool BindableVarrayNumber::push_back(bool IsNULL, int64 value)
bool BindableVarrayNumber::push_back(bool IsNULL, int64_t value)
{
OCINumber buffer;
engine/shared/library/sharedDatabaseInterface/src_oci/DbBindableVarray.h
+8 -2
View File
@@ -59,12 +59,18 @@ namespace DB
public:
bool push_back(bool IsNULL, int value);
bool push_back(bool IsNULL, double value);
#if not __x86_64__
bool push_back(bool IsNULL, long int value);
bool push_back(bool IsNULL, int64 value);
#endif
bool push_back(bool IsNULL, int64_t value);
bool push_back(int value);
bool push_back(double value);
#if not __x86_64__
bool push_back(long int value);
bool push_back(int64 value);
#endif
bool push_back(int64_t value);
virtual std::string outputValue() const;
};
engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ void DB::OCIQueryImpl::preprocessBinds()
(*i)->indicator=-1;
else
{
(*i)->length=(unsigned short)*((*i)->owner->getIndicator()); //TODO: something better
(*i)->length=(uint16_t)*((*i)->owner->getIndicator()); //TODO: something better
(*i)->indicator=1;
if ((*i)->stringAdjust)
++(*i)->length; //TODO: This feels like a hack