GNOME.org
 

Re: cpp branch

Sam, I have applied your patches, though I needed to swap a ] and )
around in your conditional compilation patch, and add some #include
<string.h> lines for your C++ ORB patch. I really think that you should
get cvs write access and commit stuff directly.

Unfortunately, this seems to have made things worse:

[root@localhost ORBit2]# cd test
[root@localhost test]# orbit-idl-2 -lc++ empty.idl
orbit-idl 2.3.101 compiling
 small mode, show preprocessor errors, passes: stubs skels common
headers skel_impl imodule


(process:19818): ** CRITICAL **: file orbit-idl-driver.c: line 50
(orbit_idl_to_backend): assertion `binfo && binfo->op_output' failed

(process:19818): ** WARNING **: empty.idl compilation failed
[root@localhost test]# 


By the way, can you tell me something about this 'C++ ORB'. Why do we
need a separate ORB? I thought that Orbit/C++ just provided C++
stubs/skels which in turn used the C stubs/skels. Please forgive my
ignorance.


On Sat, 2002-01-05 at 11:25, Sam Couter wrote:
> Sam Couter <sam@topic.com.au> wrote:
> > 2) Actually getting the C++ ORB to compile at all. No guarantees about
> > the code actually being useful. :)
> 
> Okay, the attached patch will make the C++ ORB build, but it won't be a
> useful ORB. Some of the internals have changed a fair bit, so the few
> problems I couldn't solve quickly got #if 0'd out of existence. Getting
> it to build is the first step towards making it work.
> -- 
> Sam "Eddie" Couter  |  mailto:sam@topic.com.au     |  I need a short and
> Internet Engineer   |  jabber:eddiesam@jabber.org  |  clever comment for
> tSA Consulting      |  http://www.topic.com.au/    |  my .signature file
> OpenPGP fingerprint:  A46B 9BB5 3148 7BEA 1F05  5BD5 8530 03AE DE89 C75C
> ----
> 

> ? orb_cpp.diff
> ? test/test-mem
> Index: include/orbit/orb-core/corba-orb.h
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/include/orbit/orb-core/corba-orb.h,v
> retrieving revision 1.11
> diff -u -r1.11 corba-orb.h
> --- include/orbit/orb-core/corba-orb.h	2001/11/21 10:46:18	1.11
> +++ include/orbit/orb-core/corba-orb.h	2002/01/05 10:20:57
> @@ -21,6 +21,8 @@
>  
>  void      ORBit_ORB_start_servers (CORBA_ORB orb);
>  
> +CORBA_TypeCode CORBA_TypeCode_allocate(void);
> +
>  #endif /* ORBIT2_INTERNAL_API */
>  
>  #endif
> Index: include/orbit/orb-core/corba-typecode.h
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/include/orbit/orb-core/corba-typecode.h,v
> retrieving revision 1.13
> diff -u -r1.13 corba-typecode.h
> --- include/orbit/orb-core/corba-typecode.h	2001/11/26 01:42:14	1.13
> +++ include/orbit/orb-core/corba-typecode.h	2002/01/05 10:20:57
> @@ -4,6 +4,8 @@
>  #include <orbit/orb-core/corba-typecode-type.h>
>  #include <orbit/orb-core/corba-any-type.h>
>  #include <orbit/orb-core/orbit-object.h>
> +#include <orbit/orb-core/orb-types.h>
> +#include <orbit/GIOP/giop-basics.h>
>  
>  #define CORBA_tk_recursive -1
>  #define CORBA_tk_last (CORBA_tk_abstract_interface + 1)
> Index: src/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/Makefile.am,v
> retrieving revision 1.4
> diff -u -r1.4 Makefile.am
> --- src/Makefile.am	2000/11/17 01:15:44	1.4
> +++ src/Makefile.am	2002/01/05 10:20:57
> @@ -1,2 +1 @@
> -SUBDIRS=idl-compiler idl orb services
> -
> +SUBDIRS=idl-compiler idl orb orb-cpp services
> Index: src/orb/orb-core/corba-orb.c
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb/orb-core/corba-orb.c,v
> retrieving revision 1.47
> diff -u -r1.47 corba-orb.c
> --- src/orb/orb-core/corba-orb.c	2001/12/05 13:58:13	1.47
> +++ src/orb/orb-core/corba-orb.c	2002/01/05 10:21:00
> @@ -378,7 +378,7 @@
>  	return ORBit_RootObject_duplicate (objref);
>  }
>  
> -static CORBA_TypeCode
> +CORBA_TypeCode
>  CORBA_TypeCode_allocate (void)
>  {
>  	CORBA_TypeCode tc = g_new0 (struct CORBA_TypeCode_struct, 1);
> Index: src/orb-cpp/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/Makefile.am,v
> retrieving revision 1.1.2.2
> diff -u -r1.1.2.2 Makefile.am
> --- src/orb-cpp/Makefile.am	2001/12/11 09:39:14	1.1.2.2
> +++ src/orb-cpp/Makefile.am	2002/01/05 10:21:00
> @@ -1,7 +1,12 @@
> -## Process this file with automake to produce Makefile.in
> -
>  lib_LTLIBRARIES = liborbitcpp.la
>  
> +INCLUDES = \
> +	-I. \
> +	-I$(top_srcdir)/include \
> +	-DORBIT2_INTERNAL_API \
> +	$(WARN_CFLAGS) \
> +	$(ORBIT_CFLAGS)
> +
>  liborbitcppincludedir = $(includedir)/orb
>  
>  liborbitcppinclude_HEADERS = \
> @@ -33,5 +38,5 @@
>  			orbitcpp_typecode.cc
>  			$(liborbitcppinclude_HEADERS)
>  
> -liborbitcpp_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
> +liborbitcpp_la_LDFLAGS = -version-info $(LT_VERSION)
>  liborbitcpp_la_LIBADD = $(ORBIT_LIBS) -lstdc++
> Index: src/orb-cpp/orbitcpp.hh
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp.hh,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp.hh
> --- src/orb-cpp/orbitcpp.hh	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp.hh	2002/01/05 10:21:00
> @@ -32,19 +32,19 @@
>  
>  
>  
> -#include <orb/orbitcpp_constants.hh>
> -#include <orb/orbitcpp_types.hh>
> -#include <orb/orbitcpp_smartptr.hh>
> -#include <orb/orbitcpp_tools.hh>
> -#include <orb/orbitcpp_exception.hh>
> -#include <orb/orbitcpp_object.hh>
> -#include <orb/orbitcpp_orb.hh>
> -#include <orb/orbitcpp_sequence.hh>
> -#include <orb/orbitcpp_poa.hh>
> -#include <orb/orbitcpp_any.hh>
> +#include "orbitcpp_constants.hh"
> +#include "orbitcpp_types.hh"
> +#include "orbitcpp_smartptr.hh"
> +#include "orbitcpp_tools.hh"
> +#include "orbitcpp_exception.hh"
> +#include "orbitcpp_object.hh"
> +#include "orbitcpp_orb.hh"
> +#include "orbitcpp_sequence.hh"
> +#include "orbitcpp_poa.hh"
> +#include "orbitcpp_any.hh"
>  
>  // hopefully this will be removed when the object_var stuff gets
>  // sorted out.  - PD
> -#include <orb/orbitcpp_var_smartptr.hh>
> +#include "orbitcpp_var_smartptr.hh"
>  
>  #endif
> Index: src/orb-cpp/orbitcpp_any.cc
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_any.cc,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_any.cc
> --- src/orb-cpp/orbitcpp_any.cc	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_any.cc	2002/01/05 10:21:00
> @@ -24,20 +24,24 @@
>   *  Description: CORBA Any implementation
>   */
>  #include <cwchar>
> -#include <orb/orbit.h>
> -#include <orb/orbitcpp.hh>
> +#include <orbit/orbit.h>
> +#include "orbitcpp.hh"
>  #include "orbitcpp_any.hh"
>  
>  
>  /* ORBit_demarshal_allocate_mem cut & paste - this should ideally be
>     global */
>  
> +/* FIXME: This is sure to be broken for ORBit2. */
>  static gpointer
>  ORBit_demarshal_allocate_mem(CORBA_TypeCode tc, gint nelements)
>  {
> -    size_t block_size;
>      gpointer retval = NULL;
>  
> +	/* And it seems to be quite broken. */
> +#if 0
> +    size_t block_size;
> +
>      if(!nelements) return retval;
>  
>      block_size = ORBit_gather_alloc_info(tc);
> @@ -50,6 +54,7 @@
>  
>  	*(CORBA_TypeCode *)((char *)retval-sizeof(ORBit_mem_info)-sizeof(CORBA_TypeCode)) = (CORBA_TypeCode)CORBA_Object_duplicate((CORBA_Object)tc, NULL);
>      }
> +#endif
>  
>      return retval;
>  }
> Index: src/orb-cpp/orbitcpp_any.hh
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_any.hh,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_any.hh
> --- src/orb-cpp/orbitcpp_any.hh	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_any.hh	2002/01/05 10:21:00
> @@ -27,12 +27,11 @@
>  #define __ORBITCPP_ANY_HH
>  
>  #include <cstdlib>
> -#include <orb/orbit.h>
> -#include <orb/orbitcpp_types.hh>
> -#include <orb/orbitcpp_object.hh>
> -#include <orb/orbitcpp_exception.hh>
> -//#include <orb/corba_typecode.h>
> -#include <orb/orbitcpp_typecode.hh>
> +#include <orbit/orbit.h>
> +#include "orbitcpp_types.hh"
> +#include "orbitcpp_object.hh"
> +#include "orbitcpp_exception.hh"
> +#include "orbitcpp_typecode.hh"
>  
>  namespace CORBA {
>  	class Any;
> Index: src/orb-cpp/orbitcpp_exception.cc
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_exception.cc,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_exception.cc
> --- src/orb-cpp/orbitcpp_exception.cc	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_exception.cc	2002/01/05 10:21:00
> @@ -27,7 +27,7 @@
>  
>  
>  
> -#include <orb/orbitcpp_exception.hh>
> +#include "orbitcpp_exception.hh"
>  
>  
>  
> @@ -69,7 +69,7 @@
>  	const char *repo_id = CORBA_exception_id(&m_env);	
>  
>      #define P(name,quotedrepoid) ORBITCPP_SYSEX_THROW_O_MATIC(name,quotedrepoid)
> -	#include <orb/orbitcpp_exceptionlist.hh>
> +	#include "orbitcpp_exceptionlist.hh"
>      #undef P
>  	
>  	CORBA_exception_free(&m_env);
> Index: src/orb-cpp/orbitcpp_exception.hh
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_exception.hh,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_exception.hh
> --- src/orb-cpp/orbitcpp_exception.hh	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_exception.hh	2002/01/05 10:21:01
> @@ -33,8 +33,8 @@
>  
>  
>  
> -#include <orb/orbitcpp_types.hh>
> -#include <orb/orbitcpp_tools.hh>
> +#include "orbitcpp_types.hh"
> +#include "orbitcpp_tools.hh"
>  
>  
>  
> @@ -160,7 +160,7 @@
>  	};
>  	
>  	#define P(name,quotedname) ORBITCPP_SYSEXCEPTION_FACTORY(name,quotedname)
> -	#include <orb/orbitcpp_exceptionlist.hh>
> +	#include "orbitcpp_exceptionlist.hh"
>  	#undef P
>  
>  	class UserException : public Exception {
> Index: src/orb-cpp/orbitcpp_object.cc
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_object.cc,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_object.cc
> --- src/orb-cpp/orbitcpp_object.cc	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_object.cc	2002/01/05 10:21:01
> @@ -27,8 +27,8 @@
>  
>  
>  
> -#include <orb/orbitcpp_object.hh>
> -#include <orb/orbitcpp_exception.hh>
> +#include "orbitcpp_object.hh"
> +#include "orbitcpp_exception.hh"
>  
>  
>  
> Index: src/orb-cpp/orbitcpp_object.hh
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_object.hh,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_object.hh
> --- src/orb-cpp/orbitcpp_object.hh	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_object.hh	2002/01/05 10:21:01
> @@ -29,9 +29,9 @@
>  
>  
>  
> -#include <orb/orbitcpp_types.hh>
> -#include <orb/orbitcpp_tools.hh>
> -#include <orb/orbitcpp_smartptr.hh>
> +#include "orbitcpp_types.hh"
> +#include "orbitcpp_tools.hh"
> +#include "orbitcpp_smartptr.hh"
>  
>  
>  
> @@ -61,7 +61,7 @@
>  		friend void release(Object_ptr o);
>  	
>  	protected:
> -		CORBA_Object_struct m_target;
> +		CORBA_Object_type m_target;
>  		
>  	public:
>  		// begin ORBit-C++ extension
> Index: src/orb-cpp/orbitcpp_orb.cc
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_orb.cc,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_orb.cc
> --- src/orb-cpp/orbitcpp_orb.cc	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_orb.cc	2002/01/05 10:21:01
> @@ -27,9 +27,9 @@
>  
>  
>  #include <iostream>
> -#include <orb/orbitcpp_object.hh>
> -#include <orb/orbitcpp_orb.hh>
> -#include <orb/orbitcpp_exception.hh>
> +#include "orbitcpp_object.hh"
> +#include "orbitcpp_orb.hh"
> +#include "orbitcpp_exception.hh"
>  
>  
>  
> Index: src/orb-cpp/orbitcpp_orb.hh
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_orb.hh,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_orb.hh
> --- src/orb-cpp/orbitcpp_orb.hh	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_orb.hh	2002/01/05 10:21:01
> @@ -32,7 +32,7 @@
>  
>  
>  
> -#include <orb/orbitcpp_object.hh>
> +#include "orbitcpp_object.hh"
>  
>  namespace CORBA {
>  	CORBA::ORB_ptr ORB_init(int& argc, char** argv,
> Index: src/orb-cpp/orbitcpp_poa.cc
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_poa.cc,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_poa.cc
> --- src/orb-cpp/orbitcpp_poa.cc	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_poa.cc	2002/01/05 10:21:04
> @@ -27,7 +27,7 @@
>  
>  
>  
> -#include <orb/orbitcpp_poa.hh>
> +#include "orbitcpp_poa.hh"
>  
>  
>  
> Index: src/orb-cpp/orbitcpp_poa.hh
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_poa.hh,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_poa.hh
> --- src/orb-cpp/orbitcpp_poa.hh	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_poa.hh	2002/01/05 10:21:04
> @@ -34,19 +34,18 @@
>  
>  
>  
> -#include <orb/orbitcpp_smartptr.hh>
> -#include <orb/orbitcpp_orb.hh>
> -#include <orb/orbitcpp_object.hh>
> -#include <orb/orbitcpp_exception.hh>
> -#include <orb/orbitcpp_sequence.hh>
> +#include "orbitcpp_smartptr.hh"
> +#include "orbitcpp_orb.hh"
> +#include "orbitcpp_object.hh"
> +#include "orbitcpp_exception.hh"
> +#include "orbitcpp_sequence.hh"
>  
>  
>  
> -
>  namespace PortableServer {
>  	ORBITCPP_DECLARE_SIMPLE_SEQUENCE(CORBA::Octet,
> -		CORBA_sequence_octet__alloc,
> -		CORBA_octet_allocbuf,
> +		CORBA_sequence_CORBA_octet__alloc,
> +		CORBA_sequence_CORBA_octet_allocbuf,
>  		PortableServer_ObjectId,
>  		ObjectId)
>  
> Index: src/orb-cpp/orbitcpp_sequence.hh
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_sequence.hh,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_sequence.hh
> --- src/orb-cpp/orbitcpp_sequence.hh	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_sequence.hh	2002/01/05 10:21:04
> @@ -31,7 +31,8 @@
>  
>  #include <cstddef>
>  #include <cassert>
> -#include <orb/orbitcpp_smartptr.hh>
> +#include "orbitcpp_smartptr.hh"
> +#include <orbit/orb-core/orb-core.h>
>  
>  
>  
> Index: src/orb-cpp/orbitcpp_smartptr.hh
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_smartptr.hh,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_smartptr.hh
> --- src/orb-cpp/orbitcpp_smartptr.hh	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_smartptr.hh	2002/01/05 10:21:04
> @@ -33,8 +33,8 @@
>  
>  
>  
> -#include <orb/orbitcpp_types.hh>
> -#include <orb/orbitcpp_tools.hh>
> +#include "orbitcpp_types.hh"
> +#include "orbitcpp_tools.hh"
>  
>  namespace CORBA {
>  	class Object;
> Index: src/orb-cpp/orbitcpp_tools.cc
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_tools.cc,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_tools.cc
> --- src/orb-cpp/orbitcpp_tools.cc	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_tools.cc	2002/01/05 10:21:06
> @@ -30,8 +30,9 @@
>  
>  #include <cstdio>
>  #include <cstdlib>
> -#include <orb/orbitcpp_tools.hh>
> -#include <orb/orbitcpp_exception.hh>
> +#include "orbitcpp_tools.hh"
> +#include "orbitcpp_exception.hh"
> +#include <orbit/orb-core/corba-orb.h>
>  
>  
>  
> @@ -64,10 +65,7 @@
>  }
>  
>  CORBA_TypeCode _orbitcpp::TypeCode_allocate() {
> -	CORBA_TypeCode tc = g_new0(struct CORBA_TypeCode_struct,1);
> -	CEnvironment ev;
> -	ORBit_pseudo_object_init(&tc->parent,ORBIT_PSEUDO_TYPECODE,ev);
> -	ev.propagate_sysex();
> +	CORBA_TypeCode tc = CORBA_TypeCode_allocate();
>  	return tc;
>  }
>  
> Index: src/orb-cpp/orbitcpp_tools.hh
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_tools.hh,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_tools.hh
> --- src/orb-cpp/orbitcpp_tools.hh	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_tools.hh	2002/01/05 10:21:06
> @@ -30,10 +30,10 @@
>  #define __ORBITCPP_TOOLS_HH
>  
>  
> -#include <orb/orbit.h>
> +#include <orbit/orbit.h>
>  
> -#include <orb/orbitcpp_config.hh>
> -#include <orb/orbitcpp_types.hh>
> +#include "orbitcpp_config.hh"
> +#include "orbitcpp_types.hh"
>  
>  
>  
> Index: src/orb-cpp/orbitcpp_typecode.cc
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_typecode.cc,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_typecode.cc
> --- src/orb-cpp/orbitcpp_typecode.cc	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_typecode.cc	2002/01/05 10:21:06
> @@ -22,53 +22,59 @@
>   *  Author: Sam Couter <sam@topic.com.au>
>   */
>  
> -#include <orb/orbitcpp_typecode.hh>
> -#include <orb/orbitcpp_exception.hh>
> +#include "orbitcpp_typecode.hh"
> +#include "orbitcpp_exception.hh"
> +#include <orbit/orb-core/corba-typecode.h>
>  
> +
>  using namespace _orbitcpp;
>  
> +
>  CORBA::TypeCode_ptr CORBA::_tc_null =
>  	reinterpret_cast <CORBA::TypeCode_ptr> (TC_null);
>  CORBA::TypeCode_ptr CORBA::_tc_void =
>  	reinterpret_cast <CORBA::TypeCode_ptr> (TC_void);
>  CORBA::TypeCode_ptr CORBA::_tc_short =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_short);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_short);
>  CORBA::TypeCode_ptr CORBA::_tc_long =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_long);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_long);
>  CORBA::TypeCode_ptr CORBA::_tc_longlong =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_longlong);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_long_long);
>  CORBA::TypeCode_ptr CORBA::_tc_ushort =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_ushort);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_unsigned_short);
>  CORBA::TypeCode_ptr CORBA::_tc_ulong =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_ulong);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_unsigned_long);
>  CORBA::TypeCode_ptr CORBA::_tc_ulonglong =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_ulonglong);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_unsigned_long_long);
>  CORBA::TypeCode_ptr CORBA::_tc_float =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_float);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_float);
>  CORBA::TypeCode_ptr CORBA::_tc_double =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_double);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_double);
>  CORBA::TypeCode_ptr CORBA::_tc_longdouble =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_longdouble);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_long_double);
>  CORBA::TypeCode_ptr CORBA::_tc_boolean =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_boolean);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_boolean);
>  CORBA::TypeCode_ptr CORBA::_tc_char =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_char);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_char);
>  CORBA::TypeCode_ptr CORBA::_tc_wchar =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_wchar);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_wchar);
>  CORBA::TypeCode_ptr CORBA::_tc_octet =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_octet);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_octet);
>  CORBA::TypeCode_ptr CORBA::_tc_any =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_any);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_any);
>  CORBA::TypeCode_ptr CORBA::_tc_TypeCode =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_TypeCode);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_TypeCode);
> +/* There doesn't seem to be a TypeCode defined for CORBA_Principal yet... */
> +#if 0
>  CORBA::TypeCode_ptr CORBA::_tc_Principal =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_Principal);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_Principal);
> +#endif
>  CORBA::TypeCode_ptr CORBA::_tc_Object =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_Object);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_Object);
>  CORBA::TypeCode_ptr CORBA::_tc_string =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_string);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_string);
>  CORBA::TypeCode_ptr CORBA::_tc_wstring =
> -	reinterpret_cast <CORBA::TypeCode_ptr> (TC_wstring);
> +	reinterpret_cast <CORBA::TypeCode_ptr> (TC_CORBA_wstring);
>  
>  CORBA::Boolean
>  CORBA::TypeCode::equal(TypeCode_ptr tc) const
> @@ -290,7 +296,7 @@
>  CORBA::ValueModifier
>  CORBA::TypeCode::type_modifier() const
>  {
> -	CORBA::ValueModifier retval;
> +	CORBA::ValueModifier retval = 0;
>  	CEnvironment ev;
>  
>  	/* not implemented by ORBit */
> Index: src/orb-cpp/orbitcpp_typecode.hh
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_typecode.hh,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_typecode.hh
> --- src/orb-cpp/orbitcpp_typecode.hh	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_typecode.hh	2002/01/05 10:21:06
> @@ -25,10 +25,10 @@
>  #ifndef __ORBITCPP_TYPECODE_HH
>  #define __ORBITCPP_TYPECODE_HH
>  
> -#include <orb/corba_typecode.h>
> -#include <orb/orbitcpp_object.hh>
> -#include <orb/orbitcpp_exception.hh>
> -#include <orb/orbitcpp_sequence.hh>
> +#include <orbit/orb-core/corba-typecode.h>
> +#include "orbitcpp_object.hh"
> +#include "orbitcpp_exception.hh"
> +#include "orbitcpp_sequence.hh"
>  
>  namespace CORBA {
>  
> Index: src/orb-cpp/orbitcpp_types.cc
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_types.cc,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_types.cc
> --- src/orb-cpp/orbitcpp_types.cc	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_types.cc	2002/01/05 10:21:06
> @@ -26,7 +26,7 @@
>  
>  
>  
> -#include <orb/orbitcpp_types.hh>
> +#include "orbitcpp_types.hh"
>  
>  
>  
> Index: src/orb-cpp/orbitcpp_types.hh
> ===================================================================
> RCS file: /cvs/gnome/ORBit2/src/orb-cpp/Attic/orbitcpp_types.hh,v
> retrieving revision 1.1.2.1
> diff -u -r1.1.2.1 orbitcpp_types.hh
> --- src/orb-cpp/orbitcpp_types.hh	2001/12/11 07:59:42	1.1.2.1
> +++ src/orb-cpp/orbitcpp_types.hh	2002/01/05 10:21:06
> @@ -27,7 +27,7 @@
>  #ifndef __ORBITCPP_BASICTYPES_HH
>  #define __ORBITCPP_BASICTYPES_HH
>  
> -#include <orb/orbit.h>
> +#include <orbit/orbit.h>
>  
>  
>  
-- 
Murray Cumming
murrayc@usa.net
www.murrayc.com
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]