summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/Parser.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-06-09 22:32:22 -0400
committerBernard Normier <bernard@zeroc.com>2016-06-09 22:33:32 -0400
commit69e99559db0bd9cfa076b65360af21c0ab417a12 (patch)
tree8961f24ff3e5dbaefcbe65c9905f460ce8eb0f3c /cpp/src/Slice/Parser.cpp
parentICE-7166 - Change php library name to IcePHP.so on OS X (diff)
downloadice-69e99559db0bd9cfa076b65360af21c0ab417a12.tar.bz2
ice-69e99559db0bd9cfa076b65360af21c0ab417a12.tar.xz
ice-69e99559db0bd9cfa076b65360af21c0ab417a12.zip
Renamed C++11 AMI/AMD suffix: _async to Async
Diffstat (limited to 'cpp/src/Slice/Parser.cpp')
-rw-r--r--cpp/src/Slice/Parser.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 8dce5096a56..4fedc671cfa 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -4108,9 +4108,12 @@ Slice::Exception::Exception(const ContainerPtr& container, const string& name, c
DataMemberPtr
Slice::Struct::createDataMember(const string& name, const TypePtr& type, bool optional, int tag,
const SyntaxTreeBasePtr& defaultValueType, const string& defaultValue,
- const string& defaultLiteral)
+ const string& defaultLiteral, bool checkName)
{
- checkIdentifier(name);
+ if(checkName)
+ {
+ checkIdentifier(name);
+ }
ContainedList matches = _unit->findContents(thisScope() + name);
if(!matches.empty())