Changeset 2261 for trunk/gsdl/lib

Timestamp:

2001-04-03T02:13:26+12:00 (23 years ago)

Author:

say1

Message:

fixed a minor c initialisation bug

Location:

trunk/gsdl/lib

Files:

• corbaiface.h (modified) (2 diffs)
• corbaiface.mpp (modified) (2 diffs)
• corbaiface_skel.mpp (modified) (1 diff)

trunk/gsdl/lib/corbaiface.h

@@ -489 +489 @@
     virtual void collectionList( corbatext_tarray& collist, corbaComError& error ) = 0;
     virtual void hasCollection( const corbatext_t& corbaCollection, CORBA::Boolean& has, corbaComError& error ) = 0;
-    virtual CORBA::Boolean ping( const corbatext_t& collection, corbaComError& error ) = 0;
+    virtual void ping( const corbatext_t& collection, CORBA::Boolean& wasSuccess, corbaComError& error ) = 0;
     virtual void getDocument( const corbatext_t& collection, corbaDocRequest& request, corbaDocResponse& response, corbaComError& error ) = 0;
     virtual void getCollectInfo( const corbatext_t& collection, corbaColInfoResponse& response, corbaComError& error ) = 0;
@@ -513 +513 @@
     void collectionList( corbatext_tarray& collist, corbaComError& error );
     void hasCollection( const corbatext_t& corbaCollection, CORBA::Boolean& has, corbaComError& error );
-    CORBA::Boolean ping( const corbatext_t& collection, corbaComError& error );
+    void ping( const corbatext_t& collection, CORBA::Boolean& wasSuccess, corbaComError& error );
     void getDocument( const corbatext_t& collection, corbaDocRequest& request, corbaDocResponse& response, corbaComError& error );
     void getCollectInfo( const corbatext_t& collection, corbaColInfoResponse& response, corbaComError& error );

trunk/gsdl/lib/corbaiface.mpp

@@ -1501 +1501 @@
 
 
-CORBA::Boolean gsdlInterface::corbaiface_stub::ping( const gsdlInterface::corbatext_t& collection, gsdlInterface::corbaComError& error )
+void gsdlInterface::corbaiface_stub::ping( const gsdlInterface::corbatext_t& collection, CORBA::Boolean& wasSuccess, gsdlInterface::corbaComError& error )
 {
   CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
+  CORBA::StaticAny _wasSuccess( CORBA::_stc_boolean, &wasSuccess );
   CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-  CORBA::Boolean _res;
-  CORBA::StaticAny __res( CORBA::_stc_boolean, &_res );
-
   CORBA::StaticRequest __req( this, "ping" );
   __req.add_in_arg( &_collection );
+  __req.add_inout_arg( &_wasSuccess );
   __req.add_inout_arg( &_error );
-  __req.set_result( &__res );
 
   __req.invoke();
@@ -1517 +1515 @@
   mico_sii_throw( &__req, 
     0);
-  return _res;
 }
 

trunk/gsdl/lib/corbaiface_skel.mpp

@@ -67 +67 @@
         corbatext_t collection;
         CORBA::StaticAny _collection( _marshaller_gsdlInterface_corbatext_t, &collection );
-        corbaComError error;
-        CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
-
-        CORBA::Boolean _res;
-        CORBA::StaticAny __res( CORBA::_stc_boolean, &_res );
-        _req->add_in_arg( &_collection );
-        _req->add_inout_arg( &_error );
-        _req->set_result( &__res );
-
-        if( !_req->read_args() )
-          return true;
-
-        _res = ping( collection, error );
+        CORBA::Boolean wasSuccess;
+        CORBA::StaticAny _wasSuccess( CORBA::_stc_boolean, &wasSuccess );
+        corbaComError error;
+        CORBA::StaticAny _error( _marshaller_gsdlInterface_corbaComError, &error );
+
+        _req->add_in_arg( &_collection );
+        _req->add_inout_arg( &_wasSuccess );
+        _req->add_inout_arg( &_error );
+
+        if( !_req->read_args() )
+          return true;
+
+        ping( collection, wasSuccess, error );
         _req->write_results();
         return true;