gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] /srv/bzr/gnash/trunk r11327: Minor cleanup.


From: Benjamin Wolsey
Subject: [Gnash-commit] /srv/bzr/gnash/trunk r11327: Minor cleanup.
Date: Wed, 29 Jul 2009 13:09:29 +0200
User-agent: Bazaar (1.13.1)

------------------------------------------------------------
revno: 11327
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Wed 2009-07-29 13:09:29 +0200
message:
  Minor cleanup.
modified:
  libcore/asobj/Error_as.cpp
    ------------------------------------------------------------
    revno: 11326.1.1
    committer: Benjamin Wolsey <address@hidden>
    branch nick: temp
    timestamp: Wed 2009-07-29 12:56:51 +0200
    message:
      Drop Error_as type.
    modified:
      libcore/asobj/Error_as.cpp
    ------------------------------------------------------------
    revno: 11326.1.2
    committer: Benjamin Wolsey <address@hidden>
    branch nick: temp
    timestamp: Wed 2009-07-29 12:57:41 +0200
    message:
      Update straggler.
    modified:
      libcore/asobj/Error_as.cpp
=== modified file 'libcore/asobj/Error_as.cpp'
--- a/libcore/asobj/Error_as.cpp        2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/Error_as.cpp        2009-07-29 10:57:41 +0000
@@ -45,19 +45,6 @@
 }
 
 
-class Error_as: public as_object
-{
-
-public:
-
-       Error_as()
-               :
-               as_object(getErrorInterface())
-       {}
-
-};
-
-
 // extern 
 void Error_class_init(as_object& where, const ObjectURI& uri)
 {
@@ -107,7 +94,7 @@
 as_value
 error_toString(const fn_call& fn)
 {
-       boost::intrusive_ptr<Error_as> ptr = ensureType<Error_as>(fn.this_ptr);
+       boost::intrusive_ptr<as_object> ptr = 
ensureType<as_object>(fn.this_ptr);
 
     string_table& st = getStringTable(*ptr);
     as_value message;
@@ -123,7 +110,8 @@
 
     if (!fn.isInstantiation()) return as_value();
 
-       boost::intrusive_ptr<Error_as> err = new Error_as;
+    as_object* proto = getErrorInterface();
+       boost::intrusive_ptr<as_object> err = new as_object(proto);
        
     string_table& st = getStringTable(fn);
     if (fn.nargs > 0)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]