diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-09-30 00:53:00 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-09-30 00:53:00 +0200 |
| commit | e4ff01e47d4ac9a95dda688ac709b22186559422 (patch) | |
| tree | a2786a435fdb9bead163593e9fbc4571031a81c6 /storage/connect | |
| parent | 4b2b2abe8bdb12a2e97e5d27805477013b49edde (diff) | |
| download | mariadb-git-e4ff01e47d4ac9a95dda688ac709b22186559422.tar.gz | |
- Fix all compiler issues on FreeBSD clang.
modified:
storage/connect/array.cpp
storage/connect/filamap.cpp
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/array.cpp | 2 | ||||
| -rw-r--r-- | storage/connect/filamap.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/storage/connect/array.cpp b/storage/connect/array.cpp index fb8dbfd7869..9c679456b68 100644 --- a/storage/connect/array.cpp +++ b/storage/connect/array.cpp @@ -129,7 +129,7 @@ PARRAY MakeValueArray(PGLOBAL g, PPARM pp) break; case TYPE_VOID: // Integer stored inside pp->Value - par->AddValue(g, (int)parmp->Value); + par->AddValue(g, (int)(uintptr_t)parmp->Value); break; } // endswitch valtyp diff --git a/storage/connect/filamap.cpp b/storage/connect/filamap.cpp index c0ca40f4c01..d79296a8497 100644 --- a/storage/connect/filamap.cpp +++ b/storage/connect/filamap.cpp @@ -290,8 +290,8 @@ bool MAPFAM::RecordPos(PGLOBAL g) /***********************************************************************/ int MAPFAM::InitDelete(PGLOBAL g, int fpos, int spos) { - Fpos = Memory + fpos; - Mempos = Memory + spos; + Fpos = Memory + (uintptr_t)fpos; + Mempos = Memory + (uintptr_t)spos; return RC_OK; } // end of InitDelete @@ -685,7 +685,7 @@ bool MPXFAM::SetPos(PGLOBAL g, int pos) /***********************************************************************/ int MPXFAM::InitDelete(PGLOBAL g, int fpos, int spos) { - Fpos = Memory + Headlen + fpos * Lrecl; + Fpos = Memory + Headlen + (uintptr_t)fpos * Lrecl; Mempos = Fpos + Lrecl; return RC_OK; } // end of InitDelete |