Changeset 3605 in Sophya

Timestamp:

Apr 29, 2009, 12:15:21 PM (16 years ago)

Author:

ansari

Message:

Remplacement (MacOS X) des fonctions deprecated NSxxx de chargement dynamique par dlopen()... , Reza 29/04/2009

Location:

trunk/SophyaLib/SysTools

Files:

• pdlmgr.cc (modified) (4 diffs)
• pdlmgr.h (modified) (2 diffs)

trunk/SophyaLib/SysTools/pdlmgr.cc

@@ -29 +29 @@
   flavours (Linux, HP/Compaq/Digital OSF-Tru64, SGI IRIX, IBM AIX, Sun Solaris,
   MacOS X/Darwin). \n
-  For MacOS X/Darwin, the NSxxx API 
+  For MacOS X/Darwin (version <= 10.3), the NSxxx API 
   <tt> (NSLinkModule , NSCreateObjectFileImageFromFile, ...) </tt> 
-  is used.
+  is used. From MacOSX v >= 10.4, NSxxx API is deprecated.
   The example here shows the linking of shared library named "mylib.so" 
   containing a function \c double \c myfunction(double x). 
@@ -252 +252 @@
 cerr << "PDynLinkMgr::PDynLinkMgr() Not yet available on HP-UX " << endl;
 return;
-#elif defined(Darwin)
+#elif defined(Darwin) && ( GCC_VERSION <= 3350 )
 NSObjectFileImageReturnCode nsrc = NSCreateObjectFileImageFromFile(fnameso.c_str(), &nsobjfile);
 if (nsrc == NSObjectFileImageSuccess) {
@@ -297 +297 @@
 cerr << "PDynLinkMgr::~PDynLinkMgr() Not yet available on HP-UX " << endl;
 // return;
-#elif defined(Darwin)
+#elif defined(Darwin) && ( GCC_VERSION <= 3350 )
 if (dylok) { 
   if (nsmod != NULL)  NSUnLinkModule(nsmod, NSUNLINKMODULE_OPTION_NONE);
@@ -327 +327 @@
 return f;
 #endif
-#if defined(Darwin)
+#if defined(Darwin) && ( GCC_VERSION <= 3350 )
 string funame = "_" + funcname;
 NSSymbol nsf = NSLookupSymbolInModule(nsmod, funame.c_str());

trunk/SophyaLib/SysTools/pdlmgr.h

@@ -12 +12 @@
 #if defined(HPUX)
 #include <dl.h>
-#elif defined(Darwin)
+/* Les fonction NSCreateObjectFile...() sont deprecated - Il faut utiliser les dlopen()...
+   qui sont plus efficaces a partir de 10.4  - On se cale donc sur les versions de GCC */
+#elif defined(Darwin) && ( GCC_VERSION <= 3350 )
 #include <mach-o/dyld.h>
 #else
@@ -47 +49 @@
 #if defined(HPUX)
   shl_t dlhandle;
-#elif defined(Darwin)
+#elif defined(Darwin) && ( GCC_VERSION <= 3350 )
   NSObjectFileImage nsobjfile;
   NSModule nsmod;