diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-09-03 14:42:10 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-03 14:42:10 +0200 |
| commit | c82f0a59f136fbeb8b66eabdc29e0e18b64d6717 (patch) | |
| tree | 585ce7bf387885677d020463e446424598a34093 /cpp/src/FreezeScript/Parser.cpp | |
| parent | Merge branch 'encoding11' into mx (diff) | |
| parent | changing data member mapping to use Ice.Optional in C# (diff) | |
| download | ice-c82f0a59f136fbeb8b66eabdc29e0e18b64d6717.tar.bz2 ice-c82f0a59f136fbeb8b66eabdc29e0e18b64d6717.tar.xz ice-c82f0a59f136fbeb8b66eabdc29e0e18b64d6717.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/IceGrid/Database.cpp
Diffstat (limited to 'cpp/src/FreezeScript/Parser.cpp')
| -rw-r--r-- | cpp/src/FreezeScript/Parser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/FreezeScript/Parser.cpp b/cpp/src/FreezeScript/Parser.cpp index 7bc5e70a5d9..0fcf26f067a 100644 --- a/cpp/src/FreezeScript/Parser.cpp +++ b/cpp/src/FreezeScript/Parser.cpp @@ -174,7 +174,7 @@ FreezeScript::EvaluateException::ice_print(ostream& out) const } } -IceUtil::Exception* +FreezeScript::EvaluateException* FreezeScript::EvaluateException::ice_clone() const { return new EvaluateException(ice_file(), ice_line(), _reason); |