diff options
| author | Jose <jose@zeroc.com> | 2017-03-23 09:49:55 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-03-23 09:49:55 +0100 |
| commit | eda2a27ccf1f9aad908d8f7cfdb7fcca48d8558c (patch) | |
| tree | ccc5243e489a4818e66fad9d63ead738be0adf47 | |
| parent | Replaced tabs with spaces (diff) | |
| download | ice-eda2a27ccf1f9aad908d8f7cfdb7fcca48d8558c.tar.bz2 ice-eda2a27ccf1f9aad908d8f7cfdb7fcca48d8558c.tar.xz ice-eda2a27ccf1f9aad908d8f7cfdb7fcca48d8558c.zip | |
Fix for PHP optionals Ice\None not used in generated code
| -rw-r--r-- | cpp/src/slice2php/Main.cpp | 2 | ||||
| -rw-r--r-- | php/test/Ice/optional/Client.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp index 17cb92dd475..a59c75e6751 100644 --- a/cpp/src/slice2php/Main.cpp +++ b/cpp/src/slice2php/Main.cpp @@ -1398,7 +1398,7 @@ CodeVisitor::writeConstructorParams(const MemberInfoList& members) } else if(member->optional()) { - _out << "Ice_Unset"; + _out << (_ns ? scopedToName("::Ice::None", _ns) : "Ice_Unset"); } else { diff --git a/php/test/Ice/optional/Client.php b/php/test/Ice/optional/Client.php index e8e54af1e06..b189d06bce9 100644 --- a/php/test/Ice/optional/Client.php +++ b/php/test/Ice/optional/Client.php @@ -36,7 +36,7 @@ function allTests($communicator) global $Ice_Encoding_1_0; $enum = $NS ? constant("Test\\MyEnum::MyEnumMember") : constant("Test_MyEnum::MyEnumMember"); - $none = $MS ? constant("Ice\\None") : constant("Ice_Unset"); + $none = $NS ? constant("Ice\\None") : constant("Ice_Unset"); echo "testing stringToProxy... "; flush(); |