Merge V9_dev branch into master

[samples/atomsolv.git] / src / ATOMSOLV / ATOMSOLV.hxx

diff --git a/src/ATOMSOLV/ATOMSOLV.hxx b/src/ATOMSOLV/ATOMSOLV.hxx
index f9c47ca1e7b8de274e397b5f81ca0d45a34f5f54..2cfde291eccc155450df6e8911af1e7272497645 100644 (file)
--- a/src/ATOMSOLV/ATOMSOLV.hxx
+++ b/src/ATOMSOLV/ATOMSOLV.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -51,13 +51,13 @@ public:
           const char *interfaceName);
   virtual ~ATOMSOLV();
 
-  CORBA::Boolean setData( CORBA::Long studyID, const ATOMSOLV_ORB::TMoleculeList& theData );
-  CORBA::Boolean getData( CORBA::Long studyID, ATOMSOLV_ORB::TMoleculeList_out outData );
-  CORBA::Boolean processData( CORBA::Long studyID );
+  CORBA::Boolean setData( const ATOMSOLV_ORB::TMoleculeList& theData );
+  CORBA::Boolean getData( ATOMSOLV_ORB::TMoleculeList_out outData );
+  CORBA::Boolean processData();
   virtual char*  getVersion();
 
 private:
-  std::map<long, ATOMSOLV_ORB::TMoleculeList*> myData;
+  ATOMSOLV_ORB::TMoleculeList* myData;
 };
 
 extern "C"