Skip to content

Commit 6ef15da

Browse files
committed
Bug#32107056 SEVERAL COMPILE WARNINGS FOR MYSQL CLUSTER ON WINDOWS WITH VS 2019 [#4] [noclose]
storage\ndb\src\ndbapi\ObjectMap.hpp(168,1): warning C4302: 'type cast': truncation from 'void *' to 'long' Change-Id: I11ffba127bc19db15e9a50307b50532941f9fdb2
1 parent e6ae6fe commit 6ef15da

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

storage/ndb/src/ndbapi/ObjectMap.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2003, 2020, Oracle and/or its affiliates.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License, version 2.0,
@@ -132,7 +132,7 @@ NdbObjectIdMap::map(void * object)
132132
m_firstFree = m_map[ff].getNext();
133133
m_map[ff].setObj(object);
134134

135-
DBUG_PRINT("info",("NdbObjectIdMap::map(0x%lx) %u", (long) object, ff<<2));
135+
DBUG_PRINT("info",("NdbObjectIdMap::map(%p) %u", object, ff<<2));
136136

137137
return ff<<2;
138138
}
@@ -162,15 +162,15 @@ NdbObjectIdMap::unmap(Uint32 id, void *object)
162162
}
163163
else
164164
{
165-
g_eventLogger->error("NdbObjectIdMap::unmap(%u, 0x%lx) obj=0x%lx",
166-
id, (long) object, (long) obj);
167-
DBUG_PRINT("error",("NdbObjectIdMap::unmap(%u, 0x%lx) obj=0x%lx",
168-
id, (long) object, (long) obj));
165+
g_eventLogger->error("NdbObjectIdMap::unmap(%u, %p) obj=%p",
166+
id, object, obj);
167+
DBUG_PRINT("error",("NdbObjectIdMap::unmap(%u, %p) obj=%p",
168+
id, object, obj));
169169
assert(false);
170170
return 0;
171171
}
172172

173-
DBUG_PRINT("info",("NdbObjectIdMap::unmap(%u) obj=0x%lx", id, (long) obj));
173+
DBUG_PRINT("info",("NdbObjectIdMap::unmap(%u) obj=%p", id, obj));
174174

175175
return obj;
176176
}

0 commit comments

Comments
 (0)