diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-01-11 17:48:15 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-01-11 17:48:15 -0500 |
| commit | 05485a47ea107737ada8b0941a7a066c6a075f40 (patch) | |
| tree | 8bf8a5fee750b20a631f02f60e6db21788ecc14f | |
| parent | Moved UniquePtr to IceInternal (diff) | |
| download | ice-05485a47ea107737ada8b0941a7a066c6a075f40.tar.bz2 ice-05485a47ea107737ada8b0941a7a066c6a075f40.tar.xz ice-05485a47ea107737ada8b0941a7a066c6a075f40.zip | |
Replace NULL by ICE_NULLPTR
48 files changed, 455 insertions, 455 deletions
diff --git a/cpp/include/IceUtil/StringUtil.h b/cpp/include/IceUtil/StringUtil.h index 2c8e2d8b549..43c58d1625a 100644 --- a/cpp/include/IceUtil/StringUtil.h +++ b/cpp/include/IceUtil/StringUtil.h @@ -77,7 +77,7 @@ ICE_API bool match(const std::string&, const std::string&, bool = false); // ICE_API std::string lastErrorToString(); #ifdef _WIN32 -ICE_API std::string errorToString(int, LPCVOID = NULL); +ICE_API std::string errorToString(int, LPCVOID = ICE_NULLPTR); #else ICE_API std::string errorToString(int); #endif diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 95e9a49249d..c89bc020c2a 100755 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -182,7 +182,7 @@ setTcpLoopbackFastPath(SOCKET fd) DWORD NumberOfBytesReturned = 0; int status = - WSAIoctl(fd, SIO_LOOPBACK_FAST_PATH, &OptionValue, sizeof(OptionValue), NULL, 0, &NumberOfBytesReturned, 0, 0); + WSAIoctl(fd, SIO_LOOPBACK_FAST_PATH, &OptionValue, sizeof(OptionValue), ICE_NULLPTR, 0, &NumberOfBytesReturned, 0, 0); if(status == SOCKET_ERROR) { // On platforms that do not support fast path (< Windows 8), WSAEONOTSUPP is expected. @@ -283,16 +283,16 @@ getLocalAddresses(ProtocolSupport protocol, bool includeLoopback) } DWORD size; - DWORD rv = GetAdaptersAddresses(family, 0, NULL, NULL, &size); + DWORD rv = GetAdaptersAddresses(family, 0, ICE_NULLPTR, ICE_NULLPTR, &size); if(rv == ERROR_BUFFER_OVERFLOW) { PIP_ADAPTER_ADDRESSES adapter_addresses = (PIP_ADAPTER_ADDRESSES) malloc(size); - rv = GetAdaptersAddresses(family, 0, NULL, adapter_addresses, &size); + rv = GetAdaptersAddresses(family, 0, ICE_NULLPTR, adapter_addresses, &size); if(rv == ERROR_SUCCESS) { - for(PIP_ADAPTER_ADDRESSES aa = adapter_addresses; aa != NULL; aa = aa->Next) + for(PIP_ADAPTER_ADDRESSES aa = adapter_addresses; aa != ICE_NULLPTR; aa = aa->Next) { - for(PIP_ADAPTER_UNICAST_ADDRESS ua = aa->FirstUnicastAddress; ua != NULL; ua = ua->Next) + for(PIP_ADAPTER_UNICAST_ADDRESS ua = aa->FirstUnicastAddress; ua != ICE_NULLPTR; ua = ua->Next) { Address addr; memcpy(&addr.saStorage, ua->Address.lpSockaddr, ua->Address.iSockaddrLength); @@ -1105,7 +1105,7 @@ IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol throw ex; } - for(struct addrinfo* p = info; p != NULL; p = p->ai_next) + for(struct addrinfo* p = info; p != ICE_NULLPTR; p = p->ai_next) { memcpy(&addr.saStorage, p->ai_addr, p->ai_addrlen); if(p->ai_family == PF_INET) @@ -2910,7 +2910,7 @@ IceInternal::doConnectAsync(SOCKET fd, const Address& addr, const Address& sourc throw ex; } - LPFN_CONNECTEX ConnectEx = NULL; // a pointer to the 'ConnectEx()' function + LPFN_CONNECTEX ConnectEx = ICE_NULLPTR; // a pointer to the 'ConnectEx()' function GUID GuidConnectEx = WSAID_CONNECTEX; // The Guid DWORD dwBytes; if(WSAIoctl(fd, @@ -2920,8 +2920,8 @@ IceInternal::doConnectAsync(SOCKET fd, const Address& addr, const Address& sourc &ConnectEx, sizeof(ConnectEx), &dwBytes, - NULL, - NULL) == SOCKET_ERROR) + ICE_NULLPTR, + ICE_NULLPTR) == SOCKET_ERROR) { SocketException ex(__FILE__, __LINE__); ex.error = getSocketErrno(); @@ -2985,7 +2985,7 @@ IceInternal::doFinishConnectAsync(SOCKET fd, AsyncInfo& info) } } - if(setsockopt(fd, SOL_SOCKET, SO_UPDATE_CONNECT_CONTEXT, NULL, 0) == SOCKET_ERROR) + if(setsockopt(fd, SOL_SOCKET, SO_UPDATE_CONNECT_CONTEXT, ICE_NULLPTR, 0) == SOCKET_ERROR) { SocketException ex(__FILE__, __LINE__); ex.error = getSocketErrno(); diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp index 27de7af6881..8c77d470e8a 100644 --- a/cpp/src/Ice/PropertiesI.cpp +++ b/cpp/src/Ice/PropertiesI.cpp @@ -319,8 +319,8 @@ Ice::PropertiesI::load(const std::string& file) DWORD numValues; try { - err = RegQueryInfoKey(iceKey, NULL, NULL, NULL, NULL, NULL, NULL, &numValues, &maxNameSize, &maxDataSize, - NULL, NULL); + err = RegQueryInfoKey(iceKey, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, &numValues, &maxNameSize, &maxDataSize, + ICE_NULLPTR, ICE_NULLPTR); if(err != ERROR_SUCCESS) { InitializationException ex(__FILE__, __LINE__); @@ -336,7 +336,7 @@ Ice::PropertiesI::load(const std::string& file) DWORD keyType; DWORD nameBufSize = static_cast<DWORD>(nameBuf.size()); DWORD dataBufSize = static_cast<DWORD>(dataBuf.size()); - err = RegEnumValueW(iceKey, i, &nameBuf[0], &nameBufSize, NULL, &keyType, &dataBuf[0], &dataBufSize); + err = RegEnumValueW(iceKey, i, &nameBuf[0], &nameBufSize, ICE_NULLPTR, &keyType, &dataBuf[0], &dataBufSize); if(err != ERROR_SUCCESS || nameBufSize == 0) { ostringstream os; diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp index 41bce57d1c0..e421d7271e1 100644 --- a/cpp/src/Ice/Selector.cpp +++ b/cpp/src/Ice/Selector.cpp @@ -49,8 +49,8 @@ Selector::~Selector() void Selector::setup(int sizeIO) { - _handle = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, sizeIO); - if(_handle == NULL) + _handle = CreateIoCompletionPort(INVALID_HANDLE_VALUE, ICE_NULLPTR, 0, sizeIO); + if(_handle == ICE_NULLPTR) { Ice::SocketException ex(__FILE__, __LINE__); ex.error = GetLastError(); @@ -76,7 +76,7 @@ Selector::initialize(EventHandler* handler) } #ifdef ICE_USE_IOCP HANDLE socket = reinterpret_cast<HANDLE>(handler->getNativeInfo()->fd()); - if(CreateIoCompletionPort(socket, _handle, reinterpret_cast<ULONG_PTR>(handler), 0) == NULL) + if(CreateIoCompletionPort(socket, _handle, reinterpret_cast<ULONG_PTR>(handler), 0) == ICE_NULLPTR) { Ice::SocketException ex(__FILE__, __LINE__); ex.error = GetLastError(); diff --git a/cpp/src/Ice/StreamSocket.cpp b/cpp/src/Ice/StreamSocket.cpp index 5b6d6eb36d1..26562b09f3e 100755 --- a/cpp/src/Ice/StreamSocket.cpp +++ b/cpp/src/Ice/StreamSocket.cpp @@ -402,7 +402,7 @@ StreamSocket::startWrite(Buffer& buf) _write.buf.len = static_cast<DWORD>(packetSize); _write.buf.buf = reinterpret_cast<char*>(&*buf.i); - int err = WSASend(_fd, &_write.buf, 1, &_write.count, 0, &_write, NULL); + int err = WSASend(_fd, &_write.buf, 1, &_write.count, 0, &_write, ICE_NULLPTR); if(err == SOCKET_ERROR) { if(!wouldBlock()) @@ -465,7 +465,7 @@ StreamSocket::startRead(Buffer& buf) size_t packetSize = getRecvPacketSize(length); _read.buf.len = static_cast<DWORD>(packetSize); _read.buf.buf = reinterpret_cast<char*>(&*buf.i); - int err = WSARecv(_fd, &_read.buf, 1, &_read.count, &_read.flags, &_read, NULL); + int err = WSARecv(_fd, &_read.buf, 1, &_read.count, &_read.flags, &_read, ICE_NULLPTR); if(err == SOCKET_ERROR) { if(!wouldBlock()) diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp index e601c3418db..3af1acbe40a 100755 --- a/cpp/src/Ice/TcpAcceptor.cpp +++ b/cpp/src/Ice/TcpAcceptor.cpp @@ -105,7 +105,7 @@ IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation) void IceInternal::TcpAcceptor::startAccept() { - LPFN_ACCEPTEX AcceptEx = NULL; // a pointer to the 'AcceptEx()' function + LPFN_ACCEPTEX AcceptEx = ICE_NULLPTR; // a pointer to the 'AcceptEx()' function GUID GuidAcceptEx = WSAID_ACCEPTEX; // The Guid DWORD dwBytes; if(WSAIoctl(_fd, @@ -115,8 +115,8 @@ IceInternal::TcpAcceptor::startAccept() &AcceptEx, sizeof(AcceptEx), &dwBytes, - NULL, - NULL) == SOCKET_ERROR) + ICE_NULLPTR, + ICE_NULLPTR) == SOCKET_ERROR) { SocketException ex(__FILE__, __LINE__); ex.error = getSocketErrno(); diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp index 00c035b557a..6f3ee3540c9 100755 --- a/cpp/src/Ice/UdpTransceiver.cpp +++ b/cpp/src/Ice/UdpTransceiver.cpp @@ -503,7 +503,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf) int err; if(_state == StateConnected) { - err = WSASend(_fd, &_write.buf, 1, &_write.count, 0, &_write, NULL); + err = WSASend(_fd, &_write.buf, 1, &_write.count, 0, &_write, ICE_NULLPTR); } else { @@ -524,7 +524,7 @@ IceInternal::UdpTransceiver::startWrite(Buffer& buf) throw ex; } err = WSASendTo(_fd, &_write.buf, 1, &_write.count, 0, &_peerAddr.sa, - len, &_write, NULL); + len, &_write, ICE_NULLPTR); } if(err == SOCKET_ERROR) @@ -595,7 +595,7 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf) int err; if(_state == StateConnected) { - err = WSARecv(_fd, &_read.buf, 1, &_read.count, &_read.flags, &_read, NULL); + err = WSARecv(_fd, &_read.buf, 1, &_read.count, &_read.flags, &_read, ICE_NULLPTR); } else { @@ -603,7 +603,7 @@ IceInternal::UdpTransceiver::startRead(Buffer& buf) _readAddrLen = static_cast<socklen_t>(sizeof(sockaddr_storage)); err = WSARecvFrom(_fd, &_read.buf, 1, &_read.count, &_read.flags, - &_readAddr.sa, &_readAddrLen, &_read, NULL); + &_readAddr.sa, &_readAddrLen, &_read, ICE_NULLPTR); } if(err == SOCKET_ERROR) diff --git a/cpp/src/Ice/ios/StreamAcceptor.cpp b/cpp/src/Ice/ios/StreamAcceptor.cpp index 8b3ca41041a..bd3e7e88a33 100644 --- a/cpp/src/Ice/ios/StreamAcceptor.cpp +++ b/cpp/src/Ice/ios/StreamAcceptor.cpp @@ -72,7 +72,7 @@ IceObjC::StreamAcceptor::accept() CFWriteStreamRef writeStream = nil; try { - CFStreamCreatePairWithSocket(NULL, fd, &readStream, &writeStream); + CFStreamCreatePairWithSocket(ICE_NULLPTR, fd, &readStream, &writeStream); _instance->setupStreams(readStream, writeStream, true, ""); return new StreamTransceiver(_instance, readStream, writeStream, fd); } diff --git a/cpp/src/Ice/ios/StreamConnector.cpp b/cpp/src/Ice/ios/StreamConnector.cpp index 70b604fc92d..3863e29b63a 100644 --- a/cpp/src/Ice/ios/StreamConnector.cpp +++ b/cpp/src/Ice/ios/StreamConnector.cpp @@ -29,10 +29,10 @@ IceObjC::StreamConnector::connect() CFWriteStreamRef writeStream = nil; try { - CFStringRef h = CFStringCreateWithCString(NULL, _host.c_str(), kCFStringEncodingUTF8); - CFHostRef host = CFHostCreateWithName(NULL, h); + CFStringRef h = CFStringCreateWithCString(ICE_NULLPTR, _host.c_str(), kCFStringEncodingUTF8); + CFHostRef host = CFHostCreateWithName(ICE_NULLPTR, h); CFRelease(h); - CFStreamCreatePairWithSocketToCFHost(NULL, host, _port, &readStream, &writeStream); + CFStreamCreatePairWithSocketToCFHost(ICE_NULLPTR, host, _port, &readStream, &writeStream); CFRelease(host); _instance->setupStreams(readStream, writeStream, false, _host); diff --git a/cpp/src/Ice/ios/StreamEndpointI.cpp b/cpp/src/Ice/ios/StreamEndpointI.cpp index 676210ee493..5643ee51124 100644 --- a/cpp/src/Ice/ios/StreamEndpointI.cpp +++ b/cpp/src/Ice/ios/StreamEndpointI.cpp @@ -49,7 +49,7 @@ namespace inline CFStringRef toCFString(const string& s) { - return CFStringCreateWithCString(NULL, s.c_str(), kCFStringEncodingUTF8); + return CFStringCreateWithCString(ICE_NULLPTR, s.c_str(), kCFStringEncodingUTF8); } } diff --git a/cpp/src/Ice/ios/StreamTransceiver.cpp b/cpp/src/Ice/ios/StreamTransceiver.cpp index 863428190d1..ba367dccf74 100644 --- a/cpp/src/Ice/ios/StreamTransceiver.cpp +++ b/cpp/src/Ice/ios/StreamTransceiver.cpp @@ -240,7 +240,7 @@ IceObjC::StreamTransceiver::initialize(Buffer& readBuffer, Buffer& writeBuffer) { if(_error) { - CFErrorRef err = NULL; + CFErrorRef err = ICE_NULLPTR; if(CFWriteStreamGetStatus(_writeStream) == kCFStreamStatusError) { err = CFWriteStreamCopyError(_writeStream); diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index afcca9685e5..7e7224c142e 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -302,13 +302,13 @@ Activator::Activator(const TraceLevelsPtr& traceLevels) : { #ifdef _WIN32 _hIntr = CreateEvent( - NULL, // Security attributes + ICE_NULLPTR, // Security attributes TRUE, // Manual reset FALSE, // Initial state is nonsignaled - NULL // Unnamed + ICE_NULLPTR // Unnamed ); - if(_hIntr == NULL) + if(_hIntr == ICE_NULLPTR) { SyscallException ex(__FILE__, __LINE__); ex.error = getSystemErrno(); @@ -337,7 +337,7 @@ Activator::~Activator() assert(!_thread); #ifdef _WIN32 - if(_hIntr != NULL) + if(_hIntr != ICE_NULLPTR) { CloseHandle(_hIntr); } @@ -389,7 +389,7 @@ Activator::activate(const string& name, // IceGrid doesn't support to use string converters, so don't need to use // any string converter in wstringToString conversions. // - if(SearchPathW(NULL, stringToWstring(path).c_str(), ext.c_str(), _MAX_PATH, absbuf, &fPart) == 0) + if(SearchPathW(ICE_NULLPTR, stringToWstring(path).c_str(), ext.c_str(), _MAX_PATH, absbuf, &fPart) == 0) { if(_traceLevels->activator > 0) { @@ -416,7 +416,7 @@ Activator::activate(const string& name, if(!pwd.empty()) { wchar_t absbuf[_MAX_PATH]; - if(_wfullpath(absbuf, stringToWstring(pwd).c_str(), _MAX_PATH) == NULL) + if(_wfullpath(absbuf, stringToWstring(pwd).c_str(), _MAX_PATH) == ICE_NULLPTR) { if(_traceLevels->activator > 0) { @@ -505,7 +505,7 @@ Activator::activate(const string& name, // any string converter in stringToWstring conversions. // wstring wpwd = stringToWstring(pwd); - const wchar_t* dir = !wpwd.empty() ? wpwd.c_str() : NULL; + const wchar_t* dir = !wpwd.empty() ? wpwd.c_str() : ICE_NULLPTR; // // Make a copy of the command line. @@ -518,7 +518,7 @@ Activator::activate(const string& name, // Since Windows is case insensitive wrt environment variables we convert the keys to // uppercase to ensure matches are found. // - const wchar_t* env = NULL; + const wchar_t* env = ICE_NULLPTR; wstring envbuf; if(!envs.empty()) { @@ -582,10 +582,10 @@ Activator::activate(const string& name, PROCESS_INFORMATION pi; ZeroMemory(&pi, sizeof(pi)); BOOL b = CreateProcessW( - NULL, // Executable + ICE_NULLPTR, // Executable cmdbuf, // Command line - NULL, // Process attributes - NULL, // Thread attributes + ICE_NULLPTR, // Process attributes + ICE_NULLPTR, // Thread attributes FALSE, // Do NOT inherit handles CREATE_NEW_PROCESS_GROUP | CREATE_UNICODE_ENVIRONMENT, // Process creation flags (LPVOID)env, // Process environment @@ -981,7 +981,7 @@ Activator::sendSignal(const string& name, int signal) else if(signal == SIGKILL) { HANDLE hnd = OpenProcess(PROCESS_TERMINATE, FALSE, pid); - if(hnd == NULL) + if(hnd == ICE_NULLPTR) { SyscallException ex(__FILE__, __LINE__); ex.error = getSystemErrno(); diff --git a/cpp/src/IceSSL/Certificate.cpp b/cpp/src/IceSSL/Certificate.cpp index fe0e85aef94..dd15ff928a6 100755 --- a/cpp/src/IceSSL/Certificate.cpp +++ b/cpp/src/IceSSL/Certificate.cpp @@ -1129,8 +1129,8 @@ Certificate::load(const string& file) throw CertificateReadException(__FILE__, __LINE__, "error opening file"); } - X509CertificateRef x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL); - if(x == NULL) + X509CertificateRef x = PEM_read_bio_X509_AUX(cert, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR); + if(x == ICE_NULLPTR) { BIO_free(cert); throw CertificateReadException(__FILE__, __LINE__, "error reading file:\n" + getSslErrors(false)); @@ -1218,8 +1218,8 @@ Certificate::decode(const string& encoding) return ICE_MAKE_SHARED(Certificate, cert); #elif defined(ICE_USE_OPENSSL) BIO *cert = BIO_new_mem_buf(static_cast<void*>(const_cast<char*>(&encoding[0])), static_cast<int>(encoding.size())); - X509CertificateRef x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL); - if(x == NULL) + X509CertificateRef x = PEM_read_bio_X509_AUX(cert, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR); + if(x == ICE_NULLPTR) { BIO_free(cert); throw CertificateEncodingException(__FILE__, __LINE__, getSslErrors(false)); diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp index 5a0f815b12d..26608354fa2 100755 --- a/cpp/src/IceSSL/Util.cpp +++ b/cpp/src/IceSSL/Util.cpp @@ -556,7 +556,7 @@ IceSSL::getSslErrors(bool verbose) else { const char* reason = ERR_reason_error_string(err); - ostr << (reason == NULL ? "unknown reason" : reason); + ostr << (reason == ICE_NULLPTR ? "unknown reason" : reason); if(flags & ERR_TXT_STRING) { ostr << ": " << data; @@ -622,7 +622,7 @@ IceSSL::fromCFString(CFStringRef v) CFDictionaryRef IceSSL::getCertificateProperty(SecCertificateRef cert, CFTypeRef key) { - CFArrayRef keys = CFArrayCreate(NULL, &key , 1, &kCFTypeArrayCallBacks); + CFArrayRef keys = CFArrayCreate(ICE_NULLPTR, &key , 1, &kCFTypeArrayCallBacks); CFErrorRef err = 0; CFDictionaryRef values = SecCertificateCopyValues(cert, keys, &err); CFRelease(keys); @@ -1409,7 +1409,7 @@ IceSSL::findCertificateChain(const std::string& keychainPath, const std::string& err = SecItemCopyMatching(query.get(), (CFTypeRef*)&identity); if(err == noErr) { - SecCertificateRef cert2 = NULL; + SecCertificateRef cert2 = ICE_NULLPTR; if((err = SecIdentityCopyCertificate(identity, &cert2)) == noErr) { err = CFEqual(cert2, cert) ? noErr : errSecItemNotFound; diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h index fc6af1020cc..3208452366c 100644 --- a/cpp/src/IceSSL/Util.h +++ b/cpp/src/IceSSL/Util.h @@ -175,7 +175,7 @@ std::string fromCFString(CFStringRef); inline CFStringRef toCFString(const std::string& s) { - return CFStringCreateWithCString(NULL, s.c_str(), kCFStringEncodingUTF8); + return CFStringCreateWithCString(ICE_NULLPTR, s.c_str(), kCFStringEncodingUTF8); } std::string errorToString(CFErrorRef); diff --git a/cpp/src/IceUtil/FileUtil.cpp b/cpp/src/IceUtil/FileUtil.cpp index 6c7203d7c87..8ddef052585 100644 --- a/cpp/src/IceUtil/FileUtil.cpp +++ b/cpp/src/IceUtil/FileUtil.cpp @@ -254,7 +254,7 @@ IceUtilInternal::getcwd(string& cwd) // from Windows API. // wchar_t cwdbuf[_MAX_PATH]; - if(_wgetcwd(cwdbuf, _MAX_PATH) == NULL) + if(_wgetcwd(cwdbuf, _MAX_PATH) == ICE_NULLPTR) { return -1; } @@ -293,7 +293,7 @@ IceUtilInternal::FileLock::FileLock(const std::string& path) : // #ifndef ICE_OS_UWP _fd = ::CreateFileW(stringToWstring(path, IceUtil::getProcessStringConverter()).c_str(), - GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + GENERIC_WRITE, 0, ICE_NULLPTR, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, ICE_NULLPTR); #else CREATEFILE2_EXTENDED_PARAMETERS params; params.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; @@ -411,7 +411,7 @@ int IceUtilInternal::getcwd(string& cwd) { char cwdbuf[PATH_MAX]; - if(::getcwd(cwdbuf, PATH_MAX) == NULL) + if(::getcwd(cwdbuf, PATH_MAX) == ICE_NULLPTR) { return -1; } diff --git a/cpp/src/IceUtil/StringUtil.cpp b/cpp/src/IceUtil/StringUtil.cpp index 6c87d8d7148..5ed73e29faf 100644 --- a/cpp/src/IceUtil/StringUtil.cpp +++ b/cpp/src/IceUtil/StringUtil.cpp @@ -826,13 +826,13 @@ IceUtilInternal::errorToString(int error, LPCVOID source) stored = FormatMessageW( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | - (source != NULL ? FORMAT_MESSAGE_FROM_HMODULE : 0), + (source != ICE_NULLPTR ? FORMAT_MESSAGE_FROM_HMODULE : 0), source, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language const_cast<wchar_t*>(lpMsgBuf.data()), static_cast<int>(lpMsgBuf.size()), - NULL); + ICE_NULLPTR); if(stored == 0) { @@ -864,13 +864,13 @@ IceUtilInternal::errorToString(int error, LPCVOID source) FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | - (source != NULL ? FORMAT_MESSAGE_FROM_HMODULE : 0), + (source != ICE_NULLPTR ? FORMAT_MESSAGE_FROM_HMODULE : 0), source, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language reinterpret_cast<LPWSTR>(&msg), 0, - NULL); + ICE_NULLPTR); #endif if(stored > 0) diff --git a/cpp/src/IceUtil/UtilException.cpp b/cpp/src/IceUtil/UtilException.cpp index eb416b268ac..e87c764154c 100644 --- a/cpp/src/IceUtil/UtilException.cpp +++ b/cpp/src/IceUtil/UtilException.cpp @@ -391,7 +391,7 @@ getStackTrace(const vector<void*>& stackFrames) "startHook", &myModule); // - // If GetModuleHandleEx fails, myModule is NULL, i.e. we'll locate the current exe's directory. + // If GetModuleHandleEx fails, myModule is ICE_NULLPTR, i.e. we'll locate the current exe's directory. // TCHAR myFilename[MAX_PATH]; diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp index 180545bea67..3525e9b4e99 100644 --- a/cpp/src/IceXML/Parser.cpp +++ b/cpp/src/IceXML/Parser.cpp @@ -409,7 +409,7 @@ IceXML::Parser::parse(const string& file, Handler& handler) // The given filenam void IceXML::Parser::parse(istream& in, Handler& handler) { - XML_Parser parser = XML_ParserCreate(NULL); + XML_Parser parser = XML_ParserCreate(ICE_NULLPTR); CallbackData cb; cb.parser = parser; cb.handler = &handler; diff --git a/cpp/src/Slice/Python.cpp b/cpp/src/Slice/Python.cpp index 6080c23d3c0..bc1da962d70 100644 --- a/cpp/src/Slice/Python.cpp +++ b/cpp/src/Slice/Python.cpp @@ -588,7 +588,7 @@ Slice::Python::compile(const vector<string>& argv) if(preprocess) { char buf[4096]; - while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL) + while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != ICE_NULLPTR) { if(fputs(buf, stdout) == EOF) { diff --git a/cpp/src/Slice/Ruby.cpp b/cpp/src/Slice/Ruby.cpp index d53fc353b5a..7861bcb8c0b 100644 --- a/cpp/src/Slice/Ruby.cpp +++ b/cpp/src/Slice/Ruby.cpp @@ -248,7 +248,7 @@ Slice::Ruby::compile(const vector<string>& argv) if(preprocess) { char buf[4096]; - while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL) + while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != ICE_NULLPTR) { if(fputs(buf, stdout) == EOF) { diff --git a/cpp/src/slice2confluence/ConfluenceOutput.cpp b/cpp/src/slice2confluence/ConfluenceOutput.cpp index cac2dc645e4..0c2135d869c 100644 --- a/cpp/src/slice2confluence/ConfluenceOutput.cpp +++ b/cpp/src/slice2confluence/ConfluenceOutput.cpp @@ -138,7 +138,7 @@ Confluence::ConfluenceOutput::escapeComment(string comment) // For each position of a found escape character while(pos != string::npos) { - pair<unsigned int,unsigned int> *region = NULL; + pair<unsigned int,unsigned int> *region = ICE_NULLPTR; // Is this pos in an escaped section? for(list<pair<unsigned int,unsigned int> >::iterator i = escaperLimits.begin(); i != escaperLimits.end(); @@ -151,7 +151,7 @@ Confluence::ConfluenceOutput::escapeComment(string comment) } } - if(region == NULL) + if(region == ICE_NULLPTR) { comment.replace(pos, c.size(), replacement); pos = comment.find(c, pos + replacement.size()); diff --git a/cpp/src/slice2confluence/Main.cpp b/cpp/src/slice2confluence/Main.cpp index 38a38ff8d87..8eeca1c303b 100644 --- a/cpp/src/slice2confluence/Main.cpp +++ b/cpp/src/slice2confluence/Main.cpp @@ -283,7 +283,7 @@ compile(const vector<string>& argv) if(preprocess) { char buf[4096]; - while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL) + while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != ICE_NULLPTR) { if(fputs(buf, stdout) == EOF) { diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp index c082b103c06..7378da1b118 100644 --- a/cpp/src/slice2cpp/Main.cpp +++ b/cpp/src/slice2cpp/Main.cpp @@ -297,7 +297,7 @@ compile(const vector<string>& argv) if(preprocess) { char buf[4096]; - while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL) + while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != ICE_NULLPTR) { if(fputs(buf, stdout) == EOF) { diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp index f4b3e009a68..21738ba6f83 100644 --- a/cpp/src/slice2cs/Main.cpp +++ b/cpp/src/slice2cs/Main.cpp @@ -278,7 +278,7 @@ compile(const vector<string>& argv) if(preprocess) { char buf[4096]; - while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL) + while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != ICE_NULLPTR) { if(fputs(buf, stdout) == EOF) { diff --git a/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp index 012f4bffb61..ae2bfaa75ff 100644 --- a/cpp/src/slice2html/Main.cpp +++ b/cpp/src/slice2html/Main.cpp @@ -255,7 +255,7 @@ compile(const vector<string>& argv) if(preprocess) { char buf[4096]; - while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL) + while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != ICE_NULLPTR) { if(fputs(buf, stdout) == EOF) { diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp index 27845a76994..86b07bf60d5 100644 --- a/cpp/src/slice2java/Main.cpp +++ b/cpp/src/slice2java/Main.cpp @@ -316,7 +316,7 @@ compile(const vector<string>& argv) if(preprocess) { char buf[4096]; - while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL) + while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != ICE_NULLPTR) { if(fputs(buf, stdout) == EOF) { diff --git a/cpp/src/slice2js/Main.cpp b/cpp/src/slice2js/Main.cpp index 158e31efd00..a73738fcee9 100644 --- a/cpp/src/slice2js/Main.cpp +++ b/cpp/src/slice2js/Main.cpp @@ -302,7 +302,7 @@ compile(const vector<string>& argv) if(preprocess) { char buf[4096]; - while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL) + while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != ICE_NULLPTR) { if(fputs(buf, stdout) == EOF) { diff --git a/cpp/src/slice2objc/Main.cpp b/cpp/src/slice2objc/Main.cpp index ed999c32067..24ac096d92c 100644 --- a/cpp/src/slice2objc/Main.cpp +++ b/cpp/src/slice2objc/Main.cpp @@ -254,7 +254,7 @@ compile(const vector<string>& argv) if(preprocess) { char buf[4096]; - while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL) + while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != ICE_NULLPTR) { if(fputs(buf, stdout) == EOF) { diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp index 312091ecde1..2817fdab3d6 100644 --- a/cpp/src/slice2php/Main.cpp +++ b/cpp/src/slice2php/Main.cpp @@ -1726,7 +1726,7 @@ compile(const vector<string>& argv) if(preprocess) { char buf[4096]; - while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL) + while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != ICE_NULLPTR) { if(fputs(buf, stdout) == EOF) { diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 0ca99b5224e..573eb4ce66d 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -657,7 +657,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) bool isElCapitanOrGreater = false; vector<char> s(256); size_t size = s.size(); - int ret = sysctlbyname("kern.osrelease", &s[0], &size, NULL, 0); + int ret = sysctlbyname("kern.osrelease", &s[0], &size, ICE_NULLPTR, 0); if(ret == 0) { // version format is x.y.z diff --git a/cpp/test/IceUtil/stacktrace/Client.cpp b/cpp/test/IceUtil/stacktrace/Client.cpp index 3284dc0ee62..ffafedbb9ec 100644 --- a/cpp/test/IceUtil/stacktrace/Client.cpp +++ b/cpp/test/IceUtil/stacktrace/Client.cpp @@ -92,7 +92,7 @@ getIceHome() WCHAR buf[512]; DWORD bufSize = sizeof(buf); - if(RegQueryValueExW(hKey, L"InstallDir", 0, NULL, (LPBYTE)buf, &bufSize) != ERROR_SUCCESS) + if(RegQueryValueExW(hKey, L"InstallDir", 0, ICE_NULLPTR, (LPBYTE)buf, &bufSize) != ERROR_SUCCESS) { return ""; } diff --git a/php/src/php5/Communicator.cpp b/php/src/php5/Communicator.cpp index d1a53a18e32..2d8fcc0b919 100644 --- a/php/src/php5/Communicator.cpp +++ b/php/src/php5/Communicator.cpp @@ -1431,25 +1431,25 @@ static zend_function_entry _interfaceMethods[] = }; static zend_function_entry _classMethods[] = { - ZEND_ME(Ice_Communicator, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_Communicator, destroy, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, stringToProxy, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, proxyToString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, propertyToProxy, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, proxyToProperty, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, stringToIdentity, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, identityToString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, addObjectFactory, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, findObjectFactory, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, getValueFactoryManager, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, getImplicitContext, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, getProperties, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, getLogger, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, getDefaultRouter, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, setDefaultRouter, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, getDefaultLocator, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, setDefaultLocator, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, flushBatchRequests, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_Communicator, destroy, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, stringToProxy, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, proxyToString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, propertyToProxy, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, proxyToProperty, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, stringToIdentity, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, identityToString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, addObjectFactory, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, findObjectFactory, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, getValueFactoryManager, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, getImplicitContext, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, getProperties, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, getLogger, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, getDefaultRouter, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, setDefaultRouter, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, getDefaultLocator, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, setDefaultLocator, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, flushBatchRequests, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; @@ -1462,9 +1462,9 @@ static zend_function_entry _vfmInterfaceMethods[] = }; static zend_function_entry _vfmClassMethods[] = { - ZEND_ME(Ice_ValueFactoryManager, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_ValueFactoryManager, add, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ValueFactoryManager, find, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ValueFactoryManager, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_ValueFactoryManager, add, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ValueFactoryManager, find, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; diff --git a/php/src/php5/Connection.cpp b/php/src/php5/Connection.cpp index 51a4b6d6fc8..1d85343ed37 100644 --- a/php/src/php5/Connection.cpp +++ b/php/src/php5/Connection.cpp @@ -406,18 +406,18 @@ static zend_function_entry _interfaceMethods[] = }; static zend_function_entry _connectionClassMethods[] = { - ZEND_ME(Ice_Connection, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_Connection, __toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, close, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, getEndpoint, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, flushBatchRequests, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, setACM, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, getACM, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, type, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, timeout, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, getInfo, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, setBufferSize, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_Connection, __toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, close, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, getEndpoint, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, flushBatchRequests, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, setACM, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, getACM, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, type, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, timeout, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, getInfo, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, setBufferSize, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; @@ -431,7 +431,7 @@ ZEND_METHOD(Ice_ConnectionInfo, __construct) // static zend_function_entry _connectionInfoClassMethods[] = { - ZEND_ME(Ice_ConnectionInfo, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_ConnectionInfo, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) {0, 0, 0} }; // @@ -522,12 +522,12 @@ IcePHP::connectionInit(TSRMLS_D) // Register the IPConnectionInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "IPConnectionInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "IPConnectionInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_IPConnectionInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_IPConnectionInfo", ICE_NULLPTR); #endif ce.create_object = handleConnectionInfoAlloc; - ipConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, connectionInfoClassEntry, NULL TSRMLS_CC); + ipConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, connectionInfoClassEntry, ICE_NULLPTR TSRMLS_CC); zend_declare_property_string(ipConnectionInfoClassEntry, STRCAST("localAddress"), sizeof("localAddress") - 1, STRCAST(""), ZEND_ACC_PUBLIC TSRMLS_CC); zend_declare_property_long(ipConnectionInfoClassEntry, STRCAST("localPort"), sizeof("localPort") - 1, 0, @@ -541,23 +541,23 @@ IcePHP::connectionInit(TSRMLS_D) // Register the TCPConnectionInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPConnectionInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPConnectionInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_TCPConnectionInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_TCPConnectionInfo", ICE_NULLPTR); #endif ce.create_object = handleConnectionInfoAlloc; - tcpConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, ipConnectionInfoClassEntry, NULL TSRMLS_CC); + tcpConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, ipConnectionInfoClassEntry, ICE_NULLPTR TSRMLS_CC); // // Register the UDPConnectionInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPConnectionInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPConnectionInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_UDPConnectionInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_UDPConnectionInfo", ICE_NULLPTR); #endif ce.create_object = handleConnectionInfoAlloc; - udpConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, ipConnectionInfoClassEntry, NULL TSRMLS_CC); + udpConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, ipConnectionInfoClassEntry, ICE_NULLPTR TSRMLS_CC); zend_declare_property_string(udpConnectionInfoClassEntry, STRCAST("mcastAddress"), sizeof("mcastAddress") - 1, STRCAST(""), ZEND_ACC_PUBLIC TSRMLS_CC); zend_declare_property_long(udpConnectionInfoClassEntry, STRCAST("mcastPort"), sizeof("mcastPort") - 1, 0, @@ -567,12 +567,12 @@ IcePHP::connectionInit(TSRMLS_D) // Register the WSConnectionInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "WSConnectionInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "WSConnectionInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_WSConnectionInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_WSConnectionInfo", ICE_NULLPTR); #endif ce.create_object = handleConnectionInfoAlloc; - wsConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, connectionInfoClassEntry, NULL TSRMLS_CC); + wsConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, connectionInfoClassEntry, ICE_NULLPTR TSRMLS_CC); zend_declare_property_string(wsConnectionInfoClassEntry, STRCAST("headers"), sizeof("headers") - 1, STRCAST(""), ZEND_ACC_PUBLIC TSRMLS_CC); @@ -580,12 +580,12 @@ IcePHP::connectionInit(TSRMLS_D) // Register the SSLConnectionInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "SSLConnectionInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "SSLConnectionInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_SSLConnectionInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_SSLConnectionInfo", ICE_NULLPTR); #endif ce.create_object = handleConnectionInfoAlloc; - sslConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, connectionInfoClassEntry, NULL TSRMLS_CC); + sslConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, connectionInfoClassEntry, ICE_NULLPTR TSRMLS_CC); zend_declare_property_string(sslConnectionInfoClassEntry, STRCAST("cipher"), sizeof("cipher") - 1, STRCAST(""), ZEND_ACC_PUBLIC TSRMLS_CC); zend_declare_property_string(sslConnectionInfoClassEntry, STRCAST("certs"), sizeof("certs") - 1, diff --git a/php/src/php5/Endpoint.cpp b/php/src/php5/Endpoint.cpp index 831f602125d..8ba0c1cc993 100644 --- a/php/src/php5/Endpoint.cpp +++ b/php/src/php5/Endpoint.cpp @@ -238,10 +238,10 @@ static zend_function_entry _interfaceMethods[] = // static zend_function_entry _endpointMethods[] = { - ZEND_ME(Ice_Endpoint, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_Endpoint, __toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Endpoint, toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Endpoint, getInfo, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Endpoint, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_Endpoint, __toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Endpoint, toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Endpoint, getInfo, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; @@ -250,10 +250,10 @@ static zend_function_entry _endpointMethods[] = // static zend_function_entry _endpointInfoMethods[] = { - ZEND_ME(Ice_EndpointInfo, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_EndpointInfo, type, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_EndpointInfo, datagram, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_EndpointInfo, secure, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_EndpointInfo, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_EndpointInfo, type, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_EndpointInfo, datagram, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_EndpointInfo, secure, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; @@ -317,12 +317,12 @@ IcePHP::endpointInit(TSRMLS_D) // Define the IPEndpointInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "IPEndpointInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "IPEndpointInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_IPEndpointInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_IPEndpointInfo", ICE_NULLPTR); #endif ce.create_object = handleEndpointInfoAlloc; - ipEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, endpointInfoClassEntry, NULL TSRMLS_CC); + ipEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, endpointInfoClassEntry, ICE_NULLPTR TSRMLS_CC); zend_declare_property_string(ipEndpointInfoClassEntry, STRCAST("host"), sizeof("host") - 1, STRCAST(""), ZEND_ACC_PUBLIC TSRMLS_CC); zend_declare_property_long(ipEndpointInfoClassEntry, STRCAST("port"), sizeof("port") - 1, 0, @@ -334,23 +334,23 @@ IcePHP::endpointInit(TSRMLS_D) // Define the TCPEndpointInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPEndpointInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPEndpointInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_TCPEndpointInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_TCPEndpointInfo", ICE_NULLPTR); #endif ce.create_object = handleEndpointInfoAlloc; - tcpEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, ipEndpointInfoClassEntry, NULL TSRMLS_CC); + tcpEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, ipEndpointInfoClassEntry, ICE_NULLPTR TSRMLS_CC); // // Define the UDPEndpointInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPEndpointInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPEndpointInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_UDPEndpointInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_UDPEndpointInfo", ICE_NULLPTR); #endif ce.create_object = handleEndpointInfoAlloc; - udpEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, ipEndpointInfoClassEntry, NULL TSRMLS_CC); + udpEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, ipEndpointInfoClassEntry, ICE_NULLPTR TSRMLS_CC); zend_declare_property_string(udpEndpointInfoClassEntry, STRCAST("mcastInterface"), sizeof("mcastInterface") - 1, STRCAST(""), ZEND_ACC_PUBLIC TSRMLS_CC); zend_declare_property_long(udpEndpointInfoClassEntry, STRCAST("mcastTtl"), sizeof("mcastTtl") - 1, 0, @@ -360,12 +360,12 @@ IcePHP::endpointInit(TSRMLS_D) // Define the WSEndpointInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "WSEndpointInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "WSEndpointInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_WSEndpointInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_WSEndpointInfo", ICE_NULLPTR); #endif ce.create_object = handleEndpointInfoAlloc; - wsEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, endpointInfoClassEntry, NULL TSRMLS_CC); + wsEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, endpointInfoClassEntry, ICE_NULLPTR TSRMLS_CC); zend_declare_property_string(wsEndpointInfoClassEntry, STRCAST("resource"), sizeof("resource") - 1, STRCAST(""), ZEND_ACC_PUBLIC TSRMLS_CC); @@ -373,12 +373,12 @@ IcePHP::endpointInit(TSRMLS_D) // Define the OpaqueEndpointInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "OpaqueEndpointInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "OpaqueEndpointInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_OpaqueEndpointInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_OpaqueEndpointInfo", ICE_NULLPTR); #endif ce.create_object = handleEndpointInfoAlloc; - opaqueEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, endpointInfoClassEntry, NULL TSRMLS_CC); + opaqueEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, endpointInfoClassEntry, ICE_NULLPTR TSRMLS_CC); zend_declare_property_null(opaqueEndpointInfoClassEntry, STRCAST("rawEncoding"), sizeof("rawEncoding") - 1, ZEND_ACC_PUBLIC TSRMLS_CC); zend_declare_property_null(opaqueEndpointInfoClassEntry, STRCAST("rawBytes"), sizeof("rawBytes") - 1, @@ -388,12 +388,12 @@ IcePHP::endpointInit(TSRMLS_D) // Define the SSLEndpointInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "SSLEndpointInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "SSLEndpointInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_SSLEndpointInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_SSLEndpointInfo", ICE_NULLPTR); #endif ce.create_object = handleEndpointInfoAlloc; - sslEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, endpointInfoClassEntry, NULL TSRMLS_CC); + sslEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, endpointInfoClassEntry, ICE_NULLPTR TSRMLS_CC); return true; } diff --git a/php/src/php5/Init.cpp b/php/src/php5/Init.cpp index fbb397724d8..5da2c5f9603 100644 --- a/php/src/php5/Init.cpp +++ b/php/src/php5/Init.cpp @@ -30,28 +30,28 @@ ZEND_END_ARG_INFO() #define ICEPHP_COMMUNICATOR_FUNCTIONS \ ZEND_FE(Ice_initialize, Ice_initialize_arginfo) \ - ZEND_FE(Ice_register, NULL) \ - ZEND_FE(Ice_unregister, NULL) \ - ZEND_FE(Ice_find, NULL) \ - ZEND_FE(Ice_getProperties, NULL) \ - ZEND_FE(Ice_identityToString, NULL) \ - ZEND_FE(Ice_stringToIdentity, NULL) \ + ZEND_FE(Ice_register, ICE_NULLPTR) \ + ZEND_FE(Ice_unregister, ICE_NULLPTR) \ + ZEND_FE(Ice_find, ICE_NULLPTR) \ + ZEND_FE(Ice_getProperties, ICE_NULLPTR) \ + ZEND_FE(Ice_identityToString, ICE_NULLPTR) \ + ZEND_FE(Ice_stringToIdentity, ICE_NULLPTR) \ #ifdef ICEPHP_USE_NAMESPACES # define ICEPHP_COMMUNICATOR_NS_FUNCTIONS \ ZEND_NS_FALIAS("Ice", initialize, Ice_initialize, Ice_initialize_arginfo) \ - ZEND_NS_FALIAS("Ice", register, Ice_register, NULL) \ - ZEND_NS_FALIAS("Ice", unregister, Ice_unregister, NULL) \ - ZEND_NS_FALIAS("Ice", find, Ice_find, NULL) \ - ZEND_NS_FALIAS("Ice", getProperties, Ice_getProperties, NULL) \ - ZEND_NS_FALIAS("Ice", identityToString, Ice_identityToString, NULL) \ - ZEND_NS_FALIAS("Ice", stringToIdentity, Ice_stringToIdentity, NULL) + ZEND_NS_FALIAS("Ice", register, Ice_register, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", unregister, Ice_unregister, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", find, Ice_find, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", getProperties, Ice_getProperties, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", identityToString, Ice_identityToString, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", stringToIdentity, Ice_stringToIdentity, ICE_NULLPTR) #else # define ICEPHP_COMMUNICATOR_NS_FUNCTIONS #endif #define ICEPHP_OPERATION_FUNCTIONS \ - ZEND_FE(IcePHP_defineOperation, NULL) + ZEND_FE(IcePHP_defineOperation, ICE_NULLPTR) #define ICEPHP_PROPERTIES_FUNCTIONS \ ZEND_FE(Ice_createProperties, Ice_createProperties_arginfo) @@ -64,42 +64,42 @@ ZEND_END_ARG_INFO() #endif #define ICEPHP_TYPE_FUNCTIONS \ - ZEND_FE(IcePHP_defineEnum, NULL) \ - ZEND_FE(IcePHP_defineStruct, NULL) \ - ZEND_FE(IcePHP_defineSequence, NULL) \ - ZEND_FE(IcePHP_defineDictionary, NULL) \ - ZEND_FE(IcePHP_declareProxy, NULL) \ - ZEND_FE(IcePHP_defineProxy, NULL) \ - ZEND_FE(IcePHP_declareClass, NULL) \ - ZEND_FE(IcePHP_defineClass, NULL) \ - ZEND_FE(IcePHP_defineException, NULL) \ - ZEND_FE(IcePHP_stringify, NULL) \ - ZEND_FE(IcePHP_stringifyException, NULL) + ZEND_FE(IcePHP_defineEnum, ICE_NULLPTR) \ + ZEND_FE(IcePHP_defineStruct, ICE_NULLPTR) \ + ZEND_FE(IcePHP_defineSequence, ICE_NULLPTR) \ + ZEND_FE(IcePHP_defineDictionary, ICE_NULLPTR) \ + ZEND_FE(IcePHP_declareProxy, ICE_NULLPTR) \ + ZEND_FE(IcePHP_defineProxy, ICE_NULLPTR) \ + ZEND_FE(IcePHP_declareClass, ICE_NULLPTR) \ + ZEND_FE(IcePHP_defineClass, ICE_NULLPTR) \ + ZEND_FE(IcePHP_defineException, ICE_NULLPTR) \ + ZEND_FE(IcePHP_stringify, ICE_NULLPTR) \ + ZEND_FE(IcePHP_stringifyException, ICE_NULLPTR) #define ICEPHP_UTIL_FUNCTIONS \ - ZEND_FE(Ice_stringVersion, NULL) \ - ZEND_FE(Ice_intVersion, NULL) \ - ZEND_FE(Ice_generateUUID, NULL) \ - ZEND_FE(Ice_currentProtocol, NULL) \ - ZEND_FE(Ice_currentProtocolEncoding, NULL) \ - ZEND_FE(Ice_currentEncoding, NULL) \ - ZEND_FE(Ice_protocolVersionToString, NULL) \ - ZEND_FE(Ice_stringToProtocolVersion, NULL) \ - ZEND_FE(Ice_encodingVersionToString, NULL) \ - ZEND_FE(Ice_stringToEncodingVersion, NULL) + ZEND_FE(Ice_stringVersion, ICE_NULLPTR) \ + ZEND_FE(Ice_intVersion, ICE_NULLPTR) \ + ZEND_FE(Ice_generateUUID, ICE_NULLPTR) \ + ZEND_FE(Ice_currentProtocol, ICE_NULLPTR) \ + ZEND_FE(Ice_currentProtocolEncoding, ICE_NULLPTR) \ + ZEND_FE(Ice_currentEncoding, ICE_NULLPTR) \ + ZEND_FE(Ice_protocolVersionToString, ICE_NULLPTR) \ + ZEND_FE(Ice_stringToProtocolVersion, ICE_NULLPTR) \ + ZEND_FE(Ice_encodingVersionToString, ICE_NULLPTR) \ + ZEND_FE(Ice_stringToEncodingVersion, ICE_NULLPTR) #ifdef ICEPHP_USE_NAMESPACES # define ICEPHP_UTIL_NS_FUNCTIONS \ - ZEND_NS_FALIAS("Ice", stringVersion, Ice_stringVersion, NULL) \ - ZEND_NS_FALIAS("Ice", intVersion, Ice_intVersion, NULL) \ - ZEND_NS_FALIAS("Ice", generateUUID, Ice_generateUUID, NULL) \ - ZEND_NS_FALIAS("Ice", currentProtocol, Ice_currentProtocol, NULL) \ - ZEND_NS_FALIAS("Ice", currentProtocolEncoding, Ice_currentProtocolEncoding, NULL) \ - ZEND_NS_FALIAS("Ice", currentEncoding, Ice_currentEncoding, NULL) \ - ZEND_NS_FALIAS("Ice", protocolVersionToString, Ice_protocolVersionToString, NULL) \ - ZEND_NS_FALIAS("Ice", stringToProtocolVersion, Ice_stringToProtocolVersion, NULL) \ - ZEND_NS_FALIAS("Ice", encodingVersionToString, Ice_encodingVersionToString, NULL) \ - ZEND_NS_FALIAS("Ice", stringToEncodingVersion, Ice_stringToEncodingVersion, NULL) + ZEND_NS_FALIAS("Ice", stringVersion, Ice_stringVersion, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", intVersion, Ice_intVersion, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", generateUUID, Ice_generateUUID, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", currentProtocol, Ice_currentProtocol, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", currentProtocolEncoding, Ice_currentProtocolEncoding, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", currentEncoding, Ice_currentEncoding, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", protocolVersionToString, Ice_protocolVersionToString, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", stringToProtocolVersion, Ice_stringToProtocolVersion, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", encodingVersionToString, Ice_encodingVersionToString, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", stringToEncodingVersion, Ice_stringToEncodingVersion, ICE_NULLPTR) #else # define ICEPHP_UTIL_NS_FUNCTIONS #endif diff --git a/php/src/php5/Logger.cpp b/php/src/php5/Logger.cpp index eb911c71de7..2194b61a755 100644 --- a/php/src/php5/Logger.cpp +++ b/php/src/php5/Logger.cpp @@ -240,13 +240,13 @@ static zend_function_entry _interfaceMethods[] = }; static zend_function_entry _classMethods[] = { - ZEND_ME(Ice_Logger, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_Logger, __toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Logger, print, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Logger, trace, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Logger, warning, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Logger, error, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Logger, cloneWithPrefix, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Logger, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_Logger, __toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Logger, print, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Logger, trace, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Logger, warning, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Logger, error, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Logger, cloneWithPrefix, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; // diff --git a/php/src/php5/Properties.cpp b/php/src/php5/Properties.cpp index 5fad58e39a8..8fa43b1d4fb 100644 --- a/php/src/php5/Properties.cpp +++ b/php/src/php5/Properties.cpp @@ -603,21 +603,21 @@ static zend_function_entry _interfaceMethods[] = }; static zend_function_entry _classMethods[] = { - ZEND_ME(Ice_Properties, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_Properties, __toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getProperty, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getPropertyWithDefault, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getPropertyAsInt, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getPropertyAsIntWithDefault, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getPropertyAsList, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getPropertyAsListWithDefault, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getPropertiesForPrefix, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, setProperty, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getCommandLineOptions, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, parseCommandLineOptions, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, parseIceCommandLineOptions, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, load, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, clone, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_Properties, __toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getProperty, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getPropertyWithDefault, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getPropertyAsInt, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getPropertyAsIntWithDefault, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getPropertyAsList, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getPropertyAsListWithDefault, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getPropertiesForPrefix, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, setProperty, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getCommandLineOptions, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, parseCommandLineOptions, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, parseIceCommandLineOptions, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, load, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, clone, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; diff --git a/php/src/php5/Proxy.cpp b/php/src/php5/Proxy.cpp index b86c15314c9..48c30c2782e 100644 --- a/php/src/php5/Proxy.cpp +++ b/php/src/php5/Proxy.cpp @@ -1635,55 +1635,55 @@ handleCompare(zval* zobj1, zval* zobj2 TSRMLS_DC) // static zend_function_entry _proxyMethods[] = { - ZEND_ME(Ice_ObjectPrx, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_ObjectPrx, __toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getCommunicator, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getIdentity, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_identity, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getContext, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_context, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getFacet, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_facet, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getAdapterId, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_adapterId, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getEndpoints, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_endpoints, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getLocatorCacheTimeout, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getConnectionId, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_locatorCacheTimeout, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isConnectionCached, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_connectionCached, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getEndpointSelection, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_endpointSelection, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isSecure, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_secure, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getEncodingVersion, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_encodingVersion, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isPreferSecure, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_preferSecure, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getRouter, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_router, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getLocator, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_locator, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_twoway, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isTwoway, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_oneway, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isOneway, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_batchOneway, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isBatchOneway, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_datagram, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isDatagram, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_batchDatagram, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isBatchDatagram, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_compress, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_timeout, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_connectionId, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getConnection, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getCachedConnection, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_flushBatchRequests, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_uncheckedCast, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_checkedCast, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_ObjectPrx, __toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getCommunicator, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getIdentity, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_identity, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getContext, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_context, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getFacet, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_facet, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getAdapterId, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_adapterId, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getEndpoints, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_endpoints, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getLocatorCacheTimeout, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getConnectionId, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_locatorCacheTimeout, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isConnectionCached, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_connectionCached, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getEndpointSelection, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_endpointSelection, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isSecure, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_secure, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getEncodingVersion, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_encodingVersion, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isPreferSecure, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_preferSecure, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getRouter, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_router, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getLocator, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_locator, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_twoway, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isTwoway, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_oneway, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isOneway, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_batchOneway, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isBatchOneway, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_datagram, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isDatagram, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_batchDatagram, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isBatchDatagram, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_compress, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_timeout, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_connectionId, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getConnection, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getCachedConnection, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_flushBatchRequests, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_uncheckedCast, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_checkedCast, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; diff --git a/php/src/php7/Communicator.cpp b/php/src/php7/Communicator.cpp index 4f8ffabd945..18a080b1d66 100644 --- a/php/src/php7/Communicator.cpp +++ b/php/src/php7/Communicator.cpp @@ -1434,25 +1434,25 @@ static zend_function_entry _interfaceMethods[] = }; static zend_function_entry _classMethods[] = { - ZEND_ME(Ice_Communicator, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_Communicator, destroy, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, stringToProxy, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, proxyToString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, propertyToProxy, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, proxyToProperty, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, stringToIdentity, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, identityToString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, addObjectFactory, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, findObjectFactory, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, getValueFactoryManager, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, getImplicitContext, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, getProperties, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, getLogger, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, getDefaultRouter, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, setDefaultRouter, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, getDefaultLocator, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, setDefaultLocator, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Communicator, flushBatchRequests, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_Communicator, destroy, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, stringToProxy, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, proxyToString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, propertyToProxy, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, proxyToProperty, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, stringToIdentity, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, identityToString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, addObjectFactory, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, findObjectFactory, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, getValueFactoryManager, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, getImplicitContext, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, getProperties, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, getLogger, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, getDefaultRouter, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, setDefaultRouter, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, getDefaultLocator, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, setDefaultLocator, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Communicator, flushBatchRequests, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; @@ -1465,9 +1465,9 @@ static zend_function_entry _vfmInterfaceMethods[] = }; static zend_function_entry _vfmClassMethods[] = { - ZEND_ME(Ice_ValueFactoryManager, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_ValueFactoryManager, add, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ValueFactoryManager, find, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ValueFactoryManager, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_ValueFactoryManager, add, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ValueFactoryManager, find, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; diff --git a/php/src/php7/Connection.cpp b/php/src/php7/Connection.cpp index e4231293390..2d598fc7da9 100644 --- a/php/src/php7/Connection.cpp +++ b/php/src/php7/Connection.cpp @@ -401,18 +401,18 @@ static zend_function_entry _interfaceMethods[] = }; static zend_function_entry _connectionClassMethods[] = { - ZEND_ME(Ice_Connection, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_Connection, __toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, close, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, getEndpoint, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, flushBatchRequests, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, setACM, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, getACM, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, type, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, timeout, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, getInfo, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Connection, setBufferSize, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_Connection, __toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, close, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, getEndpoint, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, flushBatchRequests, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, setACM, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, getACM, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, type, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, timeout, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, getInfo, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Connection, setBufferSize, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; @@ -426,7 +426,7 @@ ZEND_METHOD(Ice_ConnectionInfo, __construct) // static zend_function_entry _connectionInfoClassMethods[] = { - ZEND_ME(Ice_ConnectionInfo, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_ConnectionInfo, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) {0, 0, 0} }; // @@ -514,9 +514,9 @@ IcePHP::connectionInit(void) // Register the IPConnectionInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "IPConnectionInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "IPConnectionInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_IPConnectionInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_IPConnectionInfo", ICE_NULLPTR); #endif ce.create_object = handleConnectionInfoAlloc; ipConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, connectionInfoClassEntry); @@ -533,9 +533,9 @@ IcePHP::connectionInit(void) // Register the TCPConnectionInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPConnectionInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPConnectionInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_TCPConnectionInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_TCPConnectionInfo", ICE_NULLPTR); #endif ce.create_object = handleConnectionInfoAlloc; tcpConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, ipConnectionInfoClassEntry); @@ -544,9 +544,9 @@ IcePHP::connectionInit(void) // Register the UDPConnectionInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPConnectionInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPConnectionInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_UDPConnectionInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_UDPConnectionInfo", ICE_NULLPTR); #endif ce.create_object = handleConnectionInfoAlloc; udpConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, ipConnectionInfoClassEntry); @@ -559,9 +559,9 @@ IcePHP::connectionInit(void) // Register the WSConnectionInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "WSConnectionInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "WSConnectionInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_WSConnectionInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_WSConnectionInfo", ICE_NULLPTR); #endif ce.create_object = handleConnectionInfoAlloc; wsConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, connectionInfoClassEntry); @@ -572,9 +572,9 @@ IcePHP::connectionInit(void) // Register the SSLConnectionInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "SSLConnectionInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "SSLConnectionInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_SSLConnectionInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_SSLConnectionInfo", ICE_NULLPTR); #endif ce.create_object = handleConnectionInfoAlloc; sslConnectionInfoClassEntry = zend_register_internal_class_ex(&ce, connectionInfoClassEntry); diff --git a/php/src/php7/Endpoint.cpp b/php/src/php7/Endpoint.cpp index e15b24bdf17..69858fadbc9 100644 --- a/php/src/php7/Endpoint.cpp +++ b/php/src/php7/Endpoint.cpp @@ -228,10 +228,10 @@ static zend_function_entry _interfaceMethods[] = // static zend_function_entry _endpointMethods[] = { - ZEND_ME(Ice_Endpoint, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_Endpoint, __toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Endpoint, toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Endpoint, getInfo, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Endpoint, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_Endpoint, __toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Endpoint, toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Endpoint, getInfo, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; @@ -240,10 +240,10 @@ static zend_function_entry _endpointMethods[] = // static zend_function_entry _endpointInfoMethods[] = { - ZEND_ME(Ice_EndpointInfo, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_EndpointInfo, type, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_EndpointInfo, datagram, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_EndpointInfo, secure, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_EndpointInfo, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_EndpointInfo, type, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_EndpointInfo, datagram, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_EndpointInfo, secure, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; @@ -309,9 +309,9 @@ IcePHP::endpointInit(void) // Define the IPEndpointInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "IPEndpointInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "IPEndpointInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_IPEndpointInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_IPEndpointInfo", ICE_NULLPTR); #endif ce.create_object = handleEndpointInfoAlloc; ipEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, endpointInfoClassEntry); @@ -326,9 +326,9 @@ IcePHP::endpointInit(void) // Define the TCPEndpointInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPEndpointInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPEndpointInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_TCPEndpointInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_TCPEndpointInfo", ICE_NULLPTR); #endif ce.create_object = handleEndpointInfoAlloc; tcpEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, ipEndpointInfoClassEntry); @@ -337,9 +337,9 @@ IcePHP::endpointInit(void) // Define the UDPEndpointInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPEndpointInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPEndpointInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_UDPEndpointInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_UDPEndpointInfo", ICE_NULLPTR); #endif ce.create_object = handleEndpointInfoAlloc; udpEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, ipEndpointInfoClassEntry); @@ -352,9 +352,9 @@ IcePHP::endpointInit(void) // Define the WSEndpointInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "WSEndpointInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "WSEndpointInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_WSEndpointInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_WSEndpointInfo", ICE_NULLPTR); #endif ce.create_object = handleEndpointInfoAlloc; wsEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, endpointInfoClassEntry); @@ -365,9 +365,9 @@ IcePHP::endpointInit(void) // Define the OpaqueEndpointInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "OpaqueEndpointInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "OpaqueEndpointInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_OpaqueEndpointInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_OpaqueEndpointInfo", ICE_NULLPTR); #endif ce.create_object = handleEndpointInfoAlloc; opaqueEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, endpointInfoClassEntry); @@ -380,9 +380,9 @@ IcePHP::endpointInit(void) // Define the SSLEndpointInfo class. // #ifdef ICEPHP_USE_NAMESPACES - INIT_NS_CLASS_ENTRY(ce, "Ice", "SSLEndpointInfo", NULL); + INIT_NS_CLASS_ENTRY(ce, "Ice", "SSLEndpointInfo", ICE_NULLPTR); #else - INIT_CLASS_ENTRY(ce, "Ice_SSLEndpointInfo", NULL); + INIT_CLASS_ENTRY(ce, "Ice_SSLEndpointInfo", ICE_NULLPTR); #endif ce.create_object = handleEndpointInfoAlloc; sslEndpointInfoClassEntry = zend_register_internal_class_ex(&ce, endpointInfoClassEntry); diff --git a/php/src/php7/Init.cpp b/php/src/php7/Init.cpp index 1679703f80a..9956b7fe356 100644 --- a/php/src/php7/Init.cpp +++ b/php/src/php7/Init.cpp @@ -30,28 +30,28 @@ ZEND_END_ARG_INFO() #define ICEPHP_COMMUNICATOR_FUNCTIONS \ ZEND_FE(Ice_initialize, Ice_initialize_arginfo) \ - ZEND_FE(Ice_register, NULL) \ - ZEND_FE(Ice_unregister, NULL) \ - ZEND_FE(Ice_find, NULL) \ - ZEND_FE(Ice_getProperties, NULL) \ - ZEND_FE(Ice_identityToString, NULL) \ - ZEND_FE(Ice_stringToIdentity, NULL) + ZEND_FE(Ice_register, ICE_NULLPTR) \ + ZEND_FE(Ice_unregister, ICE_NULLPTR) \ + ZEND_FE(Ice_find, ICE_NULLPTR) \ + ZEND_FE(Ice_getProperties, ICE_NULLPTR) \ + ZEND_FE(Ice_identityToString, ICE_NULLPTR) \ + ZEND_FE(Ice_stringToIdentity, ICE_NULLPTR) #ifdef ICEPHP_USE_NAMESPACES # define ICEPHP_COMMUNICATOR_NS_FUNCTIONS \ ZEND_NS_FALIAS("Ice", initialize, Ice_initialize, Ice_initialize_arginfo) \ - ZEND_NS_FALIAS("Ice", register, Ice_register, NULL) \ - ZEND_NS_FALIAS("Ice", unregister, Ice_unregister, NULL) \ - ZEND_NS_FALIAS("Ice", find, Ice_find, NULL) \ - ZEND_NS_FALIAS("Ice", getProperties, Ice_getProperties, NULL) \ - ZEND_NS_FALIAS("Ice", identityToString, Ice_identityToString, NULL) \ - ZEND_NS_FALIAS("Ice", stringToIdentity, Ice_stringToIdentity, NULL) + ZEND_NS_FALIAS("Ice", register, Ice_register, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", unregister, Ice_unregister, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", find, Ice_find, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", getProperties, Ice_getProperties, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", identityToString, Ice_identityToString, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", stringToIdentity, Ice_stringToIdentity, ICE_NULLPTR) #else # define ICEPHP_COMMUNICATOR_NS_FUNCTIONS #endif #define ICEPHP_OPERATION_FUNCTIONS \ - ZEND_FE(IcePHP_defineOperation, NULL) + ZEND_FE(IcePHP_defineOperation, ICE_NULLPTR) #define ICEPHP_PROPERTIES_FUNCTIONS \ ZEND_FE(Ice_createProperties, Ice_createProperties_arginfo) @@ -64,42 +64,42 @@ ZEND_END_ARG_INFO() #endif #define ICEPHP_TYPE_FUNCTIONS \ - ZEND_FE(IcePHP_defineEnum, NULL) \ - ZEND_FE(IcePHP_defineStruct, NULL) \ - ZEND_FE(IcePHP_defineSequence, NULL) \ - ZEND_FE(IcePHP_defineDictionary, NULL) \ - ZEND_FE(IcePHP_declareProxy, NULL) \ - ZEND_FE(IcePHP_defineProxy, NULL) \ - ZEND_FE(IcePHP_declareClass, NULL) \ - ZEND_FE(IcePHP_defineClass, NULL) \ - ZEND_FE(IcePHP_defineException, NULL) \ - ZEND_FE(IcePHP_stringify, NULL) \ - ZEND_FE(IcePHP_stringifyException, NULL) + ZEND_FE(IcePHP_defineEnum, ICE_NULLPTR) \ + ZEND_FE(IcePHP_defineStruct, ICE_NULLPTR) \ + ZEND_FE(IcePHP_defineSequence, ICE_NULLPTR) \ + ZEND_FE(IcePHP_defineDictionary, ICE_NULLPTR) \ + ZEND_FE(IcePHP_declareProxy, ICE_NULLPTR) \ + ZEND_FE(IcePHP_defineProxy, ICE_NULLPTR) \ + ZEND_FE(IcePHP_declareClass, ICE_NULLPTR) \ + ZEND_FE(IcePHP_defineClass, ICE_NULLPTR) \ + ZEND_FE(IcePHP_defineException, ICE_NULLPTR) \ + ZEND_FE(IcePHP_stringify, ICE_NULLPTR) \ + ZEND_FE(IcePHP_stringifyException, ICE_NULLPTR) #define ICEPHP_UTIL_FUNCTIONS \ - ZEND_FE(Ice_stringVersion, NULL) \ - ZEND_FE(Ice_intVersion, NULL) \ - ZEND_FE(Ice_generateUUID, NULL) \ - ZEND_FE(Ice_currentProtocol, NULL) \ - ZEND_FE(Ice_currentProtocolEncoding, NULL) \ - ZEND_FE(Ice_currentEncoding, NULL) \ - ZEND_FE(Ice_protocolVersionToString, NULL) \ - ZEND_FE(Ice_stringToProtocolVersion, NULL) \ - ZEND_FE(Ice_encodingVersionToString, NULL) \ - ZEND_FE(Ice_stringToEncodingVersion, NULL) + ZEND_FE(Ice_stringVersion, ICE_NULLPTR) \ + ZEND_FE(Ice_intVersion, ICE_NULLPTR) \ + ZEND_FE(Ice_generateUUID, ICE_NULLPTR) \ + ZEND_FE(Ice_currentProtocol, ICE_NULLPTR) \ + ZEND_FE(Ice_currentProtocolEncoding, ICE_NULLPTR) \ + ZEND_FE(Ice_currentEncoding, ICE_NULLPTR) \ + ZEND_FE(Ice_protocolVersionToString, ICE_NULLPTR) \ + ZEND_FE(Ice_stringToProtocolVersion, ICE_NULLPTR) \ + ZEND_FE(Ice_encodingVersionToString, ICE_NULLPTR) \ + ZEND_FE(Ice_stringToEncodingVersion, ICE_NULLPTR) #ifdef ICEPHP_USE_NAMESPACES # define ICEPHP_UTIL_NS_FUNCTIONS \ - ZEND_NS_FALIAS("Ice", stringVersion, Ice_stringVersion, NULL) \ - ZEND_NS_FALIAS("Ice", intVersion, Ice_intVersion, NULL) \ - ZEND_NS_FALIAS("Ice", generateUUID, Ice_generateUUID, NULL) \ - ZEND_NS_FALIAS("Ice", currentProtocol, Ice_currentProtocol, NULL) \ - ZEND_NS_FALIAS("Ice", currentProtocolEncoding, Ice_currentProtocolEncoding, NULL) \ - ZEND_NS_FALIAS("Ice", currentEncoding, Ice_currentEncoding, NULL) \ - ZEND_NS_FALIAS("Ice", protocolVersionToString, Ice_protocolVersionToString, NULL) \ - ZEND_NS_FALIAS("Ice", stringToProtocolVersion, Ice_stringToProtocolVersion, NULL) \ - ZEND_NS_FALIAS("Ice", encodingVersionToString, Ice_encodingVersionToString, NULL) \ - ZEND_NS_FALIAS("Ice", stringToEncodingVersion, Ice_stringToEncodingVersion, NULL) + ZEND_NS_FALIAS("Ice", stringVersion, Ice_stringVersion, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", intVersion, Ice_intVersion, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", generateUUID, Ice_generateUUID, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", currentProtocol, Ice_currentProtocol, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", currentProtocolEncoding, Ice_currentProtocolEncoding, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", currentEncoding, Ice_currentEncoding, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", protocolVersionToString, Ice_protocolVersionToString, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", stringToProtocolVersion, Ice_stringToProtocolVersion, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", encodingVersionToString, Ice_encodingVersionToString, ICE_NULLPTR) \ + ZEND_NS_FALIAS("Ice", stringToEncodingVersion, Ice_stringToEncodingVersion, ICE_NULLPTR) #else # define ICEPHP_UTIL_NS_FUNCTIONS #endif diff --git a/php/src/php7/Logger.cpp b/php/src/php7/Logger.cpp index b5c9e962007..0660740e84a 100644 --- a/php/src/php7/Logger.cpp +++ b/php/src/php7/Logger.cpp @@ -236,13 +236,13 @@ static zend_function_entry _interfaceMethods[] = }; static zend_function_entry _classMethods[] = { - ZEND_ME(Ice_Logger, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_Logger, __toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Logger, print, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Logger, trace, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Logger, warning, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Logger, error, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Logger, cloneWithPrefix, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Logger, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_Logger, __toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Logger, print, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Logger, trace, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Logger, warning, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Logger, error, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Logger, cloneWithPrefix, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; // diff --git a/php/src/php7/Properties.cpp b/php/src/php7/Properties.cpp index cfdb779e881..07892920a50 100644 --- a/php/src/php7/Properties.cpp +++ b/php/src/php7/Properties.cpp @@ -585,21 +585,21 @@ static zend_function_entry _interfaceMethods[] = }; static zend_function_entry _classMethods[] = { - ZEND_ME(Ice_Properties, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_Properties, __toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getProperty, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getPropertyWithDefault, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getPropertyAsInt, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getPropertyAsIntWithDefault, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getPropertyAsList, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getPropertyAsListWithDefault, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getPropertiesForPrefix, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, setProperty, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, getCommandLineOptions, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, parseCommandLineOptions, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, parseIceCommandLineOptions, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, load, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_Properties, clone, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_Properties, __toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getProperty, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getPropertyWithDefault, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getPropertyAsInt, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getPropertyAsIntWithDefault, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getPropertyAsList, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getPropertyAsListWithDefault, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getPropertiesForPrefix, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, setProperty, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, getCommandLineOptions, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, parseCommandLineOptions, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, parseIceCommandLineOptions, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, load, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_Properties, clone, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; diff --git a/php/src/php7/Proxy.cpp b/php/src/php7/Proxy.cpp index d9bb45ca0ee..99a722d7e21 100644 --- a/php/src/php7/Proxy.cpp +++ b/php/src/php7/Proxy.cpp @@ -1589,55 +1589,55 @@ handleCompare(zval* zobj1, zval* zobj2) // static zend_function_entry _proxyMethods[] = { - ZEND_ME(Ice_ObjectPrx, __construct, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) - ZEND_ME(Ice_ObjectPrx, __toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getCommunicator, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_toString, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getIdentity, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_identity, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getContext, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_context, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getFacet, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_facet, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getAdapterId, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_adapterId, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getEndpoints, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_endpoints, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getLocatorCacheTimeout, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getConnectionId, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_locatorCacheTimeout, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isConnectionCached, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_connectionCached, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getEndpointSelection, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_endpointSelection, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isSecure, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_secure, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getEncodingVersion, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_encodingVersion, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isPreferSecure, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_preferSecure, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getRouter, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_router, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getLocator, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_locator, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_twoway, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isTwoway, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_oneway, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isOneway, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_batchOneway, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isBatchOneway, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_datagram, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isDatagram, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_batchDatagram, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_isBatchDatagram, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_compress, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_timeout, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_connectionId, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getConnection, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_getCachedConnection, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_flushBatchRequests, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_uncheckedCast, NULL, ZEND_ACC_PUBLIC) - ZEND_ME(Ice_ObjectPrx, ice_checkedCast, NULL, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, __construct, ICE_NULLPTR, ZEND_ACC_PRIVATE|ZEND_ACC_CTOR) + ZEND_ME(Ice_ObjectPrx, __toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getCommunicator, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_toString, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getIdentity, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_identity, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getContext, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_context, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getFacet, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_facet, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getAdapterId, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_adapterId, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getEndpoints, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_endpoints, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getLocatorCacheTimeout, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getConnectionId, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_locatorCacheTimeout, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isConnectionCached, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_connectionCached, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getEndpointSelection, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_endpointSelection, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isSecure, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_secure, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getEncodingVersion, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_encodingVersion, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isPreferSecure, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_preferSecure, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getRouter, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_router, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getLocator, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_locator, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_twoway, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isTwoway, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_oneway, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isOneway, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_batchOneway, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isBatchOneway, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_datagram, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isDatagram, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_batchDatagram, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_isBatchDatagram, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_compress, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_timeout, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_connectionId, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getConnection, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_getCachedConnection, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_flushBatchRequests, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_uncheckedCast, ICE_NULLPTR, ZEND_ACC_PUBLIC) + ZEND_ME(Ice_ObjectPrx, ice_checkedCast, ICE_NULLPTR, ZEND_ACC_PUBLIC) {0, 0, 0} }; diff --git a/python/modules/IcePy/Init.cpp b/python/modules/IcePy/Init.cpp index 5c026c27321..a7855719137 100644 --- a/python/modules/IcePy/Init.cpp +++ b/python/modules/IcePy/Init.cpp @@ -111,10 +111,10 @@ static struct PyModuleDef iceModule = "The Internet Communications Engine.", -1, methods, - NULL, - NULL, - NULL, - NULL + ICE_NULLPTR, + ICE_NULLPTR, + ICE_NULLPTR, + ICE_NULLPTR }; #else diff --git a/python/modules/IcePy/Util.cpp b/python/modules/IcePy/Util.cpp index 8d0cd602aae..953bbee84a0 100644 --- a/python/modules/IcePy/Util.cpp +++ b/python/modules/IcePy/Util.cpp @@ -118,13 +118,13 @@ versionToString(PyObject* args, const char* type) PyObject* p; if(!PyArg_ParseTuple(args, STRCAST("O!"), versionType, &p)) { - return NULL; + return ICE_NULLPTR; } T v; if(!getVersion<T>(p, v, type)) { - return NULL; + return ICE_NULLPTR; } string s; @@ -135,7 +135,7 @@ versionToString(PyObject* args, const char* type) catch(const Ice::Exception& ex) { IcePy::setPythonException(ex); - return NULL; + return ICE_NULLPTR; } return createString(s); } @@ -146,7 +146,7 @@ stringToVersion(PyObject* args, const char* type) char* str; if(!PyArg_ParseTuple(args, STRCAST("s"), &str)) { - return NULL; + return ICE_NULLPTR; } T v; @@ -157,7 +157,7 @@ stringToVersion(PyObject* args, const char* type) catch(const Ice::Exception& ex) { IcePy::setPythonException(ex); - return NULL; + return ICE_NULLPTR; } return createVersion<T>(v, type); |