|
Last change
on this file since 25234 was 25231, checked in by ak19, 12 years ago |
|
Many changes to get corba working again ever since the addition of RSS support meant that the method get_rss_items needed to be mirrored in the corba code. The corba code was not compiling then and it turned out we needed a later version of Mico's corba implementation (2.3.13 up from 2.3.5). Therefore the current commit not only corrects some errors in the recently added getRssItems() method but includes further changes: 1. namespaced use of iostream functions were required in some mpp files. 2. New types and member variables added to the corbaiface.idl interface file, to mirror the presence of equivalent variables in comtools.h which hadn't been ported over yet. (Such as the complex corba data type equivalent of collectionmetamap used in comtools.h.) This required (de)serialisation methods to be declared and implemented in corbatext_t.h and corbatext_t.mpp. The additional member variables for the corbaColInfoResponse in corbaiface.idl are now also unpacked in corbaproto.mpp along with the rest of the data structure. 3. Having changed from mico version 2.3.5 to 2.3.13 required code to changed to use POA instead of BOA. This also meant that skeleton files were no longer to be generated when running idl over corbaiface.idl. corbaserver inherits from a POA related object now instead of from the skeleton. 4. Makefile.in was updated to reflect these changes (absence of skeleton), includes a target to run IDL over the corbaiface.idl file to generate the necessary helper files, and corrects earlier oversights in updating the corba makefile with the rest of the changes made over time to runtime-src.
|
-
Property svn:keywords
set to
Author Date Id Revision
|
|
File size:
953 bytes
|
| Line | |
|---|
| 1 | #include "comtypes.h"
|
|---|
| 2 |
|
|---|
| 3 | void corbatext_fillChar(corbatext_t *t, char *text);
|
|---|
| 4 | void corbatext_usvector(corbatext_t t, std::vector<unsigned short>& us);
|
|---|
| 5 | char *corbatext_string(corbatext_t t);
|
|---|
| 6 | #ifdef TEXT_T_H
|
|---|
| 7 | void corbatext_arrayToCorbaArray(text_tarray t, corbatext_tarray *ca);
|
|---|
| 8 | void corbatext_corbaArrayToArray(corbatext_tarray ca, text_tarray *ta);
|
|---|
| 9 | void corbatext_mapToCorbaMap(text_tmap tm, corbatext_tmap *cm);
|
|---|
| 10 | void corbatext_corbaMapToMap(corbatext_tmap cm, text_tmap &tm);
|
|---|
| 11 | void corbatext_setToCorbaArray(text_tset set, corbatext_tset *cset);
|
|---|
| 12 | void corbatext_corbaArrayToSet(corbatext_tset cset, text_tset *set);
|
|---|
| 13 | corbatext_t_var corbatext_corbatext(text_t t);
|
|---|
| 14 | int corbatext_corbatext(text_t t, corbatext_t_var ct);
|
|---|
| 15 | #endif
|
|---|
| 16 | #ifdef COMTYPES_H
|
|---|
| 17 | void corbatext_colmetamapToCorbaColmetamap(collectionmeta_map cm, corbatext_tcollectionmeta_map *ccm);
|
|---|
| 18 | void corbatext_corbaColmetamapToColmetamap(corbatext_tcollectionmeta_map ccm, collectionmeta_map &cm);
|
|---|
| 19 | #endif
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
