From: <bo...@us...> - 2003-09-05 06:18:56
|
Update of /cvsroot/libfunutil/libfunutil/lib/funUtil In directory sc8-pr-cvs1:/tmp/cvs-serv25700 Modified Files: LoadableClass.h Log Message: s/LoadableClass/fun::LoadableClass/ in macros Index: LoadableClass.h =================================================================== RCS file: /cvsroot/libfunutil/libfunutil/lib/funUtil/LoadableClass.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- LoadableClass.h 28 Aug 2003 11:29:10 -0000 1.6 +++ LoadableClass.h 5 Sep 2003 06:18:49 -0000 1.7 @@ -50,11 +50,11 @@ * sigh... your class must inherit from LoadableClass.) * * All "INSTANTIATOR(Foo)" does is create the following code: - * extern "C" { LoadableClass * newFoo() { return new Foo(); } } + * extern "C" { fun::LoadableClass * newFoo() { return new Foo(); } } * So if you want to do that yourself, or something more sophisticated, * knock yourself out. */ -#define INSTANTIATOR(clsnm) extern "C" { LoadableClass * new ## clsnm() { return new clsnm; } } +#define INSTANTIATOR(clsnm) extern "C" { fun::LoadableClass * new ## clsnm() { return new clsnm; } } /** * If you want a class to be loadable by ClassLoader, and you multiply @@ -66,11 +66,11 @@ * LoadableClass.) * * All "INSTANTIATOR_UNAMBIGUOUS(Foo, SuperFoo)" does is create the following code: - * extern "C" { LoadableClass * newFoo() { return (SuperFoo *)(new Foo()); } } + * extern "C" { fun::LoadableClass * newFoo() { return (SuperFoo *)(new Foo()); } } * So if you want to do that yourself, or something more sophisticated, * knock yourself out. */ -#define INSTANTIATOR_UNAMBIGUOUS(clsnm, supercls) extern "C" { LoadableClass * new ## clsnm() { return (supercls *)(new clsnm); } } +#define INSTANTIATOR_UNAMBIGUOUS(clsnm, supercls) extern "C" { fun::LoadableClass * new ## clsnm() { return (supercls *)(new clsnm); } } /** * If you want a class defined in a namespace to be loadable by ClassLoader, @@ -80,11 +80,11 @@ * LoadableClass.) * * All "NAMESPACE_INSTANTIATOR(NameSpace, Foo)" does is create the following code: - * extern "C" { LoadableClass * newNameSpace_Foo() { return new NameSpace::Foo(); } } + * extern "C" { fun::LoadableClass * newNameSpace_Foo() { return new NameSpace::Foo(); } } * So if you want to do that yourself, or something more sophisticated, * knock yourself out. */ -#define NAMESPACE_INSTANTIATOR(ns, clsnm) extern "C" { LoadableClass * new ## ns ## _ ## clsnm() { return new ns::clsnm; } } +#define NAMESPACE_INSTANTIATOR(ns, clsnm) extern "C" { fun::LoadableClass * new ## ns ## _ ## clsnm() { return new ns::clsnm; } } /** * If you want a class defined in a namespace to be loadable by ClassLoader, @@ -96,11 +96,11 @@ * class must inherit from LoadableClass.) * * All "NAMESPACE_INSTANTIATOR(NameSpace, Foo, SuperFoo)" does is create the following code: - * extern "C" { LoadableClass * newNameSpace_Foo() { return (SuperFoo *)(new NameSpace::Foo); } } + * extern "C" { fun::LoadableClass * newNameSpace_Foo() { return (SuperFoo *)(new NameSpace::Foo); } } * So if you want to do that yourself, or something more sophisticated, * knock yourself out. */ -#define NAMESPACE_INSTANTIATOR_UNAMBIGUOUS(ns, clsnm, supercls) extern "C" { LoadableClass * new ## ns ## _ ## clsnm() { return (supercls *)(new ns::clsnm); } } +#define NAMESPACE_INSTANTIATOR_UNAMBIGUOUS(ns, clsnm, supercls) extern "C" { fun::LoadableClass * new ## ns ## _ ## clsnm() { return (supercls *)(new ns::clsnm); } } }; // namespace fun |