diff options
| author | Joe George <joe@zeroc.com> | 2017-05-02 13:58:41 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-05-02 15:42:34 -0400 |
| commit | cd472ddf8bd8a9c2bcfc80e988e6db450ea7dbf9 (patch) | |
| tree | 5dbc0bfc43e2c195ab7e7d819e1914611f943f1d /php/src/php5 | |
| parent | Removed trailing whitespace generated by slice2js (diff) | |
| download | ice-cd472ddf8bd8a9c2bcfc80e988e6db450ea7dbf9.tar.bz2 ice-cd472ddf8bd8a9c2bcfc80e988e6db450ea7dbf9.tar.xz ice-cd472ddf8bd8a9c2bcfc80e988e6db450ea7dbf9.zip | |
Remove trailing whitespace
Diffstat (limited to 'php/src/php5')
| -rw-r--r-- | php/src/php5/Connection.cpp | 4 | ||||
| -rw-r--r-- | php/src/php5/Operation.cpp | 4 | ||||
| -rw-r--r-- | php/src/php5/Types.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/php/src/php5/Connection.cpp b/php/src/php5/Connection.cpp index d845f548768..3cad9981679 100644 --- a/php/src/php5/Connection.cpp +++ b/php/src/php5/Connection.cpp @@ -747,11 +747,11 @@ IcePHP::createConnectionInfo(zval* zv, const Ice::ConnectionInfoPtr& p TSRMLS_DC add_property_string(zv, STRCAST("cipher"), const_cast<char*>(info->cipher.c_str()), 1); add_property_bool(zv, STRCAST("verified"), info->verified ? 1 : 0); - + zval* zarr; MAKE_STD_ZVAL(zarr); AutoDestroy listDestroyer(zarr); - + Ice::StringSeq encoded; for(vector<IceSSL::CertificatePtr>::const_iterator i = info->certs.begin(); i != info->certs.end(); ++i) { diff --git a/php/src/php5/Operation.cpp b/php/src/php5/Operation.cpp index 07003b7b4d6..ebbf863dbd5 100644 --- a/php/src/php5/Operation.cpp +++ b/php/src/php5/Operation.cpp @@ -878,9 +878,9 @@ ZEND_FUNCTION(IcePHP_defineOperation) ProxyInfoPtr c = ProxyInfoPtr::dynamicCast(type); assert(c); - OperationIPtr op = new OperationI(name, + OperationIPtr op = new OperationI(name, static_cast<Ice::OperationMode>(mode), - static_cast<Ice::OperationMode>(sendMode), + static_cast<Ice::OperationMode>(sendMode), static_cast<Ice::FormatType>(format), inParams, outParams, returnType, exceptions TSRMLS_CC); diff --git a/php/src/php5/Types.cpp b/php/src/php5/Types.cpp index 739e50fc19c..9f55bf29e88 100644 --- a/php/src/php5/Types.cpp +++ b/php/src/php5/Types.cpp @@ -3079,7 +3079,7 @@ IcePHP::ObjectWriter::_iceWrite(Ice::OutputStream* os) const } AutoDestroy destroy(ret); - + if(Z_TYPE_P(ret) != IS_STRING) { throw AbortMarshaling(); |