RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: mongo                            Date:   16-Sep-2010 22:37:58
  Branch: HEAD                             Handle: 2010091620375800

  Modified files:
    mongo/scripting         engine_spidermonkey.cpp engine_spidermonkey.h

  Log:
    - mongo: hotwire jsapi.h changes to share TM from GPSEE used with RPM.

  Summary:
    Revision    Changes     Path
    1.2         +6  -6      mongo/scripting/engine_spidermonkey.cpp
    1.2         +2  -0      mongo/scripting/engine_spidermonkey.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: mongo/scripting/engine_spidermonkey.cpp
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.2 engine_spidermonkey.cpp
  --- mongo/scripting/engine_spidermonkey.cpp	15 Sep 2010 18:43:44 -0000	1.1.1.1
  +++ mongo/scripting/engine_spidermonkey.cpp	16 Sep 2010 20:37:58 -0000	1.2
  @@ -1137,12 +1137,12 @@
               uassert( 10223 ,  "deleted SMScope twice?" , _convertor );
   
               for ( list<void*>::iterator i=_roots.begin(); i != _roots.end(); i++ ){
  -                JS_RemoveRoot( _context , *i );
  +                JS_RemoveGCThingRoot( _context , (void **)*i );
               }
               _roots.clear();
               
               if ( _this ){
  -                JS_RemoveRoot( _context , &_this );
  +                JS_RemoveObjectRoot( _context , &_this );
                   _this = 0;
               }
   
  @@ -1163,7 +1163,7 @@
               assert( _convertor );
               return;
               if ( _this ){
  -                JS_RemoveRoot( _context , &_this );
  +                JS_RemoveObjectRoot( _context , &_this );
                   _this = 0;
               }
               currentScope.reset( this );
  @@ -1171,7 +1171,7 @@
           }
           
           void addRoot( void * root , const char * name ){
  -            JS_AddNamedRoot( _context , root , name );
  +            JS_AddNamedGCThingRoot( _context , (void **)root , name );
               _roots.push_back( root );
           }
   
  @@ -1312,13 +1312,13 @@
           void setThis( const BSONObj * obj ){
               smlock;
               if ( _this ){
  -                JS_RemoveRoot( _context , &_this );
  +                JS_RemoveObjectRoot( _context , &_this );
                   _this = 0;
               }
               
               if ( obj ){
                   _this = _convertor->toJSObject( obj );
  -                JS_AddNamedRoot( _context , &_this , "scope this" );
  +                JS_AddNamedObjectRoot( _context , &_this , "scope this" );
               }
           }
   
  @@ .
  patch -p0 <<'@@ .'
  Index: mongo/scripting/engine_spidermonkey.h
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.2 engine_spidermonkey.h
  --- mongo/scripting/engine_spidermonkey.h	15 Sep 2010 18:43:44 -0000	1.1.1.1
  +++ mongo/scripting/engine_spidermonkey.h	16 Sep 2010 20:37:58 -0000	1.2
  @@ -18,6 +18,8 @@
   #pragma once
   
   #include "engine.h"
  +#undef	malloc
  +#undef	realloc
   
   // START inc hacking
   
  @@ .