[pclasses-cvs] pclasses2/src/System SharedLib.dyld.cpp,1.3,1.4 SharedLib.shl.cpp,1.3,1.4 SharedLib.win32.cpp,1.3,1.4

[stephan b. <sg...@us...>]

Update of /cvsroot/pclasses/pclasses2/src/System
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22229/src/System

Modified Files:
	SharedLib.dyld.cpp SharedLib.shl.cpp SharedLib.win32.cpp 
Log Message:
Removed the auto-appending of the default SO extension, analog to the removal in the dl/ltdl-based SharedLibs.

Index: SharedLib.dyld.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/System/SharedLib.dyld.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SharedLib.dyld.cpp	23 Dec 2004 21:50:44 -0000	1.3
+++ SharedLib.dyld.cpp	25 Dec 2004 00:21:13 -0000	1.4
@@ -22,10 +22,8 @@
 
 #include <mach-o/dyld.h>
 
-#ifdef PCLASSES_WITH_STL
-#  include <string>
-#  include <sstream>
-#endif
+#include <string>
+#include <sstream>
 
 namespace P {
 
@@ -49,40 +47,38 @@
 
 SharedLib::SharedLib(const Unicode::String& name, BindMode mode) throw(SystemError)
 {
-	Unicode::String realName = name;
-	realName.append(".dyld");
+// 	Unicode::String realName = name;
+// 	realName.append(".dyld");
 
 	int flags = BindMode2Flags(mode) | NSLINKMODULE_OPTION_RETURN_ON_ERROR;
 
 	NSObjectFileImage file;
 	NSObjectFileImageReturnCode ret;
-	ret = NSCreateObjectFileImageFromFile(realName.utf8(), &file);
+	ret = NSCreateObjectFileImageFromFile(name.utf8(), &file);
 	if(ret != NSObjectFileImageSuccess)
 		throw SystemError(0, "Could not load shared library", P_SOURCEINFO);
 
-	NSModule out = NSLinkModule(file, realName.utf8(), flags);
+	NSModule out = NSLinkModule(file, name.utf8(), flags);
 	_handle = (unsigned long)out;
 }
 
-#ifndef PCLASSES_WITH_STL
 SharedLib::SharedLib(const std::string& name, BindMode mode) throw(SystemError)
 {
-	std::ostringstream realName;
-	realName << name;
-	realName << ".dyld";
+// 	std::ostringstream realName;
+// 	realName << name;
+// 	realName << ".dyld";
 
 	int flags = BindMode2Flags(mode) | NSLINKMODULE_OPTION_RETURN_ON_ERROR;
 
 	NSObjectFileImage file;
 	NSObjectFileImageReturnCode ret;
-	ret = NSCreateObjectFileImageFromFile(realName.c_str(), &file);
+	ret = NSCreateObjectFileImageFromFile(name.c_str(), &file);
 	if(ret != NSObjectFileImageSuccess)
 		throw SystemError(0, "Could not load shared library", P_SOURCEINFO);
 
-	NSModule out = NSLinkModule(file, realName.c_str(), flags);
+	NSModule out = NSLinkModule(file, name.c_str(), flags);
 	_handle = (unsigned long)out;
 }
-#endif
 
 SharedLib::~SharedLib() throw()
 {

Index: SharedLib.win32.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/System/SharedLib.win32.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SharedLib.win32.cpp	23 Dec 2004 21:50:44 -0000	1.3
+++ SharedLib.win32.cpp	25 Dec 2004 00:21:13 -0000	1.4
@@ -21,10 +21,8 @@
 #include "pclasses/System/SharedLib.h"
 #include <windows.h>
 
-#ifdef PCLASSES_WITH_STL
-#  include <string>
-#  include <sstream>
-#endif
+#include <string>
+#include <sstream>
 
 namespace P {
 
@@ -32,27 +30,25 @@
 
 SharedLib::SharedLib(const Unicode::String& name, BindMode mode) throw(SystemError)
 {
-	Unicode::String realName = name;
-	realName.append(".dll");
+// 	Unicode::String realName = name;
+// 	realName.append(".dll");
 
-	//@fixme _handle = (unsigned long)LoadLibrary(name);
+	_handle = (unsigned long)LoadLibrary(name);
 	if(!_handle)
 		throw SystemError(GetLastError(), "Could not load shared library", P_SOURCEINFO);
 }
 
-#ifndef PCLASSES_WITH_STL
 SharedLib::SharedLib(const std::string& name, BindMode mode) throw(SystemError)
 {
-	std::ostringstream realName;
-	realName << name;
-	realName << ".dll";
+// 	std::ostringstream realName;
+// 	realName << name;
+// 	realName << ".dll";
 
-	_handle = (unsigned long)LoadLibrary(realName.c_str());
+	_handle = (unsigned long)LoadLibrary(name.c_str());
 
 	if(!_handle)
 		throw SystemError(GetLastError(), "Could not load shared library", P_SOURCEINFO);
 }
-#endif
 
 SharedLib::~SharedLib() throw()
 {

Index: SharedLib.shl.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/System/SharedLib.shl.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SharedLib.shl.cpp	23 Dec 2004 21:50:44 -0000	1.3
+++ SharedLib.shl.cpp	25 Dec 2004 00:21:13 -0000	1.4
@@ -23,10 +23,8 @@
 #include <dl.h>
 #include <errno.h>
 
-#ifdef PCLASSES_WITH_STL
-#  include <string>
-#  include <sstream>
-#endif
+#include <string>
+#include <sstream>
 
 namespace P {
 
@@ -51,31 +49,29 @@
 
 SharedLib::SharedLib(const Unicode::String& name, BindMode mode) throw(SystemError)
 {
-	Unicode::String realName = name;
-	realName.append(".sl");
+// 	Unicode::String realName = name;
+// 	realName.append(".sl");
 
-	_handle = (unsigned long)shl_load(realName.utf8(), BindMode2Flags(mode));
+	_handle = (unsigned long)shl_load(name.utf8(), BindMode2Flags(mode));
 
 	//@fixme dlerror() on hpux ??
 	if(!_handle)
 		throw SystemError(errno, dlerror(), P_SOURCEINFO);
 }
 
-#ifndef PCLASSES_WITH_STL
 SharedLib::SharedLib(const std::string& name, BindMode mode) throw(SystemError)
 {
-	std::ostringstream realName;
-	realName << name;
-	realName << ".sl";
+// 	std::ostringstream realName;
+// 	realName << name;
+// 	realName << ".sl";
 
-	_handle = (unsigned long)shl_load(realName.str().c_str(), 
+	_handle = (unsigned long)shl_load(name.str().c_str(), 
 		BindMode2Flags(mode));
 
 	//@fixme dlerror() on hpux ??
 	if(!_handle)
 		throw SystemError(errno, dlerror(), P_SOURCEINFO);
 }
-#endif
 
 SharedLib::~SharedLib() throw()
 {