diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-08-13 15:04:39 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-14 10:39:13 +0200 |
| commit | ed93117447a3217fab0e2425f8761e24423024b5 (patch) | |
| tree | 2e178188bef319d1a1e5594acd5732e9959e35a8 /mysqlc | |
| parent | 9272ce4e6f54bc283bbbe6106f66fd48c4ce8d82 (diff) | |
fdo#53061: Fix for C++11 #define NULL nullptr
Change-Id: Ia1805aab4bec7fef02c96ec4e7a7a0ed9991d3c3
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'mysqlc')
| -rw-r--r-- | mysqlc/source/mysqlc_propertyids.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysqlc/source/mysqlc_propertyids.hxx b/mysqlc/source/mysqlc_propertyids.hxx index 4f88b0cb6380..3118813ccddf 100644 --- a/mysqlc/source/mysqlc_propertyids.hxx +++ b/mysqlc/source/mysqlc_propertyids.hxx @@ -136,7 +136,7 @@ enum //------------------------------------------------------------------------------ #define DECL_PROP1IMPL(varname, type) \ -pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(reinterpret_cast< type*>(NULL)), +pProperties[nPos++] = Property(OPropertyMap::getPropMap().getNameByIndex(PROPERTY_ID_##varname), PROPERTY_ID_##varname, ::getCppuType(static_cast< type*>(0)), //------------------------------------------------------------------------------ #define DECL_PROP0(varname, type) \ DECL_PROP1IMPL(varname, type) 0) |