Changeset 3758

Show
Ignore:
Timestamp:
05/09/07 09:17:54 (6 years ago)
Author:
balister
Message:

Only need one orb variable.

Location:
ossie/trunk/ossie
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • ossie/trunk/ossie/framework/Application_impl.cpp

    r3757 r3758  
    5454    _sadParser = sadParser; 
    5555    connectionData = _connectionData; 
    56     _orb = new ossieSupport::ORB(); 
     56    orb = new ossieSupport::ORB(); 
    5757    waveformContext = wnc; 
    5858 
    … …  
    285285 
    286286        while (CORBA::is_nil (_rscObj)) 
    287             _rscObj = _orb->get_object_from_name (waveformContext, (*appComponentNamingContexts)[mem].elementId); 
     287            _rscObj = orb->get_object_from_name (waveformContext, (*appComponentNamingContexts)[mem].elementId); 
    288288 
    289289#if 0 ///\todo Remove dependency on SAD Parser 

  • ossie/trunk/ossie/include/ossie/Application_impl.h

    r3757 r3758  
    127127        std::string appName; 
    128128        std::vector <ossieSupport::ConnectionInfo *> connectionData; 
    129         ossieSupport::ORB *_orb; 
     129        ossieSupport::ORB *orb; 
    130130        CosNaming::NamingContext_ptr waveformContext; 
    131131