merge -r 61110:61111

[mono.git] / mcs / class / Microsoft.JScript / Microsoft.JScript / ActiveXObjectConstructor.cs

diff --git a/mcs/class/Microsoft.JScript/Microsoft.JScript/ActiveXObjectConstructor.cs b/mcs/class/Microsoft.JScript/Microsoft.JScript/ActiveXObjectConstructor.cs
index f8b6e2cd019b5dbc9b2a0bb0066dab17b5d0db49..a99ce7f5f03aad9d88bfe39b1587087d8d38988d 100644 (file)
--- a/mcs/class/Microsoft.JScript/Microsoft.JScript/ActiveXObjectConstructor.cs
+++ b/mcs/class/Microsoft.JScript/Microsoft.JScript/ActiveXObjectConstructor.cs
@@ -5,12 +5,40 @@
 //
 // (C) 2003, Cesar Octavio Lopez Nataren, <cesar@ciencias.unam.mx>
 
-namespace Microsoft.JScript.Tmp
-{
-       using System;
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace Microsoft.JScript {
+
+       public class ActiveXObjectConstructor : ScriptFunction {
+
+               internal static ActiveXObjectConstructor Ctr = new ActiveXObjectConstructor ();
+
+               internal ActiveXObjectConstructor ()
+               {
+                       name = "ActiveXObject";
+               }
 
-       public class ActiveXObjectConstructor : ScriptFunction
-       {
                [JSFunctionAttribute (JSFunctionAttributeEnum.HasVarArgs)]
                public new Object CreateInstance (params Object [] args)
                {
@@ -22,4 +50,4 @@ namespace Microsoft.JScript.Tmp
                        throw new NotImplementedException ();
                }
        }
-}
\ No newline at end of file
+}