summaryrefslogtreecommitdiff
path: root/cli_ure
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2015-09-03 21:56:04 +0200
committerDavid Ostrovsky <david@ostrovsky.org>2015-09-03 21:26:13 +0000
commitfd27553f3848be20e113b99bdb756b7ce00c790f (patch)
treeef57a835b8f4f3086f3dc97d5672dc2aa2fbbf8a /cli_ure
parentaafc0d29178ebb88201d4062481d3498e4a9ff18 (diff)
climaker: Fix std::array and cli::array collision
Change-Id: I7b4815b4b7e8f016ce7a9047c77a6dde46b1ee0a Reviewed-on: https://gerrit.libreoffice.org/18320 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'cli_ure')
-rw-r--r--cli_ure/source/climaker/climaker_app.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/cli_ure/source/climaker/climaker_app.cxx b/cli_ure/source/climaker/climaker_app.cxx
index efff92ded838..01ab101b0f73 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -509,8 +509,8 @@ SAL_IMPLEMENT_MAIN()
if (product.getLength() != 0)
{
- array< ::System::Type^>^ params = gcnew array< ::System::Type^> (1);
- array< ::System::Object^>^args = gcnew array< ::System::Object^>(1);
+ cli::array< ::System::Type^>^ params = gcnew cli::array< ::System::Type^> (1);
+ cli::array< ::System::Object^>^args = gcnew cli::array< ::System::Object^>(1);
params[ 0 ] = ::System::String::typeid;
args[ 0 ] = ustring_to_String( product );
assembly_builder->SetCustomAttribute(
@@ -520,8 +520,8 @@ SAL_IMPLEMENT_MAIN()
}
if (description.getLength() != 0)
{
- array< ::System::Type^>^ params = gcnew array< ::System::Type^>(1);
- array< ::System::Object^>^ args = gcnew array< ::System::Object^>(1);
+ cli::array< ::System::Type^>^ params = gcnew cli::array< ::System::Type^>(1);
+ cli::array< ::System::Object^>^ args = gcnew cli::array< ::System::Object^>(1);
params[ 0 ] = ::System::String::typeid;
args[ 0 ] = ustring_to_String( description );
assembly_builder->SetCustomAttribute(
@@ -531,8 +531,8 @@ SAL_IMPLEMENT_MAIN()
}
if (company.getLength() != 0)
{
- array< ::System::Type^>^ params = gcnew array< ::System::Type^>(1);
- array< ::System::Object^>^ args = gcnew array< ::System::Object^>(1);
+ cli::array< ::System::Type^>^ params = gcnew cli::array< ::System::Type^>(1);
+ cli::array< ::System::Object^>^ args = gcnew cli::array< ::System::Object^>(1);
params[ 0 ] = ::System::String::typeid;
args[ 0 ] = ustring_to_String( company );
assembly_builder->SetCustomAttribute(
@@ -542,8 +542,8 @@ SAL_IMPLEMENT_MAIN()
}
if (copyright.getLength() != 0)
{
- array< ::System::Type^>^ params = gcnew array< ::System::Type^>(1);
- array< ::System::Object^>^ args = gcnew array< ::System::Object^>(1);
+ cli::array< ::System::Type^>^ params = gcnew cli::array< ::System::Type^>(1);
+ cli::array< ::System::Object^>^ args = gcnew cli::array< ::System::Object^>(1);
params[ 0 ] = ::System::String::typeid;
args[ 0 ] = ustring_to_String( copyright );
assembly_builder->SetCustomAttribute(
@@ -553,8 +553,8 @@ SAL_IMPLEMENT_MAIN()
}
if (trademark.getLength() != 0)
{
- array< ::System::Type^>^ params = gcnew array< ::System::Type^>(1);
- array< ::System::Object^>^ args = gcnew array< ::System::Object^>(1);
+ cli::array< ::System::Type^>^ params = gcnew cli::array< ::System::Type^>(1);
+ cli::array< ::System::Object^>^ args = gcnew cli::array< ::System::Object^>(1);
params[ 0 ] = ::System::String::typeid;
args[ 0 ] = ustring_to_String( trademark );
assembly_builder->SetCustomAttribute(
@@ -564,8 +564,8 @@ SAL_IMPLEMENT_MAIN()
}
// load extra assemblies
- array<Assembly^>^ assemblies =
- gcnew array<Assembly^>(extra_assemblies.size());
+ cli::array<Assembly^>^ assemblies =
+ gcnew cli::array<Assembly^>(extra_assemblies.size());
for ( size_t pos = 0; pos < extra_assemblies.size(); ++pos )
{
assemblies[ pos ] = Assembly::LoadFrom(