diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 1997-02-17 19:59:42 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 1997-02-17 19:59:42 +0000 |
| commit | f5184a4abbec95431f220a1d0a13b10bd77f1693 (patch) | |
| tree | e8a23afa2bfc115a623c734b7bcb53e3891637e5 /TAO/IIOP | |
| parent | 1150bf09ad72f6be0f1aa07c0c1f889783a58f07 (diff) | |
| download | ATCD-f5184a4abbec95431f220a1d0a13b10bd77f1693.tar.gz | |
Mostly makefile changes to get this to compile properly,
but also changed declaration for the __tc_consts[] array
to so that it could be referenced in xdr.cpp.
Diffstat (limited to 'TAO/IIOP')
| -rw-r--r-- | TAO/IIOP/Makefile.conf | 3 | ||||
| -rw-r--r-- | TAO/IIOP/docs/us/plan.html | 29 | ||||
| -rw-r--r-- | TAO/IIOP/docs/us/server | 5 | ||||
| -rw-r--r-- | TAO/IIOP/lib/Makefile.gen | 2 | ||||
| -rw-r--r-- | TAO/IIOP/lib/runtime/marshal.cpp | 9 | ||||
| -rw-r--r-- | TAO/IIOP/test/Makefile | 2 |
6 files changed, 46 insertions, 4 deletions
diff --git a/TAO/IIOP/Makefile.conf b/TAO/IIOP/Makefile.conf index 58ce0083328..52fc1a178f9 100644 --- a/TAO/IIOP/Makefile.conf +++ b/TAO/IIOP/Makefile.conf @@ -12,6 +12,7 @@ # # flags for debug builds +#CXX=CC DEBUG_CPPFLAGS += -DDEBUG DEBUG_CCFLAGS += -g +w # "+w" enables all warnings on devpro compilers @@ -34,7 +35,7 @@ CCFLAGS = $($(MODE)_CCFLAGS) CCFLAGS += -qoption cg -Wc,-Qiselect-funcpad=0 # G++ benefits from this stuff ... -CXXFLAGS = $(CCFLAGS) -fnonnull-objects +#CXXFLAGS = $(CCFLAGS) -fnonnull-objects # Use Solaris threads (DevPro's option) CCFLAGS += -mt diff --git a/TAO/IIOP/docs/us/plan.html b/TAO/IIOP/docs/us/plan.html new file mode 100644 index 00000000000..5650257a330 --- /dev/null +++ b/TAO/IIOP/docs/us/plan.html @@ -0,0 +1,29 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> +<html> + <head> + <title>IIOP Notes</title> + </head> + + <body> + <h1>IIOP Notes</h1> + + <p> + The current plan for transforming the Sun IIOP Reference + implementation into the basis of the TAO is: + + <ol> + <li>Replace selected portions of code with ACE components while maintaining the current architecture and design. + <li>Distill the design patterns and begin re-architecting. + </ol> + + <p> + Please feel free to email additions to this list! + + <hr> + <address><a href="mailto:cleeland@cs.wustl.edu">Chris Cleeland</a></address> +<!-- Created: Fri Feb 14 15:22:32 CST 1997 --> +<!-- hhmts start --> +Last modified: Fri Feb 14 15:46:52 CST +<!-- hhmts end --> + </body> +</html> diff --git a/TAO/IIOP/docs/us/server b/TAO/IIOP/docs/us/server new file mode 100644 index 00000000000..afad69638a8 --- /dev/null +++ b/TAO/IIOP/docs/us/server @@ -0,0 +1,5 @@ +This note describes architectural differences between the Sun IIOP +Reference implementation (SIR) and a new architecture based on ACE. +After narrating the SIR architecture, shortcomings of that design are +highlighted, and a solution known as The ACE ORB (TAO) presented. + diff --git a/TAO/IIOP/lib/Makefile.gen b/TAO/IIOP/lib/Makefile.gen index ffddb5dcd69..d3355ec1968 100644 --- a/TAO/IIOP/lib/Makefile.gen +++ b/TAO/IIOP/lib/Makefile.gen @@ -5,7 +5,7 @@ include $(ROOT)/Makefile.conf CPPFLAGS += -I$(ROOT)/lib -CCFLAGS += -pic +CCFLAGS += -PIC default: $(FILES:%.cpp=../obj/%.o) diff --git a/TAO/IIOP/lib/runtime/marshal.cpp b/TAO/IIOP/lib/runtime/marshal.cpp index 60531602eb8..34352eab1ea 100644 --- a/TAO/IIOP/lib/runtime/marshal.cpp +++ b/TAO/IIOP/lib/runtime/marshal.cpp @@ -502,7 +502,14 @@ CDR::encoder ( // and need some kind of init function. Luckily, they're increasingly // rare in any "production" environment. // -const CORBA_TypeCode_ptr +#if THE_COMPILER_CAN_FIND_THIS_PROPERLY +const // The extern reference in onc/xdr.cpp doesn't + // seem to be able to find this decl with as + // long as the const is part of it. I even + // tried changing the ref decl to have 'const' + // in it, to no avail. --cjc +#endif +CORBA_TypeCode_ptr __tc_consts [TC_KIND_COUNT] = { _tc_CORBA_Null , _tc_CORBA_Void diff --git a/TAO/IIOP/test/Makefile b/TAO/IIOP/test/Makefile index 3dfca9eab2e..74e91214b51 100644 --- a/TAO/IIOP/test/Makefile +++ b/TAO/IIOP/test/Makefile @@ -7,7 +7,7 @@ include $(ROOT)/Makefile.conf CPPFLAGS += -I$(ROOT)/proto/include -LDLIBS = -Qoption ld -R$(ROOT)/proto/lib -L$(ROOT)/proto/lib -lcorba +LDLIBS = -R$(ROOT)/proto/lib -L$(ROOT)/proto/lib -lcorba -lpthread PROG_SRCS = svr.cpp clnt.cpp cubit.cpp \ test1.cpp test1_clnt.cpp test1_svr.cpp \ |