Changeset 19456

Show
Ignore:
Timestamp:
11/10/06 15:00:58 (2 years ago)
Author:
patrick
Message:

Updated for API changes, most notably the deprecation of vpr::ReturnStatus?.
VRJ.NET now compiles against the current VR Juggler 2.1 code base.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • vrj.net/trunk/src/gadget_bridge_cpp/gadget_Analog.cpp

    r15541 r19456  
    1818{ 
    1919   // Constructor wrapper. 
    20    SHARPPY_API gadget_Analog_Adapter* gadget_Analog_Analog__0(gadget_Analog_Adapter::writeObject_callback_vpr_ObjectWriter_t cb0, gadget_Analog_Adapter::readObject_callback_vpr_ObjectReader_t cb1, gadget_Analog_Adapter::config_callback_jccl_ConfigElementPtr_t cb2, gadget_Analog_Adapter::getBaseType_callback_t cb3) 
     20   SHARPPY_API gadget_Analog_Adapter* gadget_Analog_Analog__0(gadget_Analog_Adapter::writeObject_callback_vpr_ObjectWriter_t cb0, gadget_Analog_Adapter::readObject_callback_vpr_ObjectReader_t cb1, gadget_Analog_Adapter::config_callback_jccl_ConfigElementPtr_t cb2) 
    2121   { 
    2222      gadget_Analog_Adapter* obj = new gadget_Analog_Adapter(); 
    …… 
    2424      obj->readObject_callback_vpr_ObjectReader = cb1; 
    2525      obj->config_callback_jccl_ConfigElementPtr = cb2; 
    26       obj->getBaseType_callback = cb3; 
    2726      return obj; 
    2827   } 
    …… 
    9796 
    9897   // Wrapper for virtual method gadget::Analog::writeObject() 
    99    SHARPPY_API vpr::ReturnStatus* gadget_Analog_writeObject__vpr_ObjectWriter1(gadget_Analog_Adapter* self_, vpr::ObjectWriter* p0) 
     98   SHARPPY_API void gadget_Analog_writeObject__vpr_ObjectWriter1(gadget_Analog_Adapter* self_, vpr::ObjectWriter* p0) 
    10099   { 
    101       vpr::ReturnStatus* result; 
    102       result = new vpr::ReturnStatus(self_->gadget::Analog::writeObject(p0)); 
    103       return result; 
     100      self_->gadget::Analog::writeObject(p0); 
    104101   } 
    105102 
    106103 
    107104   // Wrapper for virtual method gadget::Analog::readObject() 
    108    SHARPPY_API vpr::ReturnStatus* gadget_Analog_readObject__vpr_ObjectReader1(gadget_Analog_Adapter* self_, vpr::ObjectReader* p0) 
     105   SHARPPY_API void gadget_Analog_readObject__vpr_ObjectReader1(gadget_Analog_Adapter* self_, vpr::ObjectReader* p0) 
    109106   { 
    110       vpr::ReturnStatus* result; 
    111       result = new vpr::ReturnStatus(self_->gadget::Analog::readObject(p0)); 
    112       return result; 
     107      self_->gadget::Analog::readObject(p0); 
    113108   } 
    114109 
    …… 
    123118 
    124119 
    125    // Wrapper for virtual method gadget::Analog::getBaseType() 
    126    SHARPPY_API char* gadget_Analog_getBaseType__0(gadget_Analog_Adapter* self_) 
    127    { 
    128       std::string temp_result; 
    129       char* result; 
    130       temp_result = self_->gadget::Analog::getBaseType(); 
    131       result = strdup(temp_result.c_str()); 
    132       return result; 
    133    } 
    134  
    135  
    136120} // extern "C" for gadget::Analog 
    137121 

  • vrj.net/trunk/src/gadget_bridge_cpp/gadget_Analog_Adapter.h

    r15541 r19456  
    2626   {;} 
    2727 
    28    typedef vpr::ReturnStatus* (*writeObject_callback_vpr_ObjectWriter_t)(vpr::ObjectWriter*); 
     28   typedef void (*writeObject_callback_vpr_ObjectWriter_t)(vpr::ObjectWriter*); 
    2929   writeObject_callback_vpr_ObjectWriter_t writeObject_callback_vpr_ObjectWriter; 
    3030 
    3131   /// Override for virtual function gadget::Analog::writeObject. 
    32    virtual vpr::ReturnStatus writeObject(vpr::ObjectWriter* p0) 
     32   virtual void writeObject(vpr::ObjectWriter* p0) 
    3333   { 
    34       vpr::ReturnStatus result = *(writeObject_callback_vpr_ObjectWriter(p0)); 
    35       return result; 
     34      writeObject_callback_vpr_ObjectWriter(p0); 
    3635   } 
    3736 
    38    typedef vpr::ReturnStatus* (*readObject_callback_vpr_ObjectReader_t)(vpr::ObjectReader*); 
     37   typedef void (*readObject_callback_vpr_ObjectReader_t)(vpr::ObjectReader*); 
    3938   readObject_callback_vpr_ObjectReader_t readObject_callback_vpr_ObjectReader; 
    4039 
    4140   /// Override for virtual function gadget::Analog::readObject. 
    42    virtual vpr::ReturnStatus readObject(vpr::ObjectReader* p0) 
     41   virtual void readObject(vpr::ObjectReader* p0) 
    4342   { 
    44       vpr::ReturnStatus result = *(readObject_callback_vpr_ObjectReader(p0)); 
    45       return result; 
     43      readObject_callback_vpr_ObjectReader(p0); 
    4644   } 
    4745 
    …… 
    5452      jccl::ConfigElementPtr* p_p0 = new jccl::ConfigElementPtr(p0); 
    5553      bool result = config_callback_jccl_ConfigElementPtr(p_p0); 
    56       return result; 
    57    } 
    58  
    59    typedef char* (*getBaseType_callback_t)(); 
    60    getBaseType_callback_t getBaseType_callback; 
    61  
    62    /// Override for virtual function gadget::Analog::getBaseType. 
    63    virtual std::string getBaseType() 
    64    { 
    65       std::string result = getBaseType_callback(); 
    6654      return result; 
    6755   } 

  • vrj.net/trunk/src/gadget_bridge_cpp/gadget_Digital.cpp

    r15541 r19456  
    1818{ 
    1919   // Constructor wrapper. 
    20    SHARPPY_API gadget_Digital_Adapter* gadget_Digital_Digital__0(gadget_Digital_Adapter::config_callback_jccl_ConfigElementPtr_t cb0, gadget_Digital_Adapter::getBaseType_callback_t cb1, gadget_Digital_Adapter::writeObject_callback_vpr_ObjectWriter_t cb2, gadget_Digital_Adapter::readObject_callback_vpr_ObjectReader_t cb3) 
     20   SHARPPY_API gadget_Digital_Adapter* gadget_Digital_Digital__0(gadget_Digital_Adapter::config_callback_jccl_ConfigElementPtr_t cb0, gadget_Digital_Adapter::writeObject_callback_vpr_ObjectWriter_t cb1, gadget_Digital_Adapter::readObject_callback_vpr_ObjectReader_t cb2) 
    2121   { 
    2222      gadget_Digital_Adapter* obj = new gadget_Digital_Adapter(); 
    2323      obj->config_callback_jccl_ConfigElementPtr = cb0; 
    24       obj->getBaseType_callback = cb1; 
    25       obj->writeObject_callback_vpr_ObjectWriter = cb2; 
    26       obj->readObject_callback_vpr_ObjectReader = cb3; 
     24      obj->writeObject_callback_vpr_ObjectWriter = cb1; 
     25      obj->readObject_callback_vpr_ObjectReader = cb2; 
    2726      return obj; 
    2827   } 
    …… 
    6665 
    6766 
    68    // Wrapper for virtual method gadget::Digital::getBaseType() 
    69    SHARPPY_API char* gadget_Digital_getBaseType__0(gadget_Digital_Adapter* self_) 
     67   // Wrapper for virtual method gadget::Digital::writeObject() 
     68   SHARPPY_API void gadget_Digital_writeObject__vpr_ObjectWriter1(gadget_Digital_Adapter* self_, vpr::ObjectWriter* p0) 
    7069   { 
    71       std::string temp_result; 
    72       char* result; 
    73       temp_result = self_->gadget::Digital::getBaseType(); 
    74       result = strdup(temp_result.c_str()); 
    75       return result; 
    76    } 
    77  
    78  
    79    // Wrapper for virtual method gadget::Digital::writeObject() 
    80    SHARPPY_API vpr::ReturnStatus* gadget_Digital_writeObject__vpr_ObjectWriter1(gadget_Digital_Adapter* self_, vpr::ObjectWriter* p0) 
    81    { 
    82       vpr::ReturnStatus* result; 
    83       result = new vpr::ReturnStatus(self_->gadget::Digital::writeObject(p0)); 
    84       return result; 
     70      self_->gadget::Digital::writeObject(p0); 
    8571   } 
    8672 
    8773 
    8874   // Wrapper for virtual method gadget::Digital::readObject() 
    89    SHARPPY_API vpr::ReturnStatus* gadget_Digital_readObject__vpr_ObjectReader1(gadget_Digital_Adapter* self_, vpr::ObjectReader* p0) 
     75   SHARPPY_API void gadget_Digital_readObject__vpr_ObjectReader1(gadget_Digital_Adapter* self_, vpr::ObjectReader* p0) 
    9076   { 
    91       vpr::ReturnStatus* result; 
    92       result = new vpr::ReturnStatus(self_->gadget::Digital::readObject(p0)); 
    93       return result; 
     77      self_->gadget::Digital::readObject(p0); 
    9478   } 
    9579 

  • vrj.net/trunk/src/gadget_bridge_cpp/gadget_Digital_Adapter.h

    r15541 r19456  
    3737   } 
    3838 
    39    typedef char* (*getBaseType_callback_t)(); 
    40    getBaseType_callback_t getBaseType_callback; 
    41  
    42    /// Override for virtual function gadget::Digital::getBaseType. 
    43    virtual std::string getBaseType() 
    44    { 
    45       std::string result = getBaseType_callback(); 
    46       return result; 
    47    } 
    48  
    49    typedef vpr::ReturnStatus* (*writeObject_callback_vpr_ObjectWriter_t)(vpr::ObjectWriter*); 
     39   typedef void (*writeObject_callback_vpr_ObjectWriter_t)(vpr::ObjectWriter*); 
    5040   writeObject_callback_vpr_ObjectWriter_t writeObject_callback_vpr_ObjectWriter; 
    5141 
    5242   /// Override for virtual function gadget::Digital::writeObject. 
    53    virtual vpr::ReturnStatus writeObject(vpr::ObjectWriter* p0) 
     43   virtual void writeObject(vpr::ObjectWriter* p0) 
    5444   { 
    55       vpr::ReturnStatus result = *(writeObject_callback_vpr_ObjectWriter(p0)); 
    56       return result; 
     45      writeObject_callback_vpr_ObjectWriter(p0); 
    5746   } 
    5847 
    59    typedef vpr::ReturnStatus* (*readObject_callback_vpr_ObjectReader_t)(vpr::ObjectReader*); 
     48   typedef void (*readObject_callback_vpr_ObjectReader_t)(vpr::ObjectReader*); 
    6049   readObject_callback_vpr_ObjectReader_t readObject_callback_vpr_ObjectReader; 
    6150 
    6251   /// Override for virtual function gadget::Digital::readObject. 
    63    virtual vpr::ReturnStatus readObject(vpr::ObjectReader* p0) 
     52   virtual void readObject(vpr::ObjectReader* p0) 
    6453   { 
    65       vpr::ReturnStatus result = *(readObject_callback_vpr_ObjectReader(p0)); 
    66       return result; 
     54      readObject_callback_vpr_ObjectReader(p0); 
    6755   } 
    6856 

  • vrj.net/trunk/src/gadget_bridge_cpp/gadget_Input.cpp

    r15541 r19456  
    1818{ 
    1919   // Constructor wrapper. 
    20    SHARPPY_API gadget_Input_Adapter* gadget_Input_Input__0(gadget_Input_Adapter::config_callback_jccl_ConfigElementPtr_t cb0, gadget_Input_Adapter::sample_callback_t cb1, gadget_Input_Adapter::startSampling_callback_t cb2, gadget_Input_Adapter::stopSampling_callback_t cb3, gadget_Input_Adapter::updateData_callback_t cb4, gadget_Input_Adapter::getBaseType_callback_t cb5, gadget_Input_Adapter::writeObject_callback_vpr_ObjectWriter_t cb6, gadget_Input_Adapter::readObject_callback_vpr_ObjectReader_t cb7, gadget_Input_Adapter::destroy_callback_t cb8) 
     20   SHARPPY_API gadget_Input_Adapter* gadget_Input_Input__0(gadget_Input_Adapter::config_callback_jccl_ConfigElementPtr_t cb0, gadget_Input_Adapter::sample_callback_t cb1, gadget_Input_Adapter::startSampling_callback_t cb2, gadget_Input_Adapter::stopSampling_callback_t cb3, gadget_Input_Adapter::updateData_callback_t cb4, gadget_Input_Adapter::writeObject_callback_vpr_ObjectWriter_t cb5, gadget_Input_Adapter::readObject_callback_vpr_ObjectReader_t cb6, gadget_Input_Adapter::destroy_callback_t cb7) 
    2121   { 
    2222      gadget_Input_Adapter* obj = new gadget_Input_Adapter(); 
    …… 
    2626      obj->stopSampling_callback = cb3; 
    2727      obj->updateData_callback = cb4; 
    28       obj->getBaseType_callback = cb5; 
    29       obj->writeObject_callback_vpr_ObjectWriter = cb6; 
    30       obj->readObject_callback_vpr_ObjectReader = cb7; 
    31       obj->destroy_callback = cb8; 
     28      obj->writeObject_callback_vpr_ObjectWriter = cb5; 
     29      obj->readObject_callback_vpr_ObjectReader = cb6; 
     30      obj->destroy_callback = cb7; 
    3231      return obj; 
    3332   } 
    …… 
    101100 
    102101 
    103    // Wrapper for virtual method gadget::Input::getBaseType() 
    104    SHARPPY_API char* gadget_Input_getBaseType__0(gadget_Input_Adapter* self_) 
     102   // Wrapper for virtual method gadget::Input::writeObject() 
     103   SHARPPY_API void gadget_Input_writeObject__vpr_ObjectWriter1(gadget_Input_Adapter* self_, vpr::ObjectWriter* p0) 
    105104   { 
    106       std::string temp_result; 
    107       char* result; 
    108       temp_result = self_->gadget::Input::getBaseType(); 
    109       result = strdup(temp_result.c_str()); 
    110       return result; 
    111    } 
    112  
    113  
    114    // Wrapper for virtual method gadget::Input::writeObject() 
    115    SHARPPY_API vpr::ReturnStatus* gadget_Input_writeObject__vpr_ObjectWriter1(gadget_Input_Adapter* self_, vpr::ObjectWriter* p0) 
    116    { 
    117       vpr::ReturnStatus* result; 
    118       result = new vpr::ReturnStatus(self_->gadget::Input::writeObject(p0)); 
    119       return result; 
     105      self_->gadget::Input::writeObject(p0); 
    120106   } 
    121107 
    122108 
    123109   // Wrapper for virtual method gadget::Input::readObject() 
    124    SHARPPY_API vpr::ReturnStatus* gadget_Input_readObject__vpr_ObjectReader1(gadget_Input_Adapter* self_, vpr::ObjectReader* p0) 
     110   SHARPPY_API void gadget_Input_readObject__vpr_ObjectReader1(gadget_Input_Adapter* self_, vpr::ObjectReader* p0) 
    125111   { 
    126       vpr::ReturnStatus* result; 
    127       result = new vpr::ReturnStatus(self_->gadget::Input::readObject(p0)); 
    128       return result; 
     112      self_->gadget::Input::readObject(p0); 
    129113   } 
    130114 

  • vrj.net/trunk/src/gadget_bridge_cpp/gadget_InputManager.cpp

    r15541 r19456  
    3535 
    3636   // Wrapper for non-virtual method gadget::InputManager::updateAllData() 
    37    SHARPPY_API void gadget_InputManager_updateAllData__0(gadget::InputManager* self_) 
     37   SHARPPY_API void gadget_InputManager_updateAllDevices__0(gadget::InputManager* self_) 
    3838   { 
    39       self_->updateAllData(); 
     39      self_->updateAllDevices(); 
     40   } 
     41 
     42 
     43   // Wrapper for non-virtual method gadget::InputManager::updateAllData() 
     44   SHARPPY_API void gadget_InputManager_updateAllProxies__0(gadget::InputManager* self_) 
     45   { 
     46      self_->updateAllProxies(); 
    4047   } 
    4148 

  • vrj.net/trunk/src/gadget_bridge_cpp/gadget_Input_Adapter.h

    r15541 r19456  
    7676   } 
    7777 
    78    typedef char* (*getBaseType_callback_t)(); 
    79    getBaseType_callback_t getBaseType_callback; 
    8078 
    81    /// Override for virtual function gadget::Input::getBaseType. 
    82    virtual std::string getBaseType() 
    83    { 
    84       std::string result = getBaseType_callback(); 
    85       return result; 
    86    } 
    87  
    88    typedef vpr::ReturnStatus* (*writeObject_callback_vpr_ObjectWriter_t)(vpr::ObjectWriter*); 
     79   typedef void (*writeObject_callback_vpr_ObjectWriter_t)(vpr::ObjectWriter*); 
    8980   writeObject_callback_vpr_ObjectWriter_t writeObject_callback_vpr_ObjectWriter; 
    9081 
    9182   /// Override for virtual function gadget::Input::writeObject. 
    92    virtual vpr::ReturnStatus writeObject(vpr::ObjectWriter* p0) 
     83   virtual void writeObject(vpr::ObjectWriter* p0) 
    9384   { 
    94       vpr::ReturnStatus result = *(writeObject_callback_vpr_ObjectWriter(p0)); 
    95       return result; 
     85      writeObject_callback_vpr_ObjectWriter(p0); 
    9686   } 
    9787 
    98    typedef vpr::ReturnStatus* (*readObject_callback_vpr_ObjectReader_t)(vpr::ObjectReader*); 
     88   typedef void (*readObject_callback_vpr_ObjectReader_t)(vpr::ObjectReader*); 
    9989   readObject_callback_vpr_ObjectReader_t readObject_callback_vpr_ObjectReader; 
    10090 
    10191   /// Override for virtual function gadget::Input::readObject. 
    102    virtual vpr::ReturnStatus readObject(vpr::ObjectReader* p0) 
     92   virtual void readObject(vpr::ObjectReader* p0) 
    10393   { 
    104       vpr::ReturnStatus result = *(readObject_callback_vpr_ObjectReader(p0)); 
    105       return result; 
     94      readObject_callback_vpr_ObjectReader(p0); 
    10695   } 
    10796 

  • vrj.net/trunk/src/gadget_bridge_cpp/gadget_Position.cpp

    r15541 r19456  
    1818{ 
    1919   // Constructor wrapper. 
    20    SHARPPY_API gadget_Position_Adapter* gadget_Position_Position__0(gadget_Position_Adapter::config_callback_jccl_ConfigElementPtr_t cb0, gadget_Position_Adapter::getBaseType_callback_t cb1, gadget_Position_Adapter::writeObject_callback_vpr_ObjectWriter_t cb2, gadget_Position_Adapter::readObject_callback_vpr_ObjectReader_t cb3) 
     20   SHARPPY_API gadget_Position_Adapter* gadget_Position_Position__0(gadget_Position_Adapter::config_callback_jccl_ConfigElementPtr_t cb0, gadget_Position_Adapter::writeObject_callback_vpr_ObjectWriter_t cb1, gadget_Position_Adapter::readObject_callback_vpr_ObjectReader_t cb2) 
    2121   { 
    2222      gadget_Position_Adapter* obj = new gadget_Position_Adapter(); 
    2323      obj->config_callback_jccl_ConfigElementPtr = cb0; 
    24       obj->getBaseType_callback = cb1; 
    25       obj->writeObject_callback_vpr_ObjectWriter = cb2; 
    26       obj->readObject_callback_vpr_ObjectReader = cb3; 
     24      obj->writeObject_callback_vpr_ObjectWriter = cb1; 
     25      obj->readObject_callback_vpr_ObjectReader = cb2; 
    2726      return obj; 
    2827   } 
    …… 
    6665 
    6766 
    68    // Wrapper for virtual method gadget::Position::getBaseType() 
    69    SHARPPY_API char* gadget_Position_getBaseType__0(gadget_Position_Adapter* self_) 
     67   // Wrapper for virtual method gadget::Position::writeObject() 
     68   SHARPPY_API void gadget_Position_writeObject__vpr_ObjectWriter1(gadget_Position_Adapter* self_, vpr::ObjectWriter* p0) 
    7069   { 
    71       std::string temp_result; 
    72       char* result; 
    73       temp_result = self_->gadget::Position::getBaseType(); 
    74       result = strdup(temp_result.c_str()); 
    75       return result; 
    76    } 
    77  
    78  
    79    // Wrapper for virtual method gadget::Position::writeObject() 
    80    SHARPPY_API vpr::ReturnStatus* gadget_Position_writeObject__vpr_ObjectWriter1(gadget_Position_Adapter* self_, vpr::ObjectWriter* p0) 
    81    { 
    82       vpr::ReturnStatus* result; 
    83       result = new vpr::ReturnStatus(self_->gadget::Position::writeObject(p0)); 
    84       return result; 
     70      self_->gadget::Position::writeObject(p0); 
    8571   } 
    8672 
    8773 
    8874   // Wrapper for virtual method gadget::Position::readObject() 
    89    SHARPPY_API vpr::ReturnStatus* gadget_Position_readObject__vpr_ObjectReader1(gadget_Position_Adapter* self_, vpr::ObjectReader* p0) 
     75   SHARPPY_API void gadget_Position_readObject__vpr_ObjectReader1(gadget_Position_Adapter* self_, vpr::ObjectReader* p0) 
    9076   { 
    91       vpr::ReturnStatus* result; 
    92       result = new vpr::ReturnStatus(self_->gadget::Position::readObject(p0)); 
    93       return result; 
     77      self_->gadget::Position::readObject(p0); 
    9478   } 
    9579 

  • vrj.net/trunk/src/gadget_bridge_cpp/gadget_Position_Adapter.h

    r15541 r19456  
    3737   } 
    3838 
    39    typedef char* (*getBaseType_callback_t)(); 
    40    getBaseType_callback_t getBaseType_callback; 
    41  
    42    /// Override for virtual function gadget::Position::getBaseType. 
    43    virtual std::string getBaseType() 
    44    { 
    45       std::string result = getBaseType_callback(); 
    46       return result; 
    47    } 
    48  
    49    typedef vpr::ReturnStatus* (*writeObject_callback_vpr_ObjectWriter_t)(vpr::ObjectWriter*); 
     39   typedef void (*writeObject_callback_vpr_ObjectWriter_t)(vpr::ObjectWriter*); 
    5040   writeObject_callback_vpr_ObjectWriter_t writeObject_callback_vpr_ObjectWriter; 
    5141 
    5242   /// Override for virtual function gadget::Position::writeObject. 
    53    virtual vpr::ReturnStatus writeObject(vpr::ObjectWriter* p0) 
     43   virtual void writeObject(vpr::ObjectWriter* p0) 
    5444   { 
    55       vpr::ReturnStatus result = *(writeObject_callback_vpr_ObjectWriter(p0)); 
    56       return result; 
     45      writeObject_callback_vpr_ObjectWriter(p0); 
    5746   } 
    5847 
    59    typedef vpr::ReturnStatus* (*readObject_callback_vpr_ObjectReader_t)(vpr::ObjectReader*); 
     48   typedef void (*readObject_callback_vpr_ObjectReader_t)(vpr::ObjectReader*); 
    6049   readObject_callback_vpr_ObjectReader_t readObject_callback_vpr_ObjectReader; 
    6150 
    6251   /// Override for virtual function gadget::Position::readObject. 
    63    virtual vpr::ReturnStatus readObject(vpr::ObjectReader* p0) 
     52   virtual void readObject(vpr::ObjectReader* p0) 
    6453   { 
    65       vpr::ReturnStatus result = *(readObject_callback_vpr_ObjectReader(p0)); 
    66       return result; 
     54      readObject_callback_vpr_ObjectReader(p0); 
    6755   } 
    6856 

  • vrj.net/trunk/src/gadget_bridge_cpp/gadget_Proxy.cpp

    r15541 r19456  
    5353 
    5454 
    55    // Wrapper for non-virtual method gadget::Proxy::stupify() 
    56    SHARPPY_API void gadget_Proxy_stupify__bool0(gadget_Proxy_Adapter* self_) 
     55   // Wrapper for non-virtual method gadget::Proxy::stupefy() 
     56   SHARPPY_API void gadget_Proxy_stupefy__bool0(gadget_Proxy_Adapter* self_) 
    5757   { 
    58       self_->stupify(); 
     58      self_->stupefy(); 
    5959   } 
    6060 
    61    // Wrapper for non-virtual method gadget::Proxy::stupify() 
    62    SHARPPY_API void gadget_Proxy_stupify__bool1(gadget_Proxy_Adapter* self_, bool p0) 
     61   // Wrapper for non-virtual method gadget::Proxy::stupefy() 
     62   SHARPPY_API void gadget_Proxy_stupefy__bool1(gadget_Proxy_Adapter* self_, bool p0) 
    6363   { 
    64       self_->stupify(p0); 
     64      self_->stupefy(p0); 
    6565   } 
    6666 
    …… 
    100100 
    101101 
    102    // Wrapper for virtual method gadget::Proxy::isStupified() 
    103    SHARPPY_API bool gadget_Proxy_isStupified__0(gadget_Proxy_Adapter* self_) 
     102   // Wrapper for virtual method gadget::Proxy::isStupefied() 
     103   SHARPPY_API bool gadget_Proxy_isStupefied__0(gadget_Proxy_Adapter* self_) 
    104104   { 
    105105      bool result; 
    106       result = self_->gadget::Proxy::isStupified(); 
     106      result = self_->gadget::Proxy::isStupefied(); 
    107107      return result; 
    108108   } 

  • vrj.net/trunk/src/gadget_bridge_cs/gadget_Analog.cs

    r15541 r19456  
    180180   // Start of virtual methods. 
    181181   // Delegate for the writeObject() callback. 
    182    protected IntPtr writeObjectAdapter(vpr.ObjectWriter p0) 
    183    { 
    184       return writeObject(p0).RawObject; 
    185    } 
    186  
    187    public delegate IntPtr writeObjectDelegate_vpr_ObjectWriter([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectWriterMarshaler))] vpr.ObjectWriter p0); 
     182   protected void writeObjectAdapter(vpr.ObjectWriter p0) 
     183   { 
     184      writeObject(p0); 
     185   } 
     186 
     187   public delegate void writeObjectDelegate_vpr_ObjectWriter([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectWriterMarshaler))] vpr.ObjectWriter p0); 
    188188   protected writeObjectDelegate_vpr_ObjectWriter m_writeObjectDelegate_vpr_ObjectWriter; 
    189189 
    190190   [DllImport("gadget_bridge", CharSet = CharSet.Ansi)] 
    191    [return : MarshalAs(UnmanagedType.CustomMarshaler, 
    192                        MarshalTypeRef = typeof(vpr.ReturnStatusMarshaler))] 
    193    private extern static vpr.ReturnStatus gadget_Analog_writeObject__vpr_ObjectWriter1(IntPtr obj, 
     191   private extern static void gadget_Analog_writeObject__vpr_ObjectWriter1(IntPtr obj, 
    194192        [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectWriterMarshaler))] vpr.ObjectWriter p0); 
    195193 
    196    public virtual vpr.ReturnStatus writeObject(vpr.ObjectWriter p0) 
    197    { 
    198       vpr.ReturnStatus result; 
    199       result = gadget_Analog_writeObject__vpr_ObjectWriter1(mRawObject, p0); 
    200       return result; 
     194   public virtual void writeObject(vpr.ObjectWriter p0) 
     195   { 
     196      gadget_Analog_writeObject__vpr_ObjectWriter1(mRawObject, p0); 
    201197   } 
    202198 
    203199 
    204200   // Delegate for the readObject() callback. 
    205    protected IntPtr readObjectAdapter(vpr.ObjectReader p0) 
    206    { 
    207       return readObject(p0).RawObject; 
    208    } 
    209  
    210    public delegate IntPtr readObjectDelegate_vpr_ObjectReader([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectReaderMarshaler))] vpr.ObjectReader p0); 
     201   protected void readObjectAdapter(vpr.ObjectReader p0) 
     202   { 
     203      readObject(p0); 
     204   } 
     205 
     206   public delegate void readObjectDelegate_vpr_ObjectReader([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectReaderMarshaler))] vpr.ObjectReader p0); 
    211207   protected readObjectDelegate_vpr_ObjectReader m_readObjectDelegate_vpr_ObjectReader; 
    212208 
    213209   [DllImport("gadget_bridge", CharSet = CharSet.Ansi)] 
    214    [return : MarshalAs(UnmanagedType.CustomMarshaler, 
    215                        MarshalTypeRef = typeof(vpr.ReturnStatusMarshaler))] 
    216    private extern static vpr.ReturnStatus gadget_Analog_readObject__vpr_ObjectReader1(IntPtr obj, 
     210   private extern static void gadget_Analog_readObject__vpr_ObjectReader1(IntPtr obj, 
    217211        [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectReaderMarshaler))] vpr.ObjectReader p0); 
    218212 
    219    public virtual vpr.ReturnStatus readObject(vpr.ObjectReader p0) 
    220    { 
    221       vpr.ReturnStatus result; 
    222       result = gadget_Analog_readObject__vpr_ObjectReader1(mRawObject, p0); 
    223       return result; 
     213   public virtual void readObject(vpr.ObjectReader p0) 
     214   { 
     215      gadget_Analog_readObject__vpr_ObjectReader1(mRawObject, p0); 
    224216   } 
    225217 

  • vrj.net/trunk/src/gadget_bridge_cs/gadget_Digital.cs

    r15541 r19456  
    158158 
    159159   // Delegate for the writeObject() callback. 
    160    protected IntPtr writeObjectAdapter(vpr.ObjectWriter p0) 
    161    { 
    162       return writeObject(p0).RawObject; 
    163    } 
    164  
    165    public delegate IntPtr writeObjectDelegate_vpr_ObjectWriter([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectWriterMarshaler))] vpr.ObjectWriter p0); 
     160   protected void writeObjectAdapter(vpr.ObjectWriter p0) 
     161   { 
     162      writeObject(p0); 
     163   } 
     164 
     165   public delegate void writeObjectDelegate_vpr_ObjectWriter([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectWriterMarshaler))] vpr.ObjectWriter p0); 
    166166   protected writeObjectDelegate_vpr_ObjectWriter m_writeObjectDelegate_vpr_ObjectWriter; 
    167167 
    168168   [DllImport("gadget_bridge", CharSet = CharSet.Ansi)] 
    169    [return : MarshalAs(UnmanagedType.CustomMarshaler, 
    170                        MarshalTypeRef = typeof(vpr.ReturnStatusMarshaler))] 
    171    private extern static vpr.ReturnStatus gadget_Digital_writeObject__vpr_ObjectWriter1(IntPtr obj, 
     169   private extern static void gadget_Digital_writeObject__vpr_ObjectWriter1(IntPtr obj, 
    172170        [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectWriterMarshaler))] vpr.ObjectWriter p0); 
    173171 
    174    public virtual vpr.ReturnStatus writeObject(vpr.ObjectWriter p0) 
    175    { 
    176       vpr.ReturnStatus result; 
    177       result = gadget_Digital_writeObject__vpr_ObjectWriter1(mRawObject, p0); 
    178       return result; 
     172   public virtual void writeObject(vpr.ObjectWriter p0) 
     173   { 
     174      gadget_Digital_writeObject__vpr_ObjectWriter1(mRawObject, p0); 
    179175   } 
    180176 
    181177 
    182178   // Delegate for the readObject() callback. 
    183    protected IntPtr readObjectAdapter(vpr.ObjectReader p0) 
    184    { 
    185       return readObject(p0).RawObject; 
    186    } 
    187  
    188    public delegate IntPtr readObjectDelegate_vpr_ObjectReader([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectReaderMarshaler))] vpr.ObjectReader p0); 
     179   protected void readObjectAdapter(vpr.ObjectReader p0) 
     180   { 
     181      readObject(p0); 
     182   } 
     183 
     184   public delegate void readObjectDelegate_vpr_ObjectReader([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectReaderMarshaler))] vpr.ObjectReader p0); 
    189185   protected readObjectDelegate_vpr_ObjectReader m_readObjectDelegate_vpr_ObjectReader; 
    190186 
    191187   [DllImport("gadget_bridge", CharSet = CharSet.Ansi)] 
    192    [return : MarshalAs(UnmanagedType.CustomMarshaler, 
    193                        MarshalTypeRef = typeof(vpr.ReturnStatusMarshaler))] 
    194    private extern static vpr.ReturnStatus gadget_Digital_readObject__vpr_ObjectReader1(IntPtr obj, 
     188   private extern static void gadget_Digital_readObject__vpr_ObjectReader1(IntPtr obj, 
    195189        [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectReaderMarshaler))] vpr.ObjectReader p0); 
    196190 
    197    public virtual vpr.ReturnStatus readObject(vpr.ObjectReader p0) 
    198    { 
    199       vpr.ReturnStatus result; 
    200       result = gadget_Digital_readObject__vpr_ObjectReader1(mRawObject, p0); 
    201       return result; 
     191   public virtual void readObject(vpr.ObjectReader p0) 
     192   { 
     193      gadget_Digital_readObject__vpr_ObjectReader1(mRawObject, p0); 
    202194   } 
    203195 

  • vrj.net/trunk/src/gadget_bridge_cs/gadget_Input.cs

    r15541 r19456  
    178178 
    179179   // Delegate for the writeObject() callback. 
    180    protected IntPtr writeObjectAdapter(vpr.ObjectWriter p0) 
    181    { 
    182       return writeObject(p0).RawObject; 
    183    } 
    184  
    185    public delegate IntPtr writeObjectDelegate_vpr_ObjectWriter([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectWriterMarshaler))] vpr.ObjectWriter p0); 
     180   protected void writeObjectAdapter(vpr.ObjectWriter p0) 
     181   { 
     182      writeObject(p0); 
     183   } 
     184 
     185   public delegate void writeObjectDelegate_vpr_ObjectWriter([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectWriterMarshaler))] vpr.ObjectWriter p0); 
    186186   protected writeObjectDelegate_vpr_ObjectWriter m_writeObjectDelegate_vpr_ObjectWriter; 
    187187 
    188188   [DllImport("gadget_bridge", CharSet = CharSet.Ansi)] 
    189    [return : MarshalAs(UnmanagedType.CustomMarshaler, 
    190                        MarshalTypeRef = typeof(vpr.ReturnStatusMarshaler))] 
    191    private extern static vpr.ReturnStatus gadget_Input_writeObject__vpr_ObjectWriter1(IntPtr obj, 
     189   private extern static void gadget_Input_writeObject__vpr_ObjectWriter1(IntPtr obj, 
    192190        [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectWriterMarshaler))] vpr.ObjectWriter p0); 
    193191 
    194    public virtual vpr.ReturnStatus writeObject(vpr.ObjectWriter p0) 
    195    { 
    196       vpr.ReturnStatus result; 
    197       result = gadget_Input_writeObject__vpr_ObjectWriter1(mRawObject, p0); 
    198       return result; 
     192   public virtual void writeObject(vpr.ObjectWriter p0) 
     193   { 
     194      gadget_Input_writeObject__vpr_ObjectWriter1(mRawObject, p0); 
    199195   } 
    200196 
    201197 
    202198   // Delegate for the readObject() callback. 
    203    protected IntPtr readObjectAdapter(vpr.ObjectReader p0) 
    204    { 
    205       return readObject(p0).RawObject; 
    206    } 
    207  
    208    public delegate IntPtr readObjectDelegate_vpr_ObjectReader([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectReaderMarshaler))] vpr.ObjectReader p0); 
     199   protected void readObjectAdapter(vpr.ObjectReader p0) 
     200   { 
     201      readObject(p0); 
     202   } 
     203 
     204   public delegate void readObjectDelegate_vpr_ObjectReader([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectReaderMarshaler))] vpr.ObjectReader p0); 
    209205   protected readObjectDelegate_vpr_ObjectReader m_readObjectDelegate_vpr_ObjectReader; 
    210206 
    211207   [DllImport("gadget_bridge", CharSet = CharSet.Ansi)] 
    212    [return : MarshalAs(UnmanagedType.CustomMarshaler, 
    213                        MarshalTypeRef = typeof(vpr.ReturnStatusMarshaler))] 
    214    private extern static vpr.ReturnStatus gadget_Input_readObject__vpr_ObjectReader1(IntPtr obj, 
     208   private extern static void gadget_Input_readObject__vpr_ObjectReader1(IntPtr obj, 
    215209        [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectReaderMarshaler))] vpr.ObjectReader p0); 
    216210 
    217    public virtual vpr.ReturnStatus readObject(vpr.ObjectReader p0) 
    218    { 
    219       vpr.ReturnStatus result; 
    220       result = gadget_Input_readObject__vpr_ObjectReader1(mRawObject, p0); 
    221       return result; 
     211   public virtual void readObject(vpr.ObjectReader p0) 
     212   { 
     213      gadget_Input_readObject__vpr_ObjectReader1(mRawObject, p0); 
    222214   } 
    223215 

  • vrj.net/trunk/src/gadget_bridge_cs/gadget_InputManager.cs

    r15541 r19456  
    7171 
    7272   [DllImport("gadget_bridge", CharSet = CharSet.Ansi)] 
    73    private extern static void gadget_InputManager_updateAllData__0(IntPtr obj); 
    74  
    75    public  void updateAllData() 
    76    { 
    77       gadget_InputManager_updateAllData__0(mRawObject); 
     73   private extern static void gadget_InputManager_updateAllDevices__0(IntPtr obj); 
     74 
     75   public  void updateAllDevices() 
     76   { 
     77      gadget_InputManager_updateAllDevices__0(mRawObject); 
     78   } 
     79 
     80 
     81   [DllImport("gadget_bridge", CharSet = CharSet.Ansi)] 
     82   private extern static void gadget_InputManager_updateAllProxies__0(IntPtr obj); 
     83 
     84   public  void updateAllProxies() 
     85   { 
     86      gadget_InputManager_updateAllProxies__0(mRawObject); 
    7887   } 
    7988 

  • vrj.net/trunk/src/gadget_bridge_cs/gadget_Position.cs

    r15541 r19456  
    158158 
    159159   // Delegate for the writeObject() callback. 
    160    protected IntPtr writeObjectAdapter(vpr.ObjectWriter p0) 
    161    { 
    162       return writeObject(p0).RawObject; 
    163    } 
    164  
    165    public delegate IntPtr writeObjectDelegate_vpr_ObjectWriter([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectWriterMarshaler))] vpr.ObjectWriter p0); 
     160   protected void writeObjectAdapter(vpr.ObjectWriter p0) 
     161   { 
     162      writeObject(p0); 
     163   } 
     164 
     165   public delegate void writeObjectDelegate_vpr_ObjectWriter([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectWriterMarshaler))] vpr.ObjectWriter p0); 
    166166   protected writeObjectDelegate_vpr_ObjectWriter m_writeObjectDelegate_vpr_ObjectWriter; 
    167167 
    168168   [DllImport("gadget_bridge", CharSet = CharSet.Ansi)] 
    169    [return : MarshalAs(UnmanagedType.CustomMarshaler, 
    170                        MarshalTypeRef = typeof(vpr.ReturnStatusMarshaler))] 
    171    private extern static vpr.ReturnStatus gadget_Position_writeObject__vpr_ObjectWriter1(IntPtr obj, 
     169   private extern static void gadget_Position_writeObject__vpr_ObjectWriter1(IntPtr obj, 
    172170        [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectWriterMarshaler))] vpr.ObjectWriter p0); 
    173171 
    174    public virtual vpr.ReturnStatus writeObject(vpr.ObjectWriter p0) 
    175    { 
    176       vpr.ReturnStatus result; 
    177       result = gadget_Position_writeObject__vpr_ObjectWriter1(mRawObject, p0); 
    178       return result; 
     172   public virtual void writeObject(vpr.ObjectWriter p0) 
     173   { 
     174      gadget_Position_writeObject__vpr_ObjectWriter1(mRawObject, p0); 
    179175   } 
    180176 
    181177 
    182178   // Delegate for the readObject() callback. 
    183    protected IntPtr readObjectAdapter(vpr.ObjectReader p0) 
    184    { 
    185       return readObject(p0).RawObject; 
    186    } 
    187  
    188    public delegate IntPtr readObjectDelegate_vpr_ObjectReader([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectReaderMarshaler))] vpr.ObjectReader p0); 
     179   protected void readObjectAdapter(vpr.ObjectReader p0) 
     180   { 
     181      readObject(p0); 
     182   } 
     183 
     184   public delegate void readObjectDelegate_vpr_ObjectReader([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectReaderMarshaler))] vpr.ObjectReader p0); 
    189185   protected readObjectDelegate_vpr_ObjectReader m_readObjectDelegate_vpr_ObjectReader; 
    190186 
    191187   [DllImport("gadget_bridge", CharSet = CharSet.Ansi)] 
    192    [return : MarshalAs(UnmanagedType.CustomMarshaler, 
    193                        MarshalTypeRef = typeof(vpr.ReturnStatusMarshaler))] 
    194    private extern static vpr.ReturnStatus gadget_Position_readObject__vpr_ObjectReader1(IntPtr obj, 
     188   private extern static void gadget_Position_readObject__vpr_ObjectReader1(IntPtr obj, 
    195189        [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(vpr.ObjectReaderMarshaler))] vpr.ObjectReader p0); 
    196190 
    197    public virtual vpr.ReturnStatus readObject(vpr.ObjectReader p0) 
    198    { 
    199       vpr.ReturnStatus result; 
    200       result = gadget_Position_readObject__vpr_ObjectReader1(mRawObject, p0); 
    201       return result; 
     191   public virtual void readObject(vpr.ObjectReader p0) 
     192   { 
     193      gadget_Position_readObject__vpr_ObjectReader1(mRawObject, p0); 
    202194   } 
    203195 

  • vrj.net/trunk/src/gadget_bridge_cs/gadget_Proxy.cs

    r15541 r19456  
    111111 
    112112   [DllImport("gadget_bridge", CharSet = CharSet.Ansi)] 
    113    private extern static void gadget_Proxy_stupify__bool0(IntPtr obj); 
    114  
    115    public  void stupify() 
    116    { 
    117       gadget_Proxy_stupify__bool0(mRawObject); 
    118    } 
    119  
    120    [DllImport("gadget_bridge", CharSet = CharSet.Ansi)] 
    121    private extern static void gadget_Proxy_stupify__bool1(IntPtr obj, 
     113   private extern static void gadget_Proxy_stupefy__bool0(IntPtr obj); 
     114 
     115   public  void stupefy() 
     116   { 
     117      gadget_Proxy_stupefy__bool0(mRawObject); 
     118   } 
     119 
     120   [DllImport("gadget_bridge", CharSet = CharSet.Ansi)] 
     121   private extern static void gadget_Proxy_stupefy__bool1(IntPtr obj, 
    122122        bool p0); 
    123123 
    124