Menu
▾
▴
micomt-commit — MICO/mt commit notices
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
(15) |
Dec
(15) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(23) |
Feb
|
Mar
(25) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Karel G. <kg...@us...> - 2001-11-04 18:34:56
|
Update of /cvsroot/micomt/mico/include/mico/os-thread
In directory usw-pr-cvs1:/tmp/cvs-serv12565/include/mico/os-thread
Modified Files:
pththreads.h
Log Message:
- added initialization of MT stuff into main ORB init
- implemented priority handling in GNU Pth thread support
- fixed data key handling in GNU Pth thread support
- fixed GNU Pth support for compilation
- changed configure to disable MICO parts which are not MT ready
- added support for GNU Pth thread package into configure
- changed configure for better handling of thread package configuration
- changed optimization from '-O' to '-O2'
Index: pththreads.h
===================================================================
RCS file: /cvsroot/micomt/mico/include/mico/os-thread/pththreads.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** pththreads.h 2001/10/26 19:59:59 1.9
--- pththreads.h 2001/11/04 18:34:52 1.10
***************
*** 33,37 ****
#define __os_thread_pthreads_h__
! static void _init (MICO_ULong _tpsize, MICO_ULong _tpincr);
/*********************************** Mutex *****************************************/
--- 33,38 ----
#define __os_thread_pthreads_h__
! //static void _init (MICO_ULong _tpsize, MICO_ULong _tpincr);
! extern void _init ();
/*********************************** Mutex *****************************************/
***************
*** 228,232 ****
class Semaphore __NAME( :public NamedObject ) {
private:
! CondVar _cond;
MICO_ULong count; // current value
--- 229,234 ----
class Semaphore __NAME( :public NamedObject ) {
private:
! CondVar _cond;
! Mutex _mutex;
MICO_ULong count; // current value
***************
*** 274,297 ****
static int get_priority_max() {
! // return sched_get_priority_max( sched_getscheduler(0) );
! return 0;
};
static int get_priority_min() {
! // return sched_get_priority_min( sched_getscheduler(0) );
! return 0;
};
// key handling
! static void createKey( ThreadKey &key ) {
! assert( pth_key_create( &key, NULL ) == 0 );
};
static void deleteKey( ThreadKey key ) {
! assert( pth_key_delete( key ) == 0 );
};
static void *getSpecific( ThreadKey key ) {
! return pthr_getdata( key );
};
static void setSpecific( ThreadKey key, void *value ) {
! assert( pth_setdata( key, value ) == 0 );
};
--- 276,310 ----
static int get_priority_max() {
! //return 0;
! pth_attr_t __t_attr = pth_attr_new();
! pth_attr_set(__t_attr, PTH_ATTR_PRIO, PTH_PRIO_MAX);
! int* __prio;
! pth_attr_get(__t_attr, PTH_ATTR_PRIO, __prio);
! pth_attr_destroy(__t_attr);
! return (*__prio);
};
+
static int get_priority_min() {
! //return 0;
! pth_attr_t __t_attr = pth_attr_new();
! pth_attr_set(__t_attr, PTH_ATTR_PRIO, PTH_PRIO_MIN);
! int* __prio;
! pth_attr_get(__t_attr, PTH_ATTR_PRIO, __prio);
! pth_attr_destroy(__t_attr);
! return (*__prio);
};
// key handling
! static void createKey( ThreadKey &key, void (*__cleanup) (void *) = NULL ) {
! assert( pth_key_create( &key, __cleanup ) == 1 );
};
static void deleteKey( ThreadKey key ) {
! assert( pth_key_delete( key ) == 1 );
};
static void *getSpecific( ThreadKey key ) {
! return pth_key_getdata( key );
};
static void setSpecific( ThreadKey key, void *value ) {
! assert( pth_key_setdata( key, value ) == 1 );
};
|
|
From: Karel G. <kg...@us...> - 2001-11-04 18:34:55
|
Update of /cvsroot/micomt/mico/idl In directory usw-pr-cvs1:/tmp/cvs-serv12565/idl Modified Files: params.cc Log Message: - added initialization of MT stuff into main ORB init - implemented priority handling in GNU Pth thread support - fixed data key handling in GNU Pth thread support - fixed GNU Pth support for compilation - changed configure to disable MICO parts which are not MT ready - added support for GNU Pth thread package into configure - changed configure for better handling of thread package configuration - changed optimization from '-O' to '-O2' Index: params.cc =================================================================== RCS file: /cvsroot/micomt/mico/idl/params.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** params.cc 2001/10/26 19:59:58 1.8 --- params.cc 2001/11/04 18:34:52 1.9 *************** *** 468,472 **** #ifdef HAVE_PTH_THREADS ! cout << "\"PTH\" Threads"; #endif // HAVE_PTH_THREADS --- 468,472 ---- #ifdef HAVE_PTH_THREADS ! cout << "GNU Pth Threads"; #endif // HAVE_PTH_THREADS |
|
From: Karel G. <kg...@us...> - 2001-11-04 18:34:55
|
Update of /cvsroot/micomt/mico/include/mico
In directory usw-pr-cvs1:/tmp/cvs-serv12565/include/mico
Modified Files:
config.h.in os-thread.h
Log Message:
- added initialization of MT stuff into main ORB init
- implemented priority handling in GNU Pth thread support
- fixed data key handling in GNU Pth thread support
- fixed GNU Pth support for compilation
- changed configure to disable MICO parts which are not MT ready
- added support for GNU Pth thread package into configure
- changed configure for better handling of thread package configuration
- changed optimization from '-O' to '-O2'
Index: config.h.in
===================================================================
RCS file: /cvsroot/micomt/mico/include/mico/config.h.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** config.h.in 2001/10/26 19:59:59 1.12
--- config.h.in 2001/11/04 18:34:52 1.13
***************
*** 129,132 ****
--- 129,135 ----
#undef HAVE_SOLARIS_THREADS
+ /* Define if you have GNU Pth thread support */
+ #undef HAVE_PTH_THREADS
+
/* Define if you want thread support at all */
#undef HAVE_THREADS
***************
*** 285,288 ****
--- 288,294 ----
/* Define if you have the <openssl/ssl.h> header file. */
#undef HAVE_OPENSSL_SSL_H
+
+ /* Define if you have the <pth.h> header file. */
+ #undef HAVE_PTH_H
/* Define if you have the <pthread.h> header file. */
Index: os-thread.h
===================================================================
RCS file: /cvsroot/micomt/mico/include/mico/os-thread.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** os-thread.h 2001/10/26 19:59:59 1.23
--- os-thread.h 2001/11/04 18:34:52 1.24
***************
*** 60,64 ****
#if defined (HAVE_PTHREADS) || defined (HAVE_DCE_THREADS) || \
! defined (HAVE_DCE_THREADS) || defined (HAVE_SOLARIS_THREADS) || \
defined (HAVE_WIN_THREADS)
--- 60,64 ----
#if defined (HAVE_PTHREADS) || defined (HAVE_DCE_THREADS) || \
! defined (HAVE_SOLARIS_THREADS) || defined (HAVE_PTH_THREADS) || \
defined (HAVE_WIN_THREADS)
|
|
From: Karel G. <kg...@us...> - 2001-11-04 18:34:55
|
Update of /cvsroot/micomt/mico
In directory usw-pr-cvs1:/tmp/cvs-serv12565
Modified Files:
CHANGES.mt configure.in
Log Message:
- added initialization of MT stuff into main ORB init
- implemented priority handling in GNU Pth thread support
- fixed data key handling in GNU Pth thread support
- fixed GNU Pth support for compilation
- changed configure to disable MICO parts which are not MT ready
- added support for GNU Pth thread package into configure
- changed configure for better handling of thread package configuration
- changed optimization from '-O' to '-O2'
Index: CHANGES.mt
===================================================================
RCS file: /cvsroot/micomt/mico/CHANGES.mt,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** CHANGES.mt 2001/10/26 19:59:54 1.19
--- CHANGES.mt 2001/11/04 18:34:52 1.20
***************
*** 1,3 ****
--- 1,11 ----
+ - added initialization of MT stuff into main ORB init
+ - implemented priority handling in GNU Pth thread support
+ - fixed data key handling in GNU Pth thread support
+ - fixed GNU Pth support for compilation
+ - changed configure to disable MICO parts which are not MT ready
+ - added support for GNU Pth thread package into configure
+ - changed configure for better handling of thread package configuration
+ - changed optimization from '-O' to '-O2'
- merged with MICO 2.3.6
- implemented thread-per-request thread model. Please use `-ORBThreadPerRequest' option
Index: configure.in
===================================================================
RCS file: /cvsroot/micomt/mico/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** configure.in 2001/10/26 20:17:55 1.27
--- configure.in 2001/11/04 18:34:52 1.28
***************
*** 81,85 ****
AC_ARG_ENABLE(optimize,
! [ --disable-optimize do not use -O to compile],
use_opt=$enableval, use_opt=yes)
--- 81,85 ----
AC_ARG_ENABLE(optimize,
! [ --disable-optimize do not use -O2 to compile],
use_opt=$enableval, use_opt=yes)
***************
*** 156,162 ****
use_threads=$enableval, use_threads=no)
! AC_ARG_ENABLE(use-pthreads,
! [ --enable-pthreads use pthread library when compiling with threads],
! use_pthreads=$enableval, use_pthreads=yes)
AC_ARG_ENABLE(minimum-corba,
--- 156,174 ----
use_threads=$enableval, use_threads=no)
! AC_ARG_ENABLE(pthreads,
! [ --enable-pthreads use POSIX thread library when compiling with threads],
! use_pthreads=$enableval, use_pthreads=no)
!
! AC_ARG_ENABLE(solaris-threads,
! [ --enable-solaris-threads use Solaris thread library when compiling with threads],
! use_solaris_threads=$enableval, use_solaris_threads=no)
!
! AC_ARG_ENABLE(dce-threads,
! [ --enable-dce-threads use DCE thread library when compiling with threads],
! use_dce_threads=$enableval, use_dce_threads=no)
!
! AC_ARG_ENABLE(pth-threads,
! [ --enable-pth-threads use GNU Pth thread library when compiling with threads],
! use_pth_threads=$enableval, use_pth_threads=no)
AC_ARG_ENABLE(minimum-corba,
***************
*** 269,307 ****
#
! if test X"$use_threads" = Xyes; then
! if test X"$use_pthreads" = Xno; then
! AC_CHECK_LIB(thread, open, use_solaris_threads=yes, use_solaris_threads=no)
! if test X"$use_solaris_threads" = Xyes; then
! AC_CHECK_HEADERS(thread.h semaphore.h synch.h,,
! AC_MSG_ERROR(solaris thread header files incomplete)
! )
! AC_DEFINE(HAVE_SOLARIS_THREADS)
! SHLIBS="-lthread"
! fi
else
! AC_CHECK_LIB(pthread, open, use_pthreads=yes, use_pthreads=no)
! if test X"$use_pthreads" = Xyes; then
! AC_CHECK_HEADERS(pthread.h semaphore.h sched.h,,
! AC_MSG_ERROR(pthread header files incomplete)
! )
! AC_DEFINE(HAVE_PTHREADS)
! SHLIBS="-lpthread"
! else
! AC_CHECK_LIB(cma, open, use_dcethreads=yes, use_dcethreads=no)
! if test X"$use_dcethreads" = Xyes; then
! AC_CHECK_HEADERS(pthread.h semaphore.h sched.h,,
! AC_MSG_ERROR(DCE pthread header files incomplete)
)
! AC_DEFINE(HAVE_DCE_THREADS)
! SHLIBS="-lcma"
fi
fi
fi
- else
- use_pthreads=no
- use_dcethreads=no
- use_solaris_threads=no
fi
if test X"$use_threads" = Xyes; then
if test X"$use_mini_stl" = Xyes; then
--- 281,416 ----
#
! platform_supports_threads=no
!
! if test X"$use_pthreads" = Xyes; then
! use_solaris_threads=no
! use_dce_threads=no
! use_pth_threads=no
! AC_CHECK_LIB(pthread, open, use_pthreads=yes, use_pthreads=no)
! if test X"$use_pthreads" = Xyes; then
! AC_CHECK_HEADERS(pthread.h semaphore.h sched.h,,
! AC_MSG_ERROR(pthread header files incomplete)
! )
! AC_DEFINE(HAVE_PTHREADS)
! SHLIBS="-lpthread"
! platform_supports_threads=yes
! use_threads=yes
else
! echo ""
! AC_MSG_ERROR("Your platform does not support Solaris threads !")
! fi
! fi
!
! if test X"$use_solaris_threads" = Xyes; then
! use_pthreads=no
! use_dce_threads=no
! use_pth_threads=no
! AC_CHECK_LIB(thread, open, use_solaris_threads=yes, use_solaris_threads=no)
! if test X"$use_solaris_threads" = Xyes; then
! AC_CHECK_HEADERS(thread.h semaphore.h synch.h,,
! AC_MSG_ERROR(solaris thread header files incomplete)
! )
! AC_DEFINE(HAVE_SOLARIS_THREADS)
! SHLIBS="-lthread"
! platform_supports_threads=yes
! use_threads=yes
! else
! echo ""
! AC_MSG_ERROR("Your platform does not support Solaris threads !")
! fi
! fi
!
! if test X"$use_dce_threads" = Xyes; then
! use_pthreads=no
! use_solaris_threads=no
! use_pth_threads=no
! AC_CHECK_LIB(cma, open, use_dcethreads=yes, use_dcethreads=no)
! if test X"$use_dcethreads" = Xyes; then
! AC_CHECK_HEADERS(pthread.h semaphore.h sched.h,,
! AC_MSG_ERROR(DCE pthread header files incomplete)
! )
! AC_DEFINE(HAVE_DCE_THREADS)
! SHLIBS="-lcma"
! platform_supports_threads=yes
! use_threads=yes
! else
! echo ""
! AC_MSG_ERROR("Your platform does not support DCE threads !")
! fi
! fi
!
! if test X"$use_pth_threads" = Xyes; then
! use_pthreads=no
! use_dce_threads=no
! use_solaris_threads=no
! unset pth_config_prog
! AC_CHECK_PROG(pth_config_prog, pth-config, yes, no)
! if test X"$pth_config_prog" = Xyes; then
! PTH_HEADERS=`pth-config --cflags`
! PTH_LDFLAGS=`pth-config --ldflags`
! PTH_LIBS=`pth-config --libs`
! CFLAGS="$PTH_HEADERS $CFLAGS"
! CXXFLAGS="$PTH_HEADERS $CXXFLAGS"
! LDFLAGS="$PTH_LDFLAGS $LDFLAGS"
! PTH_INCLUDE_DIR=`pth-config --includedir`
! PTH_LIB_DIR=`pth-config --libdir`
! AC_CHECK_HEADER($PTH_INCLUDE_DIR/pth.h)
! AC_CHECK_LIB(pth, pth_init, pth_lib=yes, pth_lib=no, "-L$PTH_LIB_DIR")
! AC_DEFINE(HAVE_PTH_THREADS)
! AC_DEFINE(HAVE_PTH_H)
! SHLIBS=$PTH_LIBS
! use_pth_threads=yes
! platform_supports_threads=yes
! use_threads=yes
! else
! echo ""
! AC_MSG_ERROR("Your platform does not support GNU Pth threads !")
! fi
! fi
!
! if test X"$platform_supports_threads" = Xno; then
! if test X"$use_threads" = Xyes; then
! if test X"$use_pthreads" = Xno; then
! AC_CHECK_LIB(thread, open, use_solaris_threads=yes, use_solaris_threads=no)
! if test X"$use_solaris_threads" = Xyes; then
! AC_CHECK_HEADERS(thread.h semaphore.h synch.h,,
! AC_MSG_ERROR(solaris thread header files incomplete)
)
! AC_DEFINE(HAVE_SOLARIS_THREADS)
! SHLIBS="-lthread"
fi
+ else
+ AC_CHECK_LIB(pthread, open, use_pthreads=yes, use_pthreads=no)
+ if test X"$use_pthreads" = Xyes; then
+ AC_CHECK_HEADERS(pthread.h semaphore.h sched.h,,
+ AC_MSG_ERROR(pthread header files incomplete)
+ )
+ AC_DEFINE(HAVE_PTHREADS)
+ SHLIBS="-lpthread"
+ else
+ AC_CHECK_LIB(cma, open, use_dcethreads=yes, use_dcethreads=no)
+ if test X"$use_dcethreads" = Xyes; then
+ AC_CHECK_HEADERS(pthread.h semaphore.h sched.h,,
+ AC_MSG_ERROR(DCE pthread header files incomplete)
+ )
+ AC_DEFINE(HAVE_DCE_THREADS)
+ SHLIBS="-lcma"
+ else
+ AC_CHECK_PROG(pth-config, use_pth_threads=yes, use_pth_threads=no)
+ SHLIBS="`pth-config --libs`"
+ echo "GNU Pth : $SHLIBS"
+ fi
+ fi
fi
+ else
+ use_pthreads=no
+ use_dcethreads=no
+ use_solaris_threads=no
+ use_pth_threads=no
fi
fi
+ service_disabled=no
+
if test X"$use_threads" = Xyes; then
if test X"$use_mini_stl" = Xyes; then
***************
*** 310,315 ****
use_mini_stl=no
STLINC=""
fi
! if test X"$use_pthreads" = Xno -a X"$use_dcethreads" = Xno -a X"$use_solaris_threads" = Xno; then
AC_MSG_ERROR([MICO does not support the thread package for your platform,
please remove --enable-threads from your configure command-line to build])
--- 419,461 ----
use_mini_stl=no
STLINC=""
+ fi
+ if test X"$use_ccm" = Xyes; then
+ AC_MSG_WARN(disabling CCM support for MT build.)
+ use_ccm=no
+ service_disabled=yes
fi
! if test X"$use_coss" = Xyes; then
! if test X"$use_events" = Xyes; then
! AC_MSG_WARN(disabling cos events for MT build.)
! use_events=no
! service_disabled=yes
! fi
! if test X"$use_streams" = Xyes; then
! AC_MSG_WARN(disabling mico streams for MT build.)
! use_streams=no
! service_disabled=yes
! fi
! if test X"$use_relship" = Xyes; then
! AC_MSG_WARN(disabling cos relship for MT build.)
! use_relship=no
! service_disabled=yes
! fi
! if test X"$use_property" = Xyes; then
! AC_MSG_WARN(disabling cos property for MT build.)
! use_property=no
! service_disabled=yes
! fi
! if test X"$use_time" = Xyes; then
! AC_MSG_WARN(disabling cos time for MT build.)
! use_time=no
! service_disabled=yes
! fi
! if test X"$use_trader" = Xyes; then
! AC_MSG_WARN(disabling cos trader for MT build.)
! use_trader=no
! service_disabled=yes
! fi
! fi
! if test X"$use_pthreads" = Xno -a X"$use_dcethreads" = Xno -a X"$use_solaris_threads" = Xno -a X"$use_pth_threads" = Xno; then
AC_MSG_ERROR([MICO does not support the thread package for your platform,
please remove --enable-threads from your configure command-line to build])
***************
*** 329,333 ****
#
! CONF_OPT_FLAGS=-O
CONF_DEBUG_FLAGS=-g
CONF_LIBNSL=yes
--- 475,479 ----
#
! CONF_OPT_FLAGS=-O2
CONF_DEBUG_FLAGS=-g
CONF_LIBNSL=yes
***************
*** 687,691 ****
AC_SUBST(BASE_LIBS)
! BASE_LIBS=$LIBS
# AC_CHECK_LIB(fl, open)
--- 833,837 ----
AC_SUBST(BASE_LIBS)
! BASE_LIBS="$SHLIBS $LIBS"
# AC_CHECK_LIB(fl, open)
***************
*** 1390,1393 ****
--- 1536,1548 ----
rm -f shtest* libshtest* conftest*
+
+ if test X"$use_threads" = Xyes -a X"$service_disabled" = Xyes; then
+ echo ""
+ echo ""
+ echo "NOTE: Since services events, streams, relship, property, time and trader,"
+ echo "and CCM experimental implementation are not prepared for running"
+ echo "on top of multi-threaded MICO, they are disabled for MT build."
+ echo ""
+ fi
AC_SUBST(USE_CCM)
|
|
From: Karel G. <kg...@us...> - 2001-10-26 20:17:58
|
Update of /cvsroot/micomt/mico
In directory usw-pr-cvs1:/tmp/cvs-serv25984
Modified Files:
configure.in
Log Message:
- fixed bug while configuring threads support
Index: configure.in
===================================================================
RCS file: /cvsroot/micomt/mico/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** configure.in 2001/10/26 19:59:54 1.26
--- configure.in 2001/10/26 20:17:55 1.27
***************
*** 269,273 ****
#
! if test X"$use_threads" = Xyes -a ; then
if test X"$use_pthreads" = Xno; then
AC_CHECK_LIB(thread, open, use_solaris_threads=yes, use_solaris_threads=no)
--- 269,273 ----
#
! if test X"$use_threads" = Xyes; then
if test X"$use_pthreads" = Xno; then
AC_CHECK_LIB(thread, open, use_solaris_threads=yes, use_solaris_threads=no)
|
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:34
|
Update of /cvsroot/micomt/mico/ir
In directory usw-pr-cvs1:/tmp/cvs-serv17698/ir
Modified Files:
Makefile Makefile.win32 ir3.cc ir3_skel.cc ir_impl.cc
ir_impl.h ir_skel.cc main.cc
Log Message:
- merged with MICO 2.3.6
Index: Makefile
===================================================================
RCS file: /cvsroot/micomt/mico/ir/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile 2001/07/06 22:15:07 1.2
--- Makefile 2001/10/26 19:59:59 1.3
***************
*** 97,102 ****
--any -I../include --mico-core --name ir ../include/mico/ir.idl
$(IDL) --no-poa-ties --c++-skel --windows-dll --relative-paths \
! --any -I../include --mico-core --name ir3 \
! ../include/mico/ir3.idl
sleep 1
patch < ir.cc.diffs
--- 97,101 ----
--any -I../include --mico-core --name ir ../include/mico/ir.idl
$(IDL) --no-poa-ties --c++-skel --windows-dll --relative-paths \
! --any -I../include --name ir3 ../include/mico/ir3.idl
sleep 1
patch < ir.cc.diffs
Index: Makefile.win32
===================================================================
RCS file: /cvsroot/micomt/mico/ir/Makefile.win32,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Makefile.win32 1999/11/03 23:20:53 1.1.1.1
--- Makefile.win32 2001/10/26 20:00:00 1.2
***************
*** 1,52 ****
! #
! # MICO --- a CORBA 2.0 implementation
! # Copyright (C) 1997 Kay Roemer & Arno Puder
! #
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2 of the License, or
! # (at your option) any later version.
! #
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
! #
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
! #
! # Send comments and/or bug reports to:
! # mi...@in...
! #
!
! !include ..\MakeVars.win32
!
! LINK_BUG_OBJS=..\orb\util.obj \
! ..\idl\params.obj ..\idl\parser.obj ..\idl\yacc.obj \
! ..\idl\scanner.obj ..\idl\parsenode.obj ..\idl\idlparser.obj \
! ..\idl\codegen.obj ..\idl\codegen-midl.obj \
! ..\idl\codegen-c++-util.obj ..\idl\codegen-c++-common.obj \
! ..\idl\codegen-c++-stub.obj ..\idl\codegen-c++-skel.obj \
! ..\idl\codegen-c++.obj ..\idl\codegen-c++-impl.obj \
! ..\idl\codegen-idl.obj ..\idl\dep.obj ..\idl\error.obj \
! ..\idl\const.obj ..\idl\db.obj ..\idl\prepro.obj
!
! CXXFLAGS = $(CXXFLAGS) /I. /I..\include /I..\include\windows /I..\idl
!
! SRCS = ir.cc ir_skel.cc ir_base.cc ir_impl.cc main.cc
!
!
! STATIC_OBJS = $(SRCS:.cc=.obj)
!
!
! prg: ird.exe
! copy ird.exe ..\win32-bin
!
! ird.exe: $(STATIC_OBJS)
! $(LINK) $(LINKFLAGS) /out:ird.exe main.obj $(LINK_BUG_OBJS) \
! ..\orb\mico$(VERSION).lib ole32.lib ..\idl\idl$(VERSION).lib
!
! clean:
! del /f $(STATIC_OBJS) main.obj ird.exe *.pdb 2> nul
!
--- 1,60 ----
! #
! # MICO --- a CORBA 2.0 implementation
! # Copyright (C) 1997 Kay Roemer & Arno Puder
! #
! # This program is free software; you can redistribute it and/or modify
! # it under the terms of the GNU General Public License as published by
! # the Free Software Foundation; either version 2 of the License, or
! # (at your option) any later version.
! #
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY; without even the implied warranty of
! # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
! # GNU General Public License for more details.
! #
! # You should have received a copy of the GNU General Public License
! # along with this program; if not, write to the Free Software
! # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
! #
! # Send comments and/or bug reports to:
! # mi...@in...
! #
!
! !include ..\MakeVars.win32
!
! LINK_BUG_OBJS=..\orb\util.obj \
! ..\idl\params.obj ..\idl\parser.obj ..\idl\yacc.obj \
! ..\idl\scanner.obj ..\idl\parsenode.obj ..\idl\idlparser.obj \
! ..\idl\codegen.obj ..\idl\codegen-midl.obj \
! ..\idl\codegen-c++-util.obj ..\idl\codegen-c++-common.obj \
! ..\idl\codegen-c++-stub.obj ..\idl\codegen-c++-skel.obj \
! ..\idl\codegen-c++.obj ..\idl\codegen-c++-impl.obj \
! ..\idl\codegen-idl.obj ..\idl\dep.obj ..\idl\error.obj \
! ..\idl\const.obj ..\idl\db.obj ..\idl\prepro.obj
!
! CXXFLAGS = $(CXXFLAGS) /I. /I..\include /I..\include\windows /I..\idl
!
! SRCS = ir_skel.cc ir_impl.cc main.cc
!
!
! STATIC_OBJS = $(SRCS:.cc=.obj)
!
!
! prg: ird.exe
! copy ird.exe ..\win32-bin
!
! ird.exe: $(STATIC_OBJS)
! $(LINK) $(LINKFLAGS) /out:ird.exe main.obj $(LINK_BUG_OBJS) \
! ..\orb\mico$(VERSION).lib ole32.lib ..\idl\idl$(VERSION).lib
!
! clean:
! -del *.obj
! -del *.exe
! -del *.def
! -del *.dmp
! -del *.dll
! -del *.lib
! -del *.exp
! -del *.pdb
! -del *.pch
! -del *~
Index: ir3.cc
===================================================================
RCS file: /cvsroot/micomt/mico/ir/ir3.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ir3.cc 2001/07/06 22:15:07 1.1
--- ir3.cc 2001/10/26 20:00:00 1.2
***************
*** 1,5 ****
/*
! * MICO --- a free CORBA implementation
! * Copyright (C) 1997-98 Kay Roemer & Arno Puder
*
* This file was automatically generated. DO NOT EDIT!
--- 1,5 ----
/*
! * MICO --- an Open Source CORBA implementation
! * Copyright (c) 1997-2001 by The Mico Team
*
* This file was automatically generated. DO NOT EDIT!
***************
*** 43,47 ****
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/ComponentDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::ComponentDef_ptr) _p );
! if (_obj->_is_a_remote("IDL:CORBA/ComponentIR/ComponentDef:1.0")) {
_o = new CORBA::ComponentIR::ComponentDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
--- 43,47 ----
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/ComponentDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::ComponentDef_ptr) _p );
! if (!strcmp (_obj->_repoid(), "IDL:CORBA/ComponentIR/ComponentDef:1.0") || _obj->_is_a_remote ("IDL:CORBA/ComponentIR/ComponentDef:1.0")) {
_o = new CORBA::ComponentIR::ComponentDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
***************
*** 69,72 ****
--- 69,73 ----
void assign (StaticValueType dst, const StaticValueType src) const;
void free (StaticValueType) const;
+ void release (StaticValueType) const;
CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
void marshal (CORBA::DataEncoder &, StaticValueType) const;
***************
*** 91,94 ****
--- 92,100 ----
}
+ void _Marshaller_CORBA_ComponentIR_ComponentDef::release( StaticValueType v ) const
+ {
+ CORBA::release( *(_MICO_T *) v );
+ }
+
CORBA::Boolean _Marshaller_CORBA_ComponentIR_ComponentDef::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
{
***************
*** 736,740 ****
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/HomeDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::HomeDef_ptr) _p );
! if (_obj->_is_a_remote("IDL:CORBA/ComponentIR/HomeDef:1.0")) {
_o = new CORBA::ComponentIR::HomeDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
--- 742,746 ----
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/HomeDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::HomeDef_ptr) _p );
! if (!strcmp (_obj->_repoid(), "IDL:CORBA/ComponentIR/HomeDef:1.0") || _obj->_is_a_remote ("IDL:CORBA/ComponentIR/HomeDef:1.0")) {
_o = new CORBA::ComponentIR::HomeDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
***************
*** 762,765 ****
--- 768,772 ----
void assign (StaticValueType dst, const StaticValueType src) const;
void free (StaticValueType) const;
+ void release (StaticValueType) const;
CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
void marshal (CORBA::DataEncoder &, StaticValueType) const;
***************
*** 784,787 ****
--- 791,799 ----
}
+ void _Marshaller_CORBA_ComponentIR_HomeDef::release( StaticValueType v ) const
+ {
+ CORBA::release( *(_MICO_T *) v );
+ }
+
CORBA::Boolean _Marshaller_CORBA_ComponentIR_HomeDef::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
{
***************
*** 1350,1354 ****
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/Container:1.0" )))
return _duplicate( (CORBA::ComponentIR::Container_ptr) _p );
! if (_obj->_is_a_remote("IDL:CORBA/ComponentIR/Container:1.0")) {
_o = new CORBA::ComponentIR::Container_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
--- 1362,1366 ----
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/Container:1.0" )))
return _duplicate( (CORBA::ComponentIR::Container_ptr) _p );
! if (!strcmp (_obj->_repoid(), "IDL:CORBA/ComponentIR/Container:1.0") || _obj->_is_a_remote ("IDL:CORBA/ComponentIR/Container:1.0")) {
_o = new CORBA::ComponentIR::Container_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
***************
*** 1376,1379 ****
--- 1388,1392 ----
void assign (StaticValueType dst, const StaticValueType src) const;
void free (StaticValueType) const;
+ void release (StaticValueType) const;
CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
void marshal (CORBA::DataEncoder &, StaticValueType) const;
***************
*** 1398,1401 ****
--- 1411,1419 ----
}
+ void _Marshaller_CORBA_ComponentIR_Container::release( StaticValueType v ) const
+ {
+ CORBA::release( *(_MICO_T *) v );
+ }
+
CORBA::Boolean _Marshaller_CORBA_ComponentIR_Container::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
{
***************
*** 1670,1674 ****
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/ModuleDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::ModuleDef_ptr) _p );
! if (_obj->_is_a_remote("IDL:CORBA/ComponentIR/ModuleDef:1.0")) {
_o = new CORBA::ComponentIR::ModuleDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
--- 1688,1692 ----
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/ModuleDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::ModuleDef_ptr) _p );
! if (!strcmp (_obj->_repoid(), "IDL:CORBA/ComponentIR/ModuleDef:1.0") || _obj->_is_a_remote ("IDL:CORBA/ComponentIR/ModuleDef:1.0")) {
_o = new CORBA::ComponentIR::ModuleDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
***************
*** 1696,1699 ****
--- 1714,1718 ----
void assign (StaticValueType dst, const StaticValueType src) const;
void free (StaticValueType) const;
+ void release (StaticValueType) const;
CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
void marshal (CORBA::DataEncoder &, StaticValueType) const;
***************
*** 1718,1721 ****
--- 1737,1745 ----
}
+ void _Marshaller_CORBA_ComponentIR_ModuleDef::release( StaticValueType v ) const
+ {
+ CORBA::release( *(_MICO_T *) v );
+ }
+
CORBA::Boolean _Marshaller_CORBA_ComponentIR_ModuleDef::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
{
***************
*** 1870,1874 ****
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/Repository:1.0" )))
return _duplicate( (CORBA::ComponentIR::Repository_ptr) _p );
! if (_obj->_is_a_remote("IDL:CORBA/ComponentIR/Repository:1.0")) {
_o = new CORBA::ComponentIR::Repository_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
--- 1894,1898 ----
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/Repository:1.0" )))
return _duplicate( (CORBA::ComponentIR::Repository_ptr) _p );
! if (!strcmp (_obj->_repoid(), "IDL:CORBA/ComponentIR/Repository:1.0") || _obj->_is_a_remote ("IDL:CORBA/ComponentIR/Repository:1.0")) {
_o = new CORBA::ComponentIR::Repository_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
***************
*** 1896,1899 ****
--- 1920,1924 ----
void assign (StaticValueType dst, const StaticValueType src) const;
void free (StaticValueType) const;
+ void release (StaticValueType) const;
CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
void marshal (CORBA::DataEncoder &, StaticValueType) const;
***************
*** 1918,1921 ****
--- 1943,1951 ----
}
+ void _Marshaller_CORBA_ComponentIR_Repository::release( StaticValueType v ) const
+ {
+ CORBA::release( *(_MICO_T *) v );
+ }
+
CORBA::Boolean _Marshaller_CORBA_ComponentIR_Repository::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
{
***************
*** 2063,2067 ****
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/ProvidesDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::ProvidesDef_ptr) _p );
! if (_obj->_is_a_remote("IDL:CORBA/ComponentIR/ProvidesDef:1.0")) {
_o = new CORBA::ComponentIR::ProvidesDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
--- 2093,2097 ----
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/ProvidesDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::ProvidesDef_ptr) _p );
! if (!strcmp (_obj->_repoid(), "IDL:CORBA/ComponentIR/ProvidesDef:1.0") || _obj->_is_a_remote ("IDL:CORBA/ComponentIR/ProvidesDef:1.0")) {
_o = new CORBA::ComponentIR::ProvidesDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
***************
*** 2089,2092 ****
--- 2119,2123 ----
void assign (StaticValueType dst, const StaticValueType src) const;
void free (StaticValueType) const;
+ void release (StaticValueType) const;
CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
void marshal (CORBA::DataEncoder &, StaticValueType) const;
***************
*** 2111,2114 ****
--- 2142,2150 ----
}
+ void _Marshaller_CORBA_ComponentIR_ProvidesDef::release( StaticValueType v ) const
+ {
+ CORBA::release( *(_MICO_T *) v );
+ }
+
CORBA::Boolean _Marshaller_CORBA_ComponentIR_ProvidesDef::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
{
***************
*** 2465,2469 ****
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/UsesDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::UsesDef_ptr) _p );
! if (_obj->_is_a_remote("IDL:CORBA/ComponentIR/UsesDef:1.0")) {
_o = new CORBA::ComponentIR::UsesDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
--- 2501,2505 ----
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/UsesDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::UsesDef_ptr) _p );
! if (!strcmp (_obj->_repoid(), "IDL:CORBA/ComponentIR/UsesDef:1.0") || _obj->_is_a_remote ("IDL:CORBA/ComponentIR/UsesDef:1.0")) {
_o = new CORBA::ComponentIR::UsesDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
***************
*** 2491,2494 ****
--- 2527,2531 ----
void assign (StaticValueType dst, const StaticValueType src) const;
void free (StaticValueType) const;
+ void release (StaticValueType) const;
CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
void marshal (CORBA::DataEncoder &, StaticValueType) const;
***************
*** 2513,2516 ****
--- 2550,2558 ----
}
+ void _Marshaller_CORBA_ComponentIR_UsesDef::release( StaticValueType v ) const
+ {
+ CORBA::release( *(_MICO_T *) v );
+ }
+
CORBA::Boolean _Marshaller_CORBA_ComponentIR_UsesDef::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
{
***************
*** 2972,2976 ****
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/EventDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::EventDef_ptr) _p );
! if (_obj->_is_a_remote("IDL:CORBA/ComponentIR/EventDef:1.0")) {
_o = new CORBA::ComponentIR::EventDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
--- 3014,3018 ----
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/EventDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::EventDef_ptr) _p );
! if (!strcmp (_obj->_repoid(), "IDL:CORBA/ComponentIR/EventDef:1.0") || _obj->_is_a_remote ("IDL:CORBA/ComponentIR/EventDef:1.0")) {
_o = new CORBA::ComponentIR::EventDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
***************
*** 2998,3001 ****
--- 3040,3044 ----
void assign (StaticValueType dst, const StaticValueType src) const;
void free (StaticValueType) const;
+ void release (StaticValueType) const;
CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
void marshal (CORBA::DataEncoder &, StaticValueType) const;
***************
*** 3020,3023 ****
--- 3063,3071 ----
}
+ void _Marshaller_CORBA_ComponentIR_EventDef::release( StaticValueType v ) const
+ {
+ CORBA::release( *(_MICO_T *) v );
+ }
+
CORBA::Boolean _Marshaller_CORBA_ComponentIR_EventDef::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
{
***************
*** 3429,3433 ****
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/EmitsDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::EmitsDef_ptr) _p );
! if (_obj->_is_a_remote("IDL:CORBA/ComponentIR/EmitsDef:1.0")) {
_o = new CORBA::ComponentIR::EmitsDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
--- 3477,3481 ----
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/EmitsDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::EmitsDef_ptr) _p );
! if (!strcmp (_obj->_repoid(), "IDL:CORBA/ComponentIR/EmitsDef:1.0") || _obj->_is_a_remote ("IDL:CORBA/ComponentIR/EmitsDef:1.0")) {
_o = new CORBA::ComponentIR::EmitsDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
***************
*** 3455,3458 ****
--- 3503,3507 ----
void assign (StaticValueType dst, const StaticValueType src) const;
void free (StaticValueType) const;
+ void release (StaticValueType) const;
CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
void marshal (CORBA::DataEncoder &, StaticValueType) const;
***************
*** 3477,3480 ****
--- 3526,3534 ----
}
+ void _Marshaller_CORBA_ComponentIR_EmitsDef::release( StaticValueType v ) const
+ {
+ CORBA::release( *(_MICO_T *) v );
+ }
+
CORBA::Boolean _Marshaller_CORBA_ComponentIR_EmitsDef::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
{
***************
*** 3614,3618 ****
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/PublishesDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::PublishesDef_ptr) _p );
! if (_obj->_is_a_remote("IDL:CORBA/ComponentIR/PublishesDef:1.0")) {
_o = new CORBA::ComponentIR::PublishesDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
--- 3668,3672 ----
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/PublishesDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::PublishesDef_ptr) _p );
! if (!strcmp (_obj->_repoid(), "IDL:CORBA/ComponentIR/PublishesDef:1.0") || _obj->_is_a_remote ("IDL:CORBA/ComponentIR/PublishesDef:1.0")) {
_o = new CORBA::ComponentIR::PublishesDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
***************
*** 3640,3643 ****
--- 3694,3698 ----
void assign (StaticValueType dst, const StaticValueType src) const;
void free (StaticValueType) const;
+ void release (StaticValueType) const;
CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
void marshal (CORBA::DataEncoder &, StaticValueType) const;
***************
*** 3662,3665 ****
--- 3717,3725 ----
}
+ void _Marshaller_CORBA_ComponentIR_PublishesDef::release( StaticValueType v ) const
+ {
+ CORBA::release( *(_MICO_T *) v );
+ }
+
CORBA::Boolean _Marshaller_CORBA_ComponentIR_PublishesDef::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
{
***************
*** 3799,3803 ****
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/ConsumesDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::ConsumesDef_ptr) _p );
! if (_obj->_is_a_remote("IDL:CORBA/ComponentIR/ConsumesDef:1.0")) {
_o = new CORBA::ComponentIR::ConsumesDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
--- 3859,3863 ----
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/ConsumesDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::ConsumesDef_ptr) _p );
! if (!strcmp (_obj->_repoid(), "IDL:CORBA/ComponentIR/ConsumesDef:1.0") || _obj->_is_a_remote ("IDL:CORBA/ComponentIR/ConsumesDef:1.0")) {
_o = new CORBA::ComponentIR::ConsumesDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
***************
*** 3825,3828 ****
--- 3885,3889 ----
void assign (StaticValueType dst, const StaticValueType src) const;
void free (StaticValueType) const;
+ void release (StaticValueType) const;
CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
void marshal (CORBA::DataEncoder &, StaticValueType) const;
***************
*** 3847,3850 ****
--- 3908,3916 ----
}
+ void _Marshaller_CORBA_ComponentIR_ConsumesDef::release( StaticValueType v ) const
+ {
+ CORBA::release( *(_MICO_T *) v );
+ }
+
CORBA::Boolean _Marshaller_CORBA_ComponentIR_ConsumesDef::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
{
***************
*** 4146,4150 ****
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/FactoryDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::FactoryDef_ptr) _p );
! if (_obj->_is_a_remote("IDL:CORBA/ComponentIR/FactoryDef:1.0")) {
_o = new CORBA::ComponentIR::FactoryDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
--- 4212,4216 ----
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/FactoryDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::FactoryDef_ptr) _p );
! if (!strcmp (_obj->_repoid(), "IDL:CORBA/ComponentIR/FactoryDef:1.0") || _obj->_is_a_remote ("IDL:CORBA/ComponentIR/FactoryDef:1.0")) {
_o = new CORBA::ComponentIR::FactoryDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
***************
*** 4172,4175 ****
--- 4238,4242 ----
void assign (StaticValueType dst, const StaticValueType src) const;
void free (StaticValueType) const;
+ void release (StaticValueType) const;
CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
void marshal (CORBA::DataEncoder &, StaticValueType) const;
***************
*** 4194,4197 ****
--- 4261,4269 ----
}
+ void _Marshaller_CORBA_ComponentIR_FactoryDef::release( StaticValueType v ) const
+ {
+ CORBA::release( *(_MICO_T *) v );
+ }
+
CORBA::Boolean _Marshaller_CORBA_ComponentIR_FactoryDef::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
{
***************
*** 4331,4335 ****
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/FinderDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::FinderDef_ptr) _p );
! if (_obj->_is_a_remote("IDL:CORBA/ComponentIR/FinderDef:1.0")) {
_o = new CORBA::ComponentIR::FinderDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
--- 4403,4407 ----
if( (_p = _obj->_narrow_helper( "IDL:CORBA/ComponentIR/FinderDef:1.0" )))
return _duplicate( (CORBA::ComponentIR::FinderDef_ptr) _p );
! if (!strcmp (_obj->_repoid(), "IDL:CORBA/ComponentIR/FinderDef:1.0") || _obj->_is_a_remote ("IDL:CORBA/ComponentIR/FinderDef:1.0")) {
_o = new CORBA::ComponentIR::FinderDef_stub;
_o->MICO_SCOPE(CORBA,Object::operator=)( *_obj );
***************
*** 4357,4360 ****
--- 4429,4433 ----
void assign (StaticValueType dst, const StaticValueType src) const;
void free (StaticValueType) const;
+ void release (StaticValueType) const;
CORBA::Boolean demarshal (CORBA::DataDecoder&, StaticValueType) const;
void marshal (CORBA::DataEncoder &, StaticValueType) const;
***************
*** 4379,4382 ****
--- 4452,4460 ----
}
+ void _Marshaller_CORBA_ComponentIR_FinderDef::release( StaticValueType v ) const
+ {
+ CORBA::release( *(_MICO_T *) v );
+ }
+
CORBA::Boolean _Marshaller_CORBA_ComponentIR_FinderDef::demarshal( CORBA::DataDecoder &dc, StaticValueType v ) const
{
***************
*** 4939,4944 ****
! struct __tc_init_COMPONENTIR {
! __tc_init_COMPONENTIR()
{
CORBA::ComponentIR::_tc_ComponentDef =
--- 5017,5022 ----
! struct __tc_init_IR3 {
! __tc_init_IR3()
{
CORBA::ComponentIR::_tc_ComponentDef =
***************
*** 5576,5579 ****
};
! static __tc_init_COMPONENTIR __init_COMPONENTIR;
--- 5654,5657 ----
};
! static __tc_init_IR3 __init_IR3;
Index: ir3_skel.cc
===================================================================
RCS file: /cvsroot/micomt/mico/ir/ir3_skel.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ir3_skel.cc 2001/07/06 22:15:08 1.1
--- ir3_skel.cc 2001/10/26 20:00:00 1.2
***************
*** 1,5 ****
/*
! * MICO --- a free CORBA implementation
! * Copyright (C) 1997-98 Kay Roemer & Arno Puder
*
* This file was automatically generated. DO NOT EDIT!
--- 1,5 ----
/*
! * MICO --- an Open Source CORBA implementation
! * Copyright (c) 1997-2001 by The Mico Team
*
[...1767 lines suppressed...]
! POA_CORBA::ComponentIR::FinderDef::invoke (CORBA::StaticServerRequest_ptr __req)
{
! if (dispatch (__req)) {
return;
}
***************
*** 1614,1619 ****
CORBA::Exception * ex =
new CORBA::BAD_OPERATION (0, CORBA::COMPLETED_NO);
! _req->set_exception (ex);
! _req->write_results();
}
--- 1614,1619 ----
CORBA::Exception * ex =
new CORBA::BAD_OPERATION (0, CORBA::COMPLETED_NO);
! __req->set_exception (ex);
! __req->write_results();
}
Index: ir_impl.cc
===================================================================
RCS file: /cvsroot/micomt/mico/ir/ir_impl.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ir_impl.cc 2001/07/23 20:12:08 1.3
--- ir_impl.cc 2001/10/26 20:00:00 1.4
***************
*** 1,5 ****
/*
! * MICO --- a free CORBA implementation
! * Copyright (C) 1997-98 Kay Roemer & Arno Puder
*
* This library is free software; you can redistribute it and/or
--- 1,5 ----
/*
! * MICO --- an Open Source CORBA implementation
! * Copyright (c) 1997-2001 by The Mico Team
*
* This library is free software; you can redistribute it and/or
***************
*** 17,22 ****
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
! * Send comments and/or bug reports to:
! * mi...@in...
*/
--- 17,22 ----
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
! * For more information, visit the MICO Home Page at
! * http://www.mico.org/
*/
***************
*** 1763,1767 ****
CORBA::TypeCode_var tc1 = _type_def->type();
CORBA::TypeCode_var tc2 = ((CORBA::Any&) a).type();
! if( !tc1->equal( tc2 ) ) {
mico_throw (CORBA::NO_PERMISSION());
}
--- 1763,1767 ----
CORBA::TypeCode_var tc1 = _type_def->type();
CORBA::TypeCode_var tc2 = ((CORBA::Any&) a).type();
! if( !tc1->equivalent( tc2 ) ) {
mico_throw (CORBA::NO_PERMISSION());
}
***************
*** 2626,2629 ****
--- 2626,2631 ----
CORBA::StructMemberSeq* ExceptionDef_impl::members()
{
+ // update member types
+ CORBA::TypeCode_var dummy = type ();
return new CORBA::StructMemberSeq (_members);
}
***************
*** 2631,2636 ****
void ExceptionDef_impl::members( const CORBA::StructMemberSeq& _value )
{
! for (CORBA::ULong i=0; i<_value.length(); i++) {
! if (!*_value[i].name.in()) {
/*
* empty name
--- 2633,2638 ----
void ExceptionDef_impl::members( const CORBA::StructMemberSeq& _value )
{
! for (CORBA::ULong i0=0; i0<_value.length(); i0++) {
! if (!*_value[i0].name.in()) {
/*
* empty name
***************
*** 2638,2642 ****
mico_throw (CORBA::BAD_PARAM());
}
! if (strnocasecmp (_value[i].name, _name.in()) == 0) {
/*
* member name must be different from scope name
--- 2640,2644 ----
mico_throw (CORBA::BAD_PARAM());
}
! if (strnocasecmp (_value[i0].name, _name.in()) == 0) {
/*
* member name must be different from scope name
***************
*** 2644,2648 ****
mico_throw (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3, CORBA::COMPLETED_NO));
}
! if (CORBA::is_nil (_value[i].type_def.in())) {
/*
* empty type
--- 2646,2650 ----
mico_throw (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3, CORBA::COMPLETED_NO));
}
! if (CORBA::is_nil (_value[i0].type_def.in())) {
/*
* empty type
***************
*** 2685,2694 ****
_members = _value;
-
- for (CORBA::ULong i = 0; i < _members.length(); ++i) {
- _members[i].type = _members[i].type_def->type();
- }
-
- _type = CORBA::TypeCode::create_exception_tc (_id, _name, _members);
}
--- 2687,2690 ----
***************
*** 2696,2699 ****
--- 2692,2700 ----
ExceptionDef_impl::type()
{
+ for (CORBA::ULong i1 = 0; i1 < _members.length(); ++i1) {
+ _members[i1].type = _members[i1].type_def->type();
+ }
+
+ _type = CORBA::TypeCode::create_exception_tc (_id, _name, _members);
return CORBA::TypeCode::_duplicate (_type);
}
***************
*** 2720,2724 ****
d.defined_in = def_in_id;
d.version = _version;
! d.type = _type;
desc->kind = _dk;
--- 2721,2725 ----
d.defined_in = def_in_id;
d.version = _version;
! d.type = type ();
desc->kind = _dk;
Index: ir_impl.h
===================================================================
RCS file: /cvsroot/micomt/mico/ir/ir_impl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ir_impl.h 2001/07/06 22:15:08 1.2
--- ir_impl.h 2001/10/26 20:00:00 1.3
***************
*** 1,6 ****
// -*- c++ -*-
/*
! * MICO --- a free CORBA implementation
! * Copyright (C) 1997-98 Kay Roemer & Arno Puder
*
* This library is free software; you can redistribute it and/or
--- 1,6 ----
// -*- c++ -*-
/*
! * MICO --- an Open Source CORBA implementation
! * Copyright (c) 1997-2001 by The Mico Team
*
* This library is free software; you can redistribute it and/or
***************
*** 18,23 ****
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
! * Send comments and/or bug reports to:
! * mi...@in...
*/
--- 18,23 ----
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
! * For more information, visit the MICO Home Page at
! * http://www.mico.org/
*/
Index: ir_skel.cc
===================================================================
RCS file: /cvsroot/micomt/mico/ir/ir_skel.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ir_skel.cc 2001/07/06 22:15:08 1.2
--- ir_skel.cc 2001/10/26 20:00:00 1.3
***************
*** 1,5 ****
/*
! * MICO --- a free CORBA implementation
! * Copyright (C) 1997-98 Kay Roemer & Arno Puder
*
* This file was automatically generated. DO NOT EDIT!
--- 1,5 ----
/*
! * MICO --- an Open Source CORBA implementation
! * Copyright (c) 1997-2001 by The Mico Team
*
* This file was automatically generated. DO NOT EDIT!
Index: main.cc
===================================================================
RCS file: /cvsroot/micomt/mico/ir/main.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** main.cc 2001/07/06 22:15:08 1.2
--- main.cc 2001/10/26 20:00:00 1.3
***************
*** 1,5 ****
/*
! * MICO --- a free CORBA implementation
! * Copyright (C) 1997-98 Kay Roemer & Arno Puder
*
* This program is free software; you can redistribute it and/or modify
--- 1,5 ----
/*
! * MICO --- an Open Source CORBA implementation
! * Copyright (c) 1997-2001 by The Mico Team
*
* This program is free software; you can redistribute it and/or modify
***************
*** 17,22 ****
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
! * Send comments and/or bug reports to:
! * mi...@in...
*/
--- 17,22 ----
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
! * For more information, visit the MICO Home Page at
! * http://www.mico.org/
*/
|
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:34
|
Update of /cvsroot/micomt/mico/include/mico/os-thread In directory usw-pr-cvs1:/tmp/cvs-serv17698/include/mico/os-thread Modified Files: dcethreads.h pthreads.h pththreads.h solaris-threads.h Log Message: - merged with MICO 2.3.6 Index: dcethreads.h =================================================================== RCS file: /cvsroot/micomt/mico/include/mico/os-thread/dcethreads.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** dcethreads.h 2001/08/18 20:29:25 1.13 --- dcethreads.h 2001/10/26 19:59:59 1.14 *************** *** 1,30 **** ! /* -*- mode: c++; c-basic-offset: 4; -*- ! * ! * MICO --- a CORBA implementation ! * Copyright (C) 1997-98 Kay Roemer & Arno Puder * ! * OSThread: An abstract Thread class for MICO ! * Copyright (C) 1999 Andy Kersting & Andreas Schultz * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Library General Public ! * License as published by the Free Software Foundation; either ! * version 2 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Library General Public License for more details. ! * ! * You should have received a copy of the GNU Library General Public ! * License along with this library; if not, write to the Free ! * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * Send comments and/or bug reports to: ! * mi...@in... * ! * $Id$ * ! * support for Draft 4 (DCE) threads * */ --- 1,30 ---- ! // -*- c++ -*- ! /* ! * MICO --- an Open Source CORBA implementation ! * Copyright (c) 1997-2001 by The Mico Team * ! * OSThread: An abstract Thread class for MICO ! * Copyright (C) 1999 Andy Kersting & Andreas Schultz * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Library General Public ! * License as published by the Free Software Foundation; either ! * version 2 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Library General Public License for more details. ! * ! * You should have received a copy of the GNU Library General Public ! * License along with this library; if not, write to the Free ! * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * For more information, visit the MICO Home Page at ! * http://www.mico.org/ * ! * $Id$ * ! * support for Draft 4 (DCE) threads * */ Index: pthreads.h =================================================================== RCS file: /cvsroot/micomt/mico/include/mico/os-thread/pthreads.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -r1.25 -r1.26 *** pthreads.h 2001/08/18 20:29:25 1.25 --- pthreads.h 2001/10/26 19:59:59 1.26 *************** *** 1,31 **** ! /* -*- mode: c++; c-basic-offset: 4; -*- ! * ! * MICO --- a CORBA implementation ! * Copyright (C) 1997-98 Kay Roemer & Arno Puder * ! * OSThread: An abstract Thread class for MICO ! * Copyright (C) 1999 Andy Kersting & Andreas Schultz * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Library General Public ! * License as published by the Free Software Foundation; either ! * version 2 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Library General Public License for more details. ! * ! * You should have received a copy of the GNU Library General Public ! * License along with this library; if not, write to the Free ! * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * Send comments and/or bug reports to: ! * mi...@in... * ! * $Id$ * ! * support for POSIX Draft 10ish Pthreads for Linux as developed by ! * Xavier Le...@in... * */ --- 1,31 ---- ! // -*- c++ -*- ! /* ! * MICO --- an Open Source CORBA implementation ! * Copyright (c) 1997-2001 by The Mico Team * ! * OSThread: An abstract Thread class for MICO ! * Copyright (C) 1999 Andy Kersting & Andreas Schultz * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Library General Public ! * License as published by the Free Software Foundation; either ! * version 2 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Library General Public License for more details. ! * ! * You should have received a copy of the GNU Library General Public ! * License along with this library; if not, write to the Free ! * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * For more information, visit the MICO Home Page at ! * http://www.mico.org/ * ! * $Id$ * ! * support for POSIX Draft 10ish Pthreads for Linux as developed by ! * Xavier Le...@in... * */ Index: pththreads.h =================================================================== RCS file: /cvsroot/micomt/mico/include/mico/os-thread/pththreads.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** pththreads.h 2001/08/18 20:29:25 1.8 --- pththreads.h 2001/10/26 19:59:59 1.9 *************** *** 1,30 **** ! /* -*- mode: c++; c-basic-offset: 4; -*- ! * ! * MICO --- a CORBA implementation ! * Copyright (C) 1997-98 Kay Roemer & Arno Puder * ! * OSThread: An abstract Thread class for MICO ! * Copyright (C) 1999 Andy Kersting & Andreas Schultz * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Library General Public ! * License as published by the Free Software Foundation; either ! * version 2 of the License, or (at your option) any later version. * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this library; if not, write to the Free ! * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * Send comments and/or bug reports to: ! * mi...@in... * ! * $Id$ * ! * support for GNU Pth - The GNU Portable Threads (http://www.gnu.org/software/pth) * */ --- 1,30 ---- ! // -*- c++ -*- ! /* ! * MICO --- an Open Source CORBA implementation ! * Copyright (c) 1997-2001 by The Mico Team * ! * OSThread: An abstract Thread class for MICO ! * Copyright (C) 1999 Andy Kersting & Andreas Schultz * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Library General Public ! * License as published by the Free Software Foundation; either ! * version 2 of the License, or (at your option) any later version. * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Library General Public License for more details. * ! * You should have received a copy of the GNU Library General Public ! * License along with this library; if not, write to the Free ! * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * For more information, visit the MICO Home Page at ! * http://www.mico.org/ * ! * $Id$ * ! * support for GNU Pth - The GNU Portable Threads (http://www.gnu.org/software/pth) * */ *************** *** 392,393 **** --- 392,394 ---- #endif // __os_thread_pthreads_h__ + Index: solaris-threads.h =================================================================== RCS file: /cvsroot/micomt/mico/include/mico/os-thread/solaris-threads.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** solaris-threads.h 2001/08/18 20:29:25 1.6 --- solaris-threads.h 2001/10/26 19:59:59 1.7 *************** *** 1,30 **** ! /* -*- mode: c++; c-basic-offset: 4; -*- ! * ! * MICO --- a CORBA implementation ! * Copyright (C) 1997-98 Kay Roemer & Arno Puder * ! * OSThread: An abstract Thread class for MICO ! * Copyright (C) 1999 Andy Kersting & Andreas Schultz * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Library General Public ! * License as published by the Free Software Foundation; either ! * version 2 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Library General Public License for more details. ! * ! * You should have received a copy of the GNU Library General Public ! * License along with this library; if not, write to the Free ! * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * Send comments and/or bug reports to: ! * mi...@in... * ! * $Id$ * ! * support for Solaris-Threads * */ --- 1,30 ---- ! // -*- c++ -*- ! /* ! * MICO --- an Open Source CORBA implementation ! * Copyright (c) 1997-2001 by The Mico Team * ! * OSThread: An abstract Thread class for MICO ! * Copyright (C) 1999 Andy Kersting & Andreas Schultz * ! * This library is free software; you can redistribute it and/or ! * modify it under the terms of the GNU Library General Public ! * License as published by the Free Software Foundation; either ! * version 2 of the License, or (at your option) any later version. ! * ! * This library is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ! * Library General Public License for more details. ! * ! * You should have received a copy of the GNU Library General Public ! * License along with this library; if not, write to the Free ! * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * For more information, visit the MICO Home Page at ! * http://www.mico.org/ * ! * $Id$ * ! * support for Solaris-Threads * */ |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:33
|
Update of /cvsroot/micomt/mico/include/mico/transport In directory usw-pr-cvs1:/tmp/cvs-serv17698/include/mico/transport Modified Files: tcp.h udp.h unix.h Log Message: - merged with MICO 2.3.6 Index: tcp.h =================================================================== RCS file: /cvsroot/micomt/mico/include/mico/transport/tcp.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** tcp.h 2001/03/22 15:58:36 1.6 --- tcp.h 2001/10/26 19:59:59 1.7 *************** *** 1,7 **** ! /* -*- mode: c++; c-basic-offset: 4; -*- * - * MICO --- a free CORBA implementation - * Copyright (C) 1997-98 Kay Roemer & Arno Puder - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public --- 1,7 ---- ! // -*- c++ -*- ! /* ! * MICO --- an Open Source CORBA implementation ! * Copyright (c) 1997-2001 by The Mico Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public *************** *** 18,23 **** * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * Send comments and/or bug reports to: ! * mi...@in... */ --- 18,23 ---- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * For more information, visit the MICO Home Page at ! * http://www.mico.org/ */ Index: udp.h =================================================================== RCS file: /cvsroot/micomt/mico/include/mico/transport/udp.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** udp.h 2001/03/22 15:58:36 1.5 --- udp.h 2001/10/26 19:59:59 1.6 *************** *** 1,7 **** ! /* -*- mode: c++; c-basic-offset: 4; -*- * - * MICO --- a free CORBA implementation - * Copyright (C) 1997-98 Kay Roemer & Arno Puder - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public --- 1,7 ---- ! // -*- c++ -*- ! /* ! * MICO --- an Open Source CORBA implementation ! * Copyright (c) 1997-2001 by The Mico Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public *************** *** 18,23 **** * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * Send comments and/or bug reports to: ! * mi...@in... */ --- 18,23 ---- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * For more information, visit the MICO Home Page at ! * http://www.mico.org/ */ Index: unix.h =================================================================== RCS file: /cvsroot/micomt/mico/include/mico/transport/unix.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** unix.h 2001/03/22 15:58:36 1.5 --- unix.h 2001/10/26 19:59:59 1.6 *************** *** 1,6 **** // -*- c++ -*- /* ! * MICO --- a free CORBA implementation ! * Copyright (C) 1997-98 Kay Roemer & Arno Puder * * This library is free software; you can redistribute it and/or --- 1,6 ---- // -*- c++ -*- /* ! * MICO --- an Open Source CORBA implementation ! * Copyright (c) 1997-2001 by The Mico Team * * This library is free software; you can redistribute it and/or *************** *** 18,23 **** * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * Send comments and/or bug reports to: ! * mi...@in... */ --- 18,23 ---- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * For more information, visit the MICO Home Page at ! * http://www.mico.org/ */ |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:33
|
Update of /cvsroot/micomt/mico/include/ministl
In directory usw-pr-cvs1:/tmp/cvs-serv17698/include/ministl
Modified Files:
bool.h
Log Message:
- merged with MICO 2.3.6
Index: bool.h
===================================================================
RCS file: /cvsroot/micomt/mico/include/ministl/bool.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** bool.h 1999/11/03 23:20:53 1.1.1.1
--- bool.h 2001/10/26 19:59:59 1.2
***************
*** 38,41 ****
--- 38,44 ----
operator int ()
{ return rep; }
+
+ operator int() const
+ { return rep; }
};
|
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:33
|
Update of /cvsroot/micomt/mico/include In directory usw-pr-cvs1:/tmp/cvs-serv17698/include Modified Files: CORBA-SMALL.h CORBA.h Log Message: - merged with MICO 2.3.6 Index: CORBA-SMALL.h =================================================================== RCS file: /cvsroot/micomt/mico/include/CORBA-SMALL.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** CORBA-SMALL.h 1999/11/03 23:20:53 1.1.1.1 --- CORBA-SMALL.h 2001/10/26 19:59:58 1.2 *************** *** 1,6 **** // -*- c++ -*- /* ! * MICO --- a free CORBA implementation ! * Copyright (C) 1997-98 Kay Roemer & Arno Puder * * This library is free software; you can redistribute it and/or --- 1,6 ---- // -*- c++ -*- /* ! * MICO --- an Open Source CORBA implementation ! * Copyright (c) 1997-2001 by The Mico Team * * This library is free software; you can redistribute it and/or *************** *** 18,23 **** * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * Send comments and/or bug reports to: ! * mi...@in... */ --- 18,23 ---- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * For more information, visit the MICO Home Page at ! * http://www.mico.org/ */ Index: CORBA.h =================================================================== RCS file: /cvsroot/micomt/mico/include/CORBA.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** CORBA.h 2001/08/25 18:41:15 1.22 --- CORBA.h 2001/10/26 19:59:58 1.23 *************** *** 1,6 **** // -*- c++ -*- /* ! * MICO --- a free CORBA implementation ! * Copyright (C) 1997-98 Kay Roemer & Arno Puder * * This library is free software; you can redistribute it and/or --- 1,6 ---- // -*- c++ -*- /* ! * MICO --- an Open Source CORBA implementation ! * Copyright (c) 1997-2001 by The Mico Team * * This library is free software; you can redistribute it and/or *************** *** 18,23 **** * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * Send comments and/or bug reports to: ! * mi...@in... */ --- 18,23 ---- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * ! * For more information, visit the MICO Home Page at ! * http://www.mico.org/ */ |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:32
|
Update of /cvsroot/micomt/mico/doc
In directory usw-pr-cvs1:/tmp/cvs-serv17698/doc
Modified Files:
FrameDescription.html FrameToc.html Makefile faq.tex
Removed Files:
doc.ps
Log Message:
- merged with MICO 2.3.6
Index: FrameDescription.html
===================================================================
RCS file: /cvsroot/micomt/mico/doc/FrameDescription.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** FrameDescription.html 2001/02/08 15:05:56 1.1.1.1
--- FrameDescription.html 2001/10/26 19:59:57 1.2
***************
*** 48,55 ****
<UL>
! <LI> start from scratch: only use what standard UNIX API has to offer;
don't rely on propietary or specialized libraries.
! <LI> use C++ for the implementation.
! <LI> only make use of widely available, non-proprietary tools.
<LI> omit bells and whistles: only implement what is required for a
CORBA compliant implementation.
--- 48,56 ----
<UL>
! <LI> start from scratch: only use what standard APIs (Posix/Win32)
! have to offer;
don't rely on propietary or specialized libraries.
! <LI> use standard C++ for the implementation.
! <LI> only make use of widely available, free, non-proprietary tools.
<LI> omit bells and whistles: only implement what is required for a
CORBA compliant implementation.
***************
*** 111,115 ****
</UL>
! We hope that the MICO homepage can serve as a meeting point between companies and the open source community. If you are interested in providing some funds to implement parts of the CORBA specification missing in MICO, please let <A HREF="mailto:ap...@pa...">me</A> know and I'll add a project description to this page. Your proposal should include timeline, milestones, deliverables and, of course, the compensation. There is only one requirement from us, namely that the resulting source code will be published under the GNU-GPL/LGPL license.
<P><img src="dot1.gif" height="25"><P>
--- 112,116 ----
</UL>
! We hope that the MICO homepage can serve as a meeting point between companies and the open source community. If you are interested in providing some funds to implement parts of the CORBA specification missing in MICO, please let <A HREF="mailto:ar...@mi...">me</A> know and I'll add a project description to this page. Your proposal should include timeline, milestones, deliverables and, of course, the compensation. There is only one requirement from us, namely that the resulting source code will be published under the GNU-GPL/LGPL license.
<P><img src="dot1.gif" height="25"><P>
***************
*** 123,127 ****
The complete sources for MICO are freely available via <I>anonymous
ftp</I>. The current version @VERSION@ runs on Sun Solaris, IBM AIX,
! HP-UX, Linux, Digital Unix, Ultrix and Windows NT and it shouldn't be too
difficult to port it to other platforms. Click
<A HREF="CHANGES">here</A> for a list of changes. Please send bug reports
--- 124,128 ----
The complete sources for MICO are freely available via <I>anonymous
ftp</I>. The current version @VERSION@ runs on Sun Solaris, IBM AIX,
! HP-UX, Linux, Digital Unix, Ultrix, Windows NT and PocketPC and it shouldn't be too
difficult to port it to other platforms. Click
<A HREF="CHANGES">here</A> for a list of changes. Please send bug reports
***************
*** 134,178 ****
<LI>Complete sources for MICO in <A HREF="mico-@VERSION@.tar.gz">.tar.gz</A>
and <A HREF="mico-@VERSION@.zip">.zip</A> format.
! <!-- ... not yet ...
! <LI><A HREF="ftp://141.2.2.1/pub/projects/mico/v0.1/mico-0.1-linux-2.0.tar.gz">
! Pre-compiled version for Linux.</A>
! <LI><A HREF="ftp://141.2.2.1/pub/projects/mico/v0.1/mico-0.1-sunos-5.5.tar.gz">
! Pre-compiled version for SunSparc.</A>
! <LI><A HREF="ftp://141.2.2.1/pub/projects/mico/v0.1/mico-0.1-aix-4.2.tar.gz">
! Pre-Compiled version for IBM RS/6000.</A>
! -->
</UL>
The following tools are necessary to compile MICO:
<UL>
! <LI>C++ compiler and library (in order or preferability):
! <UL>
! <LI> <a href="http://www.cygnus.com/egcs/">egcs 1.0</a>, or
! <LI> <a href="ftp://prep.ai.mit.edu/pub/gnu/gcc-2.8.1.tar.gz">g++ 2.8.1</a> and <a href="ftp://prep.ai.mit.edu/pub/gnu/libg++-2.8.1.tar.gz">libg++ 2.8.1</a>, or
! <LI> <a href="ftp://prep.ai.mit.edu/pub/gnu/gcc-2.7.2.tar.gz">g++ 2.7.2</a>, <a href="ftp://prep.ai.mit.edu/pub/gnu/libg++-2.7.2.tar.gz">libg++ 2.7.2</a>, and <a href="ftp://ftp.tu-darmstadt.de//pub/programming/languages/C++/compiler/cygnus-g++/gcc-2.7.2-repo.gz">repo patch (optional)</a>.
! </UL>
! <LI><a href="ftp://prep.ai.mit.edu/pub/gnu/flex-2.5.3.tar.gz">flex 2.5.3</a> (optional)
! <LI><a href="ftp://prep.ai.mit.edu/pub/gnu/bison-1.25.tar.gz">bison 1.25</a> (optional)
! <LI><a href="http://java.sun.com">JDK 1.1.5</a> (optional)
! <LI><a href="http://www.cs.princeton.edu/~appel/modern/java/CUP/">Java CUP 0.10g</a> (optional)
! <LI><a href="http://www.ssleay.org">SSLeay 0.8.1</A> (optional)
</UL>
! MICO works on the following platforms (where egcs 1.x is listed, gcc 2.7
! and 2.8 and are likeley to work as well):
<ul>
! <li> Solaris 2.5, 2.6, and 7 on Sun SPARC (egcs 1.x, native C++ compiler)
! <li> AIX 4.2 on IBM RS/6000 (egcs 1.x, native C++ compiler)
! <li> Linux 2.x on Intel x86 (egcs 1.x)
! <li> Digital Unix 4.x on DEC Alpha (egcs 1.x)
! <li> HP-UX 10.20 on PA-RISC (egcs 1.x, native C++ compiler)
! <li> Ultrix 4.3 on DEC Mips (egcs 1.x)
! <li> Linux 2.x on DEC Alpha (egcs 1.x)
! <li> SGI-IRIX on DEC Mips (egcs 1.x, native C++ compiler)
<li> PowerMax OS (native C++ compiler)
! <li> Windows 95/NT (<a href="ftp://ftp.cygnus.com/pub/gnu-win32/">Cygnus CDK beta19</a>)
! <li> Windows 95/NT (Visual-C++ 5+SP3 and 6+SP1)
! <li> FreeBSD 3.x on Intel x86 (egcs 1.x)
</ul>
--- 135,171 ----
<LI>Complete sources for MICO in <A HREF="mico-@VERSION@.tar.gz">.tar.gz</A>
and <A HREF="mico-@VERSION@.zip">.zip</A> format.
! <LI>Anonymous CVS access:<br>
! <CODE>export CVSROOT=:pserver:an...@mi...:/home/mico/cvsroot</CODE><br>
! <CODE>cvs login</CODE> <EM>(passwd: 'anon')</EM><br>
! <CODE>cvs checkout mico</CODE>
</UL>
The following tools are necessary to compile MICO:
+
<UL>
! <LI> Any decent C++ compiler. We recommend the GNU Compiler,
! <a href="http://gcc.gnu.org/">gcc 2.95.x</a>.
! <LI> <a href="ftp://prep.ai.mit.edu/pub/gnu/flex-2.5.3.tar.gz">flex 2.5.3</a> (optional)
! <LI> <a href="ftp://prep.ai.mit.edu/pub/gnu/bison-1.25.tar.gz">bison 1.25</a> (optional)
! <LI> <a href="http://java.sun.com">JDK 1.1.5</a> (or later versions) (optional)
! <LI> <a href="http://www.cs.princeton.edu/~appel/modern/java/CUP/">Java CUP 0.10g</a> (optional)
! <LI> <a href="http://www.openssl.org">OpenSSL 0.9.6a</A> (optional)
</UL>
! MICO has been reported to work on the following platforms. Let us know if
! you succeed in running MICO on other platforms
<ul>
! <li> Solaris 2.5, 2.6, and 7 on Sun SPARC (gcc 2.95, native C++ compiler)
! <li> AIX 4.2 on IBM RS/6000 (gcc 2.95, native C++ compiler)
! <li> Linux 2.x on Intel x86 (gcc 2.95)
! <li> Digital Unix 4.x on DEC Alpha (gcc 2.95)
! <li> HP-UX 10.20 on PA-RISC (gcc 2.95, native C++ compiler)
! <li> Ultrix 4.3 on DEC Mips (gcc 2.95)
! <li> Linux 2.x on DEC Alpha (gcc 2.95)
! <li> SGI-IRIX on DEC Mips (gcc 2.95, native C++ compiler)
<li> PowerMax OS (native C++ compiler)
! <li> Windows 95/NT (Visual-C++ 5+SP3 and 6+SP1, Cygwin or MinGW)
! <li> FreeBSD 3.x on Intel x86 (gcc 2.95)
</ul>
***************
*** 214,218 ****
well documented both in the manual and in online man-pages. MICO is
fully interoperable with other CORBA implementations, such as Orbix
! from Iona or VisiBroker from Inprise. The manual contains a
step-by-step procedure showing how to connect MICO with other CORBA
implementations. It even includes sample programs from various CORBA
--- 207,211 ----
well documented both in the manual and in online man-pages. MICO is
fully interoperable with other CORBA implementations, such as Orbix
! from Iona or VisiBroker from Borland. The manual contains a
step-by-step procedure showing how to connect MICO with other CORBA
implementations. It even includes sample programs from various CORBA
***************
*** 301,305 ****
(requires two sided printing capabilities)</A>
<LI> <A HREF="doc-html.tar.gz">Set of downloadable HTML pages</A>
! <LI> <A HREF="http://www.cs.uni-magdeburg.de/~aschultz/mico/">Searchable
mailing list archive</A>
<LI> <A HREF="FAQ">Frequently Asked Questions (FAQ)</A>
--- 294,298 ----
(requires two sided printing capabilities)</A>
<LI> <A HREF="doc-html.tar.gz">Set of downloadable HTML pages</A>
! <LI> <A HREF="http://www.mico.org/mailman/listinfo/">Searchable
mailing list archive</A>
<LI> <A HREF="FAQ">Frequently Asked Questions (FAQ)</A>
***************
*** 315,350 ****
Further development and other MICO related aspects are dicussed on the
! MICO mailing list. To subscribe, send a mail containing
! <P>
! <PRE> subscribe mico-devel <your name></PRE>
! <P> in the body to
! <A HREF="mailto:lis...@mi...">lis...@mi...</A>.<BR>
!
! If you want to get off the list later then send a mail containing
! <P>
! <PRE> unsubscribe mico-devel</PRE>
! <P> in the body to the same address.<BR>
! Please send your postings to <A HREF="mailto:mic...@mi...">
! mic...@mi...</A>.
!
! <P>
!
! There is also a read only mailing list, where announcements of new MICO
! releases are sent to only. To subscribe, send a mail containing
<P>
! <PRE> subscribe mico-announce <your name></PRE>
! <P> in the body to
! <A HREF="mailto:lis...@mi...">lis...@mi...</A>.<BR>
! To unsubscribe, send a mail containing
! <P>
! <PRE> unsubscribe mico-announce</PRE>
! <P> in the body to the same address.
!
!
! <P>
Before sending a question over the mailing list, you might want to
have a look at the <A
! HREF="http://www.cs.uni-magdeburg.de/~aschultz/mico/">searchable
mailing list archive</A> or the <A HREF="FAQ">FAQ</A>, to see if your
problem was already discussed before.
--- 308,328 ----
Further development and other MICO related aspects are dicussed on the
! <code>mico-devel</code> mailing list. You can subscribe by
! clicking <a href="http://www.mico.org/mailman/listinfo/mico-devel" TARGET="_top">here</a>.
<P>
! There is also a low-traffic, read-only, moderated mailing list,
! <code>mico-announce</code> where announcements of new MICO releases or
! related software are sent occasionally. To subscribe, click
! <a href="http://www.mico.org/mailman/listinfo/mico-announce" TARGET="_top">here</a>.
! <p>
! Before your subscription becomes effective, you will receive a
! confirmation message by email that <i>you must reply to</i>. The
! intent of this confirmation is to avoid illegal email addresses on the
! mailing list (for example by mistyping it on the Web subscription form).
! <p>
Before sending a question over the mailing list, you might want to
have a look at the <A
! HREF="http://www.mico.org/mailman/listinfo/">searchable
mailing list archive</A> or the <A HREF="FAQ">FAQ</A>, to see if your
problem was already discussed before.
***************
*** 354,376 ****
<TR><TD BGCOLOR="#BBBBBB">
- <A NAME=mirrors></A>
- <H1>Mirror Sites</H1>
- <P>
-
- The following sites hold copies of this page:
-
- <UL>
- <LI><A HREF="http://www.vsb.cs.uni-frankfurt.de/~mico/" TARGET="_top">
- Europe: University of Frankfurt, Germany</A>
- <LI><A HREF="http://www.inf.ethz.ch/~mico/" TARGET="_top">
- Europe: ETH Zurich, Switzerland</A>
- <LI><A HREF="http://www.icsi.berkeley.edu/~mico/" TARGET="_top">
- USA: International Computer Science Institute</A>
- </UL>
-
- <P><img src="dot1.gif" height="25"><P>
-
-
- <TR><TD BGCOLOR="#CCCCCC">
<A NAME=authors> </A>
<H1>Authors</H1>
--- 332,335 ----
***************
*** 380,389 ****
<UL>
! <LI><A HREF="http://www.informatik.uni-frankfurt.de/~roemer/" TARGET="_top">
Kay Römer:</A> <I>ORB, IIOP, OBV.</I>
! <LI><A HREF="http://www.icsi.berkeley.edu/~puder/" TARGET="_top">
Arno Puder:</A> <I>IDL-compiler, Interface Repository.</I>
! <LI><A HREF="http://www.informatik.uni-frankfurt.de/~fp/" TARGET="_top">
! Frank Pilhofer:</A> <I>POA, OBV.</I>
</UL>
--- 339,348 ----
<UL>
! <LI><A HREF="http://www.inf.ethz.ch/~roemer/" TARGET="_top">
Kay Römer:</A> <I>ORB, IIOP, OBV.</I>
! <LI><A HREF="http://www.ap-c.org/" TARGET="_top">
Arno Puder:</A> <I>IDL-compiler, Interface Repository.</I>
! <LI><A HREF="http://www.fpx.de/fp/" TARGET="_top">
! Frank Pilhofer:</A> <I>POA, OBV, CCM.</I>
</UL>
***************
*** 429,438 ****
! <TR><TD BGCOLOR="#BBBBBB">
<A NAME=stories> </A>
<H1>Success Stories</H1>
<P>
! Drop us a <A HREF="mailto:ro...@in...">mail</A> if
you want to see your project listed below...
--- 388,397 ----
! <TR><TD BGCOLOR="#CCCCCC">
<A NAME=stories> </A>
<H1>Success Stories</H1>
<P>
! Drop us a <A HREF="mailto:ar...@mi...">mail</A> if
you want to see your project listed below...
***************
*** 455,459 ****
<A HREF="http://www.objectsecurity.com/">TIS-plug-gw</A>, a TCP-proxy
firewall.
! <LI><A HREF="http://www.informatik.uni-frankfurt.de/~fp/">TclMico</A>
a Tcl extension that gives access to CORBA functionality from Tcl.
<LI>Christoph Gebauer's
--- 414,418 ----
<A HREF="http://www.objectsecurity.com/">TIS-plug-gw</A>, a TCP-proxy
firewall.
! <LI><A HREF="http://www.fpx.de/Combat/">Combat</A> is
a Tcl extension that gives access to CORBA functionality from Tcl.
<LI>Christoph Gebauer's
***************
*** 474,478 ****
<HR>
! <A HREF="mailto:ap...@pa...">webmaster</A>, Nov, 25th 2000
<PRE>
--- 433,437 ----
<HR>
! <A HREF="mailto:ar...@mi...">webmaster</A>, Nov, 25th 2000
<PRE>
Index: FrameToc.html
===================================================================
RCS file: /cvsroot/micomt/mico/doc/FrameToc.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** FrameToc.html 2001/02/08 15:05:57 1.1.1.1
--- FrameToc.html 2001/10/26 19:59:57 1.2
***************
*** 22,28 ****
<TR><TD BGCOLOR="#BBBBBB"><A HREF="FrameDescription.html#documentation" TARGET="DES">Documentation</A>
<TR><TD BGCOLOR="#CCCCCC"><A HREF="FrameDescription.html#maillist" TARGET="DES">Mailing List</A>
! <TR><TD BGCOLOR="#BBBBBB"><A HREF="FrameDescription.html#mirrors" TARGET="DES">Mirror Sites</A>
! <TR><TD BGCOLOR="#CCCCCC"><A HREF="FrameDescription.html#authors" TARGET="DES">Authors</A>
! <TR><TD BGCOLOR="#BBBBBB"><A HREF="FrameDescription.html#stories" TARGET="DES">Success Stories</A>
</TABLE>
--- 22,27 ----
<TR><TD BGCOLOR="#BBBBBB"><A HREF="FrameDescription.html#documentation" TARGET="DES">Documentation</A>
<TR><TD BGCOLOR="#CCCCCC"><A HREF="FrameDescription.html#maillist" TARGET="DES">Mailing List</A>
! <TR><TD BGCOLOR="#BBBBBB"><A HREF="FrameDescription.html#authors" TARGET="DES">Authors</A>
! <TR><TD BGCOLOR="#CCCCCC"><A HREF="FrameDescription.html#stories" TARGET="DES">Success Stories</A>
</TABLE>
Index: Makefile
===================================================================
RCS file: /cvsroot/micomt/mico/doc/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile 2001/07/26 21:49:08 1.2
--- Makefile 2001/10/26 19:59:57 1.3
***************
*** 23,27 ****
include ../MakeVars
! all: doc.ps html
$(MKFAQ) faq.tex ../FAQ
--- 23,27 ----
include ../MakeVars
! all: doc.ps # html
$(MKFAQ) faq.tex ../FAQ
***************
*** 30,34 ****
html:
! $(LATEX2HTML) -local_icons -info 0 -address "MICO documentation" doc
doc.tex: doc.tex.in ../VERSION
--- 30,34 ----
html:
! $(LATEX2HTML) -title "MICO documentation" doc.tex
doc.tex: doc.tex.in ../VERSION
***************
*** 39,43 ****
clean:
! rm -rf _region_.* doc/ auto/ mico.ps doc.aux doc.dvi \
doc.log doc.tex doc.bbl doc.toc doc.lof doc.blg *~
$(MAKE) -C pics clean
--- 39,43 ----
clean:
! rm -rf _region_.* doc/ auto/ mico.ps doc.ps doc.aux doc.dvi \
doc.log doc.tex doc.bbl doc.toc doc.lof doc.blg *~
$(MAKE) -C pics clean
Index: faq.tex
===================================================================
RCS file: /cvsroot/micomt/mico/doc/faq.tex,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** faq.tex 2001/02/08 15:05:56 1.1.1.1
--- faq.tex 2001/10/26 19:59:58 1.2
***************
*** 4,17 ****
\begin{itemize}
! \item[Q:] \emph{During compilation my gcc 2.7.2.x dies with an
"internal compiler error". What is going wrong?}
! \item[A:] Some Linux distributions (noteably Suse Linux 5 and Red Hat)
! shipped broken gcc binaries. You have to recompile gcc 2.7.2.x, or
! better yet, install egcs 1.x or gcc 2.8.x.
\end{itemize}
\begin{itemize}
! \item[Q:] \emph{I have installed gcc 2.8 or egcs, and it still dies
! with an "internal compiler error".}
\item[A:] You are encouraged to submit a bug report to the appropriate
compiler's mailing list. In the meantime, disabling optimization
--- 4,25 ----
\begin{itemize}
! \item[Q:] \emph{During compilation my gcc dies with an
"internal compiler error". What is going wrong?}
! \item[A:] Some Linux distributions are coming with a broken version of
! gcc that calls itself gcc 2.96. You will have to "downgrade" to gcc
! 2.95.x. See below for a note on gcc 3.0.
\end{itemize}
\begin{itemize}
! \item[Q:] \emph{MICO seems to compile, but then the IDL compiler crashes.
! What is going wrong?}
! \item[A:] This is an error you are likely to experience with gcc 3.0. This
! gcc version is buggy, resulting in wrong code. You cannot use MICO with
! gcc 3.0. Bug reports have been filed with the gcc database. At the moment,
! you will have to downgrade to gcc 2.95.x.
! \end{itemize}
!
! \begin{itemize}
! \item[Q:] \emph{gcc still dies with an "internal compiler error".}
\item[A:] You are encouraged to submit a bug report to the appropriate
compiler's mailing list. In the meantime, disabling optimization
***************
*** 36,59 ****
swapon /tmp/swapfile
\end{verbatim}
There are similar ways for other unix flavors. Ask your sys admin.
If for some reason you cannot add more swap space, try turning off
optimization by rerunning configure: \texttt{./configure
--disable-optimize}.
- \end{itemize}
! \begin{itemize}
! \item[Q:] \emph{I use Cygnus CDK and gcc dies with a "virtual memory
! exhausted" error. How to fix this?}
! \item[A:] There seems to be a bug Cygnus CDK beta19 that prevents gcc
! from using swap space. The only workaround is to disable optimization
! by rerunning configure: \texttt{./configure --disable-optimize}.
\end{itemize}
\begin{itemize}
! \item[Q:] \emph{I configured for namspace support but MICO doesn't compile?}
! \item[A:] Earlier versions of gcc and egcs (up to gcc 2.8 and egcs 1.0)
! have very limited namespace support. The tests configure does to
! check for working namespaces pass, but MICO itself fails to compile.
! Rerun configure with \texttt{--disable-namespace}.
\end{itemize}
--- 44,80 ----
swapon /tmp/swapfile
\end{verbatim}
+
There are similar ways for other unix flavors. Ask your sys admin.
If for some reason you cannot add more swap space, try turning off
optimization by rerunning configure: \texttt{./configure
--disable-optimize}.
! We recommend at least 64 Megabytes of physical memory for compiling
! MICO or for development based on MICO. Ready-to-run MICO applications
! have a much smaller memory footprint.
\end{itemize}
\begin{itemize}
! \item[Q:] \emph{I'm using gcc. Compliation aborts with an error message
! from the assembler (as) such as}
! \begin{verbatim}
! /usr/ccs/bin/as: error: can't compute value of an expression
! involving an external symbol
! \end{verbatim}
!
! \item[A:] This is a bug in the assember which cannot handle long symbol
! names. The preferred solution is to install the GNU assembler (from the
! binutils package). In the meantime, you can try to enable debugging
!
! \begin{verbatim}
! ./configure --enable-debug
! \end{verbatim}
!
! You can also try to use MICO's lightweight MiniSTL package instead of
! your system's STL library:
!
! \begin{verbatim}
! ./configure --enable-mini-stl
! \end{verbatim}
\end{itemize}
***************
*** 72,83 ****
people often install egcs as a second compiler in their system and
set PATH such that egcs will be picked. But that is not enough: You
! have to make sure that egcs' C++ libraries (esp. libstdc++) will be
! linked in. One way to make MICO use an egcs installed in
! \texttt{/usr/local/egcs} is:
\begin{verbatim}
! export PATH=/usr/local/egcs/bin:$PATH
! export CXXFLAGS=-L/usr/local/egcs/lib
! export LD_LIBRARY_PATH=/usr/local/egcs/lib:$LD_LIBRARY_PATH
./configure
\end{verbatim}
--- 93,104 ----
people often install egcs as a second compiler in their system and
set PATH such that egcs will be picked. But that is not enough: You
! have to make sure that gcc's C++ libraries (esp. libstdc++) will be
! linked in. One way to make MICO use a gcc installed in
! \texttt{/usr/local/gcc} is:
\begin{verbatim}
! export PATH=/usr/local/gcc/bin:$PATH
! export CXXFLAGS=-L/usr/local/gcc/lib
! export LD_LIBRARY_PATH=/usr/local/gcc/lib:$LD_LIBRARY_PATH
./configure
\end{verbatim}
***************
*** 120,141 ****
imr -ORBImplRepoAddr inet:jade:4242
\end{verbatim}
- \end{itemize}
-
- \begin{itemize}
- \item[Q:] \emph{I'm using egcs 1.x. When I turn off MiniSTL compliation
- aborts with}
- \begin{verbatim}
- /usr/ccs/bin/as: error: can't compute value of an expression
- involving an external symbol
- \end{verbatim}
-
- \item[A:] This is a bug in the assember. One solution is to enable
- debugging:
- \begin{verbatim}
- ./configure --enable-debug
- \end{verbatim}
- The preferred solution is to install GNU as (in the binutils
- package). See also the discussion on the egcs FAQ (the
- \texttt{-fsquangle} option).
\end{itemize}
--- 141,144 ----
--- doc.ps DELETED ---
|
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:32
|
Update of /cvsroot/micomt/mico/demo/ssl
In directory usw-pr-cvs1:/tmp/cvs-serv17698/demo/ssl
Modified Files:
Makefile client.cc hello.idl server.cc ssl
Removed Files:
cert.pem key.pem
Log Message:
- merged with MICO 2.3.6
Index: Makefile
===================================================================
RCS file: /cvsroot/micomt/mico/demo/ssl/Makefile,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -r1.1.1.2 -r1.2
*** Makefile 2001/01/06 23:17:55 1.1.1.2
--- Makefile 2001/10/26 19:59:57 1.2
***************
*** 26,30 ****
INSTALL_DIR = ssl
! INSTALL_SRCS = Makefile client.cc server.cc hello.idl cert.pem key.pem
INSTALL_SCRIPTS = ssl
--- 26,30 ----
INSTALL_DIR = ssl
! INSTALL_SRCS = Makefile client.cc server.cc hello.idl s_cert.pem s_key.pem c_cert.pem c_key.pem
INSTALL_SCRIPTS = ssl
***************
*** 36,41 ****
hello.h hello.cc : hello.idl $(IDLGEN)
! $(IDL) --no-poa --boa hello.idl
clean:
! rm -f hello.cc hello.h *.o core client server *~ .depend
--- 36,41 ----
hello.h hello.cc : hello.idl $(IDLGEN)
! $(IDL) hello.idl
clean:
! rm -f hello.cc hello.h *.o *.ior core client server *~ .depend
Index: client.cc
===================================================================
RCS file: /cvsroot/micomt/mico/demo/ssl/client.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** client.cc 1999/11/03 23:20:52 1.1.1.1
--- client.cc 2001/10/26 19:59:57 1.2
***************
*** 23,27 ****
#include <iostream.h>
#include <sys/time.h>
- #include <CORBA-SMALL.h>
#include "hello.h"
--- 23,26 ----
***************
*** 29,42 ****
main (int argc, char *argv[])
{
! CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "mico-local-orb");
! CORBA::BOA_var boa = orb->BOA_init (argc, argv, "mico-local-boa");
assert (argc == 2);
! CORBA::Object_var obj = orb->bind ("IDL:Hello:1.0", argv[1]);
if (CORBA::is_nil (obj)) {
cerr << "cannot bind to " << argv[1] << endl;
return 1;
}
! Hello_var hello = Hello::_narrow (obj);
hello->hello ();
return 0;
--- 28,40 ----
main (int argc, char *argv[])
{
! CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
assert (argc == 2);
! CORBA::Object_var obj = orb->string_to_object (argv[1]);
if (CORBA::is_nil (obj)) {
cerr << "cannot bind to " << argv[1] << endl;
return 1;
}
! SecureHello_var hello = SecureHello::_narrow (obj);
hello->hello ();
return 0;
Index: hello.idl
===================================================================
RCS file: /cvsroot/micomt/mico/demo/ssl/hello.idl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** hello.idl 1999/11/03 23:20:52 1.1.1.1
--- hello.idl 2001/10/26 19:59:57 1.2
***************
*** 1,3 ****
! interface Hello {
void hello ();
};
--- 1,3 ----
! interface SecureHello {
void hello ();
};
Index: server.cc
===================================================================
RCS file: /cvsroot/micomt/mico/demo/ssl/server.cc,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -r1.1.1.2 -r1.2
*** server.cc 2001/01/06 23:17:55 1.1.1.2
--- server.cc 2001/10/26 19:59:57 1.2
***************
*** 21,34 ****
*/
- #define MICO_CONF_IMR
- #define MICO_CONF_INTERCEPT
- #include <CORBA-SMALL.h>
#include <iostream.h>
#include "hello.h"
CORBA::ORB_var the_orb;
- CORBA::BOA_var the_boa;
! class Hello_impl : virtual public Hello_skel {
public:
void hello ()
--- 21,31 ----
*/
#include <iostream.h>
+ #include <fstream.h>
#include "hello.h"
CORBA::ORB_var the_orb;
! class SecureHello_impl : public virtual POA_SecureHello {
public:
void hello ()
***************
*** 114,124 ****
ac.activate (0);
! the_orb = CORBA::ORB_init (argc, argv, "mico-local-orb");
! the_boa = the_orb->BOA_init (argc, argv, "mico-local-boa");
! (void)new Hello_impl;
!
! the_boa->impl_is_ready (CORBA::ImplementationDef::_nil());
! the_orb->run ();
return 0;
--- 111,150 ----
ac.activate (0);
! the_orb = CORBA::ORB_init (argc, argv);
! CORBA::Object_var poaobj = the_orb->resolve_initial_references ("RootPOA");
! PortableServer::POA_var poa = PortableServer::POA::_narrow (poaobj);
! PortableServer::POAManager_var mgr = poa->the_POAManager();
!
! /*
! * Create a SecureHello object
! */
!
! SecureHello_impl * hello = new SecureHello_impl;
!
! /*
! * Activate the Servant
! */
!
! PortableServer::ObjectId_var oid = poa->activate_object (hello);
!
! /*
! * Write reference to file
! */
!
! ofstream of ("sec_hello.ior");
! CORBA::Object_var ref = poa->id_to_reference (oid.in());
! CORBA::String_var str = the_orb->object_to_string (ref.in());
! of << str.in() << endl;
! of.close ();
!
! mgr->activate ();
! the_orb->run();
!
! /*
! * Shutdown (never reached)
! */
! poa->destroy (TRUE, TRUE);
! delete hello;
return 0;
Index: ssl
===================================================================
RCS file: /cvsroot/micomt/mico/demo/ssl/ssl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** ssl 1999/11/03 23:20:52 1.1.1.1
--- ssl 2001/10/26 19:59:57 1.2
***************
*** 31,51 ****
# defaults to /usr/local/ssl/certs.
#
! # the standard SSLeay environment variables work as well, but the -ORBSSL*
# options override them
#
! # a key file is created by
! # genrsa -out key.pem
! # a self signed certificate is created by
! # req -days 1000 -new -x509 -key key.pem -out cert.pem
! # see the SSLeay documentation for details.
! ./server -ORBIIOPAddr $ADDR -ORBSSLcert cert.pem -ORBSSLkey key.pem \
-ORBSSLverify 0 &
server_pid=$!
! sleep 1
trap "kill $server_pid" 0
! ./client $ADDR -ORBSSLcert cert.pem -ORBSSLkey key.pem -ORBSSLverify 0
--- 31,53 ----
# defaults to /usr/local/ssl/certs.
#
! # the standard OpenSSL environment variables work as well, but the -ORBSSL*
# options override them
#
! # the server key file with the servers private key is created by
! # openssl genrsa -out s_key.pem
! # a self signed certificate for for server is created by
! # openssl req -days 1000 -new -x509 -key s_key.pem -out s_cert.pem
! # the client key and certificate are created analogous.
! # see the OpenSSL documentation for details.
! ./server -ORBIIOPAddr $ADDR -ORBSSLcert s_cert.pem -ORBSSLkey s_key.pem \
-ORBSSLverify 0 &
server_pid=$!
! sleep 2
trap "kill $server_pid" 0
! ./client `cat sec_hello.ior` -ORBSSLcert c_cert.pem -ORBSSLkey c_key.pem \
! -ORBSSLverify 0
--- cert.pem DELETED ---
--- key.pem DELETED ---
|
Update of /cvsroot/micomt/mico/demo/services/naming In directory usw-pr-cvs1:/tmp/cvs-serv17698/demo/services/naming Modified Files: Makefile Makefile.win32 account.bat account.idl account_test client.cc server.cc Log Message: - merged with MICO 2.3.6 Index: Makefile =================================================================== RCS file: /cvsroot/micomt/mico/demo/services/naming/Makefile,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -r1.1.1.2 -r1.2 *** Makefile 2001/01/06 23:17:54 1.1.1.2 --- Makefile 2001/10/26 19:59:57 1.2 *************** *** 42,46 **** account.h account.cc : account.idl $(IDLGEN) ! $(IDL) --no-poa --boa account.idl clean: --- 42,46 ---- account.h account.cc : account.idl $(IDLGEN) ! $(IDL) account.idl clean: Index: Makefile.win32 =================================================================== RCS file: /cvsroot/micomt/mico/demo/services/naming/Makefile.win32,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -r1.1.1.2 -r1.2 *** Makefile.win32 2001/01/06 23:17:54 1.1.1.2 --- Makefile.win32 2001/10/26 19:59:57 1.2 *************** *** 23,27 **** all: client.exe server.exe ! DIR_PREFIX=..\ !include ..\..\MakeVars.win32 CXXFLAGS = $(COS_CXXFLAGS) -I..\..\include $(CXXFLAGS) --- 23,27 ---- all: client.exe server.exe ! DIR_PREFIX=..\..\ !include ..\..\MakeVars.win32 CXXFLAGS = $(COS_CXXFLAGS) -I..\..\include $(CXXFLAGS) *************** *** 41,45 **** account.h account.cc : account.idl $(IDLGEN) ! $(IDL) --no-poa --boa account.idl clean: --- 41,45 ---- account.h account.cc : account.idl $(IDLGEN) ! $(IDL) account.idl clean: Index: account.bat =================================================================== RCS file: /cvsroot/micomt/mico/demo/services/naming/account.bat,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** account.bat 1999/11/03 23:20:52 1.1.1.1 --- account.bat 2001/10/26 19:59:57 1.2 *************** *** 1,27 **** ! ! set ADDR=inet:127.0.0.1:12456 ! SET MICORC=NUL ! set RC=-ORBImplRepoAddr %ADDR% -ORBNamingAddr %ADDR% ! set path=..\..\win32-bin\;%path% ! REM run BOA daemon ! echo "starting BOA daemon ..." ! start micod -ORBIIOPAddr %ADDR% ! ! ! REM register server ! echo "register name service ..." ! imr create NameService poa nsd.exe "IDL:omg.org/CosNaming/NamingContext:1.0#NameService" %RC% ! ! echo "register account service ..." ! imr create Account shared "server %RC%" IDL:Account:1.0 %RC% ! ! ! REM activate the account server to make itself register with the ! REM name service so the client can find it ... ! echo "activating Account implementation" ! imr activate Account %RC% ! pause ! REM run client ! echo "and run client ..." ! ./client %RC% ! --- 1,12 ---- ! ! set MICORC=NUL ! set PATH=..\..\..\win32-bin;%PATH% ! ! echo "starting Naming Service daemon ..." ! start ..\..\..\win32-bin\nsd -ORBIIOPAddr inet:127.0.0.1:12456 ! ! echo "starting Bank server ..." ! start .\server -ORBInitRef NameService=corbaloc::127.0.0.1:12456/NameService ! ! echo "running client ..." ! .\client -ORBInitRef NameService=corbaloc::127.0.0.1:12456/NameService Index: account.idl =================================================================== RCS file: /cvsroot/micomt/mico/demo/services/naming/account.idl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** account.idl 1999/11/03 23:20:52 1.1.1.1 --- account.idl 2001/10/26 19:59:57 1.2 *************** *** 1,2 **** --- 1,3 ---- + // -*- c++ -*- interface Account { *************** *** 4,6 **** --- 5,11 ---- void withdraw( in unsigned long amount ); long balance(); + }; + + interface Bank { + Account create (); }; Index: account_test =================================================================== RCS file: /cvsroot/micomt/mico/demo/services/naming/account_test,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** account_test 1999/11/03 23:20:52 1.1.1.1 --- account_test 2001/10/26 19:59:57 1.2 *************** *** 4,40 **** export PATH - ADDR=inet:`uname -n`:12456 - RC="-ORBImplRepoAddr $ADDR -ORBNamingAddr $ADDR" - rm -f NameService-root.inf ! # run BOA daemon ! echo "starting BOA daemon ..." ! micod -ORBIIOPAddr $ADDR --forward & ! micod_pid=$! ! ! trap "kill $micod_pid" 0 ! ! sleep 1 ! ! # register server ! echo "register name service ..." ! imr create NameService poa `which nsd` \ ! IDL:omg.org/CosNaming/NamingContext:1.0#NameService $RC ! ! echo "register account service ..." ! imr create Account shared "`pwd`/server $RC" \ ! IDL:Account:1.0 $RC ! ! sleep 1 ! # activate the account server to make itself register with the ! # name service so the client can find it ... ! echo "activating Account implementation" ! imr activate Account $RC ! ! sleep 1 ! # nsadmin $RC # ls myAccount ! ! # run client ! echo "and run client ..." ! ./client $RC --- 4,24 ---- export PATH rm -f NameService-root.inf + + echo "starting Naming Service daemon ..." + nsd -ORBIIOPAddr inet:`uname -n`:12456 & + nsd_pid=$! + + trap "kill $nsd_pid" 0 + sleep 3 + + + echo "starting Bank server ..." + ./server -ORBInitRef NameService=corbaloc::`uname -n`:12456/NameService & + server_pid=$! + + trap "kill $nsd_pid $server_pid" 0 + sleep 3 ! echo "running client ..." ! ./client -ORBInitRef NameService=corbaloc::`uname -n`:12456/NameService Index: client.cc =================================================================== RCS file: /cvsroot/micomt/mico/demo/services/naming/client.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** client.cc 1999/11/03 23:20:52 1.1.1.1 --- client.cc 2001/10/26 19:59:57 1.2 *************** *** 1,51 **** ! #include <CORBA-SMALL.h> ! #include "account.h" #include <mico/CosNaming.h> ! int main( int argc, char *argv[] ) { // ORB initialization ! CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "mico-local-orb" ); ! CORBA::BOA_var boa = orb->BOA_init (argc, argv, "mico-local-boa"); ! CORBA::Object_var nobj = ! orb->resolve_initial_references ("NameService"); ! assert (! CORBA::is_nil (nobj)); ! CosNaming::NamingContext_var nc = CosNaming::NamingContext::_narrow (nobj); CosNaming::Name name; name.length (1); ! name[0].id = CORBA::string_dup ("myAccount"); name[0].kind = CORBA::string_dup (""); CORBA::Object_var obj; #ifdef HAVE_EXCEPTIONS try { obj = nc->resolve (name); } ! catch (CosNaming::NamingContext::NotFound_catch &exc) { ! cerr << "NotFound exception" << endl; } ! catch (CosNaming::NamingContext::CannotProceed_catch &exc) { ! cerr << "CannotProceed exception" << endl; } ! catch (CosNaming::NamingContext::InvalidName_catch &exc) { ! cerr << "InvalidName exception" << endl; } #else obj = nc->resolve (name); #endif - Account_var client = Account::_narrow( obj ); ! client->deposit( 100 ); ! client->deposit( 100 ); ! client->deposit( 100 ); ! client->deposit( 100 ); ! client->deposit( 100 ); ! client->withdraw( 240 ); ! client->withdraw( 10 ); ! cout << "Balance is " << client->balance() << endl; ! return 0; } --- 1,99 ---- ! #include <CORBA.h> #include <mico/CosNaming.h> + #include "account.h" ! int ! main (int argc, char *argv[]) { // ORB initialization ! CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); ! /* ! * In demo/poa/account-1, the object reference comes from a file via ! * the "file://" object URL. Here, we retrieve the reference from the ! * Naming Service ! */ ! /* ! * Acquire a reference to the Naming Service ! */ ! ! CORBA::Object_var nsobj = ! orb->resolve_initial_references ("NameService"); ! ! CosNaming::NamingContext_var nc = ! CosNaming::NamingContext::_narrow (nsobj); ! ! if (CORBA::is_nil (nc)) { ! cerr << "oops, I cannot access the Naming Service!" << endl; ! exit (1); ! } ! ! /* ! * Construct Naming Service name for our Bank ! */ ! CosNaming::Name name; name.length (1); ! name[0].id = CORBA::string_dup ("Bank"); name[0].kind = CORBA::string_dup (""); + /* + * try to find that node in the Naming Service tree + */ + CORBA::Object_var obj; + cout << "Looking up Bank ... " << flush; + #ifdef HAVE_EXCEPTIONS try { obj = nc->resolve (name); } ! catch (CosNaming::NamingContext::NotFound &exc) { ! cout << "NotFound exception." << endl; ! exit (1); } ! catch (CosNaming::NamingContext::CannotProceed &exc) { ! cout << "CannotProceed exception." << endl; ! exit (1); } ! catch (CosNaming::NamingContext::InvalidName &exc) { ! cout << "InvalidName exception." << endl; ! exit (1); } #else obj = nc->resolve (name); #endif ! cout << "done." << endl; ! ! /* ! * The Naming Service returns a generic reference as a CORBA::Object ! * We need to narrow this to the desired type ! */ ! ! Bank_var bank = Bank::_narrow (obj); ! ! /* ! * Open an account ! */ ! ! Account_var account = bank->create (); ! ! if (CORBA::is_nil (account)) { ! printf ("oops: account is nil\n"); ! exit (1); ! } ! ! /* ! * Deposit and withdraw some money ! */ ! ! account->deposit (700); ! account->withdraw (450); ! ! printf ("Balance is %ld.\n", account->balance ()); ! return 0; } Index: server.cc =================================================================== RCS file: /cvsroot/micomt/mico/demo/services/naming/server.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** server.cc 1999/11/03 23:20:52 1.1.1.1 --- server.cc 2001/10/26 19:59:57 1.2 *************** *** 1,121 **** ! #define MICO_CONF_IMR ! #include <CORBA-SMALL.h> ! #include <iostream.h> ! #include <fstream.h> ! #include <unistd.h> ! #include "account.h" #include <mico/CosNaming.h> /* ! * Account implementation */ ! class Account_impl : virtual public Account_skel { ! CORBA::Long _current_balance; ! CORBA::Long _calls; public: ! Account_impl () ! { ! _calls = 0; ! _current_balance = 0; ! } ! ! Account_impl (CORBA::Object_ptr obj) ! : Account_skel (obj) ! { ! // cout << "restoring id " << obj->_ident() << endl; ! _calls = 0; ! ifstream inp (obj->_ident()); ! assert (inp); ! inp >> _current_balance; ! } ! ! CORBA::Boolean _save_object () ! { ! // cout << "saving id " << _ident() << endl; ! ofstream out (_ident()); ! assert (out); ! out << _current_balance; ! return TRUE; ! } ! ! void check_exit () ! { ! if (++_calls > 5) { ! CORBA::ORB_var orb = _orb(); ! CORBA::BOA_var boa = _boa(); ! /* ! * beware: while calling deactivate_impl() we can get ! * recursive invocations to the Account methods ... ! */ ! boa->deactivate_impl (CORBA::ImplementationDef::_nil()); ! orb->shutdown (TRUE); ! } ! } ! ! void deposit( CORBA::ULong amount ) ! { ! _current_balance += amount; ! check_exit (); ! } ! ! void withdraw( CORBA::ULong amount ) ! { ! _current_balance -= amount; ! check_exit (); ! } ! ! CORBA::Long balance() ! { ! check_exit (); ! return _current_balance; ! } }; /* ! * Account object restorer */ ! class AccountLoader : public CORBA::BOAObjectRestorer { public: ! CORBA::Boolean restore (CORBA::Object_ptr obj) ! { ! if (!strcmp (obj->_repoid(), "IDL:Account:1.0")) { ! (void)new Account_impl (obj); ! return TRUE; ! } ! // cout << "cannot restore " << obj->_repoid() << " objects" << endl; ! return FALSE; ! } }; ! int main( int argc, char *argv[] ) { ! AccountLoader loader; ! CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "mico-local-orb" ); ! CORBA::BOA_var boa = orb->BOA_init (argc, argv, "mico-local-boa"); ! if (!boa->restoring()) { ! cerr << "creating ..." << endl; ! Account_ptr acc = new Account_impl (); ! ! CORBA::Object_var nsobj = ! orb->resolve_initial_references ("NameService"); ! assert (! CORBA::is_nil (nsobj)); ! CosNaming::NamingContext_var nc = ! CosNaming::NamingContext::_narrow (nsobj); ! CosNaming::Name name; ! name.length (1); ! name[0].id = CORBA::string_dup ("myAccount"); ! name[0].kind = CORBA::string_dup (""); ! cerr << "binding name ..." << endl; ! nc->bind (name, acc); ! } ! boa->impl_is_ready (CORBA::ImplementationDef::_nil()); ! orb->run (); return 0; --- 1,170 ---- ! #include <CORBA.h> #include <mico/CosNaming.h> + #include "account.h" /* ! * Implementation of the Account */ ! class Account_impl : virtual public POA_Account ! { public: ! Account_impl (); ! ! void deposit (CORBA::ULong); ! void withdraw (CORBA::ULong); ! CORBA::Long balance (); ! ! private: ! CORBA::Long bal; }; + Account_impl::Account_impl () + { + bal = 0; + } + + void + Account_impl::deposit (CORBA::ULong amount) + { + bal += amount; + } + + void + Account_impl::withdraw (CORBA::ULong amount) + { + bal -= amount; + } + + CORBA::Long + Account_impl::balance () + { + return bal; + } + /* ! * Implementation of the Bank */ ! class Bank_impl : virtual public POA_Bank ! { public: ! Account_ptr create (); }; + Account_ptr + Bank_impl::create () + { + /* + * Create a new account (which is never deleted) + */ + + Account_impl * ai = new Account_impl; + + /* + * Obtain a reference using _this. This implicitely activates the + * account servant (the RootPOA, which is the object's _default_POA, + * has the IMPLICIT_ACTIVATION policy) + */ + + Account_ptr aref = ai->_this (); + assert (!CORBA::is_nil (aref)); + + /* + * Return the reference + */ + + return aref; + } + + /* + * Main + */ ! int ! main (int argc, char *argv[]) { ! /* ! * Initialize ORB, get the Root POA, and register Account object as usual ! */ ! ! CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); ! /* ! * Obtain a reference to the RootPOA and its Manager ! */ ! ! CORBA::Object_var poaobj = orb->resolve_initial_references ("RootPOA"); ! PortableServer::POA_var poa = PortableServer::POA::_narrow (poaobj); ! PortableServer::POAManager_var mgr = poa->the_POAManager(); ! ! /* ! * Create a Bank ! */ ! ! Bank_impl * micocash = new Bank_impl; ! ! /* ! * Activate the Bank ! */ ! ! PortableServer::ObjectId_var oid = poa->activate_object (micocash); ! CORBA::Object_var ref = poa->id_to_reference (oid.in()); ! ! /* ! * In demo/poa/account-1, this object reference (ref) is written to a ! * file. Here, we store the reference in the Naming Service ! */ ! /* ! * Acquire a reference to the Naming Service ! */ ! ! CORBA::Object_var nsobj = ! orb->resolve_initial_references ("NameService"); ! ! CosNaming::NamingContext_var nc = ! CosNaming::NamingContext::_narrow (nsobj); ! ! if (CORBA::is_nil (nc)) { ! cerr << "oops, I cannot access the Naming Service!" << endl; ! exit (1); ! } ! /* ! * Construct Naming Service name for our Bank ! */ ! ! CosNaming::Name name; ! name.length (1); ! name[0].id = CORBA::string_dup ("Bank"); ! name[0].kind = CORBA::string_dup (""); ! ! /* ! * Store a reference to our Bank in the Naming Service. We use 'rebind' ! * here instead of 'bind', because rebind does not complain if the desired ! * name "Bank" is already registered, but silently overwrites it (the ! * existing reference is probably from an old incarnation of this server). ! */ ! ! cout << "Binding Bank in the Naming Service ... " << flush; ! nc->rebind (name, ref); ! cout << "done." << endl; ! ! /* ! * Activate the POA and start serving requests ! */ ! ! printf ("Running.\n"); ! ! mgr->activate (); ! orb->run(); ! ! /* ! * Shutdown (never reached) ! */ ! poa->destroy (TRUE, TRUE); ! delete micocash; return 0; |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:32
|
Update of /cvsroot/micomt/mico/demo/poa/hello-2 In directory usw-pr-cvs1:/tmp/cvs-serv17698/demo/poa/hello-2 Modified Files: client.cc Log Message: - merged with MICO 2.3.6 Index: client.cc =================================================================== RCS file: /cvsroot/micomt/mico/demo/poa/hello-2/client.cc,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -r1.1.1.2 -r1.2 *** client.cc 2000/01/07 22:40:10 1.1.1.2 --- client.cc 2001/10/26 19:59:57 1.2 *************** *** 5,8 **** --- 5,12 ---- #endif + #ifdef _WINDOWS + #include <direct.h> + #endif + int main (int argc, char *argv[]) |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:31
|
Update of /cvsroot/micomt/mico/demo/poa/hello-1 In directory usw-pr-cvs1:/tmp/cvs-serv17698/demo/poa/hello-1 Modified Files: client.cc hello.bat Log Message: - merged with MICO 2.3.6 Index: client.cc =================================================================== RCS file: /cvsroot/micomt/mico/demo/poa/hello-1/client.cc,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -r1.1.1.2 -r1.2 *** client.cc 2000/01/07 22:40:10 1.1.1.2 --- client.cc 2001/10/26 19:59:57 1.2 *************** *** 5,8 **** --- 5,12 ---- #endif + #ifdef _WINDOWS + #include <direct.h> + #endif + int main (int argc, char *argv[]) Index: hello.bat =================================================================== RCS file: /cvsroot/micomt/mico/demo/poa/hello-1/hello.bat,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -r1.1.1.2 -r1.2 *** hello.bat 2000/01/07 22:40:10 1.1.1.2 --- hello.bat 2001/10/26 19:59:57 1.2 *************** *** 1,12 **** ! REM !/bin/sh ! ! SET MICORC=NUL ! REM run Server ! del /f /q hello.ref ! start .\server ! pause 2 ! ! ! REM run client ! .\client ! --- 1,12 ---- ! REM !/bin/sh ! ! SET MICORC=NUL ! REM run Server ! del /f /q hello.ref ! start .\server ! pause 2 ! ! ! REM run client ! .\client ! |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:31
|
Update of /cvsroot/micomt/mico/demo/obv/tree In directory usw-pr-cvs1:/tmp/cvs-serv17698/demo/obv/tree Modified Files: Makefile Log Message: - merged with MICO 2.3.6 Index: Makefile =================================================================== RCS file: /cvsroot/micomt/mico/demo/obv/tree/Makefile,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -r1.1.1.2 -r1.2 *** Makefile 2001/01/06 23:17:52 1.1.1.2 --- Makefile 2001/10/26 19:59:57 1.2 *************** *** 22,25 **** clean: rm -f tree.cc tree.h ! rm -f *.o core client server *~ .depend --- 22,25 ---- clean: rm -f tree.cc tree.h ! rm -f *.o core client server *~ .depend *.ref |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:31
|
Update of /cvsroot/micomt/mico/demo/poa/account-3 In directory usw-pr-cvs1:/tmp/cvs-serv17698/demo/poa/account-3 Modified Files: client.cc Log Message: - merged with MICO 2.3.6 Index: client.cc =================================================================== RCS file: /cvsroot/micomt/mico/demo/poa/account-3/client.cc,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -r1.1.1.2 -r1.2 *** client.cc 2000/01/07 22:40:10 1.1.1.2 --- client.cc 2001/10/26 19:59:57 1.2 *************** *** 11,14 **** --- 11,18 ---- #endif + #ifdef _WINDOWS + #include <direct.h> + #endif + int main (int argc, char *argv[]) |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:31
|
Update of /cvsroot/micomt/mico/demo/poa/account-2 In directory usw-pr-cvs1:/tmp/cvs-serv17698/demo/poa/account-2 Modified Files: client.cc Log Message: - merged with MICO 2.3.6 Index: client.cc =================================================================== RCS file: /cvsroot/micomt/mico/demo/poa/account-2/client.cc,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -r1.1.1.2 -r1.2 *** client.cc 2000/01/07 22:40:10 1.1.1.2 --- client.cc 2001/10/26 19:59:57 1.2 *************** *** 5,8 **** --- 5,12 ---- #endif + #ifdef _WINDOWS + #include <direct.h> + #endif + int main (int argc, char *argv[]) |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:31
|
Update of /cvsroot/micomt/mico/demo/poa In directory usw-pr-cvs1:/tmp/cvs-serv17698/demo/poa Modified Files: Makefile.win32 Log Message: - merged with MICO 2.3.6 Index: Makefile.win32 =================================================================== RCS file: /cvsroot/micomt/mico/demo/poa/Makefile.win32,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Makefile.win32 1999/11/03 23:20:52 1.1.1.1 --- Makefile.win32 2001/10/26 19:59:57 1.2 *************** *** 2,5 **** --- 2,6 ---- all: subs + DIR_PREFIX=..\ !include ..\MakeVars.win32 DIRS=hello-1 hello-2 inherit account-1 account-2 account-3 |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:30
|
Update of /cvsroot/micomt/mico/demo/poa/account-1 In directory usw-pr-cvs1:/tmp/cvs-serv17698/demo/poa/account-1 Modified Files: account client.cc Log Message: - merged with MICO 2.3.6 Index: account =================================================================== RCS file: /cvsroot/micomt/mico/demo/poa/account-1/account,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -r1.1.1.2 -r1.2 *** account 2000/01/07 22:40:10 1.1.1.2 --- account 2001/10/26 19:59:57 1.2 *************** *** 6,10 **** # run Server rm -f Bank.ref ! ./server & server_pid=$! --- 6,10 ---- # run Server rm -f Bank.ref ! ./server -ORBIIOPAddr inet:localhost:6666 & server_pid=$! Index: client.cc =================================================================== RCS file: /cvsroot/micomt/mico/demo/poa/account-1/client.cc,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -r1.1.1.2 -r1.2 *** client.cc 2000/01/07 22:40:10 1.1.1.2 --- client.cc 2001/10/26 19:59:57 1.2 *************** *** 5,8 **** --- 5,12 ---- #endif + #ifdef _WINDOWS + #include <direct.h> + #endif + int main (int argc, char *argv[]) |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:30
|
Update of /cvsroot/micomt/mico/demo/com-interworking/account2 In directory usw-pr-cvs1:/tmp/cvs-serv17698/demo/com-interworking/account2 Modified Files: Makefile.win32 Log Message: - merged with MICO 2.3.6 Index: Makefile.win32 =================================================================== RCS file: /cvsroot/micomt/mico/demo/com-interworking/account2/Makefile.win32,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -r1.1.1.2 -r1.2 *** Makefile.win32 2001/01/06 23:17:50 1.1.1.2 --- Makefile.win32 2001/10/26 19:59:56 1.2 *************** *** 1,23 **** ! # Makefile for the CORBA side. ! ! DIR_PREFIX = ..\ ! !include ..\..\MakeVars.win32 ! ! # Path of win32-bin ! WIN32_BIN = ..\..\..\win32-bin ! ! all: client.exe server.exe ! ! client.exe: account.h account.obj client.obj ! $(LD) $(LDFLAGS) account.obj client.obj $(LDLIBS) /out:$@ ! ! server.exe: account.h account.obj server.obj ! $(LD) $(LDFLAGS) account.obj server.obj $(LDLIBS) /out:$@ ! ! account.h account.cc : account.idl $(IDLGEN) ! $(IDL) --no-poa --boa account.idl ! ! clean: ! del /f /q 2> nul account.cc account.h *.o core client server *~ .depend *.exe *.obj *.pdb 0* ! ! --- 1,23 ---- ! # Makefile for the CORBA side. ! ! DIR_PREFIX = ..\ ! !include ..\..\MakeVars.win32 ! ! # Path of win32-bin ! WIN32_BIN = ..\..\..\win32-bin ! ! all: client.exe server.exe ! ! client.exe: account.h account.obj client.obj ! $(LD) $(LDFLAGS) account.obj client.obj $(LDLIBS) /out:$@ ! ! server.exe: account.h account.obj server.obj ! $(LD) $(LDFLAGS) account.obj server.obj $(LDLIBS) /out:$@ ! ! account.h account.cc : account.idl $(IDLGEN) ! $(IDL) --no-poa --boa account.idl ! ! clean: ! del /f /q 2> nul account.cc account.h *.o core client server *~ .depend *.exe *.obj *.pdb 0* ! ! |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:30
|
Update of /cvsroot/micomt/mico/demo/mfc In directory usw-pr-cvs1:/tmp/cvs-serv17698/demo/mfc Modified Files: Makefile.win32 Log Message: - merged with MICO 2.3.6 Index: Makefile.win32 =================================================================== RCS file: /cvsroot/micomt/mico/demo/mfc/Makefile.win32,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -C2 -r1.1.1.3 -r1.2 *** Makefile.win32 2001/01/06 23:17:52 1.1.1.3 --- Makefile.win32 2001/10/26 19:59:57 1.2 *************** *** 21,24 **** --- 21,25 ---- # + DIR_PREFIX=.\ !include ..\MakeVars.win32 MICO_HOME = ..\..\win32-bin |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:30
|
Update of /cvsroot/micomt/mico/demo/com-interworking/COMSide In directory usw-pr-cvs1:/tmp/cvs-serv17698/demo/com-interworking/COMSide Modified Files: Makefile.win32 Log Message: - merged with MICO 2.3.6 Index: Makefile.win32 =================================================================== RCS file: /cvsroot/micomt/mico/demo/com-interworking/COMSide/Makefile.win32,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Makefile.win32 1999/11/03 23:20:52 1.1.1.1 --- Makefile.win32 2001/10/26 19:59:56 1.2 *************** *** 1,89 **** ! ! !include <ntwin32.mak> ! ! !ifndef MIDL ! MIDL = midl ! !endif ! ! DIR_PREFIX = ..\ ! !include ..\..\MakeVars.win32 ! ! IDL = idl ! MIDLFLAGS = /Oi /ms_ext /c_ext /cpp_cmd $(CC) ! IDLFLAGS = --no-codegen-c++ --codegen-midl ! ! # Mico ! # version ! # Path of win32-bin ! WIN32_BIN = ..\..\..\win32-bin ! # ! CXXFLAGS = /I. /I$(WIN32_BIN)\include /I$(WIN32_BIN)\include\windows /D_WINDOWS -GX ! LDFLAGS = $(WIN32_BIN)\lib\mico$(VERSION).lib wsock32.lib /nologo /debug /subsystem:console ! ! .cxx.obj: ! $(CC) $(cdebug) $(cflags) $(cvarsdll) $(CXXFLAGS) /c $< ! ! .c.obj: ! $(CC) $(cdebug) $(cflags) $(cvarsdll) $(CXXFLAGS) /c $< ! ! all: account.dll clientCOM.exe serverCOM.exe ! ! # Clean up everything ! cleanall: clean ! @-del *.exe ! ! # Clean up everything but the .EXEs ! clean: ! @-del *.obj ! @-del account.dll ! @-del account.h ! @-del account.lib ! @-del account.exp ! @-del dlldata.c ! @-del account_?.c ! ! #Run IDL compiler to translate CORBA IDL into Microsoft IDL ! account.midl : ..\account2\account.idl ! $(IDL) $(IDLFLAGS) ..\account2\account.idl ! ! #Run MIDL compiler to generate the header file and the proxy DLL files. ! account.h dlldata.c account_p.c account_i.c : account.midl ! $(MIDL) $(MIDLFLAGS) account.midl ! ! #Build the files for the proxy DLL. ! dlldata.obj : dlldata.c ! $(CC) $(cdebug) $(cflags) -DREGISTER_PROXY_DLL $(cvarsdll) /c dlldata.c ! ! account_i.obj : account_i.c ! ! account_p.obj : account_p.c account.h ! ! #Link the proxy DLL. ! account.dll: account_p.obj account_i.obj dlldata.obj account.def ! $(link) $(linkdebug) -DLL -OUT:account.dll -DEF:account.def \ ! account_p.obj account_i.obj dlldata.obj rpcrt4.lib uuid.lib kernel32.lib ! ! #Build the files for the server application. ! caccount.obj: caccount.cxx account.h ! ! error.obj: error.cxx ! ! serverCOM.obj: serverCOM.cxx account.h account_i.c ! ! #Link the server application. ! #serverCOM.exe: caccount.obj error.obj account_i.obj serverCOM.obj ! # $(link) $(linkdebug) $(conlflags) -OUT:serverCOM.exe $(LDFLAGS) ..\account2\account.obj \ ! # caccount.obj error.obj account_i.obj serverCOM.obj rpcrt4.lib $(ole2libsdll) ! ! #Link the server application. ! serverCOM.exe: caccount.obj error.obj account_i.obj serverCOM.obj ! $(link) -OUT:serverCOM.exe $(LDFLAGS) ..\account2\account.obj \ ! caccount.obj error.obj account_i.obj serverCOM.obj rpcrt4.lib $(ole2libsdll) ! ! #Build the files for the client application. ! clientCOM.obj: clientCOM.cxx account.h account_i.c ! ! #Link the client application. ! clientCOM.exe: clientCOM.obj error.obj account_i.obj ! $(link) $(linkdebug) $(conlflags) -OUT:clientCOM.exe \ ! clientCOM.obj error.obj account_i.obj rpcrt4.lib $(ole2libsdll) --- 1,89 ---- ! ! !include <ntwin32.mak> ! ! !ifndef MIDL ! MIDL = midl ! !endif ! ! DIR_PREFIX = ..\ ! !include ..\..\MakeVars.win32 ! ! IDL = idl ! MIDLFLAGS = /Oi /ms_ext /c_ext /cpp_cmd $(CC) ! IDLFLAGS = --no-codegen-c++ --codegen-midl ! ! # Mico ! # version ! # Path of win32-bin ! WIN32_BIN = ..\..\..\win32-bin ! # ! CXXFLAGS = /I. /I$(WIN32_BIN)\include /I$(WIN32_BIN)\include\windows /D_WINDOWS -GX ! LDFLAGS = $(WIN32_BIN)\lib\mico$(VERSION).lib wsock32.lib /nologo /debug /subsystem:console ! ! .cxx.obj: ! $(CC) $(cdebug) $(cflags) $(cvarsdll) $(CXXFLAGS) /c $< ! ! .c.obj: ! $(CC) $(cdebug) $(cflags) $(cvarsdll) $(CXXFLAGS) /c $< ! ! all: account.dll clientCOM.exe serverCOM.exe ! ! # Clean up everything ! cleanall: clean ! @-del *.exe ! ! # Clean up everything but the .EXEs ! clean: ! @-del *.obj ! @-del account.dll ! @-del account.h ! @-del account.lib ! @-del account.exp ! @-del dlldata.c ! @-del account_?.c ! ! #Run IDL compiler to translate CORBA IDL into Microsoft IDL ! account.midl : ..\account2\account.idl ! $(IDL) $(IDLFLAGS) ..\account2\account.idl ! ! #Run MIDL compiler to generate the header file and the proxy DLL files. ! account.h dlldata.c account_p.c account_i.c : account.midl ! $(MIDL) $(MIDLFLAGS) account.midl ! ! #Build the files for the proxy DLL. ! dlldata.obj : dlldata.c ! $(CC) $(cdebug) $(cflags) -DREGISTER_PROXY_DLL $(cvarsdll) /c dlldata.c ! ! account_i.obj : account_i.c ! ! account_p.obj : account_p.c account.h ! ! #Link the proxy DLL. ! account.dll: account_p.obj account_i.obj dlldata.obj account.def ! $(link) $(linkdebug) -DLL -OUT:account.dll -DEF:account.def \ ! account_p.obj account_i.obj dlldata.obj rpcrt4.lib uuid.lib kernel32.lib ! ! #Build the files for the server application. ! caccount.obj: caccount.cxx account.h ! ! error.obj: error.cxx ! ! serverCOM.obj: serverCOM.cxx account.h account_i.c ! ! #Link the server application. ! #serverCOM.exe: caccount.obj error.obj account_i.obj serverCOM.obj ! # $(link) $(linkdebug) $(conlflags) -OUT:serverCOM.exe $(LDFLAGS) ..\account2\account.obj \ ! # caccount.obj error.obj account_i.obj serverCOM.obj rpcrt4.lib $(ole2libsdll) ! ! #Link the server application. ! serverCOM.exe: caccount.obj error.obj account_i.obj serverCOM.obj ! $(link) -OUT:serverCOM.exe $(LDFLAGS) ..\account2\account.obj \ ! caccount.obj error.obj account_i.obj serverCOM.obj rpcrt4.lib $(ole2libsdll) ! ! #Build the files for the client application. ! clientCOM.obj: clientCOM.cxx account.h account_i.c ! ! #Link the client application. ! clientCOM.exe: clientCOM.obj error.obj account_i.obj ! $(link) $(linkdebug) $(conlflags) -OUT:clientCOM.exe \ ! clientCOM.obj error.obj account_i.obj rpcrt4.lib $(ole2libsdll) |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:30
|
Update of /cvsroot/micomt/mico/demo/com-interworking In directory usw-pr-cvs1:/tmp/cvs-serv17698/demo/com-interworking Modified Files: Makefile.win32 Log Message: - merged with MICO 2.3.6 Index: Makefile.win32 =================================================================== RCS file: /cvsroot/micomt/mico/demo/com-interworking/Makefile.win32,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Makefile.win32 1999/11/03 23:20:52 1.1.1.1 --- Makefile.win32 2001/10/26 19:59:56 1.2 *************** *** 1,15 **** ! # Compile all ! ! example : ! cd account2 ! nmake /f Makefile.win32 ! cd ..\COMSide ! nmake /f Makefile.win32 ! cd .. ! ! clean: ! cd account2 ! nmake /f Makefile.win32 clean ! cd ..\COMSide ! nmake /f Makefile.win32 cleanall ! cd .. --- 1,15 ---- ! # Compile all ! ! example : ! cd account2 ! nmake /f Makefile.win32 ! cd ..\COMSide ! nmake /f Makefile.win32 ! cd .. ! ! clean: ! cd account2 ! nmake /f Makefile.win32 clean ! cd ..\COMSide ! nmake /f Makefile.win32 cleanall ! cd .. |
|
From: Karel G. <kg...@us...> - 2001-10-26 20:00:29
|
Update of /cvsroot/micomt/mico/demo In directory usw-pr-cvs1:/tmp/cvs-serv17698/demo Modified Files: MakeVars.win32 Log Message: - merged with MICO 2.3.6 Index: MakeVars.win32 =================================================================== RCS file: /cvsroot/micomt/mico/demo/MakeVars.win32,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** MakeVars.win32 1999/11/03 23:20:52 1.1.1.1 --- MakeVars.win32 2001/10/26 19:59:55 1.2 *************** *** 1,20 **** ! !include $(DIR_PREFIX)..\..\MakeVars.win32 IDLGEN = ! CXXFLAGS = $(CXXFLAGS) /I. /I$(DIR_PREFIX)..\..\include /I$(DIR_PREFIX)..\..\include\windows #sander ! CCFLAGS = $(CCFLAGS) /I. /I$(DIR_PREFIX)..\..\include /I$(DIR_PREFIX)..\..\include\windows ! LDLIBS = $(DIR_PREFIX)..\..\win32-bin\lib\mico$(VERSION).lib COS_CXXFLAGS = ! COS_LDLIBS = $(DIR_PREFIX)..\..\win32-bin\lib\micocoss$(VERSION).lib COS_LDFLAGS = COS_DEPS = AUX_CXXFLAGS = ! AUX_LDLIBS = $(DIR_PREFIX)..\..\win32-bin\lib\micoaux$(VERSION).lib AUX_LDFLAGS = AUX_DEPS = --- 1,20 ---- ! !include $(DIR_PREFIX)\..\..\MakeVars.win32 IDLGEN = ! CXXFLAGS = $(CXXFLAGS) /I. /I$(DIR_PREFIX)\..\..\include /I$(DIR_PREFIX)\..\..\include\windows #sander ! CCFLAGS = $(CCFLAGS) /I. /I$(DIR_PREFIX)\..\..\include /I$(DIR_PREFIX)\..\..\include\windows ! LDLIBS = $(DIR_PREFIX)\..\..\win32-bin\lib\mico$(VERSION).lib COS_CXXFLAGS = ! COS_LDLIBS = $(DIR_PREFIX)\..\..\win32-bin\lib\micocoss$(VERSION).lib COS_LDFLAGS = COS_DEPS = AUX_CXXFLAGS = ! AUX_LDLIBS = $(DIR_PREFIX)\..\..\win32-bin\lib\micoaux$(VERSION).lib AUX_LDFLAGS = AUX_DEPS = |
