From 0158b3de8e53f47c89b14edda2f91465d772af7c Mon Sep 17 00:00:00 2001 From: Ovidiu Mircescu Date: Mon, 8 Feb 2016 10:29:55 +0100 Subject: [PATCH] Give public access to the "getPointer" function of all "*Servant" classes. This access is usefull when you are on the server side and you want to work on the MedCoupling structure without making a costly copy. --- src/MEDCouplingCorba/DataArrayDoubleServant.hxx | 2 +- src/MEDCouplingCorba/DataArrayIntServant.hxx | 2 +- src/MEDCouplingCorba/DataArrayServant.hxx | 2 +- src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.hxx | 2 +- src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.hxx | 2 +- src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.hxx | 2 +- src/MEDCouplingCorba/MEDCouplingCMeshServant.hxx | 2 +- src/MEDCouplingCorba/MEDCouplingCurveLinearMeshServant.hxx | 2 +- src/MEDCouplingCorba/MEDCouplingExtrudedMeshServant.hxx | 2 +- src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.hxx | 2 +- src/MEDCouplingCorba/MEDCouplingFieldOverTimeServant.hxx | 2 +- src/MEDCouplingCorba/MEDCouplingFieldServant.hxx | 2 +- src/MEDCouplingCorba/MEDCouplingFieldTemplateServant.hxx | 2 +- src/MEDCouplingCorba/MEDCouplingIMeshServant.hxx | 2 +- src/MEDCouplingCorba/MEDCouplingMeshServant.hxx | 1 + src/MEDCouplingCorba/MEDCouplingMultiFieldsServant.hxx | 2 +- src/MEDCouplingCorba/MEDCouplingPointSetServant.hxx | 2 +- src/MEDCouplingCorba/MEDCouplingStructuredMeshServant.hxx | 2 +- src/MEDCouplingCorba/MEDCouplingUMeshServant.hxx | 2 +- 19 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/MEDCouplingCorba/DataArrayDoubleServant.hxx b/src/MEDCouplingCorba/DataArrayDoubleServant.hxx index 10c07bca5..2036fddc3 100644 --- a/src/MEDCouplingCorba/DataArrayDoubleServant.hxx +++ b/src/MEDCouplingCorba/DataArrayDoubleServant.hxx @@ -40,10 +40,10 @@ namespace MEDCoupling typedef DataArrayDouble CppType; DataArrayDoubleServant(const DataArrayDouble *cppPointer); protected: - const DataArrayDouble *getPointer() const { return (const DataArrayDouble *)(_cpp_pointer); } SALOME::StringSeq *GetExportableFormats(); CORBA::Boolean ExportDataAs(const char *format, SALOME::GenericObj_out exporter); public: + const DataArrayDouble *getPointer() const { return (const DataArrayDouble *)(_cpp_pointer); } void getTinyInfo(SALOME_TYPES::ListOfLong_out la, SALOME_TYPES::ListOfString_out sa); void getSerialisationData(SALOME_TYPES::ListOfDouble_out da); }; diff --git a/src/MEDCouplingCorba/DataArrayIntServant.hxx b/src/MEDCouplingCorba/DataArrayIntServant.hxx index 88965a54b..e51d68c61 100644 --- a/src/MEDCouplingCorba/DataArrayIntServant.hxx +++ b/src/MEDCouplingCorba/DataArrayIntServant.hxx @@ -39,10 +39,10 @@ namespace MEDCoupling typedef DataArrayInt CppType; DataArrayIntServant(const DataArrayInt *cppPointer); protected: - const DataArrayInt *getPointer() const { return (const DataArrayInt *)(_cpp_pointer); } SALOME::StringSeq *GetExportableFormats(); CORBA::Boolean ExportDataAs(const char *format, SALOME::GenericObj_out exporter); public: + const DataArrayInt *getPointer() const { return (const DataArrayInt *)(_cpp_pointer); } void getTinyInfo(SALOME_TYPES::ListOfLong_out la, SALOME_TYPES::ListOfString_out sa); void getSerialisationData(SALOME_TYPES::ListOfLong_out da); }; diff --git a/src/MEDCouplingCorba/DataArrayServant.hxx b/src/MEDCouplingCorba/DataArrayServant.hxx index 46e19fcf6..4491d54ab 100644 --- a/src/MEDCouplingCorba/DataArrayServant.hxx +++ b/src/MEDCouplingCorba/DataArrayServant.hxx @@ -40,7 +40,7 @@ namespace MEDCoupling DataArrayServant(const DataArray *cppPointer); char *getName(); SALOME_TYPES::ListOfString *getInfoOnComponents(); - protected: + public: const DataArray *getPointer() const { return (const DataArray *)(_cpp_pointer); } }; } diff --git a/src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.hxx b/src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.hxx index 6d15b1bd7..80a85905d 100644 --- a/src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.hxx +++ b/src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.hxx @@ -38,7 +38,7 @@ namespace MEDCoupling public: typedef MEDCoupling1DGTUMesh CppType; MEDCoupling1DGTUMeshServant(const MEDCoupling1DGTUMesh *cppPointerOfMesh); - protected: + public: const MEDCoupling1DGTUMesh *getPointer() const { return (const MEDCoupling1DGTUMesh *)_cpp_pointer; } }; } diff --git a/src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.hxx b/src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.hxx index 6f16a1b16..06bb0f807 100644 --- a/src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.hxx +++ b/src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.hxx @@ -38,7 +38,7 @@ namespace MEDCoupling public: typedef MEDCoupling1GTUMesh CppType; MEDCoupling1GTUMeshServant(const MEDCoupling1GTUMesh *cppPointerOfMesh); - protected: + public: const MEDCoupling1GTUMesh *getPointer() const { return (const MEDCoupling1GTUMesh *)_cpp_pointer; } }; } diff --git a/src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.hxx b/src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.hxx index 6e3bbd1ea..d4adf0eb6 100644 --- a/src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.hxx +++ b/src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.hxx @@ -38,7 +38,7 @@ namespace MEDCoupling public: typedef MEDCoupling1SGTUMesh CppType; MEDCoupling1SGTUMeshServant(const MEDCoupling1SGTUMesh *cppPointerOfMesh); - protected: + public: const MEDCoupling1SGTUMesh *getPointer() const { return (const MEDCoupling1SGTUMesh *)_cpp_pointer; } }; } diff --git a/src/MEDCouplingCorba/MEDCouplingCMeshServant.hxx b/src/MEDCouplingCorba/MEDCouplingCMeshServant.hxx index 2f6ac08ea..eae267fbd 100644 --- a/src/MEDCouplingCorba/MEDCouplingCMeshServant.hxx +++ b/src/MEDCouplingCorba/MEDCouplingCMeshServant.hxx @@ -37,7 +37,7 @@ namespace MEDCoupling typedef MEDCouplingCMesh CppType; MEDCouplingCMeshServant(const MEDCouplingCMesh *cppPointerOfMesh); ~MEDCouplingCMeshServant(); - private: + public: const MEDCouplingCMesh *getPointer() const { return (const MEDCouplingCMesh *)(_cpp_pointer); } }; } diff --git a/src/MEDCouplingCorba/MEDCouplingCurveLinearMeshServant.hxx b/src/MEDCouplingCorba/MEDCouplingCurveLinearMeshServant.hxx index f54daaea0..022d4c698 100644 --- a/src/MEDCouplingCorba/MEDCouplingCurveLinearMeshServant.hxx +++ b/src/MEDCouplingCorba/MEDCouplingCurveLinearMeshServant.hxx @@ -37,7 +37,7 @@ namespace MEDCoupling typedef MEDCouplingCurveLinearMesh CppType; MEDCouplingCurveLinearMeshServant(const MEDCouplingCurveLinearMesh *cppPointerOfMesh); ~MEDCouplingCurveLinearMeshServant(); - private: + public: const MEDCouplingCurveLinearMesh *getPointer() const { return (const MEDCouplingCurveLinearMesh *)(_cpp_pointer); } }; } diff --git a/src/MEDCouplingCorba/MEDCouplingExtrudedMeshServant.hxx b/src/MEDCouplingCorba/MEDCouplingExtrudedMeshServant.hxx index df7d69fd3..ede02c657 100644 --- a/src/MEDCouplingCorba/MEDCouplingExtrudedMeshServant.hxx +++ b/src/MEDCouplingCorba/MEDCouplingExtrudedMeshServant.hxx @@ -37,7 +37,7 @@ namespace MEDCoupling typedef MEDCouplingMappedExtrudedMesh CppType; MEDCouplingExtrudedMeshServant(const MEDCouplingMappedExtrudedMesh *cppPointerOfMesh); ~MEDCouplingExtrudedMeshServant(); - private: + public: const MEDCouplingMappedExtrudedMesh *getPointer() const { return (const MEDCouplingMappedExtrudedMesh *)(_cpp_pointer); } }; } diff --git a/src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.hxx b/src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.hxx index ed4950a0c..b2773d1a3 100644 --- a/src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.hxx +++ b/src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.hxx @@ -44,7 +44,7 @@ namespace MEDCoupling public: typedef MEDCouplingFieldDouble CppType; MEDCouplingFieldDoubleServant(const MEDCouplingFieldDouble *cppPointerOfMesh); - protected: + public: const MEDCouplingFieldDouble *getPointer() const { return (const MEDCouplingFieldDouble *)(_cpp_pointer); } protected: char *getName(); diff --git a/src/MEDCouplingCorba/MEDCouplingFieldOverTimeServant.hxx b/src/MEDCouplingCorba/MEDCouplingFieldOverTimeServant.hxx index a4eaa93ba..d6b029a7b 100644 --- a/src/MEDCouplingCorba/MEDCouplingFieldOverTimeServant.hxx +++ b/src/MEDCouplingCorba/MEDCouplingFieldOverTimeServant.hxx @@ -38,7 +38,7 @@ namespace MEDCoupling public: typedef MEDCouplingFieldOverTime CppType; MEDCouplingFieldOverTimeServant(const MEDCouplingFieldOverTime *cppPointer); - protected: + public: const MEDCouplingFieldOverTime *getPointer() const { return (const MEDCouplingFieldOverTime *)(_cpp_pointer); } protected: void getTinyInfoAboutTimeDefinition(SALOME_TYPES::ListOfLong_out la, SALOME_TYPES::ListOfDouble_out da); diff --git a/src/MEDCouplingCorba/MEDCouplingFieldServant.hxx b/src/MEDCouplingCorba/MEDCouplingFieldServant.hxx index 9fc758a24..a99d815a0 100644 --- a/src/MEDCouplingCorba/MEDCouplingFieldServant.hxx +++ b/src/MEDCouplingCorba/MEDCouplingFieldServant.hxx @@ -39,8 +39,8 @@ namespace MEDCoupling { protected: MEDCouplingFieldServant(const MEDCouplingField *cppPointerOfMesh); - const MEDCouplingField *getPointer() const { return (const MEDCouplingField *)(_cpp_pointer); } public: + const MEDCouplingField *getPointer() const { return (const MEDCouplingField *)(_cpp_pointer); } static SALOME_MED::MEDCouplingMeshCorbaInterface_ptr BuildCorbaRefFromCppPointer(const MEDCouplingMesh *mesh); protected: SALOME_MED::MEDCouplingMeshCorbaInterface_ptr getMesh(); diff --git a/src/MEDCouplingCorba/MEDCouplingFieldTemplateServant.hxx b/src/MEDCouplingCorba/MEDCouplingFieldTemplateServant.hxx index bfcdb24ee..e97b72ee9 100644 --- a/src/MEDCouplingCorba/MEDCouplingFieldTemplateServant.hxx +++ b/src/MEDCouplingCorba/MEDCouplingFieldTemplateServant.hxx @@ -44,7 +44,7 @@ namespace MEDCoupling public: typedef MEDCouplingFieldTemplate CppType; MEDCouplingFieldTemplateServant(const MEDCouplingFieldTemplate *cppPointerOfMesh); - protected: + public: const MEDCouplingFieldTemplate *getPointer() const { return (const MEDCouplingFieldTemplate *)(_cpp_pointer); } protected: void getTinyInfo(SALOME_TYPES::ListOfLong_out la, SALOME_TYPES::ListOfDouble_out da, SALOME_TYPES::ListOfString_out sa); diff --git a/src/MEDCouplingCorba/MEDCouplingIMeshServant.hxx b/src/MEDCouplingCorba/MEDCouplingIMeshServant.hxx index fcf0b83b1..c892157b4 100644 --- a/src/MEDCouplingCorba/MEDCouplingIMeshServant.hxx +++ b/src/MEDCouplingCorba/MEDCouplingIMeshServant.hxx @@ -37,7 +37,7 @@ namespace MEDCoupling typedef MEDCouplingIMesh CppType; MEDCouplingIMeshServant(const MEDCouplingIMesh *cppPointerOfMesh); ~MEDCouplingIMeshServant(); - private: + public: const MEDCouplingIMesh *getPointer() const { return (const MEDCouplingIMesh *)(_cpp_pointer); } }; } diff --git a/src/MEDCouplingCorba/MEDCouplingMeshServant.hxx b/src/MEDCouplingCorba/MEDCouplingMeshServant.hxx index 5394c0cf8..57a38f146 100644 --- a/src/MEDCouplingCorba/MEDCouplingMeshServant.hxx +++ b/src/MEDCouplingCorba/MEDCouplingMeshServant.hxx @@ -38,6 +38,7 @@ namespace MEDCoupling { protected: MEDCouplingMeshServant(const MEDCouplingMesh *cppPointerOfMesh); + public: const MEDCouplingMesh *getPointer() const { return (const MEDCouplingMesh *)(_cpp_pointer); } protected: char *getName(); diff --git a/src/MEDCouplingCorba/MEDCouplingMultiFieldsServant.hxx b/src/MEDCouplingCorba/MEDCouplingMultiFieldsServant.hxx index 3339ba72f..84e46c340 100644 --- a/src/MEDCouplingCorba/MEDCouplingMultiFieldsServant.hxx +++ b/src/MEDCouplingCorba/MEDCouplingMultiFieldsServant.hxx @@ -43,7 +43,7 @@ namespace MEDCoupling public: typedef MEDCouplingMultiFields CppType; MEDCouplingMultiFieldsServant(const MEDCouplingMultiFields *cppPointer); - protected: + public: const MEDCouplingMultiFields *getPointer() const { return (const MEDCouplingMultiFields *)(_cpp_pointer); } protected: char *getName(); diff --git a/src/MEDCouplingCorba/MEDCouplingPointSetServant.hxx b/src/MEDCouplingCorba/MEDCouplingPointSetServant.hxx index 7aae859e4..1a8d4fcbd 100644 --- a/src/MEDCouplingCorba/MEDCouplingPointSetServant.hxx +++ b/src/MEDCouplingCorba/MEDCouplingPointSetServant.hxx @@ -42,7 +42,7 @@ namespace MEDCoupling MEDCouplingPointSetServant(const MEDCouplingPointSet *cppPointerOfMesh); ~MEDCouplingPointSetServant(); SALOME_MED::DataArrayDoubleCorbaInterface_ptr getCoords(); - private: + public: const MEDCouplingPointSet *getPointer() const { return (const MEDCouplingPointSet *)(_cpp_pointer); } }; } diff --git a/src/MEDCouplingCorba/MEDCouplingStructuredMeshServant.hxx b/src/MEDCouplingCorba/MEDCouplingStructuredMeshServant.hxx index 31e8ba977..26dcf6127 100644 --- a/src/MEDCouplingCorba/MEDCouplingStructuredMeshServant.hxx +++ b/src/MEDCouplingCorba/MEDCouplingStructuredMeshServant.hxx @@ -41,7 +41,7 @@ namespace MEDCoupling protected: MEDCouplingStructuredMeshServant(const MEDCouplingStructuredMesh *cppPointerOfMesh); ~MEDCouplingStructuredMeshServant(); - private: + public: const MEDCouplingStructuredMesh *getPointer() const { return (const MEDCouplingStructuredMesh *)(_cpp_pointer); } }; } diff --git a/src/MEDCouplingCorba/MEDCouplingUMeshServant.hxx b/src/MEDCouplingCorba/MEDCouplingUMeshServant.hxx index 431c64561..203336276 100644 --- a/src/MEDCouplingCorba/MEDCouplingUMeshServant.hxx +++ b/src/MEDCouplingCorba/MEDCouplingUMeshServant.hxx @@ -38,7 +38,7 @@ namespace MEDCoupling public: typedef MEDCouplingUMesh CppType; MEDCouplingUMeshServant(const MEDCouplingUMesh *cppPointerOfMesh); - protected: + public: const MEDCouplingUMesh *getPointer() const { return (const MEDCouplingUMesh *)_cpp_pointer; } }; } -- 2.39.2