patches for use under NT
Matthew Newhook
matthew_newhook@stratos.ca
Thu, 3 Jul 1997 16:11:01 -0230
Hi,
What follows are diffs to allow compilation of omniORB under NT
without the .def file.
If you apply these patches the naming service won't be included in
CORBA.h. It is also intended to be used with my previous set of
patches for omniidl2.
Another major change is that the naming service is no longer directly
compiled into the ORB. Under solaris a single library libnaming.a is
produced. This is due to the fact that the stubs that are produced are
not intended to be compiled as a .dll (no dllexport, or dllimport)
and therefore cannot be linked into a .dll without a .def file.
Under NT two libraries are produced. naming_rt.lib and naming.lib.
naming_rt.lib is supposed to be used with the .dll version
(omniORB_rt.lib), and naming.lib should be used with omniORB.lib.
The changes that I've made to the MAKEFILE under NT produce a version
of omniORB with debugging information. To compile a version without
debugging change
/Zi to /O2
and
/DEBUG:full to
/pdb:none
These patches contain:
- fixes for .dll compilation under NT.
- implementation of activators under NT.
- fix to CORBA::String_member copy constructor.
- fix for deadlock when calling ORB methods in destructor of an
implementation object.
- fix to BOA::dispose method
- modifications to makefiles to produce naming.lib and naming_rt.lib
and to produce libnaming.a under NT.
---
diffs follow
---
diff -u /pub/corba/omniORB_2.2.0/include/omniORB2/CORBA.h include/omniORB2/CORBA.h
--- /pub/corba/omniORB_2.2.0/include/omniORB2/CORBA.h Tue May 6 13:34:49 1997
+++ include/omniORB2/CORBA.h Thu Jul 3 10:05:51 1997
@@ -166,7 +166,7 @@
};
// omniORB2 private class
- class String_member
+ class _OMNIORB2_NTDLL_ String_member
{
public:
typedef char* ptr_t;
@@ -179,10 +179,7 @@
}
inline String_member(const String_member &s) {
- if (_ptr) {
- string_free(_ptr);
- _ptr = 0;
- }
+ _ptr = 0;
if (s._ptr) {
_ptr = string_alloc((ULong)(strlen(s._ptr)+1));
strcpy(_ptr,s._ptr);
@@ -398,7 +395,7 @@
// PIDL Exception //
////////////////////////////////////////////////////////////////////////
- class Exception {
+ class _OMNIORB2_NTDLL_ Exception {
public:
virtual ~Exception() {}
protected:
@@ -406,7 +403,7 @@
};
enum CompletionStatus { COMPLETED_YES, COMPLETED_NO, COMPLETED_MAYBE };
- class SystemException : public Exception {
+ class _OMNIORB2_NTDLL_ SystemException : public Exception {
public:
SystemException() {
pd_minor = 0;
@@ -454,7 +451,7 @@
};
#define STD_EXCEPTION(name) \
- class name : public SystemException { \
+ class _OMNIORB2_NTDLL_ name : public SystemException { \
public: \
name (ULong minor = 0, CompletionStatus completed = COMPLETED_NO \
) : SystemException (minor,completed) {} \
@@ -490,7 +487,7 @@
#undef STD_EXCEPTION
- class UserException : public Exception {
+ class _OMNIORB2_NTDLL_ UserException : public Exception {
public:
UserException() {}
virtual ~UserException() {}
@@ -600,8 +597,8 @@
static Environment_ptr _duplicate();
static Environment_ptr _nil();
+ Environment() {} // Not implemented yet
private:
- Environment(); // Not implemented yet
};
////////////////////////////////////////////////////////////////////////
@@ -728,6 +725,7 @@
class Object;
typedef Object *Object_ptr;
+ typedef Object_ptr ObjectRef;
typedef _CORBA_Unbounded_Sequence_Octet ReferenceData;
@@ -741,7 +739,7 @@
ImplementationDef(); // Not implemented yet;
};
- class Object_Helper {
+ class _OMNIORB2_NTDLL_ Object_Helper {
public:
// omniORB2 specifics
static Object_ptr _nil();
@@ -755,7 +753,7 @@
static Object_ptr unmarshalObjRef(MemBufferedStream &s);
};
- class Object {
+ class _OMNIORB2_NTDLL_ Object {
public:
#if defined(SUPPORT_DII)
@@ -844,7 +842,7 @@
class BOA;
typedef class BOA *BOA_ptr;
- class BOA {
+ class _OMNIORB2_NTDLL_ BOA {
public:
Object_ptr create( const ReferenceData&,
InterfaceDef_ptr,
@@ -863,6 +861,10 @@
void obj_is_ready(Object_ptr, ImplementationDef_ptr p=0);
+ Object_ptr make_object(const omniObjectKey& k, const char* type_id);
+ // omniORB2 specific. Create an proxy that refers to a local object
+ // with the specified key, and the specified type_id.
+
static BOA_ptr _duplicate(BOA_ptr);
static BOA_ptr _nil();
@@ -883,7 +885,7 @@
class ORB;
typedef class ORB *ORB_ptr;
- class ORB {
+ class _OMNIORB2_NTDLL_ ORB {
public:
char *object_to_string(Object_ptr) ;
@@ -1281,7 +1283,6 @@
private:
ORB_ptr pd_orbref;
};
-
};
@@ -1289,10 +1290,6 @@
#include <omniORB2/proxyFactory.h>
// Include the COSS Naming Service header:
-#ifdef __NT__
-#include <omniORB2/Naming_NT.hh>
-#else
-#include <omniORB2/Naming.hh>
-#endif
+//#include <omniORB2/Naming.hh>
#endif // __CORBA_H__
diff -u /pub/corba/omniORB_2.2.0/include/omniORB2/CORBA_basetypes.h include/omniORB2/CORBA_basetypes.h
--- /pub/corba/omniORB_2.2.0/include/omniORB2/CORBA_basetypes.h Tue May 6 13:35:25 1997
+++ include/omniORB2/CORBA_basetypes.h Wed Jul 2 15:45:10 1997
@@ -68,8 +68,8 @@
typedef double _CORBA_Double;
#endif
-extern void _CORBA_new_operator_return_null();
-extern void _CORBA_bound_check_error();
-extern void _CORBA_marshal_error();
+extern void _OMNIORB2_NTDLL_ _CORBA_new_operator_return_null();
+extern void _OMNIORB2_NTDLL_ _CORBA_bound_check_error();
+extern void _OMNIORB2_NTDLL_ _CORBA_marshal_error();
#endif // __CORBA_BASETYPES_H__
diff -u /pub/corba/omniORB_2.2.0/include/omniORB2/CORBA_sysdep.h include/omniORB2/CORBA_sysdep.h
--- /pub/corba/omniORB_2.2.0/include/omniORB2/CORBA_sysdep.h Tue May 6 13:36:06 1997
+++ include/omniORB2/CORBA_sysdep.h Wed Jul 2 15:27:00 1997
@@ -32,6 +32,9 @@
/*
$Log: CORBA_sysdep.h,v $
+ * Revision 1.1 1997/07/02 17:52:14 matthew
+ * Initial revision
+ *
* Revision 1.10 1997/05/06 16:06:03 sll
* Public release.
*
@@ -136,10 +139,13 @@
#elif defined(_OMNIORB2_DLL)
#define _OMNIORB2_NTDLL_ __declspec(dllexport)
#pragma warning(disable: 4251)
+#pragma warning(disable: 4275)
// Disable this warning, as myPrincipalID is defined by a template, which
// can't be exported using __declspec
#elif !defined(_WINSTATIC)
#define _OMNIORB2_NTDLL_ __declspec(dllimport)
+#pragma warning(disable: 4275)
+// disable non dll-interface class '*' used as base for dll-interface class
#pragma warning(disable: 4251)
// Disable this warning, as myPrincipalID is defined by a template, which
// can't be imported using __declspec
diff -u /pub/corba/omniORB_2.2.0/include/omniORB2/Naming.hh include/omniORB2/Naming.hh
--- /pub/corba/omniORB_2.2.0/include/omniORB2/Naming.hh Wed Apr 23 12:45:08 1997
+++ include/omniORB2/Naming.hh Thu Jul 3 11:15:52 1997
@@ -21,8 +21,8 @@
typedef _CORBA_ConstrType_Variable_Var<NameComponent> NameComponent_var;
- typedef _CORBA_Unbounded_Sequence<CosNaming::NameComponent > Name;
- typedef _CORBA_Sequence_Var<Name, CosNaming::NameComponent > Name_var;
+ typedef _CORBA_Unbounded_Sequence<NameComponent > Name;
+ typedef _CORBA_Sequence_Var<Name, NameComponent > Name_var;
enum BindingType { nobject, ncontext };
@@ -61,8 +61,8 @@
}
struct Binding {
- CosNaming::Name binding_name;
- CosNaming::BindingType binding_type;
+ Name binding_name;
+ BindingType binding_type;
size_t NP_alignedSize(size_t initialoffset) const;
void operator>>= (NetBufferedStream &) const;
@@ -73,8 +73,8 @@
typedef _CORBA_ConstrType_Variable_Var<Binding> Binding_var;
- typedef _CORBA_Unbounded_Sequence<CosNaming::Binding > BindingList;
- typedef _CORBA_Sequence_Var<BindingList, CosNaming::Binding > BindingList_var;
+ typedef _CORBA_Unbounded_Sequence<Binding > BindingList;
+ typedef _CORBA_Sequence_Var<BindingList, Binding > BindingList_var;
#ifndef __CosNaming_BindingIterator__
#define __CosNaming_BindingIterator__
@@ -120,11 +120,11 @@
#endif
#ifndef __CosNaming_NamingContext__
#define __CosNaming_NamingContext__
- class NamingContext;
+ class NamingContext;
typedef NamingContext* NamingContext_ptr;
typedef NamingContext_ptr NamingContextRef;
- class NamingContext_Helper {
+ class NamingContext_Helper {
public:
static NamingContext_ptr _nil();
static CORBA::Boolean is_nil(NamingContext_ptr p);
@@ -139,7 +139,7 @@
typedef _CORBA_ObjRef_Var<NamingContext,NamingContext_Helper> NamingContext_var;
#endif
-#define CosNaming_NamingContext_IntfRepoID "IDL:CosNaming/NamingContext:1.0"
+#define CosNaming_NamingContext_IntfRepoID "IDL:omg.org/CosNaming/NamingContext:1.0"
class NamingContext : public virtual omniObject, public virtual CORBA::Object {
public:
@@ -182,17 +182,17 @@
}
}
-#define CosNaming_NamingContext_NotFound_IntfRepoID "IDL:CosNaming/NamingContext/NotFound:1.0"
+#define CosNaming_NamingContext_NotFound_IntfRepoID "IDL:omg.org/CosNaming/NamingContext/NotFound:1.0"
class NotFound : public CORBA::UserException {
public:
- CosNaming::NamingContext::NotFoundReason why;
- CosNaming::Name rest_of_name;
+ NotFoundReason why;
+ Name rest_of_name;
NotFound() {};
NotFound(const NotFound &);
- NotFound(CosNaming::NamingContext::NotFoundReason _why, const CosNaming::Name & _rest_of_name);
+ NotFound(NotFoundReason _why, const Name & _rest_of_name);
NotFound & operator=(const NotFound &);
virtual ~NotFound() {};
size_t NP_alignedSize(size_t initialoffset);
@@ -202,17 +202,17 @@
void operator<<= (MemBufferedStream &);
};
-#define CosNaming_NamingContext_CannotProceed_IntfRepoID "IDL:CosNaming/NamingContext/CannotProceed:1.0"
+#define CosNaming_NamingContext_CannotProceed_IntfRepoID "IDL:omg.org/CosNaming/NamingContext/CannotProceed:1.0"
class CannotProceed : public CORBA::UserException {
public:
- _CORBA_ObjRef_Member<CosNaming::NamingContext,CosNaming::NamingContext_Helper> cxt;
- CosNaming::Name rest_of_name;
+ _CORBA_ObjRef_Member<NamingContext,NamingContext_Helper> cxt;
+ Name rest_of_name;
CannotProceed() {};
CannotProceed(const CannotProceed &);
- CannotProceed(CosNaming::NamingContext_ptr _cxt, const CosNaming::Name & _rest_of_name);
+ CannotProceed(NamingContext_ptr _cxt, const Name & _rest_of_name);
CannotProceed & operator=(const CannotProceed &);
virtual ~CannotProceed() {};
size_t NP_alignedSize(size_t initialoffset);
@@ -222,7 +222,7 @@
void operator<<= (MemBufferedStream &);
};
-#define CosNaming_NamingContext_InvalidName_IntfRepoID "IDL:CosNaming/NamingContext/InvalidName:1.0"
+#define CosNaming_NamingContext_InvalidName_IntfRepoID "IDL:omg.org/CosNaming/NamingContext/InvalidName:1.0"
class InvalidName : public CORBA::UserException {
public:
@@ -239,7 +239,7 @@
void operator<<= (MemBufferedStream &);
};
-#define CosNaming_NamingContext_AlreadyBound_IntfRepoID "IDL:CosNaming/NamingContext/AlreadyBound:1.0"
+#define CosNaming_NamingContext_AlreadyBound_IntfRepoID "IDL:omg.org/CosNaming/NamingContext/AlreadyBound:1.0"
class AlreadyBound : public CORBA::UserException {
public:
@@ -256,7 +256,7 @@
void operator<<= (MemBufferedStream &);
};
-#define CosNaming_NamingContext_NotEmpty_IntfRepoID "IDL:CosNaming/NamingContext/NotEmpty:1.0"
+#define CosNaming_NamingContext_NotEmpty_IntfRepoID "IDL:omg.org/CosNaming/NamingContext/NotEmpty:1.0"
class NotEmpty : public CORBA::UserException {
public:
@@ -273,19 +273,19 @@
void operator<<= (MemBufferedStream &);
};
- virtual void bind ( const CosNaming::Name & n, CORBA::Object_ptr obj ) = 0;
- virtual void rebind ( const CosNaming::Name & n, CORBA::Object_ptr obj ) = 0;
- virtual void bind_context ( const CosNaming::Name & n, CosNaming::NamingContext_ptr nc ) = 0;
- virtual void rebind_context ( const CosNaming::Name & n, CosNaming::NamingContext_ptr nc ) = 0;
- virtual CORBA::Object_ptr resolve ( const CosNaming::Name & n ) = 0;
- virtual void unbind ( const CosNaming::Name & n ) = 0;
- virtual CosNaming::NamingContext_ptr new_context ( ) = 0;
- virtual CosNaming::NamingContext_ptr bind_new_context ( const CosNaming::Name & n ) = 0;
+ virtual void bind ( const Name & n, CORBA::Object_ptr obj ) = 0;
+ virtual void rebind ( const Name & n, CORBA::Object_ptr obj ) = 0;
+ virtual void bind_context ( const Name & n, NamingContext_ptr nc ) = 0;
+ virtual void rebind_context ( const Name & n, NamingContext_ptr nc ) = 0;
+ virtual CORBA::Object_ptr resolve ( const Name & n ) = 0;
+ virtual void unbind ( const Name & n ) = 0;
+ virtual NamingContext_ptr new_context ( ) = 0;
+ virtual NamingContext_ptr bind_new_context ( const Name & n ) = 0;
virtual void destroy ( ) = 0;
- virtual void ___list ( CORBA::ULong how_many, CosNaming::BindingList *& bl, CosNaming::BindingIterator_ptr & bi ) = 0;
+ virtual void ___list ( CORBA::ULong how_many, BindingList *& bl, BindingIterator_ptr & bi ) = 0;
void list ( CORBA::ULong how_many,
- _CORBA_Sequence_OUT_arg<CosNaming::BindingList,CosNaming::BindingList_var > bl,
- _CORBA_ObjRef_OUT_arg<CosNaming::BindingIterator,CosNaming::BindingIterator_var,_CORBA_ObjRef_Member<CosNaming::BindingIterator,CosNaming::BindingIterator_Helper>,CosNaming::BindingIterator_Helper > bi )
+ _CORBA_Sequence_OUT_arg<BindingList,BindingList_var > bl,
+ _CORBA_ObjRef_OUT_arg<BindingIterator,BindingIterator_var,_CORBA_ObjRef_Member<BindingIterator,BindingIterator_Helper>,BindingIterator_Helper > bi )
{
___list ( how_many, bl._data, bi._data );
}
@@ -294,11 +294,11 @@
static NamingContext_ptr _nil();
static inline size_t NP_alignedSize(NamingContext_ptr obj,size_t initialoffset) {
- return CORBA::AlignedObjRef(obj,CosNaming_NamingContext_IntfRepoID,32,initialoffset);
+ return CORBA::AlignedObjRef(obj,CosNaming_NamingContext_IntfRepoID,40,initialoffset);
}
static inline void marshalObjRef(NamingContext_ptr obj,NetBufferedStream &s) {
- CORBA::MarshalObjRef(obj,CosNaming_NamingContext_IntfRepoID,32,s);
+ CORBA::MarshalObjRef(obj,CosNaming_NamingContext_IntfRepoID,40,s);
}
static inline NamingContext_ptr unmarshalObjRef(NetBufferedStream &s) {
@@ -309,7 +309,7 @@
}
static inline void marshalObjRef(NamingContext_ptr obj,MemBufferedStream &s) {
- CORBA::MarshalObjRef(obj,CosNaming_NamingContext_IntfRepoID,32,s);
+ CORBA::MarshalObjRef(obj,CosNaming_NamingContext_IntfRepoID,40,s);
}
static inline NamingContext_ptr unmarshalObjRef(MemBufferedStream &s) {
@@ -348,17 +348,17 @@
CORBA::BOA_ptr _boa() { return CORBA::BOA::getBOA(); }
void _dispose() { _boa()->dispose(this); }
omniORB::objectKey _key();
- virtual void bind ( const CosNaming::Name & n, CORBA::Object_ptr obj ) = 0;
- virtual void rebind ( const CosNaming::Name & n, CORBA::Object_ptr obj ) = 0;
- virtual void bind_context ( const CosNaming::Name & n, CosNaming::NamingContext_ptr nc ) = 0;
- virtual void rebind_context ( const CosNaming::Name & n, CosNaming::NamingContext_ptr nc ) = 0;
- virtual CORBA::Object_ptr resolve ( const CosNaming::Name & n ) = 0;
- virtual void unbind ( const CosNaming::Name & n ) = 0;
- virtual CosNaming::NamingContext_ptr new_context ( ) = 0;
- virtual CosNaming::NamingContext_ptr bind_new_context ( const CosNaming::Name & n ) = 0;
+ virtual void bind ( const Name & n, CORBA::Object_ptr obj ) = 0;
+ virtual void rebind ( const Name & n, CORBA::Object_ptr obj ) = 0;
+ virtual void bind_context ( const Name & n, NamingContext_ptr nc ) = 0;
+ virtual void rebind_context ( const Name & n, NamingContext_ptr nc ) = 0;
+ virtual CORBA::Object_ptr resolve ( const Name & n ) = 0;
+ virtual void unbind ( const Name & n ) = 0;
+ virtual NamingContext_ptr new_context ( ) = 0;
+ virtual NamingContext_ptr bind_new_context ( const Name & n ) = 0;
virtual void destroy ( ) = 0;
- virtual void list ( CORBA::ULong how_many, CosNaming::BindingList *& bl, CosNaming::BindingIterator_ptr & bi ) = 0;
- virtual void ___list ( CORBA::ULong how_many, CosNaming::BindingList *& bl, CosNaming::BindingIterator_ptr & bi ) {
+ virtual void list ( CORBA::ULong how_many, BindingList *& bl, BindingIterator_ptr & bi ) = 0;
+ virtual void ___list ( CORBA::ULong how_many, BindingList *& bl, BindingIterator_ptr & bi ) {
list ( how_many, bl, bi );
}
virtual CORBA::Boolean dispatch(GIOP_S &s,const char *op,CORBA::Boolean response);
@@ -380,16 +380,16 @@
omni::objectIsReady(this);
}
virtual ~_proxy_NamingContext() {}
- virtual void bind ( const CosNaming::Name & n, CORBA::Object_ptr obj );
- virtual void rebind ( const CosNaming::Name & n, CORBA::Object_ptr obj );
- virtual void bind_context ( const CosNaming::Name & n, CosNaming::NamingContext_ptr nc );
- virtual void rebind_context ( const CosNaming::Name & n, CosNaming::NamingContext_ptr nc );
- virtual CORBA::Object_ptr resolve ( const CosNaming::Name & n );
- virtual void unbind ( const CosNaming::Name & n );
- virtual CosNaming::NamingContext_ptr new_context ( );
- virtual CosNaming::NamingContext_ptr bind_new_context ( const CosNaming::Name & n );
+ virtual void bind ( const Name & n, CORBA::Object_ptr obj );
+ virtual void rebind ( const Name & n, CORBA::Object_ptr obj );
+ virtual void bind_context ( const Name & n, NamingContext_ptr nc );
+ virtual void rebind_context ( const Name & n, NamingContext_ptr nc );
+ virtual CORBA::Object_ptr resolve ( const Name & n );
+ virtual void unbind ( const Name & n );
+ virtual NamingContext_ptr new_context ( );
+ virtual NamingContext_ptr bind_new_context ( const Name & n );
virtual void destroy ( );
- virtual void ___list ( CORBA::ULong how_many, CosNaming::BindingList *& bl, CosNaming::BindingIterator_ptr & bi );
+ virtual void ___list ( CORBA::ULong how_many, BindingList *& bl, BindingIterator_ptr & bi );
protected:
@@ -408,51 +408,51 @@
public:
_nil_NamingContext() { this->PR_setobj(0); }
virtual ~_nil_NamingContext() {}
- void bind ( const CosNaming::Name & n, CORBA::Object_ptr obj ){
+ void bind ( const Name & n, CORBA::Object_ptr obj ){
throw CORBA::BAD_OPERATION(0,CORBA::COMPLETED_NO);
// never reach here! Dummy return to keep some compilers happy.
return;
}
- void rebind ( const CosNaming::Name & n, CORBA::Object_ptr obj ){
+ void rebind ( const Name & n, CORBA::Object_ptr obj ){
throw CORBA::BAD_OPERATION(0,CORBA::COMPLETED_NO);
// never reach here! Dummy return to keep some compilers happy.
return;
}
- void bind_context ( const CosNaming::Name & n, CosNaming::NamingContext_ptr nc ){
+ void bind_context ( const Name & n, NamingContext_ptr nc ){
throw CORBA::BAD_OPERATION(0,CORBA::COMPLETED_NO);
// never reach here! Dummy return to keep some compilers happy.
return;
}
- void rebind_context ( const CosNaming::Name & n, CosNaming::NamingContext_ptr nc ){
+ void rebind_context ( const Name & n, NamingContext_ptr nc ){
throw CORBA::BAD_OPERATION(0,CORBA::COMPLETED_NO);
// never reach here! Dummy return to keep some compilers happy.
return;
}
- CORBA::Object_ptr resolve ( const CosNaming::Name & n ){
+ CORBA::Object_ptr resolve ( const Name & n ){
throw CORBA::BAD_OPERATION(0,CORBA::COMPLETED_NO);
// never reach here! Dummy return to keep some compilers happy.
CORBA::Object_ptr _result= 0;
return _result;
}
- void unbind ( const CosNaming::Name & n ){
+ void unbind ( const Name & n ){
throw CORBA::BAD_OPERATION(0,CORBA::COMPLETED_NO);
// never reach here! Dummy return to keep some compilers happy.
return;
}
- CosNaming::NamingContext_ptr new_context ( ){
+ NamingContext_ptr new_context ( ){
throw CORBA::BAD_OPERATION(0,CORBA::COMPLETED_NO);
// never reach here! Dummy return to keep some compilers happy.
CosNaming::NamingContext_ptr _result= 0;
return _result;
}
- CosNaming::NamingContext_ptr bind_new_context ( const CosNaming::Name & n ){
+ NamingContext_ptr bind_new_context ( const Name & n ){
throw CORBA::BAD_OPERATION(0,CORBA::COMPLETED_NO);
// never reach here! Dummy return to keep some compilers happy.
CosNaming::NamingContext_ptr _result= 0;
@@ -465,7 +465,7 @@
return;
}
- void ___list ( CORBA::ULong how_many, CosNaming::BindingList *& bl, CosNaming::BindingIterator_ptr & bi ){
+ void ___list ( CORBA::ULong how_many, BindingList *& bl, BindingIterator_ptr & bi ){
throw CORBA::BAD_OPERATION(0,CORBA::COMPLETED_NO);
// never reach here! Dummy return to keep some compilers happy.
return;
@@ -484,23 +484,23 @@
virtual const char *irRepoId() const;
virtual CORBA::Object_ptr newProxyObject(Rope *r,CORBA::Octet *key,size_t keysize,IOP::TaggedProfileList *profiles,CORBA::Boolean release);
virtual CORBA::Boolean is_a(const char *base_repoId) const;
- static CosNaming::NamingContext_ptr _nil() {
+ static NamingContext_ptr _nil() {
if (!__nil_NamingContext) {
__nil_NamingContext = new CosNaming::_nil_NamingContext;
}
return __nil_NamingContext;
}
private:
- static CosNaming::NamingContext_ptr __nil_NamingContext;
+ static NamingContext_ptr __nil_NamingContext;
};
#ifndef __CosNaming_BindingIterator__
#define __CosNaming_BindingIterator__
- class BindingIterator;
+ class BindingIterator;
typedef BindingIterator* BindingIterator_ptr;
typedef BindingIterator_ptr BindingIteratorRef;
- class BindingIterator_Helper {
+ class BindingIterator_Helper {
public:
static BindingIterator_ptr _nil();
static CORBA::Boolean is_nil(BindingIterator_ptr p);
@@ -515,19 +515,19 @@
typedef _CORBA_ObjRef_Var<BindingIterator,BindingIterator_Helper> BindingIterator_var;
#endif
-#define CosNaming_BindingIterator_IntfRepoID "IDL:CosNaming/BindingIterator:1.0"
+#define CosNaming_BindingIterator_IntfRepoID "IDL:omg.org/CosNaming/BindingIterator:1.0"
class BindingIterator : public virtual omniObject, public virtual CORBA::Object {
public:
- virtual CORBA::Boolean ___next_one ( CosNaming::Binding *& b ) = 0;
- CORBA::Boolean next_one ( _CORBA_ConstrType_Variable_OUT_arg<CosNaming::Binding,CosNaming::Binding_var> b )
+ virtual CORBA::Boolean ___next_one ( Binding *& b ) = 0;
+ CORBA::Boolean next_one ( _CORBA_ConstrType_Variable_OUT_arg<Binding,Binding_var> b )
{
return ___next_one ( b._data );
}
- virtual CORBA::Boolean ___next_n ( CORBA::ULong how_many, CosNaming::BindingList *& bl ) = 0;
+ virtual CORBA::Boolean ___next_n ( CORBA::ULong how_many, BindingList *& bl ) = 0;
CORBA::Boolean next_n ( CORBA::ULong how_many,
- _CORBA_Sequence_OUT_arg<CosNaming::BindingList,CosNaming::BindingList_var > bl )
+ _CORBA_Sequence_OUT_arg<BindingList,BindingList_var > bl )
{
return ___next_n ( how_many, bl._data );
}
@@ -537,11 +537,11 @@
static BindingIterator_ptr _nil();
static inline size_t NP_alignedSize(BindingIterator_ptr obj,size_t initialoffset) {
- return CORBA::AlignedObjRef(obj,CosNaming_BindingIterator_IntfRepoID,34,initialoffset);
+ return CORBA::AlignedObjRef(obj,CosNaming_BindingIterator_IntfRepoID,42,initialoffset);
}
static inline void marshalObjRef(BindingIterator_ptr obj,NetBufferedStream &s) {
- CORBA::MarshalObjRef(obj,CosNaming_BindingIterator_IntfRepoID,34,s);
+ CORBA::MarshalObjRef(obj,CosNaming_BindingIterator_IntfRepoID,42,s);
}
static inline BindingIterator_ptr unmarshalObjRef(NetBufferedStream &s) {
@@ -552,7 +552,7 @@
}
static inline void marshalObjRef(BindingIterator_ptr obj,MemBufferedStream &s) {
- CORBA::MarshalObjRef(obj,CosNaming_BindingIterator_IntfRepoID,34,s);
+ CORBA::MarshalObjRef(obj,CosNaming_BindingIterator_IntfRepoID,42,s);
}
static inline BindingIterator_ptr unmarshalObjRef(MemBufferedStream &s) {
@@ -591,12 +591,12 @@
CORBA::BOA_ptr _boa() { return CORBA::BOA::getBOA(); }
void _dispose() { _boa()->dispose(this); }
omniORB::objectKey _key();
- virtual CORBA::Boolean next_one ( CosNaming::Binding *& b ) = 0;
- virtual CORBA::Boolean ___next_one ( CosNaming::Binding *& b ) {
+ virtual CORBA::Boolean next_one ( Binding *& b ) = 0;
+ virtual CORBA::Boolean ___next_one ( Binding *& b ) {
return next_one ( b );
}
- virtual CORBA::Boolean next_n ( CORBA::ULong how_many, CosNaming::BindingList *& bl ) = 0;
- virtual CORBA::Boolean ___next_n ( CORBA::ULong how_many, CosNaming::BindingList *& bl ) {
+ virtual CORBA::Boolean next_n ( CORBA::ULong how_many, BindingList *& bl ) = 0;
+ virtual CORBA::Boolean ___next_n ( CORBA::ULong how_many, BindingList *& bl ) {
return next_n ( how_many, bl );
}
virtual void destroy ( ) = 0;
@@ -619,8 +619,8 @@
omni::objectIsReady(this);
}
virtual ~_proxy_BindingIterator() {}
- virtual CORBA::Boolean ___next_one ( CosNaming::Binding *& b );
- virtual CORBA::Boolean ___next_n ( CORBA::ULong how_many, CosNaming::BindingList *& bl );
+ virtual CORBA::Boolean ___next_one ( Binding *& b );
+ virtual CORBA::Boolean ___next_n ( CORBA::ULong how_many, BindingList *& bl );
virtual void destroy ( );
protected:
@@ -640,14 +640,14 @@
public:
_nil_BindingIterator() { this->PR_setobj(0); }
virtual ~_nil_BindingIterator() {}
- CORBA::Boolean ___next_one ( CosNaming::Binding *& b ){
+ CORBA::Boolean ___next_one ( Binding *& b ){
throw CORBA::BAD_OPERATION(0,CORBA::COMPLETED_NO);
// never reach here! Dummy return to keep some compilers happy.
CORBA::Boolean _result = 0;
return _result;
}
- CORBA::Boolean ___next_n ( CORBA::ULong how_many, CosNaming::BindingList *& bl ){
+ CORBA::Boolean ___next_n ( CORBA::ULong how_many, BindingList *& bl ){
throw CORBA::BAD_OPERATION(0,CORBA::COMPLETED_NO);
// never reach here! Dummy return to keep some compilers happy.
CORBA::Boolean _result = 0;
@@ -673,14 +673,14 @@
virtual const char *irRepoId() const;
virtual CORBA::Object_ptr newProxyObject(Rope *r,CORBA::Octet *key,size_t keysize,IOP::TaggedProfileList *profiles,CORBA::Boolean release);
virtual CORBA::Boolean is_a(const char *base_repoId) const;
- static CosNaming::BindingIterator_ptr _nil() {
+ static BindingIterator_ptr _nil() {
if (!__nil_BindingIterator) {
__nil_BindingIterator = new CosNaming::_nil_BindingIterator;
}
return __nil_BindingIterator;
}
private:
- static CosNaming::BindingIterator_ptr __nil_BindingIterator;
+ static BindingIterator_ptr __nil_BindingIterator;
};
};
diff -u /pub/corba/omniORB_2.2.0/include/omniORB2/bufferedStream.h include/omniORB2/bufferedStream.h
--- /pub/corba/omniORB_2.2.0/include/omniORB2/bufferedStream.h Tue May 6 13:37:54 1997
+++ include/omniORB2/bufferedStream.h Thu Jul 3 10:06:58 1997
@@ -70,7 +70,7 @@
#error "UMARSHAL has already been defined"
#endif
-class NetBufferedStream : public Strand_Sync {
+class _OMNIORB2_NTDLL_ NetBufferedStream : public Strand_Sync {
public:
NetBufferedStream(Strand *s,
_CORBA_Boolean RdLock=1,
@@ -338,7 +338,7 @@
-class MemBufferedStream {
+class _OMNIORB2_NTDLL_ MemBufferedStream {
public:
MemBufferedStream(size_t initialBufsize=0);
~MemBufferedStream();
diff -u /pub/corba/omniORB_2.2.0/include/omniORB2/giopDriver.h include/omniORB2/giopDriver.h
--- /pub/corba/omniORB_2.2.0/include/omniORB2/giopDriver.h Tue May 6 13:38:23 1997
+++ include/omniORB2/giopDriver.h Thu Jul 3 10:08:50 1997
@@ -72,7 +72,7 @@
id = i; len = strlen((const char *)i);
}
};
- class SysExceptRepoID {
+ class _OMNIORB2_NTDLL_ SysExceptRepoID {
public:
static const _SysExceptRepoID UNKNOWN;
static const _SysExceptRepoID BAD_PARAM;
@@ -108,7 +108,7 @@
static size_t max_giop_message_size;
};
-class GIOP_C : public GIOP_Basetypes, public NetBufferedStream {
+class _OMNIORB2_NTDLL_ GIOP_C : public GIOP_Basetypes, public NetBufferedStream {
public:
GIOP_C(Rope *r);
@@ -228,7 +228,7 @@
};
-class GIOP_S : public GIOP_Basetypes, public NetBufferedStream {
+class _OMNIORB2_NTDLL_ GIOP_S : public GIOP_Basetypes, public NetBufferedStream {
public:
static void dispatcher(Strand *s);
diff -u /pub/corba/omniORB_2.2.0/include/omniORB2/omniInternal.h include/omniORB2/omniInternal.h
--- /pub/corba/omniORB_2.2.0/include/omniORB2/omniInternal.h Tue May 6 13:39:17 1997
+++ include/omniORB2/omniInternal.h Wed Jul 2 15:45:50 1997
@@ -29,6 +29,9 @@
/*
$Log: omniInternal.h,v $
+ * Revision 1.1 1997/06/25 17:36:04 matthew
+ * Initial revision
+ *
* Revision 1.9 1997/05/06 16:09:13 sll
* Public release.
*
@@ -69,6 +72,8 @@
_CORBA_ULong lo;
};
+class Omni_Activator;
+
class _OMNIORB2_NTDLL_ omni {
public:
@@ -124,6 +129,7 @@
// call to BOA::dispose().
static omniObject *locateObject(omniObjectKey &k);
+ static omniObject *locateObjectInternal(omniObjectKey &k);
static void disposeObject(omniObject *obj);
// If the reference count of the object is 0, call the delete operator
// to remove the object.
@@ -231,7 +237,7 @@
omniRopeAndKey(const omniRopeAndKey&);
};
-class omniObject {
+class _OMNIORB2_NTDLL_ omniObject {
protected:
@@ -317,6 +323,7 @@
friend char * omni::objectToString(const omniObject *obj);
friend void omni::objectDuplicate(omniObject *obj);
friend omniObject *omni::locateObject(omniObjectKey &k);
+ friend omniObject *omni::locateObjectInternal(omniObjectKey &k);
friend void omni::disposeObject(omniObject *obj);
friend void omni::objectRelease(omniObject *obj);
friend char *objectToString(const omniObject *obj);
diff -u /pub/corba/omniORB_2.2.0/include/omniORB2/omniORB.h include/omniORB2/omniORB.h
--- /pub/corba/omniORB_2.2.0/include/omniORB2/omniORB.h Tue May 6 13:39:44 1997
+++ include/omniORB2/omniORB.h Wed Jul 2 15:16:12 1997
@@ -29,6 +29,9 @@
/*
$Log: omniORB.h,v $
+ * Revision 1.1 1997/06/25 18:02:04 matthew
+ * Initial revision
+ *
* Revision 1.5 1997/05/06 16:09:39 sll
* Public release.
*
@@ -37,6 +40,8 @@
#ifndef __OMNIORB_H__
#define __OMNIORB_H__
+class Omni_Activator;
+
class _OMNIORB2_NTDLL_ omniORB {
public:
@@ -167,9 +172,27 @@
}; //
////////////////////////////////////////////////////////////////////////
+ // on demand object activation.
+
+ static void register_activator(Omni_Activator* activator);
+ static void unregister_activator(Omni_Activator* activator);
+ static _CORBA_Boolean activate(omniObjectKey &k);
+
friend class omni;
private:
+ static omni_mutex activatorLock;
+ static Omni_Activator* activatorHead;
static objectKey seed;
+};
+
+class _OMNIORB2_NTDLL_ Omni_Activator
+{
+public:
+ virtual ~Omni_Activator() = 0;
+ virtual _CORBA_Boolean activate(const omniObjectKey& key) = 0;
+private:
+ friend class omniORB;
+ Omni_Activator* pd_next;
};
#endif // __OMNIORB_H__
diff -u /pub/corba/omniORB_2.2.0/src/lib/omniORB2/Makefile src/lib/omniORB2/Makefile
--- /pub/corba/omniORB_2.2.0/src/lib/omniORB2/Makefile Fri May 2 08:28:48 1997
+++ src/lib/omniORB2/Makefile Thu Jul 3 10:15:08 1997
@@ -10,7 +10,7 @@
ORB2_OBJS = constants.o corbaBoa.o corbaObject.o corbaOrb.o \
corbaString.o \
exception.o giopClient.o giopServer.o initFile.o ior.o \
- libcWrapper.o mbufferedStream.o nbufferedStream.o $(NAMINGOBJ) \
+ libcWrapper.o mbufferedStream.o nbufferedStream.o\
object.o objectRef.o objectKey.o orb.o strand.o $(NETLIBOBJS) \
unshared.o
@@ -19,25 +19,33 @@
-DCONFIG_DEFAULT_LOCATION=$(OMNIORB_CONFIG_DEFAULT_LOCATION)
-all:: libomniORB2.a
+all:: libomniORB2.a libnaming.a
-libomniORB2.a: Naming.hh $(ORB2_OBJS)
+libomniORB2.a: $(ORB2_OBJS)
(set -x; \
$(RM) $@; \
$(AR) $@ $(ORB2_OBJS); \
$(RANLIB) $@; \
)
+libnaming.a: Naming.hh $(NAMINGOBJ)
+ (set -x; \
+ $(RM) $@; \
+ $(AR) $@ $(NAMINGOBJ); \
+ $(RANLIB) $@; \
+ )
+
Naming.hh NamingSK.cc: Naming.idl
$(BINDIR)/omniidl2 Naming.idl
clean::
$(RM) *.a *.o Naming.hh NamingSK.cc
-install:: libomniORB2.a
+install:: libomniORB2.a libnaming.a
(set -x; \
$(MKDIRHIER) $(LIBDIR); \
$(CP) libomniORB2.a $(LIBDIR); \
+ $(CP) libnaming.a $(LIBDIR); \
)
SUBDIRS = sharedlib
@@ -172,7 +180,6 @@
corbaBoa.o : ../../../include/omniORB2/omniORB.h
corbaBoa.o : ../../../include/omniORB2/templates.h
corbaBoa.o : ../../../include/omniORB2/proxyFactory.h
-corbaBoa.o : Naming.hh
corbaBoa.o : ../../../include/omniORB2/CORBA.h
corbaObject.o : corbaObject.cc
corbaObject.o : ../../../include/omniORB2/CORBA.h
@@ -195,7 +202,6 @@
corbaObject.o : ../../../include/omniORB2/omniORB.h
corbaObject.o : ../../../include/omniORB2/templates.h
corbaObject.o : ../../../include/omniORB2/proxyFactory.h
-corbaObject.o : Naming.hh
corbaObject.o : ../../../include/omniORB2/CORBA.h
corbaOrb.o : corbaOrb.cc
corbaOrb.o : ../../../include/omniORB2/CORBA.h
@@ -218,7 +224,6 @@
corbaOrb.o : ../../../include/omniORB2/omniORB.h
corbaOrb.o : ../../../include/omniORB2/templates.h
corbaOrb.o : ../../../include/omniORB2/proxyFactory.h
-corbaOrb.o : Naming.hh
corbaOrb.o : ../../../include/omniORB2/CORBA.h
corbaString.o : corbaString.cc
corbaString.o : ../../../include/omniORB2/CORBA.h
@@ -241,7 +246,6 @@
corbaString.o : ../../../include/omniORB2/omniORB.h
corbaString.o : ../../../include/omniORB2/templates.h
corbaString.o : ../../../include/omniORB2/proxyFactory.h
-corbaString.o : Naming.hh
corbaString.o : ../../../include/omniORB2/CORBA.h
exception.o : exception.cc
exception.o : ../../../include/omniORB2/CORBA.h
@@ -264,7 +268,6 @@
exception.o : ../../../include/omniORB2/omniORB.h
exception.o : ../../../include/omniORB2/templates.h
exception.o : ../../../include/omniORB2/proxyFactory.h
-exception.o : Naming.hh
exception.o : ../../../include/omniORB2/CORBA.h
giopClient.o : giopClient.cc
giopClient.o : ../../../include/omniORB2/CORBA.h
@@ -287,7 +290,6 @@
giopClient.o : ../../../include/omniORB2/omniORB.h
giopClient.o : ../../../include/omniORB2/templates.h
giopClient.o : ../../../include/omniORB2/proxyFactory.h
-giopClient.o : Naming.hh
giopClient.o : ../../../include/omniORB2/CORBA.h
giopServer.o : giopServer.cc
giopServer.o : ../../../include/omniORB2/CORBA.h
@@ -310,7 +312,6 @@
giopServer.o : ../../../include/omniORB2/omniORB.h
giopServer.o : ../../../include/omniORB2/templates.h
giopServer.o : ../../../include/omniORB2/proxyFactory.h
-giopServer.o : Naming.hh
giopServer.o : ../../../include/omniORB2/CORBA.h
initFile.o : initFile.cc
initFile.o : ../../../include/omniORB2/CORBA.h
@@ -333,7 +334,6 @@
initFile.o : ../../../include/omniORB2/omniORB.h
initFile.o : ../../../include/omniORB2/templates.h
initFile.o : ../../../include/omniORB2/proxyFactory.h
-initFile.o : Naming.hh
initFile.o : ../../../include/omniORB2/CORBA.h
ior.o : ior.cc
ior.o : ../../../include/omniORB2/CORBA.h
@@ -356,7 +356,6 @@
ior.o : ../../../include/omniORB2/omniORB.h
ior.o : ../../../include/omniORB2/templates.h
ior.o : ../../../include/omniORB2/proxyFactory.h
-ior.o : Naming.hh
ior.o : ../../../include/omniORB2/CORBA.h
libcWrapper.o : libcWrapper.cc
libcWrapper.o : ../../../include/omniORB2/CORBA.h
@@ -379,7 +378,6 @@
libcWrapper.o : ../../../include/omniORB2/omniORB.h
libcWrapper.o : ../../../include/omniORB2/templates.h
libcWrapper.o : ../../../include/omniORB2/proxyFactory.h
-libcWrapper.o : Naming.hh
libcWrapper.o : ../../../include/omniORB2/CORBA.h
libcWrapper.o : libcWrapper.h
mbufferedStream.o : mbufferedStream.cc
@@ -403,7 +401,6 @@
mbufferedStream.o : ../../../include/omniORB2/omniORB.h
mbufferedStream.o : ../../../include/omniORB2/templates.h
mbufferedStream.o : ../../../include/omniORB2/proxyFactory.h
-mbufferedStream.o : Naming.hh
mbufferedStream.o : ../../../include/omniORB2/CORBA.h
nbufferedStream.o : nbufferedStream.cc
nbufferedStream.o : ../../../include/omniORB2/CORBA.h
@@ -426,7 +423,6 @@
nbufferedStream.o : ../../../include/omniORB2/omniORB.h
nbufferedStream.o : ../../../include/omniORB2/templates.h
nbufferedStream.o : ../../../include/omniORB2/proxyFactory.h
-nbufferedStream.o : Naming.hh
nbufferedStream.o : ../../../include/omniORB2/CORBA.h
object.o : object.cc
object.o : ../../../include/omniORB2/CORBA.h
@@ -449,7 +445,6 @@
object.o : ../../../include/omniORB2/omniORB.h
object.o : ../../../include/omniORB2/templates.h
object.o : ../../../include/omniORB2/proxyFactory.h
-object.o : Naming.hh
object.o : ../../../include/omniORB2/CORBA.h
objectKey.o : objectKey.cc
objectKey.o : ../../../include/omniORB2/CORBA.h
@@ -472,7 +467,6 @@
objectKey.o : ../../../include/omniORB2/omniORB.h
objectKey.o : ../../../include/omniORB2/templates.h
objectKey.o : ../../../include/omniORB2/proxyFactory.h
-objectKey.o : Naming.hh
objectKey.o : ../../../include/omniORB2/CORBA.h
objectRef.o : objectRef.cc
objectRef.o : ../../../include/omniORB2/CORBA.h
@@ -495,7 +489,6 @@
objectRef.o : ../../../include/omniORB2/omniORB.h
objectRef.o : ../../../include/omniORB2/templates.h
objectRef.o : ../../../include/omniORB2/proxyFactory.h
-objectRef.o : Naming.hh
objectRef.o : ../../../include/omniORB2/CORBA.h
objectRef.o : ../../../include/omniORB2/proxyFactory.h
orb.o : orb.cc
@@ -519,7 +512,6 @@
orb.o : ../../../include/omniORB2/omniORB.h
orb.o : ../../../include/omniORB2/templates.h
orb.o : ../../../include/omniORB2/proxyFactory.h
-orb.o : Naming.hh
orb.o : ../../../include/omniORB2/CORBA.h
orb.o : tcpSocket_UNIX.h
strand.o : strand.cc
@@ -543,7 +535,6 @@
strand.o : ../../../include/omniORB2/omniORB.h
strand.o : ../../../include/omniORB2/templates.h
strand.o : ../../../include/omniORB2/proxyFactory.h
-strand.o : Naming.hh
strand.o : ../../../include/omniORB2/CORBA.h
tcpSocket_UNIX.o : tcpSocket_UNIX.cc
tcpSocket_UNIX.o : ../../../include/omniORB2/CORBA.h
@@ -566,7 +557,6 @@
tcpSocket_UNIX.o : ../../../include/omniORB2/omniORB.h
tcpSocket_UNIX.o : ../../../include/omniORB2/templates.h
tcpSocket_UNIX.o : ../../../include/omniORB2/proxyFactory.h
-tcpSocket_UNIX.o : Naming.hh
tcpSocket_UNIX.o : ../../../include/omniORB2/CORBA.h
tcpSocket_UNIX.o : tcpSocket_UNIX.h
tcpSocket_UNIX.o : libcWrapper.h
@@ -591,7 +581,6 @@
unshared.o : ../../../include/omniORB2/omniORB.h
unshared.o : ../../../include/omniORB2/templates.h
unshared.o : ../../../include/omniORB2/proxyFactory.h
-unshared.o : Naming.hh
unshared.o : ../../../include/omniORB2/CORBA.h
unshared.o : libcWrapper.h
unshared.o : tcpSocket_UNIX.h
diff -u /pub/corba/omniORB_2.2.0/src/lib/omniORB2/Naming.idl src/lib/omniORB2/Naming.idl
--- /pub/corba/omniORB_2.2.0/src/lib/omniORB2/Naming.idl Tue Jan 21 11:09:10 1997
+++ src/lib/omniORB2/Naming.idl Wed Jun 25 11:45:47 1997
@@ -17,6 +17,8 @@
*/
+#pragma prefix "omg.org"
+
module CosNaming {
typedef string Istring;
diff -u /pub/corba/omniORB_2.2.0/src/lib/omniORB2/constants.cc src/lib/omniORB2/constants.cc
--- /pub/corba/omniORB_2.2.0/src/lib/omniORB2/constants.cc Tue May 6 12:37:52 1997
+++ src/lib/omniORB2/constants.cc Thu Jul 3 10:20:14 1997
@@ -29,6 +29,9 @@
/*
$Log: constants.cc,v $
+// Revision 1.1 1997/06/25 17:38:36 matthew
+// Initial revision
+//
// Revision 1.4 1997/05/06 15:07:47 sll
// Public release.
//
diff -u /pub/corba/omniORB_2.2.0/src/lib/omniORB2/corbaBoa.cc src/lib/omniORB2/corbaBoa.cc
--- /pub/corba/omniORB_2.2.0/src/lib/omniORB2/corbaBoa.cc Tue May 6 12:39:09 1997
+++ src/lib/omniORB2/corbaBoa.cc Thu Jun 26 17:21:56 1997
@@ -29,6 +29,9 @@
/*
$Log: corbaBoa.cc,v $
+// Revision 1.1 1997/06/25 17:37:45 matthew
+// Initial revision
+//
// Revision 1.3 1997/05/06 15:09:04 sll
// Public release.
//
@@ -156,3 +159,44 @@
return;
}
+CORBA::Object_ptr
+CORBA::
+BOA::make_object(const omniObjectKey& k, const char* type_id)
+{
+ IOP::TaggedProfileList * p = 0;
+ omniObject* omniObj = 0;
+ CORBA::Object_ptr o = 0;
+ try
+ {
+ Rope *r = 0;
+ {
+ Rope_iterator next(&Anchor::incomingAnchor);
+ r = next();
+ }
+ if (r == 0)
+ {
+ throw CORBA::INTERNAL(0,CORBA::COMPLETED_NO);
+ }
+ p = new IOP::TaggedProfileList(1);
+ if (p == 0)
+ {
+ throw CORBA::NO_MEMORY(0,CORBA::COMPLETED_NO);
+ }
+ p->length(1);
+ r->iopProfile((CORBA::Char *)&k,
+ sizeof(omniObjectKey),
+ ((IOP::TaggedProfileList &) *p)[0]);
+ omniObj = omni::createObjRef(type_id, type_id, p, 0);
+ delete p;
+ o = new Object();
+ o->PR_setobj(omniObj);
+ }
+ catch (...)
+ {
+ delete p;
+ //delete omniObj;
+ delete o;
+ throw;
+ }
+ return o;
+}
diff -u /pub/corba/omniORB_2.2.0/src/lib/omniORB2/initFile.cc src/lib/omniORB2/initFile.cc
--- /pub/corba/omniORB_2.2.0/src/lib/omniORB2/initFile.cc Mon May 12 11:43:41 1997
+++ src/lib/omniORB2/initFile.cc Thu Jul 3 10:13:56 1997
@@ -29,6 +29,9 @@
/*
$Log: initFile.cc,v $
+// Revision 1.1 1997/07/03 12:43:28 matthew
+// Initial revision
+//
// Revision 1.12 1997/05/12 14:13:33 ewc
// Minor cosmetic change.
//
@@ -193,13 +196,16 @@
if (objptr)
{
+#if 0
if((objptr->_widenFromTheMostDerivedIntf(
CosNaming_NamingContext_IntfRepoID)) == 0)
{
// The object reference supplied is not for the NamingService
invref(entryname);
}
- else NameService = objptr;
+ else
+#endif
+ NameService = objptr;
}
else invref(entryname);
diff -u /pub/corba/omniORB_2.2.0/src/lib/omniORB2/objectRef.cc src/lib/omniORB2/objectRef.cc
--- /pub/corba/omniORB_2.2.0/src/lib/omniORB2/objectRef.cc Tue May 6 12:56:41 1997
+++ src/lib/omniORB2/objectRef.cc Thu Jun 26 16:27:26 1997
@@ -29,6 +29,9 @@
/*
$Log: objectRef.cc,v $
+// Revision 1.1 1997/06/25 17:49:16 matthew
+// Initial revision
+//
// Revision 1.7 1997/05/06 15:26:37 sll
// Public release.
//
@@ -218,6 +221,7 @@
return;
}
obj->setRefCount(obj->getRefCount()-1);
+ omniObject* toDelete = 0;
if (obj->getRefCount() == 0) {
if (obj->is_proxy()) {
omniObject **p = &omniObject::proxyObjectTable;
@@ -228,7 +232,7 @@
}
p = &((*p)->pd_next);
}
- delete obj;
+ toDelete = obj;
}
else {
omniObject **p = &omniObject::localObjectTable[omniORB::hash(obj->pd_objkey.native)];
@@ -240,10 +244,12 @@
p = &((*p)->pd_next);
}
if (obj->pd_disposed)
- delete obj; // call dtor if BOA->disposed() has been called.
+ toDelete = obj;
}
}
omniObject::objectTableLock.unlock();
+ if (toDelete != 0)
+ delete toDelete; // call dtor if BOA->disposed() has been called.
return;
}
@@ -253,39 +259,56 @@
if (obj->is_proxy())
return;
omniObject::objectTableLock.lock();
- if (obj->getRefCount() <= 0) {
- omniObject::objectTableLock.unlock();
- throw CORBA::INV_OBJREF(0,CORBA::COMPLETED_NO);
- }
- else
- obj->setRefCount(obj->getRefCount()-1);
+ omniObject* toDelete = 0;
if (obj->getRefCount() == 0) {
// object has already been removed from the object table
- delete obj;
+ toDelete = obj;
}
else {
obj->pd_disposed = 1;
}
omniObject::objectTableLock.unlock();
+ if (toDelete != 0)
+ delete toDelete;
return;
}
omniObject *
-omni::locateObject(omniObjectKey &k)
+omni::locateObjectInternal(omniObjectKey &k)
{
omniObject::objectTableLock.lock();
- omniObject **p = &omniObject::localObjectTable[omniORB::hash(k)];
- while (*p) {
- if ((*p)->pd_objkey.native == k) {
- (*p)->setRefCount((*p)->getRefCount()+1);
- omniObject::objectTableLock.unlock();
- return *p;
+ omniObject *p = omniObject::localObjectTable[omniORB::hash(k)];
+ while (p) {
+ if (p->pd_objkey.native == k) {
+ p->setRefCount(p->getRefCount()+1);
+ break;
}
- p = &((*p)->pd_next);
+ p = p->pd_next;
}
omniObject::objectTableLock.unlock();
+ return p;
+}
+
+omniObject *
+omni::locateObject(omniObjectKey &k)
+{
+ omniObject* obj = locateObjectInternal(k);
+ if (obj != 0)
+ {
+ return obj;
+ }
+
+ if (omniORB::activate(k))
+ {
+ obj = locateObjectInternal(k);
+ if (obj != 0)
+ {
+ return obj;
+ }
+ }
+
throw CORBA::OBJECT_NOT_EXIST(0,CORBA::COMPLETED_NO);
return 0; // MS VC++ 4.0 needs this.
}
diff -u /pub/corba/omniORB_2.2.0/src/lib/omniORB2/orb.cc src/lib/omniORB2/orb.cc
--- /pub/corba/omniORB_2.2.0/src/lib/omniORB2/orb.cc Tue May 6 12:57:18 1997
+++ src/lib/omniORB2/orb.cc Wed Jun 25 15:50:39 1997
@@ -29,6 +29,9 @@
/*
$Log: orb.cc,v $
+// Revision 1.1 1997/06/25 17:41:27 matthew
+// Initial revision
+//
// Revision 1.9 1997/05/06 15:27:14 sll
// Public release.
//
@@ -865,4 +868,59 @@
return 0;
}
return 1;
+}
+
+/*static*/ void
+omniORB::register_activator(Omni_Activator* activator)
+{
+ activatorLock.lock();
+
+ activator->pd_next = activatorHead;
+ activatorHead = activator;
+
+ activatorLock.unlock();
+}
+
+/*static*/ void
+omniORB::unregister_activator(Omni_Activator* activator)
+{
+ int found = 0;
+
+ activatorLock.lock();
+ Omni_Activator** curr = &activatorHead;
+ while (*curr != 0)
+ {
+ if ((*curr) == activator)
+ {
+ *curr = (*curr)->pd_next;
+ found = 1;
+ break;
+ }
+ curr = &(*curr)->pd_next;
+ }
+ activatorLock.unlock();
+
+ if (!found && omniORB::traceLevel > 0)
+ {
+ cerr << "Cannot find activator in activator list." << endl;
+ }
+}
+
+/*static*/ CORBA::Boolean
+omniORB::activate(omniObjectKey &k)
+{
+ activatorLock.lock();
+ Omni_Activator* curr = activatorHead;
+ while (curr != 0)
+ {
+ if (curr->activate(k))
+ break;
+ curr = curr->pd_next;
+ }
+ activatorLock.unlock();
+ return curr != 0;
+}
+
+Omni_Activator::~Omni_Activator()
+{
}
diff -u /pub/corba/omniORB_2.2.0/src/lib/omniORB2/unshared.cc src/lib/omniORB2/unshared.cc
--- /pub/corba/omniORB_2.2.0/src/lib/omniORB2/unshared.cc Tue May 6 13:03:02 1997
+++ src/lib/omniORB2/unshared.cc Thu Jul 3 10:20:27 1997
@@ -32,6 +32,9 @@
/*
$Log: unshared.cc,v $
+// Revision 1.1 1997/06/25 17:39:13 matthew
+// Initial revision
+//
// Revision 1.5 1997/05/06 15:32:58 sll
// Public release.
//
@@ -56,6 +59,9 @@
CORBA::Object CORBA::Object::CORBA_Object_nil;
+omni_mutex omniORB::activatorLock;
+Omni_Activator* omniORB::activatorHead = 0;
+
omni_mutex omni::initLock;
CORBA::Boolean omni::orb_initialised = 0;
CORBA::Boolean omni::boa_initialised = 0;
@@ -85,6 +91,4 @@
omniORB::objectKey omniORB::seed;
-static const CosNaming::NamingContext_proxyObjectFactory CosNaming_NamingContext_proxyObjectFactory1; // To ensure that Naming Stubs are linked.
-
-
+//static const CosNaming::NamingContext_proxyObjectFactory CosNaming_NamingContext_proxyObjectFactory1; // To ensure that Naming Stubs are linked.
diff -u /pub/corba/omniORB_2.2.0/src/appl/omniNames/NamingContext_i.h src/appl/omniNames/NamingContext_i.h
--- /pub/corba/omniORB_2.2.0/src/appl/omniNames/NamingContext_i.h Wed May 7 12:07:38 1997
+++ src/appl/omniNames/NamingContext_i.h Wed Jul 2 14:13:44 1997
@@ -28,11 +28,7 @@
#include <ReadersWritersLock.h>
#include <log.h>
-#ifdef __NT__
-#include <omniORB2/Naming_NT.hh>
-#else
#include <omniORB2/Naming.hh>
-#endif
class NamingContext_i : public virtual CosNaming::_sk_NamingContext {
diff -u /pub/corba/omniORB_2.2.0/src/appl/omniNames/log.h src/appl/omniNames/log.h
--- /pub/corba/omniORB_2.2.0/src/appl/omniNames/log.h Wed May 7 12:06:15 1997
+++ src/appl/omniNames/log.h Thu Jul 3 11:50:10 1997
@@ -26,6 +26,7 @@
#define _log_h_
#include <omniORB2/CORBA.h>
+#include <omniORB2/Naming.hh>
#include <fstream.h>
#ifndef LOGDIR_ENV_VAR
diff -u /pub/corba/omniORB_2.2.0/build-win32/Applications.mak build-win32/Applications.mak
--- /pub/corba/omniORB_2.2.0/build-win32/Applications.mak Thu May 8 16:24:09 1997
+++ build-win32/Applications.mak Thu Jul 3 11:52:31 1997
@@ -114,7 +114,7 @@
/Fo"$(INTDIR)/" /c
CPP_OBJS=$(BASEDIR)\appl\omniNames/
-LINK32_FLAGS=kernel32.lib user32.lib wsock32.lib advapi32.lib omniORB2_rt.lib\
+LINK32_FLAGS=kernel32.lib user32.lib wsock32.lib advapi32.lib naming_rt.lib omniORB2_rt.lib\
omnithread_rt.lib /nologo /subsystem:console /pdb:none /machine:I386\
/out:"$(OUTDIR)/omniNames.exe"
LINK32_OBJS= \
@@ -203,7 +203,7 @@
"__NT__" /D "_X86_" /Fo"$(INTDIR)/" /c
CPP_OBJS=$(BASEDIR)\appl\utils\nameclt/
-LINK32_FLAGS=kernel32.lib user32.lib wsock32.lib advapi32.lib omniORB2_rt.lib\
+LINK32_FLAGS=kernel32.lib user32.lib wsock32.lib advapi32.lib naming_rt.lib omniORB2_rt.lib\
omnithread_rt.lib /nologo /subsystem:console /pdb:none /machine:I386\
/out:"$(OUTDIR)/nameclt.exe"
LINK32_OBJS= \
diff -u /pub/corba/omniORB_2.2.0/build-win32/MAKEFILE build-win32/MAKEFILE
--- /pub/corba/omniORB_2.2.0/build-win32/MAKEFILE Fri May 9 07:01:01 1997
+++ build-win32/MAKEFILE Thu Jul 3 11:52:53 1997
@@ -21,7 +21,8 @@
"omnithread_DLL" && "$(CFG)" != "omniORB2_static"\
&& "$(CFG)" != "omnithread_static" && "$(CFG)" != "ALL" \
&& "$(CFG)" != "omniidl2" && "$(CFG)" != "Applications" && "$(CFG)" != "all" \
- && "$(CFG)" != "install" && "$(CFG)" != "INSTALL"
+ && "$(CFG)" != "install" && "$(CFG)" != "INSTALL" \
+ && "$(CFG)" != "naming_shared" && "$(CFG)" != "naming_static"
!IF "$(CFG)" != "HELP"
!MESSAGE Invalid configuration "$(CFG)" specified.
@@ -80,6 +81,8 @@
@copy $(BASEDIR)\omniORB2_shared\omniORB2_rt.lib $(INSTALL_LOC)\lib
@copy $(BASEDIR)\omnithread_shared\omnithread_rt.lib $(INSTALL_LOC)\lib
@copy $(BASEDIR)\omniORB2_static\omniORB2.lib $(INSTALL_LOC)\lib
+ @copy $(BASEDIR)\omniORB2_static\naming.lib $(INSTALL_LOC)\lib
+ @copy $(BASEDIR)\omniORB2_static\naming_rt.lib $(INSTALL_LOC)\lib
@copy $(BASEDIR)\omnithread_static\omnithread.lib $(INSTALL_LOC)\lib
@copy $(BASEDIR)\omniidl2\omniidl2.exe $(INSTALL_LOC)\bin
@copy $(BASEDIR)\appl\omniNames\omniNames.exe $(INSTALL_LOC)\bin
@@ -99,7 +102,7 @@
@copy $(INCLDIR)\omniORB2\IIOP.h $(INSTALL_LOC)\include\omniORB2
@copy $(INCLDIR)\omniORB2\initFile.h $(INSTALL_LOC)\include\omniORB2
@copy $(INCLDIR)\omniORB2\IOP.h $(INSTALL_LOC)\include\omniORB2
- @copy $(INCLDIR)\omniORB2\Naming_NT.hh $(INSTALL_LOC)\include\omniORB2
+ @copy $(INCLDIR)\omniORB2\Naming.hh $(INSTALL_LOC)\include\omniORB2
@copy $(INCLDIR)\omniORB2\omniInternal.h $(INSTALL_LOC)\include\omniORB2
@copy $(INCLDIR)\omniORB2\omniORB.h $(INSTALL_LOC)\include\omniORB2
@copy $(INCLDIR)\omniORB2\proxyFactory.h $(INSTALL_LOC)\include\omniORB2
@@ -139,6 +142,8 @@
ALL :
$(MAKE) /$(MAKEFLAGS) /F "MAKEFILE" CFG="omniORB2_DLL"
$(MAKE) /$(MAKEFLAGS) /F "MAKEFILE" CFG="omniORB2_static"
+ $(MAKE) /$(MAKEFLAGS) /F "MAKEFILE" CFG="naming_static"
+ $(MAKE) /$(MAKEFLAGS) /F "MAKEFILE" CFG="naming_shared"
$(MAKE) /$(MAKEFLAGS) /F "MAKEFILE" CFG="omniidl2"
$(MAKE) /$(MAKEFLAGS) /F "MAKEFILE" CFG="Applications"
@@ -146,6 +151,8 @@
CLEAN:
$(MAKE) /$(MAKEFLAGS) /F "MAKEFILE" CLEAN CFG="omniORB2_DLL"
$(MAKE) /$(MAKEFLAGS) /F "MAKEFILE" CLEAN CFG="omniORB2_static"
+ $(MAKE) /$(MAKEFLAGS) /F "MAKEFILE" CLEAN CFG="naming_static"
+ $(MAKE) /$(MAKEFLAGS) /F "MAKEFILE" CLEAN CFG="naming_shared"
$(MAKE) /$(MAKEFLAGS) /F "MAKEFILE" CLEAN CFG="omniidl2"
$(MAKE) /$(MAKEFLAGS) /F "MAKEFILE" CLEAN CFG="Applications"
@@ -202,7 +209,7 @@
-@erase "$(INTDIR)\ior.obj"
-@erase "$(INTDIR)\libcWrapper.obj"
-@erase "$(INTDIR)\mbufferedStream.obj"
- -@erase "$(INTDIR)\NamingSK_NT.obj"
+ -@erase "$(INTDIR)\NamingSK.obj"
-@erase "$(INTDIR)\nbufferedStream.obj"
-@erase "$(INTDIR)\object.obj"
-@erase "$(INTDIR)\objectKey.obj"
@@ -219,17 +226,19 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
+#CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
+# "__NT__" /D "_X86_" /D "NTArchitecture" /D "_OMNIORB2_DLL" /Fo"$(INTDIR)/" /c
+CPP_PROJ=/nologo /MD /W3 /GX /Zi /D "WIN32" /D "_WINDOWS" /D\
"__NT__" /D "_X86_" /D "NTArchitecture" /D "_OMNIORB2_DLL" /Fo"$(INTDIR)/" /c
CPP_OBJS=$(BASEDIR)\omniORB2_shared/
.cc{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
-LINK32_FLAGS=wsock32.lib advapi32.lib \
- "$(BASEDIR)\omnithread_shared\omnithread_rt.lib" /nologo /subsystem:windows\
- /dll /pdb:none /machine:I386 /def:"$(SRCDIR)\omniORB2\omniorb2.def" \
- /out:"$(OUTDIR)/omniORB2_rt.dll" /implib:"$(OUTDIR)/omniORB2_rt.lib"
+#LINK32_FLAGS=wsock32.lib advapi32.lib "$(BASEDIR)\omnithread_shared\omnithread_rt.lib" /nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"$(OUTDIR)/omniORB2_rt.dll" /implib:"$(OUTDIR)/omniORB2_rt.lib"
+
+LINK32_FLAGS=wsock32.lib advapi32.lib "$(BASEDIR)\omnithread_shared\omnithread_rt.lib" /nologo /subsystem:windows /dll /DEBUG:full /machine:I386 /out:"$(OUTDIR)/omniORB2_rt.dll" /implib:"$(OUTDIR)/omniORB2_rt.lib"
+
LINK32_OBJS= \
"$(INTDIR)\constants.obj" \
"$(INTDIR)\corbaBoa.obj" \
@@ -243,7 +252,6 @@
"$(INTDIR)\ior.obj" \
"$(INTDIR)\libcWrapper.obj" \
"$(INTDIR)\mbufferedStream.obj" \
- "$(INTDIR)\NamingSK_NT.obj" \
"$(INTDIR)\nbufferedStream.obj" \
"$(INTDIR)\object.obj" \
"$(INTDIR)\objectKey.obj" \
@@ -255,10 +263,7 @@
"$(BASEDIR)\omnithread_shared\omnithread_rt.lib"
"$(OUTDIR)\omniORB2_rt.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
- $(LINK32) @<<
- $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-
+ $(LINK32) $(LINK32_FLAGS) $(LINK32_OBJS)
!ELSEIF "$(CFG)" == "omnithread_DLL"
@@ -276,16 +281,20 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
- "__NT__" /D "_X86_" /D "NTArchitecture" /D "_OMNITHREAD_DLL" /Fo"$(INTDIR)/" /c\
+#CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
+# "__NT__" /D "_X86_" /D "NTArchitecture" /D "_OMNITHREAD_DLL" /Fo"$(INTDIR)/" /c
+CPP_PROJ=/nologo /MD /W3 /GX /Zi /D "WIN32" /D "_WINDOWS" /D\
+ "__NT__" /D "_X86_" /D "NTArchitecture" /D "_OMNITHREAD_DLL" /Fo"$(INTDIR)/" /c
CPP_OBJS=$(BASEDIR)\omnithread_shared/
.cc{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
-LINK32_FLAGS=/nologo /subsystem:windows /dll /pdb:none /machine:I386\
- /out:"$(OUTDIR)/omnithread_rt.dll" /implib:"$(OUTDIR)/omnithread_rt.lib"
+#LINK32_FLAGS=/nologo /subsystem:windows /dll /pdb:none /machine:I386 /out:"$(OUTDIR)/omnithread_rt.dll" /implib:"$(OUTDIR)/omnithread_rt.lib"
+
+LINK32_FLAGS=/nologo /subsystem:windows /dll /DEBUG:FULL /machine:I386 /out:"$(OUTDIR)/omnithread_rt.dll" /implib:"$(OUTDIR)/omnithread_rt.lib"
+
LINK32_OBJS= \
"$(INTDIR)\nt.obj"
@@ -296,13 +305,59 @@
+!ELSEIF "$(CFG)" == "naming_shared"
+
+OUTDIR=$(BASEDIR)\omniORB2_shared
+INTDIR=$(BASEDIR)\omniORB2_shared
+
+ALL : "$(OUTDIR)\naming_rt.lib"
+
+CLEAN :
+ -@erase "$(INTDIR)\NamingSK.obj"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /Zi /D "WIN32" /D "_WINDOWS" /D\
+ "__NT__" /D "_X86_" /D "NTArchitecture" /Fo"$(INTDIR)/" /c
+
+LINK32_FLAGS=/lib /out:"$(OUTDIR)/naming_rt.lib"
+LINK32_OBJS= \
+ "$(INTDIR)\NamingSK.obj"
+
+"$(OUTDIR)\naming_rt.lib" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) $(LINK32_FLAGS) $(LINK32_OBJS)
+
+!ELSEIF "$(CFG)" == "naming_static"
+
+OUTDIR=$(BASEDIR)\omniORB2_static
+INTDIR=$(BASEDIR)\omniORB2_static
+
+ALL : "$(OUTDIR)\naming.lib"
+
+CLEAN :
+ -@erase "$(INTDIR)\NamingSK.obj"
+
+"$(OUTDIR)" :
+ if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
+
+CPP_PROJ=/nologo /MD /W3 /GX /Zi /D "WIN32" /D "_WINDOWS" /D\
+ "__NT__" /D "_X86_" /D "_WINSTATIC" /D "NTArchitecture" /Fo"$(INTDIR)/" /c
+LINK32_FLAGS=/lib /out:"$(OUTDIR)/naming.lib"
+LINK32_OBJS= \
+ "$(INTDIR)\NamingSK.obj"
+
+"$(OUTDIR)\naming.lib" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+ $(LINK32) $(LINK32_FLAGS) $(LINK32_OBJS)
+
!ELSEIF "$(CFG)" == "omniORB2_static"
OUTDIR=$(BASEDIR)\omniORB2_static
INTDIR=$(BASEDIR)\omniORB2_static
-ALL : "$(BASEDIR)\omnithread_static\omnithread.lib" "$(OUTDIR)\omniORB2.lib"
+ALL : "$(BASEDIR)\omnithread_static\omnithread.lib" "$(OUTDIR)\omniORB2.lib" \
+"$(OUTDIR)\naming.lib"
CLEAN :
-@erase "$(INTDIR)\constants.obj"
@@ -316,7 +371,8 @@
-@erase "$(INTDIR)\initFile.obj"
-@erase "$(INTDIR)\ior.obj"
-@erase "$(INTDIR)\libcWrapper.obj"
- -@erase "$(INTDIR)\NamingSK_NT.obj"
+ -@erase "$(INTDIR)\mbufferedStream.obj"
+ -@erase "$(INTDIR)\NamingSK.obj"
-@erase "$(INTDIR)\nbufferedStream.obj"
-@erase "$(INTDIR)\object.obj"
-@erase "$(INTDIR)\objectKey.obj"
@@ -331,8 +387,10 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
- "__NT__" /D "_X86_" /D "NTArchitecture" /D "_WINSTATIC" /Fo"$(INTDIR)/" /c
+#CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
+#"__NT__" /D "_X86_" /D "NTArchitecture" /D "_WINSTATIC" /Fo"$(INTDIR)/" /c
+CPP_PROJ=/nologo /MT /W3 /GX /Zi /D "WIN32" /D "_WINDOWS" /D\
+"__NT__" /D "_X86_" /D "NTArchitecture" /D "_WINSTATIC" /Fo"$(INTDIR)/" /c
CPP_OBJS=$(BASEDIR)\omniORB2_static/
.cc{$(CPP_OBJS)}.obj:
@@ -351,7 +409,7 @@
"$(INTDIR)\initFile.obj" \
"$(INTDIR)\ior.obj" \
"$(INTDIR)\libcWrapper.obj" \
- "$(INTDIR)\NamingSK_NT.obj" \
+ "$(INTDIR)\mbufferedStream.obj" \
"$(INTDIR)\nbufferedStream.obj" \
"$(INTDIR)\object.obj" \
"$(INTDIR)\objectKey.obj" \
@@ -381,7 +439,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
+#CPP_PROJ=/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
+# "__NT__" /D "_X86_" /D "NTArchitecture" /D "_WINSTATIC" /Fo"$(INTDIR)/" /c
+CPP_PROJ=/nologo /MT /W3 /GX /Zi /D "WIN32" /D "_WINDOWS" /D\
"__NT__" /D "_X86_" /D "NTArchitecture" /D "_WINSTATIC" /Fo"$(INTDIR)/" /c
CPP_OBJS=$(BASEDIR)\omnithread_static/
@@ -417,8 +477,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -429,7 +487,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\objectRef.obj" : $(SOURCE) $(DEP_CPP_OBJEC) "$(INTDIR)"
+"$(INTDIR)\objectRef.obj" : $(SOURCE) $(DEP_CPP_OBJEC)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -448,8 +506,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -460,7 +516,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\corbaBoa.obj" : $(SOURCE) $(DEP_CPP_CORBA) "$(INTDIR)"
+"$(INTDIR)\corbaBoa.obj" : $(SOURCE) $(DEP_CPP_CORBA)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -479,8 +535,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -491,7 +545,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\corbaObject.obj" : $(SOURCE) $(DEP_CPP_CORBAO) "$(INTDIR)"
+"$(INTDIR)\corbaObject.obj" : $(SOURCE) $(DEP_CPP_CORBAO)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -510,8 +564,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -522,7 +574,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\corbaOrb.obj" : $(SOURCE) $(DEP_CPP_CORBAOR) "$(INTDIR)"
+"$(INTDIR)\corbaOrb.obj" : $(SOURCE) $(DEP_CPP_CORBAOR)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -541,8 +593,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -553,7 +603,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\corbaString.obj" : $(SOURCE) $(DEP_CPP_CORBAS) "$(INTDIR)"
+"$(INTDIR)\corbaString.obj" : $(SOURCE) $(DEP_CPP_CORBAS)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -572,8 +622,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -584,7 +632,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\exception.obj" : $(SOURCE) $(DEP_CPP_EXCEP) "$(INTDIR)"
+"$(INTDIR)\exception.obj" : $(SOURCE) $(DEP_CPP_EXCEP)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -603,8 +651,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -615,7 +661,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\giopClient.obj" : $(SOURCE) $(DEP_CPP_GIOPC) "$(INTDIR)"
+"$(INTDIR)\giopClient.obj" : $(SOURCE) $(DEP_CPP_GIOPC)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -634,8 +680,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -646,7 +690,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\giopServer.obj" : $(SOURCE) $(DEP_CPP_GIOPS) "$(INTDIR)"
+"$(INTDIR)\giopServer.obj" : $(SOURCE) $(DEP_CPP_GIOPS)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -665,8 +709,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -677,7 +719,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\initFile.obj" : $(SOURCE) $(DEP_CPP_INITF) "$(INTDIR)"
+"$(INTDIR)\initFile.obj" : $(SOURCE) $(DEP_CPP_INITF)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -696,8 +738,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -708,7 +748,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\ior.obj" : $(SOURCE) $(DEP_CPP_IOR_C) "$(INTDIR)"
+"$(INTDIR)\ior.obj" : $(SOURCE) $(DEP_CPP_IOR_C)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -728,8 +768,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -740,7 +778,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\libcWrapper.obj" : $(SOURCE) $(DEP_CPP_LIBCW) "$(INTDIR)"
+"$(INTDIR)\libcWrapper.obj" : $(SOURCE) $(DEP_CPP_LIBCW)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -759,8 +797,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -771,7 +807,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\mbufferedStream.obj" : $(SOURCE) $(DEP_CPP_MBUFF) "$(INTDIR)"
+"$(INTDIR)\mbufferedStream.obj" : $(SOURCE) $(DEP_CPP_MBUFF)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -779,7 +815,7 @@
################################################################################
# Begin Source File
-SOURCE=$(SRCDIR)\omniORB2\NamingSK_NT.cc
+SOURCE=$(SRCDIR)\omniORB2\NamingSK.cc
DEP_CPP_NAMIN=\
{$(INCLUDE)}"\omniORB2\bufferedStream.h"\
{$(INCLUDE)}"\omniORB2\CORBA.h"\
@@ -791,7 +827,6 @@
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
{$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -802,7 +837,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\NamingSK_NT.obj" : $(SOURCE) $(DEP_CPP_NAMIN) "$(INTDIR)"
+"$(INTDIR)\NamingSK.obj" : $(SOURCE) $(DEP_CPP_NAMIN)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -821,8 +856,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -832,7 +865,7 @@
{$(INCLUDE)}"\omnithread.h"\
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\nbufferedStream.obj" : $(SOURCE) $(DEP_CPP_NBUFF) "$(INTDIR)"
+"$(INTDIR)\nbufferedStream.obj" : $(SOURCE) $(DEP_CPP_NBUFF)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -853,8 +886,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -865,7 +896,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\unshared.obj" : $(SOURCE) $(DEP_CPP_UNSHA) "$(INTDIR)"
+"$(INTDIR)\unshared.obj" : $(SOURCE) $(DEP_CPP_UNSHA)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -884,8 +915,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -896,7 +925,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\strand.obj" : $(SOURCE) $(DEP_CPP_STRAN) "$(INTDIR)"
+"$(INTDIR)\strand.obj" : $(SOURCE) $(DEP_CPP_STRAN)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -917,8 +946,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -930,7 +957,7 @@
{$(INCLUDE)}"\sys\types.h"\
-"$(INTDIR)\tcpSocket_NT.obj" : $(SOURCE) $(DEP_CPP_TCPSO) "$(INTDIR)"
+"$(INTDIR)\tcpSocket_NT.obj" : $(SOURCE) $(DEP_CPP_TCPSO)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -950,8 +977,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -964,7 +989,7 @@
{$(INCLUDE)}"\sys\types.h"\
-"$(INTDIR)\orb.obj" : $(SOURCE) $(DEP_CPP_ORB_C) "$(INTDIR)"
+"$(INTDIR)\orb.obj" : $(SOURCE) $(DEP_CPP_ORB_C)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -983,8 +1008,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -997,7 +1020,7 @@
{$(INCLUDE)}"\sys\types.h"\
-"$(INTDIR)\objectKey.obj" : $(SOURCE) $(DEP_CPP_OBJECT) "$(INTDIR)"
+"$(INTDIR)\objectKey.obj" : $(SOURCE) $(DEP_CPP_OBJECT)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -1016,8 +1039,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -1028,7 +1049,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\object.obj" : $(SOURCE) $(DEP_CPP_OBJECT_) "$(INTDIR)"
+"$(INTDIR)\object.obj" : $(SOURCE) $(DEP_CPP_OBJECT_)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -1047,8 +1068,6 @@
{$(INCLUDE)}"\omniORB2\IIOP.h"\
{$(INCLUDE)}"\omniORB2\initFile.h"\
{$(INCLUDE)}"\omniORB2\IOP.h"\
- {$(INCLUDE)}"\omniORB2\Naming.hh"\
- {$(INCLUDE)}"\omniORB2\Naming_NT.hh"\
{$(INCLUDE)}"\omniORB2\omniInternal.h"\
{$(INCLUDE)}"\omniORB2\omniORB.h"\
{$(INCLUDE)}"\omniORB2\proxyFactory.h"\
@@ -1059,7 +1078,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\constants.obj" : $(SOURCE) $(DEP_CPP_CONST) "$(INTDIR)"
+"$(INTDIR)\constants.obj" : $(SOURCE) $(DEP_CPP_CONST)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
@@ -1122,7 +1141,7 @@
{$(INCLUDE)}"\omnithread\nt.h"\
-"$(INTDIR)\nt.obj" : $(SOURCE) $(DEP_CPP_NT_CP) "$(INTDIR)"
+"$(INTDIR)\nt.obj" : $(SOURCE) $(DEP_CPP_NT_CP)
$(CPP) $(CPP_PROJ) /Tp$(SOURCE)
diff -u /pub/corba/omniORB_2.2.0/build-win32/config.win32 build-win32/config.win32
--- /pub/corba/omniORB_2.2.0/build-win32/config.win32 Thu May 8 14:47:48 1997
+++ build-win32/config.win32 Mon Jun 23 17:15:00 1997
@@ -6,7 +6,7 @@
#Location of top-level directory containing omniORB2 installation (i.e. directory where omniORB2
# distribution was unpacked):
#Note that this must be an absolute path.
-BASEDIR =
+BASEDIR = j:\omniorb_2.2.0
#Directory where omniORB2 should be installed
Matthew
--
Matthew Newhook. matthew_newhook@stratos.ca, http://www.engr.mun.ca/~matthew
Software Designer, Stratos Network Research.
w: (709) 364-5950, h: (709)-745-4346