diff options
Diffstat (limited to 'cpp')
19 files changed, 302 insertions, 597 deletions
diff --git a/cpp/msbuild/ice.test.sln b/cpp/msbuild/ice.test.sln index 38fb0fb8608..07593ae9929 100644 --- a/cpp/msbuild/ice.test.sln +++ b/cpp/msbuild/ice.test.sln @@ -1091,8 +1091,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\IceGrid\u {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "keyword", "keyword", "{FA06D314-C5C6-42B7-85C5-8C90BE223E63}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "macros", "macros", "{633FDDFF-6CD2-45A5-BD44-690EC5F88D6F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "parser", "parser", "{7530CD6F-160A-4F0B-A8C5-6EF13A008DE6}" @@ -1101,11 +1099,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "structure", "structure", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utf8BOM", "utf8BOM", "{3B6407D3-5D2C-42C6-900C-AD2B227928D3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Slice\keyword\msbuild\client.vcxproj", "{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}" - ProjectSection(ProjectDependencies) = postProject - {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Slice\macros\msbuild\client.vcxproj", "{4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}" ProjectSection(ProjectDependencies) = postProject {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} @@ -1168,9 +1161,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\libra {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Slice\clash\msbuild\client.vcxproj", "{203A52A7-BFC5-4EBE-97E6-74AB85014C44}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "escape", "escape", "{72BF4C3D-8E1B-4875-A9AA-2FD63C2442AB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "clash", "clash", "{7C3267CF-C231-48D5-9290-4C7F3FBB931A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Slice\escape\msbuild\client.vcxproj", "{C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -3820,22 +3813,6 @@ Global {D7224A94-13EF-4253-B3EA-801295D5966B}.Release|Win32.Build.0 = Release|Win32 {D7224A94-13EF-4253-B3EA-801295D5966B}.Release|x64.ActiveCfg = Release|x64 {D7224A94-13EF-4253-B3EA-801295D5966B}.Release|x64.Build.0 = Release|x64 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Debug|Win32.ActiveCfg = Debug|Win32 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Debug|Win32.Build.0 = Debug|Win32 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Debug|x64.ActiveCfg = Debug|x64 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Debug|x64.Build.0 = Debug|x64 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|Win32.ActiveCfg = Release|Win32 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|Win32.Build.0 = Release|Win32 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|x64.ActiveCfg = Release|x64 - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|x64.Build.0 = Release|x64 {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 @@ -4028,22 +4005,22 @@ Global {28347243-F75F-4B28-89F9-7EA84478D9C9}.Release|Win32.Build.0 = Release|Win32 {28347243-F75F-4B28-89F9-7EA84478D9C9}.Release|x64.ActiveCfg = Release|x64 {28347243-F75F-4B28-89F9-7EA84478D9C9}.Release|x64.Build.0 = Release|x64 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Debug|Win32.ActiveCfg = Debug|Win32 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Debug|Win32.Build.0 = Debug|Win32 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Debug|x64.ActiveCfg = Debug|x64 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Debug|x64.Build.0 = Debug|x64 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Release|Win32.ActiveCfg = Release|Win32 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Release|Win32.Build.0 = Release|Win32 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Release|x64.ActiveCfg = Release|x64 - {203A52A7-BFC5-4EBE-97E6-74AB85014C44}.Release|x64.Build.0 = Release|x64 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Debug|Win32.ActiveCfg = Debug|Win32 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Debug|Win32.Build.0 = Debug|Win32 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Debug|x64.ActiveCfg = Debug|x64 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Debug|x64.Build.0 = Debug|x64 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|Win32.ActiveCfg = Release|Win32 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|Win32.Build.0 = Release|Win32 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|x64.ActiveCfg = Release|x64 + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -4314,12 +4291,10 @@ Global {C5606B09-9FB7-4337-A490-2024CDCE4036} = {6B5F8038-66D3-45D9-887B-88BAB9BDD52E} {12405F8D-7361-450D-8AFE-85BFD3AEEFD7} = {F4A672BD-A798-4FFC-A1D2-0C5663E1AC81} {D7224A94-13EF-4253-B3EA-801295D5966B} = {F4A672BD-A798-4FFC-A1D2-0C5663E1AC81} - {FA06D314-C5C6-42B7-85C5-8C90BE223E63} = {6329287B-7697-40B8-A45A-03405F474D72} {633FDDFF-6CD2-45A5-BD44-690EC5F88D6F} = {6329287B-7697-40B8-A45A-03405F474D72} {7530CD6F-160A-4F0B-A8C5-6EF13A008DE6} = {6329287B-7697-40B8-A45A-03405F474D72} {EB9CD01D-7316-4A53-BE1A-6C8EF693BF3D} = {6329287B-7697-40B8-A45A-03405F474D72} {3B6407D3-5D2C-42C6-900C-AD2B227928D3} = {6329287B-7697-40B8-A45A-03405F474D72} - {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC} = {FA06D314-C5C6-42B7-85C5-8C90BE223E63} {4FA5930A-77B1-46D8-B1F0-EF3D00C2E0A3} = {633FDDFF-6CD2-45A5-BD44-690EC5F88D6F} {BFB8253B-4233-410B-AC03-BBC876DAB68D} = {7530CD6F-160A-4F0B-A8C5-6EF13A008DE6} {24E0F8DA-F197-4E4B-8820-0614713CD8A9} = {EB9CD01D-7316-4A53-BE1A-6C8EF693BF3D} @@ -4333,7 +4308,7 @@ Global {73C0E333-6476-4B7E-A52D-AB5E9CA36906} = {36E32583-310E-48E3-B821-CE79701BDF1D} {A9537443-BB6C-4324-B1B9-B9492CAE1CD5} = {36E32583-310E-48E3-B821-CE79701BDF1D} {28347243-F75F-4B28-89F9-7EA84478D9C9} = {36E32583-310E-48E3-B821-CE79701BDF1D} - {203A52A7-BFC5-4EBE-97E6-74AB85014C44} = {7C3267CF-C231-48D5-9290-4C7F3FBB931A} - {7C3267CF-C231-48D5-9290-4C7F3FBB931A} = {6329287B-7697-40B8-A45A-03405F474D72} + {72BF4C3D-8E1B-4875-A9AA-2FD63C2442AB} = {6329287B-7697-40B8-A45A-03405F474D72} + {C0E4DA83-0A01-4C49-AEF8-2D0B3DDABCBC} = {72BF4C3D-8E1B-4875-A9AA-2FD63C2442AB} EndGlobalSection EndGlobal diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp index 6b6493666bb..0553a520791 100644 --- a/cpp/src/Slice/PythonUtil.cpp +++ b/cpp/src/Slice/PythonUtil.cpp @@ -20,6 +20,27 @@ using namespace Slice; using namespace IceUtil; using namespace IceUtilInternal; +namespace +{ + +string +getEscapedParamName(const OperationPtr& p, const string& name) +{ + ParamDeclList params = p->parameters(); + + for(ParamDeclList::const_iterator i = params.begin(); i != params.end(); ++i) + { + if((*i)->name() == name) + { + return name + "_"; + } + } + return name; +} + +} + + namespace Slice { namespace Python @@ -576,9 +597,11 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) _out << ", " << fixIdent((*pli)->name()); } } + if(!p->isLocal()) { - _out << ", current=None"; + const string currentParamName = getEscapedParamName(*oli, "current"); + _out << ", " << currentParamName << "=None"; } _out << "):"; _out.inc(); @@ -603,7 +626,8 @@ Slice::Python::CodeVisitor::visitClassDefStart(const ClassDefPtr& p) } if(!p->isLocal()) { - _out << ", current=None"; + const string currentParamName = getEscapedParamName(*oli, "current"); + _out << ", " << currentParamName << "=None"; } _out << "):"; _out.inc(); @@ -2576,7 +2600,8 @@ Slice::Python::CodeVisitor::writeDocstring(const OperationPtr& op, DocstringMode } if(!local && (mode == DocDispatch || mode == DocAsyncDispatch)) { - _out << nl << "current -- The Current object for the invocation."; + const string currentParamName = getEscapedParamName(op, "current"); + _out << nl << currentParamName << " -- The Current object for the invocation."; } } else if(mode == DocAsyncEnd) diff --git a/cpp/src/slice2cs/CsUtil.cpp b/cpp/src/slice2cs/CsUtil.cpp index af0e5305b70..6cafdd55690 100644 --- a/cpp/src/slice2cs/CsUtil.cpp +++ b/cpp/src/slice2cs/CsUtil.cpp @@ -106,7 +106,7 @@ splitScopedName(const string& scoped) // their "@"-prefixed version; otherwise, if the passed name is // not scoped, but a C# keyword, return the "@"-prefixed name; // otherwise, check if the name is one of the method names of baseTypes; -// if so, prefix it with _Ice_; otherwise, return the name unchanged. +// if so, prefix it with ice_; otherwise, return the name unchanged. // string Slice::CsGenerator::fixId(const string& name, int baseTypes, bool mangleCasts) diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 71c12deedcd..2aca017f2b0 100644 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -337,13 +337,13 @@ Slice::CsVisitor::writeMarshalDataMember(const DataMemberPtr& member, const stri else { string stream = forStruct ? "" : "ostr_"; - string memberName = fixId(member->name()); + string memberName = name; if(forStruct) { memberName = "this." + memberName; } - writeMarshalUnmarshalCode(_out, member->type(), name, true, stream); + writeMarshalUnmarshalCode(_out, member->type(), memberName, true, stream); } } @@ -376,13 +376,13 @@ Slice::CsVisitor::writeUnmarshalDataMember(const DataMemberPtr& member, const st else { string stream = forStruct ? "" : "istr_"; - string memberName = fixId(member->name()); + string memberName = name; if(forStruct) { memberName = "this." + memberName; } - writeMarshalUnmarshalCode(_out, member->type(), classType ? patcher : name, false, stream); + writeMarshalUnmarshalCode(_out, member->type(), classType ? patcher : memberName, false, stream); } } @@ -1391,13 +1391,13 @@ Slice::CsVisitor::writeDataMemberInitializers(const DataMemberList& members, int BuiltinPtr builtin = BuiltinPtr::dynamicCast((*p)->type()); if(builtin && builtin->kind() == Builtin::KindString) { - _out << nl << fixId((*p)->name(), baseTypes) << " = \"\";"; + _out << nl << "this." << fixId((*p)->name(), baseTypes) << " = \"\";"; } StructPtr st = StructPtr::dynamicCast((*p)->type()); if(st) { - _out << nl << fixId((*p)->name(), baseTypes) << " = new " << typeToString(st, false) << "();"; + _out << nl << "this." << fixId((*p)->name(), baseTypes) << " = new " << typeToString(st, false) << "();"; } } } @@ -2479,7 +2479,7 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p) _out << " : base()"; } _out << sb; - writeDataMemberInitializers(dataMembers, 0, propertyMapping); + writeDataMemberInitializers(dataMembers, DotNet::ICloneable, propertyMapping); _out << eb; _out << sp; @@ -2488,7 +2488,7 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p) vector<string> paramDecl; for(DataMemberList::const_iterator d = allDataMembers.begin(); d != allDataMembers.end(); ++d) { - string memberName = fixId((*d)->name()); + string memberName = fixId((*d)->name(), DotNet::ICloneable); string memberType = typeToString((*d)->type(), (*d)->optional()); paramDecl.push_back(memberType + " " + memberName); } @@ -2500,7 +2500,7 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p) DataMemberList baseDataMembers = bases.front()->allDataMembers(); for(DataMemberList::const_iterator d = baseDataMembers.begin(); d != baseDataMembers.end(); ++d) { - baseParamNames.push_back(fixId((*d)->name())); + baseParamNames.push_back(fixId((*d)->name(), DotNet::ICloneable)); } _out << baseParamNames << epar; } @@ -2508,7 +2508,7 @@ Slice::Gen::TypesVisitor::visitClassDefEnd(const ClassDefPtr& p) for(DataMemberList::const_iterator d = dataMembers.begin(); d != dataMembers.end(); ++d) { _out << nl << "this."; - const string paramName = fixId((*d)->name()); + const string paramName = fixId((*d)->name(), DotNet::ICloneable); if(propertyMapping) { _out << "_" + (*d)->name(); diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index d91af385c73..390d44491ed 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -85,6 +85,19 @@ getEscapedParamName(const OperationPtr& p, const string& name) return name; } +string +getEscapedParamName(const DataMemberList& params, const string& name) +{ + for(DataMemberList::const_iterator i = params.begin(); i != params.end(); ++i) + { + if((*i)->name() == name) + { + return name + "_"; + } + } + return name; +} + bool isDeprecated(const ContainedPtr& p1, const ContainedPtr& p2) { @@ -314,7 +327,7 @@ Slice::JavaVisitor::writeResultType(Output& out, const OperationPtr& op, const s for(ParamDeclList::const_iterator pli = required.begin(); pli != required.end(); ++pli) { const string paramName = fixKwd((*pli)->name()); - writeMarshalUnmarshalCode(out, package, (*pli)->type(), OptionalNone, false, 0, paramName, true, iter, "", + writeMarshalUnmarshalCode(out, package, (*pli)->type(), OptionalNone, false, 0, "this." + paramName, true, iter, "", (*pli)->getMetaData()); } @@ -338,7 +351,7 @@ Slice::JavaVisitor::writeResultType(Output& out, const OperationPtr& op, const s } const string paramName = fixKwd((*pli)->name()); - writeMarshalUnmarshalCode(out, package, (*pli)->type(), OptionalOutParam, true, (*pli)->tag(), paramName, + writeMarshalUnmarshalCode(out, package, (*pli)->type(), OptionalOutParam, true, (*pli)->tag(), "this." + paramName, true, iter, "", (*pli)->getMetaData()); } @@ -358,7 +371,7 @@ Slice::JavaVisitor::writeResultType(Output& out, const OperationPtr& op, const s { const string paramName = fixKwd((*pli)->name()); const string patchParams = getPatcher((*pli)->type(), package, paramName, false); - writeMarshalUnmarshalCode(out, package, (*pli)->type(), OptionalNone, false, 0, paramName, false, iter, + writeMarshalUnmarshalCode(out, package, (*pli)->type(), OptionalNone, false, 0, "this." + paramName, false, iter, "", (*pli)->getMetaData(), patchParams); } @@ -386,7 +399,7 @@ Slice::JavaVisitor::writeResultType(Output& out, const OperationPtr& op, const s const string paramName = fixKwd((*pli)->name()); const string patchParams = getPatcher((*pli)->type(), package, paramName, true); - writeMarshalUnmarshalCode(out, package, (*pli)->type(), OptionalOutParam, true, (*pli)->tag(), paramName, + writeMarshalUnmarshalCode(out, package, (*pli)->type(), OptionalOutParam, true, (*pli)->tag(), "this." + paramName, false, iter, "", (*pli)->getMetaData(), patchParams); } @@ -1585,7 +1598,7 @@ Slice::JavaVisitor::writeDataMemberInitializers(Output& out, const DataMemberLis } else { - out << nl << fixKwd((*p)->name()) << " = "; + out << nl << "this." << fixKwd((*p)->name()) << " = "; writeConstantValue(out, t, (*p)->defaultValueType(), (*p)->defaultValue(), package); out << ';'; } @@ -1595,21 +1608,21 @@ Slice::JavaVisitor::writeDataMemberInitializers(Output& out, const DataMemberLis BuiltinPtr builtin = BuiltinPtr::dynamicCast(t); if(builtin && builtin->kind() == Builtin::KindString) { - out << nl << fixKwd((*p)->name()) << " = \"\";"; + out << nl << "this." << fixKwd((*p)->name()) << " = \"\";"; } EnumPtr en = EnumPtr::dynamicCast(t); if(en) { string firstEnum = fixKwd(en->getEnumerators().front()->name()); - out << nl << fixKwd((*p)->name()) << " = " << getAbsolute(en, package) << '.' << firstEnum << ';'; + out << nl << "this." << fixKwd((*p)->name()) << " = " << getAbsolute(en, package) << '.' << firstEnum << ';'; } StructPtr st = StructPtr::dynamicCast(t); if(st) { string memberType = typeToString(st, TypeModeMember, package, (*p)->getMetaData()); - out << nl << fixKwd((*p)->name()) << " = new " << memberType << "();"; + out << nl << "this." << fixKwd((*p)->name()) << " = new " << memberType << "();"; } } } @@ -2837,7 +2850,9 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) // if(allDataMembers.size() < 254) { - paramDecl.push_back("Throwable cause"); + const string causeParamName = getEscapedParamName(allDataMembers, "cause"); + + paramDecl.push_back("Throwable " + causeParamName); out << sp << nl << "public " << name << spar; out << paramDecl << epar; out << sb; @@ -2852,12 +2867,12 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) baseParamNames.push_back(fixKwd((*d)->name())); } } - baseParamNames.push_back("cause"); + baseParamNames.push_back(causeParamName); out << baseParamNames << epar << ';'; } else { - out << nl << "super(cause);"; + out << nl << "super(" << causeParamName << ");"; } for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d) { @@ -2916,13 +2931,15 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) // if(allDataMembers.size() < 254) { - paramDecl.push_back("Throwable cause"); + const string causeParamName = getEscapedParamName(allDataMembers, "cause"); + + paramDecl.push_back("Throwable " + causeParamName); out << sp << nl << "public " << name << spar; out << paramDecl << epar; out << sb; if(!base) { - out << nl << "super(cause);"; + out << nl << "super(" << causeParamName << ");"; } else { @@ -2933,7 +2950,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) { baseParamNames.push_back(fixKwd((*d)->name())); } - baseParamNames.push_back("cause"); + baseParamNames.push_back(causeParamName); out << baseParamNames << epar << ';'; } for(DataMemberList::const_iterator d = members.begin(); d != members.end(); ++d) @@ -4727,7 +4744,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) } out << nl << "default " << future << ' ' << p->name() << "Async" << spar << params << contextParam << epar; out << sb; - out << nl << "return _iceI_" << p->name() << "Async" << spar << args << "context" << "false" << epar << ';'; + out << nl << "return _iceI_" << p->name() << "Async" << spar << args << contextParamName << "false" << epar << ';'; out << eb; const string futureImpl = getFutureImplType(p, package); diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp index 2075af5be57..9890c3c68f0 100644 --- a/cpp/src/slice2java/GenCompat.cpp +++ b/cpp/src/slice2java/GenCompat.cpp @@ -1845,7 +1845,7 @@ Slice::JavaCompatVisitor::writeDataMemberInitializers(Output& out, const DataMem } else { - out << nl << fixKwd((*p)->name()) << " = "; + out << nl << "this." << fixKwd((*p)->name()) << " = "; writeConstantValue(out, t, (*p)->defaultValueType(), (*p)->defaultValue(), package); out << ';'; } @@ -1855,21 +1855,21 @@ Slice::JavaCompatVisitor::writeDataMemberInitializers(Output& out, const DataMem BuiltinPtr builtin = BuiltinPtr::dynamicCast(t); if(builtin && builtin->kind() == Builtin::KindString) { - out << nl << fixKwd((*p)->name()) << " = \"\";"; + out << nl << "this." << fixKwd((*p)->name()) << " = \"\";"; } EnumPtr en = EnumPtr::dynamicCast(t); if(en) { string firstEnum = fixKwd(en->getEnumerators().front()->name()); - out << nl << fixKwd((*p)->name()) << " = " << getAbsolute(en, package) << '.' << firstEnum << ';'; + out << nl << "this." << fixKwd((*p)->name()) << " = " << getAbsolute(en, package) << '.' << firstEnum << ';'; } StructPtr st = StructPtr::dynamicCast(t); if(st) { string memberType = typeToString(st, TypeModeMember, package, (*p)->getMetaData()); - out << nl << fixKwd((*p)->name()) << " = new " << memberType << "();"; + out << nl << "this." << fixKwd((*p)->name()) << " = new " << memberType << "();"; } } } diff --git a/cpp/src/slice2objc/Gen.cpp b/cpp/src/slice2objc/Gen.cpp index 4dcd484ba63..866f0e5d2db 100644 --- a/cpp/src/slice2objc/Gen.cpp +++ b/cpp/src/slice2objc/Gen.cpp @@ -759,8 +759,6 @@ Slice::Gen::generate(const UnitPtr& p) // Necessary for objc_getClass use when marshalling/unmarshalling proxies. _M << nl << "#import <objc/runtime.h>"; - _M << nl; - StringList includes = p->includeFiles(); for(StringList::const_iterator q = includes.begin(); q != includes.end(); ++q) { @@ -787,7 +785,6 @@ Slice::Gen::generate(const UnitPtr& p) _M << nl << "#ifndef " << _dllExport << "_EXPORTS"; _M << nl << "# define " << _dllExport << "_EXPORTS"; _M << nl << "#endif"; - _M << nl; _H << nl; _H << nl << "#ifndef " << _dllExport; @@ -806,6 +803,15 @@ Slice::Gen::generate(const UnitPtr& p) _dllExport += " "; } + // + // Disable shadow warnings in .cppm file + // + _M << sp; + _M.zeroIndent(); + _M << nl << "#ifdef __clang__"; + _M << nl << "# pragma clang diagnostic ignored \"-Wshadow-ivar\""; + _M << nl << "#endif"; + UnitVisitor unitVisitor(_H, _M, _dllExport); p->visit(&unitVisitor, false); diff --git a/cpp/test/Slice/clash/Client.cpp b/cpp/test/Slice/clash/Client.cpp deleted file mode 100644 index 66f3b8ee23b..00000000000 --- a/cpp/test/Slice/clash/Client.cpp +++ /dev/null @@ -1,24 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <Ice/Ice.h> -#include <Clash.h> - -using namespace std; - -int -main(int /*argc*/, char* /*argv*/[]) -{ - cout << "testing clash... " << flush; - // - // TODO: add runtime testing - // - cout << "ok" << endl; - return 0; -} diff --git a/cpp/test/Slice/clash/msbuild/client.vcxproj b/cpp/test/Slice/clash/msbuild/client.vcxproj deleted file mode 100644 index 576b40e016c..00000000000 --- a/cpp/test/Slice/clash/msbuild/client.vcxproj +++ /dev/null @@ -1,339 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha4\build\native\zeroc.ice.v120.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha4\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha4\build\native\zeroc.ice.v140.props" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha4\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" /> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Cpp11-Debug|Win32"> - <Configuration>Cpp11-Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Cpp11-Debug|x64"> - <Configuration>Cpp11-Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Cpp11-Release|Win32"> - <Configuration>Cpp11-Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Cpp11-Release|x64"> - <Configuration>Cpp11-Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{203A52A7-BFC5-4EBE-97E6-74AB85014C44}</ProjectGuid> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> - <IceBuilderInstallDir>$([MSBuild]::GetRegistryValue('HKEY_CURRENT_USER\SOFTWARE\ZeroC\IceBuilder', 'InstallDir.$(VisualStudioVersion)'))</IceBuilderInstallDir> - <IceBuilderCppProps>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.props</IceBuilderCppProps> - <IceBuilderCppTargets>$(IceBuilderInstallDir)\Resources\IceBuilder.Cpp.targets</IceBuilderCppTargets> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\msbuild\ice.test.props" /> - <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> - <ImportGroup Label="ExtensionSettings"> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha4\build\native\zeroc.ice.v140.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha4\build\native\zeroc.ice.v140.targets') and '$(UseBinDist)' == 'yes'" /> - <Import Project="..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha4\build\native\zeroc.ice.v120.targets" Condition="Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha4\build\native\zeroc.ice.v120.targets') and '$(UseBinDist)' == 'yes'" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'" Label="PropertySheets"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level4</WarningLevel> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level4</WarningLevel> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level4</WarningLevel> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level4</WarningLevel> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level4</WarningLevel> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level4</WarningLevel> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level4</WarningLevel> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'"> - <ClCompile> - <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <WarningLevel>Level4</WarningLevel> - </ClCompile> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\Client.cpp" /> - <ClCompile Include="Win32\Cpp11-Debug\Clash.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Release\Clash.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="Win32\Debug\Clash.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="Win32\Release\Clash.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="x64\Cpp11-Debug\Clash.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="x64\Cpp11-Release\Clash.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="x64\Debug\Clash.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - </ClCompile> - <ClCompile Include="x64\Release\Clash.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - </ClCompile> - </ItemGroup> - <ItemGroup> - <IceBuilder Include="..\Clash.ice" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="Win32\Cpp11-Debug\Clash.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Release\Clash.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - </ClInclude> - <ClInclude Include="Win32\Debug\Clash.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - </ClInclude> - <ClInclude Include="Win32\Release\Clash.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - </ClInclude> - <ClInclude Include="x64\Cpp11-Debug\Clash.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - </ClInclude> - <ClInclude Include="x64\Cpp11-Release\Clash.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - </ClInclude> - <ClInclude Include="x64\Debug\Clash.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - </ClInclude> - <ClInclude Include="x64\Release\Clash.h"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> - </ClInclude> - </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> - <Target Name="EnsureIceBuilderImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project requires the Ice Builder for Visual Studio extension. Use "Tools &gt; Extensions and Updates" to install it. For more information, see https://visualstudiogallery.msdn.microsoft.com/1a64e701-63f2-4740-8004-290e6c682ce0.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('$(IceBuilderCppProps)')" Text="$(ErrorText)" /> - </Target> - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> - <PropertyGroup> - <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> - </PropertyGroup> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha4\build\native\zeroc.ice.v140.props') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha4\build\native\zeroc.ice.v140.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha4\build\native\zeroc.ice.v140.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v140.3.7.0-alpha4\build\native\zeroc.ice.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha4\build\native\zeroc.ice.v120.props') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha4\build\native\zeroc.ice.v120.props'))" /> - <Error Condition="!Exists('..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha4\build\native\zeroc.ice.v120.targets') and '$(UseBinDist)' == 'yes'" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\msbuild\packages\zeroc.ice.v120.3.7.0-alpha4\build\native\zeroc.ice.v120.targets'))" /> - </Target> -</Project> diff --git a/cpp/test/Slice/clash/msbuild/client.vcxproj.filters b/cpp/test/Slice/clash/msbuild/client.vcxproj.filters deleted file mode 100644 index d9801e52522..00000000000 --- a/cpp/test/Slice/clash/msbuild/client.vcxproj.filters +++ /dev/null @@ -1,135 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Header Files"> - <UniqueIdentifier>{8974ca24-86ac-41d8-bd7e-74c4382bf1e6}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files"> - <UniqueIdentifier>{6565e527-176e-42b2-b577-265246e8f7dd}</UniqueIdentifier> - </Filter> - <Filter Include="Slice Files"> - <UniqueIdentifier>{fb1c28bd-bf5f-4259-b90a-ea6f1c34ae47}</UniqueIdentifier> - <Extensions>ice</Extensions> - </Filter> - <Filter Include="Source Files\x64"> - <UniqueIdentifier>{0f707e48-e326-4a2d-9855-f5031863faac}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Cpp11-Debug"> - <UniqueIdentifier>{e6a32dd6-065b-46c7-8e93-f6bf50ce0d2c}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64"> - <UniqueIdentifier>{53f9ea67-ad73-4dc0-a342-a5287486963b}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Cpp11-Debug"> - <UniqueIdentifier>{78565ab5-c3c6-4c89-a38a-8302bbff8203}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32"> - <UniqueIdentifier>{e26b44eb-68ab-46a5-a116-eab283879edc}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Cpp11-Debug"> - <UniqueIdentifier>{0efc9aa9-d8d5-4833-9db6-8a27764cd90e}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32"> - <UniqueIdentifier>{46dda298-57a9-4b85-8100-a73c8a3134b9}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Cpp11-Debug"> - <UniqueIdentifier>{47b70b40-aebb-4711-8e23-3b85987a7914}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Debug"> - <UniqueIdentifier>{a5a7d69c-3f96-4bc6-8a3b-08f82d4d62cb}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Debug"> - <UniqueIdentifier>{7e59018a-ed27-4e93-99d2-02d7e2125582}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Debug"> - <UniqueIdentifier>{d669306f-cdd5-47d0-ade9-04bfba7e55e7}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Debug"> - <UniqueIdentifier>{6175ecc2-2a1f-49c2-b25a-05b1f8cfc0e5}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Release"> - <UniqueIdentifier>{82a13772-e6dc-4516-871f-0185106b54e2}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Release"> - <UniqueIdentifier>{df4c7c45-803a-4dec-8b10-2460ce828024}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Release"> - <UniqueIdentifier>{80468036-bacb-443d-b2aa-c5870faa6550}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Release"> - <UniqueIdentifier>{c54af285-020f-4370-ad94-8ab96f114888}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\x64\Cpp11-Release"> - <UniqueIdentifier>{331018bf-1b68-47a7-8703-027261561a72}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\x64\Cpp11-Release"> - <UniqueIdentifier>{b69cc347-79af-4081-9096-cdd6e189551c}</UniqueIdentifier> - </Filter> - <Filter Include="Source Files\Win32\Cpp11-Release"> - <UniqueIdentifier>{d593306e-a014-41be-8d29-8680a5d13703}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\Win32\Cpp11-Release"> - <UniqueIdentifier>{f293ad77-e91d-431a-bf18-c0f3e42db640}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\Client.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="x64\Cpp11-Debug\Clash.cpp"> - <Filter>Source Files\x64\Cpp11-Debug</Filter> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Debug\Clash.cpp"> - <Filter>Source Files\Win32\Cpp11-Debug</Filter> - </ClCompile> - <ClCompile Include="x64\Debug\Clash.cpp"> - <Filter>Source Files\x64\Debug</Filter> - </ClCompile> - <ClCompile Include="Win32\Debug\Clash.cpp"> - <Filter>Source Files\Win32\Debug</Filter> - </ClCompile> - <ClCompile Include="x64\Release\Clash.cpp"> - <Filter>Source Files\x64\Release</Filter> - </ClCompile> - <ClCompile Include="Win32\Release\Clash.cpp"> - <Filter>Source Files\Win32\Release</Filter> - </ClCompile> - <ClCompile Include="x64\Cpp11-Release\Clash.cpp"> - <Filter>Source Files\x64\Cpp11-Release</Filter> - </ClCompile> - <ClCompile Include="Win32\Cpp11-Release\Clash.cpp"> - <Filter>Source Files\Win32\Cpp11-Release</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <IceBuilder Include="..\Clash.ice"> - <Filter>Slice Files</Filter> - </IceBuilder> - </ItemGroup> - <ItemGroup> - <ClInclude Include="x64\Cpp11-Debug\Clash.h"> - <Filter>Header Files\x64\Cpp11-Debug</Filter> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Debug\Clash.h"> - <Filter>Header Files\Win32\Cpp11-Debug</Filter> - </ClInclude> - <ClInclude Include="x64\Debug\Clash.h"> - <Filter>Header Files\x64\Debug</Filter> - </ClInclude> - <ClInclude Include="Win32\Debug\Clash.h"> - <Filter>Header Files\Win32\Debug</Filter> - </ClInclude> - <ClInclude Include="x64\Release\Clash.h"> - <Filter>Header Files\x64\Release</Filter> - </ClInclude> - <ClInclude Include="Win32\Release\Clash.h"> - <Filter>Header Files\Win32\Release</Filter> - </ClInclude> - <ClInclude Include="x64\Cpp11-Release\Clash.h"> - <Filter>Header Files\x64\Cpp11-Release</Filter> - </ClInclude> - <ClInclude Include="Win32\Cpp11-Release\Clash.h"> - <Filter>Header Files\Win32\Cpp11-Release</Filter> - </ClInclude> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/cpp/test/Slice/clash/Clash.ice b/cpp/test/Slice/escape/Clash.ice index 5cc5f69a365..5cc5f69a365 100644 --- a/cpp/test/Slice/clash/Clash.ice +++ b/cpp/test/Slice/escape/Clash.ice diff --git a/cpp/test/Slice/keyword/Client.cpp b/cpp/test/Slice/escape/Client.cpp index 661b0b223ac..a237be77858 100644 --- a/cpp/test/Slice/keyword/Client.cpp +++ b/cpp/test/Slice/escape/Client.cpp @@ -10,6 +10,7 @@ #include <Ice/Ice.h> #include <TestCommon.h> #include <Key.h> +#include <Clash.h> using namespace std; diff --git a/cpp/test/Slice/keyword/Key.ice b/cpp/test/Slice/escape/Key.ice index 86d9288493f..86d9288493f 100644 --- a/cpp/test/Slice/keyword/Key.ice +++ b/cpp/test/Slice/escape/Key.ice diff --git a/cpp/test/Slice/clash/Makefile.mk b/cpp/test/Slice/escape/Makefile.mk index afcfa5eef2f..760b3664d89 100644 --- a/cpp/test/Slice/clash/Makefile.mk +++ b/cpp/test/Slice/escape/Makefile.mk @@ -7,6 +7,6 @@ # # ********************************************************************** -$(test)_client_sources = Client.cpp Clash.ice +$(test)_client_sources = Client.cpp Clash.ice Key.ice tests += $(test) diff --git a/cpp/test/Slice/keyword/msbuild/client.vcxproj b/cpp/test/Slice/escape/msbuild/client.vcxproj index f7aa991c08e..8a0a6fe2f2a 100644 --- a/cpp/test/Slice/keyword/msbuild/client.vcxproj +++ b/cpp/test/Slice/escape/msbuild/client.vcxproj @@ -158,6 +158,15 @@ </ItemDefinitionGroup> <ItemGroup> <ClCompile Include="..\Client.cpp" /> + <ClCompile Include="Win32\Cpp11-Debug\Clash.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + </ClCompile> <ClCompile Include="Win32\Cpp11-Debug\Key.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -167,6 +176,15 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> </ClCompile> + <ClCompile Include="Win32\Cpp11-Release\Clash.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + </ClCompile> <ClCompile Include="Win32\Cpp11-Release\Key.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -176,6 +194,15 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> </ClCompile> + <ClCompile Include="Win32\Debug\Clash.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + </ClCompile> <ClCompile Include="Win32\Debug\Key.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -185,6 +212,15 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> </ClCompile> + <ClCompile Include="Win32\Release\Clash.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + </ClCompile> <ClCompile Include="Win32\Release\Key.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -194,6 +230,15 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> </ClCompile> + <ClCompile Include="x64\Cpp11-Debug\Clash.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + </ClCompile> <ClCompile Include="x64\Cpp11-Debug\Key.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -203,6 +248,15 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> </ClCompile> + <ClCompile Include="x64\Cpp11-Release\Clash.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + </ClCompile> <ClCompile Include="x64\Cpp11-Release\Key.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -212,6 +266,15 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> </ClCompile> + <ClCompile Include="x64\Debug\Clash.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + </ClCompile> <ClCompile Include="x64\Debug\Key.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -221,6 +284,15 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> </ClCompile> + <ClCompile Include="x64\Release\Clash.cpp"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + </ClCompile> <ClCompile Include="x64\Release\Key.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -232,9 +304,19 @@ </ClCompile> </ItemGroup> <ItemGroup> + <IceBuilder Include="..\Clash.ice" /> <IceBuilder Include="..\Key.ice" /> </ItemGroup> <ItemGroup> + <ClInclude Include="Win32\Cpp11-Debug\Clash.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + </ClInclude> <ClInclude Include="Win32\Cpp11-Debug\Key.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -244,6 +326,15 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> </ClInclude> + <ClInclude Include="Win32\Cpp11-Release\Clash.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + </ClInclude> <ClInclude Include="Win32\Cpp11-Release\Key.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -253,6 +344,15 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> </ClInclude> + <ClInclude Include="Win32\Debug\Clash.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + </ClInclude> <ClInclude Include="Win32\Debug\Key.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -262,6 +362,15 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> </ClInclude> + <ClInclude Include="Win32\Release\Clash.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + </ClInclude> <ClInclude Include="Win32\Release\Key.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -271,6 +380,15 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> </ClInclude> + <ClInclude Include="x64\Cpp11-Debug\Clash.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + </ClInclude> <ClInclude Include="x64\Cpp11-Debug\Key.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> @@ -280,6 +398,15 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> </ClInclude> + <ClInclude Include="x64\Cpp11-Release\Clash.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + </ClInclude> <ClInclude Include="x64\Cpp11-Release\Key.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -289,6 +416,15 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> </ClInclude> + <ClInclude Include="x64\Debug\Clash.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + </ClInclude> <ClInclude Include="x64\Debug\Key.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> @@ -298,6 +434,15 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> </ClInclude> + <ClInclude Include="x64\Release\Clash.h"> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">true</ExcludedFromBuild> + <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">true</ExcludedFromBuild> + </ClInclude> <ClInclude Include="x64\Release\Key.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'">true</ExcludedFromBuild> diff --git a/cpp/test/Slice/keyword/msbuild/client.vcxproj.filters b/cpp/test/Slice/escape/msbuild/client.vcxproj.filters index 4b50af2836c..6df3e74a22e 100644 --- a/cpp/test/Slice/keyword/msbuild/client.vcxproj.filters +++ b/cpp/test/Slice/escape/msbuild/client.vcxproj.filters @@ -76,6 +76,30 @@ <ClCompile Include="..\Client.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="x64\Cpp11-Debug\Clash.cpp"> + <Filter>Source Files\x64\Cpp11-Debug</Filter> + </ClCompile> + <ClCompile Include="Win32\Cpp11-Debug\Clash.cpp"> + <Filter>Source Files\Win32\Cpp11-Debug</Filter> + </ClCompile> + <ClCompile Include="x64\Debug\Clash.cpp"> + <Filter>Source Files\x64\Debug</Filter> + </ClCompile> + <ClCompile Include="Win32\Debug\Clash.cpp"> + <Filter>Source Files\Win32\Debug</Filter> + </ClCompile> + <ClCompile Include="x64\Release\Clash.cpp"> + <Filter>Source Files\x64\Release</Filter> + </ClCompile> + <ClCompile Include="Win32\Release\Clash.cpp"> + <Filter>Source Files\Win32\Release</Filter> + </ClCompile> + <ClCompile Include="x64\Cpp11-Release\Clash.cpp"> + <Filter>Source Files\x64\Cpp11-Release</Filter> + </ClCompile> + <ClCompile Include="Win32\Cpp11-Release\Clash.cpp"> + <Filter>Source Files\Win32\Cpp11-Release</Filter> + </ClCompile> <ClCompile Include="x64\Cpp11-Debug\Key.cpp"> <Filter>Source Files\x64\Cpp11-Debug</Filter> </ClCompile> @@ -105,8 +129,35 @@ <IceBuilder Include="..\Key.ice"> <Filter>Slice Files</Filter> </IceBuilder> + <IceBuilder Include="..\Clash.ice"> + <Filter>Slice Files</Filter> + </IceBuilder> </ItemGroup> <ItemGroup> + <ClInclude Include="x64\Cpp11-Debug\Clash.h"> + <Filter>Header Files\x64\Cpp11-Debug</Filter> + </ClInclude> + <ClInclude Include="Win32\Cpp11-Debug\Clash.h"> + <Filter>Header Files\Win32\Cpp11-Debug</Filter> + </ClInclude> + <ClInclude Include="x64\Debug\Clash.h"> + <Filter>Header Files\x64\Debug</Filter> + </ClInclude> + <ClInclude Include="Win32\Debug\Clash.h"> + <Filter>Header Files\Win32\Debug</Filter> + </ClInclude> + <ClInclude Include="x64\Release\Clash.h"> + <Filter>Header Files\x64\Release</Filter> + </ClInclude> + <ClInclude Include="Win32\Release\Clash.h"> + <Filter>Header Files\Win32\Release</Filter> + </ClInclude> + <ClInclude Include="x64\Cpp11-Release\Clash.h"> + <Filter>Header Files\x64\Cpp11-Release</Filter> + </ClInclude> + <ClInclude Include="Win32\Cpp11-Release\Clash.h"> + <Filter>Header Files\Win32\Cpp11-Release</Filter> + </ClInclude> <ClInclude Include="x64\Cpp11-Debug\Key.h"> <Filter>Header Files\x64\Cpp11-Debug</Filter> </ClInclude> diff --git a/cpp/test/Slice/clash/msbuild/packages.config b/cpp/test/Slice/escape/msbuild/packages.config index 782dcded3e4..782dcded3e4 100644 --- a/cpp/test/Slice/clash/msbuild/packages.config +++ b/cpp/test/Slice/escape/msbuild/packages.config diff --git a/cpp/test/Slice/keyword/Makefile.mk b/cpp/test/Slice/keyword/Makefile.mk deleted file mode 100644 index 149eb460831..00000000000 --- a/cpp/test/Slice/keyword/Makefile.mk +++ /dev/null @@ -1,12 +0,0 @@ -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -$(test)_client_sources = Client.cpp Key.ice - -tests += $(test) diff --git a/cpp/test/Slice/keyword/msbuild/packages.config b/cpp/test/Slice/keyword/msbuild/packages.config deleted file mode 100644 index 782dcded3e4..00000000000 --- a/cpp/test/Slice/keyword/msbuild/packages.config +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="zeroc.ice.v120" version="3.7.0-alpha4" targetFramework="native" /> - <package id="zeroc.ice.v140" version="3.7.0-alpha4" targetFramework="native" /> -</packages>
\ No newline at end of file |