[cgma-dev] r2618 - in cgm/trunk: . itaps/SIDL itaps/SIDL/gserver
kraftche at mcs.anl.gov
kraftche at mcs.anl.gov
Fri Jan 30 19:28:23 CST 2009
Author: kraftche
Date: 2009-01-30 19:28:22 -0600 (Fri, 30 Jan 2009)
New Revision: 2618
Added:
cgm/trunk/itaps/SIDL/Cclient.make
cgm/trunk/itaps/SIDL/Fclient.make
cgm/trunk/itaps/SIDL/Makefile.in
cgm/trunk/itaps/SIDL/common.make.in
cgm/trunk/itaps/SIDL/gserver.make
Removed:
cgm/trunk/itaps/SIDL/Makefile.am
Modified:
cgm/trunk/configure.in
cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.cc
cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.hh
cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.cc
cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.hh
cgm/trunk/itaps/SIDL/iGeom.sidl
Log:
o Update iGeom SIDL bindings for iGeom changes
o Copy MOAB's SIDL build system for CGM
Modified: cgm/trunk/configure.in
===================================================================
--- cgm/trunk/configure.in 2009-01-31 01:26:13 UTC (rev 2617)
+++ cgm/trunk/configure.in 2009-01-31 01:28:22 UTC (rev 2618)
@@ -426,6 +426,8 @@
itaps/Makefile
itaps/iGeom-Defs.inc
itaps/SIDL/Makefile
+ itaps/SIDL/common.make
+ itaps/SIDL/iGeom-SIDL-Defs.inc
test/Makefile
cgm_apps/Makefile
cgm_apps/examples/Makefile
Added: cgm/trunk/itaps/SIDL/Cclient.make
===================================================================
--- cgm/trunk/itaps/SIDL/Cclient.make (rev 0)
+++ cgm/trunk/itaps/SIDL/Cclient.make 2009-01-31 01:28:22 UTC (rev 2618)
@@ -0,0 +1,10 @@
+include babel.make
+
+TARGET_LIB = libiGeomCclient.la
+LTLIBS = ../gserver/libiGeomserver.la
+C_SRCS = $(STUBSRCS)
+CXX_SRCS =
+LIBLINK = $(LINK)
+bdir = Cclient
+
+include ../common.make
Added: cgm/trunk/itaps/SIDL/Fclient.make
===================================================================
--- cgm/trunk/itaps/SIDL/Fclient.make (rev 0)
+++ cgm/trunk/itaps/SIDL/Fclient.make 2009-01-31 01:28:22 UTC (rev 2618)
@@ -0,0 +1,10 @@
+include babel.make
+
+TARGET_LIB = libiGeomFclient.la
+LTLIBS = ../gserver/libiGeomserver.la
+C_SRCS = $(STUBSRCS)
+CXX_SRCS =
+LIBLINK = $(LINK)
+bdir = Fclient
+
+include ../common.make
Deleted: cgm/trunk/itaps/SIDL/Makefile.am
===================================================================
--- cgm/trunk/itaps/SIDL/Makefile.am 2009-01-31 01:26:13 UTC (rev 2617)
+++ cgm/trunk/itaps/SIDL/Makefile.am 2009-01-31 01:28:22 UTC (rev 2618)
@@ -1,153 +0,0 @@
-vpath = gserver bserver
-VPATH = gserver bserver
-BABEL_FLAGS = -V$(srcdir)
-
-LD_FLAGS_PIC = -fpic -shared
-SERVER_HDRS = iBase_ArrTag_IOR.h iBase_CreationStatus_IOR.h iBase_EntSet_IOR.h \
- iBase_EntTag_IOR.h iBase_EntityType_IOR.h iBase_ErrorActions_IOR.h \
- iBase_ErrorType_IOR.h iBase_IOR.h iBase_SetBoolOps_IOR.h \
- iBase_SetRelation_IOR.h iBase_SetTag_IOR.h iBase_StorageOrder_IOR.h \
- iBase_TagValueType_IOR.h iBase_Tag_IOR.h iMesh_AdjacencyInfo_IOR.h \
- iGeom_Construct_IOR.h iGeom_CoreQuery_IOR.h iGeom_Factory_IOR.h \
- iGeom_Geometry_IOR.h iGeom_IOR.h iGeom_Iterators_IOR.h iGeom_Modify_IOR.h \
- iGeom_Parametric_IOR.h iGeom_Primitives_IOR.h iGeom_SIDL_GeomSidl_IOR.h \
- iGeom_SIDL_IOR.h iGeom_Shape_IOR.h iGeom_Tolerance_IOR.h \
- iGeom_Topology_IOR.h iGeom_Transforms_IOR.h \
- iBase.hh iBase_ArrTag.hh iBase_CreationStatus.hh iBase_EntSet.hh \
- iBase_EntTag.hh iBase_EntityType.hh iBase_ErrorActions.hh \
- iBase_ErrorType.hh iBase_SetBoolOps.hh iBase_SetRelation.hh iBase_SetTag.hh \
- iBase_StorageOrder.hh iBase_Tag.hh iBase_TagValueType.hh iMesh.hh \
- iGeom_Booleans.hh iGeom_Construct.hh iGeom_CoreQuery.hh iGeom_Factory.hh \
- iGeom_Geometry.hh iGeom_Iterators.hh iGeom_Modify.hh iGeom_Parametric.hh \
- iGeom_Primitives.hh iGeom_SIDL.hh iGeom_SIDL_GeomSidl.hh iGeom_Shape.hh \
- iGeom_Tolerance.hh iGeom_Topology.hh iGeom_Transforms.hh sidl.hh \
- sidl_BaseClass.hh sidl_BaseException.hh sidl_BaseInterface.hh \
- sidl_ClassInfo.hh sidl_ClassInfoI.hh sidl_DFinder.hh \
- sidl_DLL.hh sidl_Finder.hh sidl_InvViolation.hh sidl_Loader.hh \
- sidl_PostViolation.hh sidl_PreViolation.hh sidl_Resolve.hh \
- sidl_SIDLException.hh sidl_Scope.hh sidl_io.hh sidl_io_Deserializer.hh \
- sidl_io_IOException.hh sidl_io_Serializeable.hh sidl_io_Serializer.hh \
- sidl_rmi.hh sidl_rmi_ConnectRegistry.hh sidl_rmi_InstanceHandle.hh \
- sidl_rmi_InstanceRegistry.hh sidl_rmi_Invocation.hh \
- sidl_rmi_NetworkException.hh sidl_rmi_ProtocolFactory.hh \
- sidl_rmi_Response.hh iGeom_SIDL_GeomSidl_Impl.hh iBase_Error_Impl.hh \
- iBase_Error_IOR.h iBase_Error.hh
-SERVER_CXX_SRCS = \
- iBase_ArrTag.cc iBase_EntSet.cc iBase_EntTag.cc \
- iBase_SetBoolOps.cc iBase_SetRelation.cc iBase_SetTag.cc iBase_Tag.cc \
- iGeom_Booleans.cc iGeom_Construct.cc iGeom_CoreQuery.cc iGeom_Factory.cc \
- iGeom_Geometry.cc iGeom_Iterators.cc iGeom_Modify.cc iGeom_Parametric.cc \
- iGeom_Primitives.cc iGeom_SIDL_GeomSidl.cc iGeom_Shape.cc \
- iGeom_Tolerance.cc iGeom_Topology.cc iGeom_Transforms.cc sidl_BaseClass.cc \
- sidle_BaseException.cc \
- sidl_BaseInterface.cc sidl_ClassInfo.cc sidl_ClassInfoI.cc sidl_DFinder.cc \
- sidl_DLL.cc sidl_Finder.cc sidl_InvViolation.cc sidl_Loader.cc \
- sidl_PostViolation.cc sidl_PreViolation.cc sidl_SIDLException.cc \
- sidl_io_Deserializer.cc sidl_io_IOException.cc sidl_io_Serializeable.cc \
- sidl_io_Serializer.cc sidl_rmi_ConnectRegistry.cc \
- sidl_rmi_InstanceHandle.cc sidl_rmi_InstanceRegistry.cc \
- sidl_rmi_Invocation.cc sidl_rmi_NetworkException.cc \
- sidl_rmi_ProtocolFactory.cc sidl_rmi_Response.cc iGeom_SIDL_GeomSidl_Skel.cc \
- iGeom_SIDL_GeomSidl_Impl.cc iBase_Error_Impl.cc \
- iBase_Error_Skel.cc iBase_Error.cc
-SERVER_C_SRCS = iGeom_SIDL_GeomSidl_IOR.c iBase_Error_IOR.c
-
-SERVER_OFILES = $(SERVER_CXX_SRCES:.cc=.o) $(SERVER_C_SRCS:.c=.o)
-
-#bin_PROGRAMS = testgeom
-#testgeom_SOURCES = testgeom.cpp
-
-LDADD = @top_srcdir@/itaps/libiGeom.la @abs_srcdir@/libiGeomserver.so ${BABEL_DIR}/lib/libsidl.la
-#testgeom_DEPENDENCIES = @top_srcdir@/itaps/libiGeom.la @abs_srcdir@/libiGeomserver.so ${BABEL_DIR}/lib/libsidl.la
-
-all: libiGeomserver.so
-
-settings:
- @echo "FACTORY_OFILES = $(FACTORY_OFILES)"
- @echo "SERVER_OFILES = $(SERVER_OFILES)"
-
-#============= iBase =============
-repo/.btimestamp: $(srcdir)/iBase.sidl
- -rm -rf repo
- @BABEL_DIR@/bin/babel $(BABEL_FLAGS) -tXML -o repo $(srcdir)/iBase.sidl
- touch $@
-
-bserver/babel.make: repo/.btimestamp $(srcdir)/iBase.sidl
- -rm -f $@
- @BABEL_DIR@/bin/babel $(BABEL_FLAGS) -sC++ -o bserver $(srcdir)/iBase.sidl
-
-#============= iBase =============
-
-repo/.gtimestamp: $(srcdir)/iGeom.sidl bserver/babel.make
- @BABEL_DIR@/bin/babel $(BABEL_FLAGS) -tXML -o repo -Rrepo $(srcdir)/iGeom.sidl
- touch $@
-
-gserver/babel.make: repo/.gtimestamp repo/.btimestamp $(srcdir)/iGeom_SIDL.sidl $(srcdir)/iGeom.sidl
- -rm -f $@
- @BABEL_DIR@/bin/babel $(BABEL_FLAGS) -R"repo" -sC++ -o gserver $(srcdir)/iGeom_SIDL.sidl
-
-Cclient: repo/.gtimestamp repo/.gtimestamp $(srcdir)/iGeom_SIDL.sidl
- -rm -rf Cclient
- @BABEL_DIR@/bin/babel $(BABEL_FLAGS) -R"repo" -cC -o Cclient $(srcdir)/iGeom_SIDL.sidl
-
-F77client: repo/.gtimestamp repo/.btimestamp $(srcdir)/iGeom_SIDL.sidl
- -rm -rf F77client
- @BABEL_DIR@/bin/babel $(BABEL_FLAGS) -R"repo" -cF77 -o F77client $(srcdir)/iGeom_SIDL.sidl
-
-
-
-libiGeomserver.so: gserver/babel.make ${SERVER_OFILES}
- $(CXX) $(LD_FLAGS) $(LD_FLAGS_PIC) -o $@ ${SERVER_OFILES}
-
-libiGeomCclient.so: Cclient ${CCLIENT_OFILES}
- $(LD) $(LD_FLAGS) $(LD_FLAGS_PIC) -o $@ ${CCLIENT_OFILES}
-
-libiGeomF77client.so: F77client ${F77CLIENT_OFILES}
- $(LD) $(LD_FLAGS) $(LD_FLAGS_PIC) -o $@ ${F77CLIENT_OFILES}
-
-Cclient/babel.make: Cclient
-
-F77client/babel.make: F77client
-
-clean:
- -rm -f *.o *.so testgeom *~ core.*
-
-clean_all: clean
- -rm -rf F77client Cclient repo
- cd mserver; rm -f ${SERVER_HDRS} ${SERVER_SRCS}
-
-.cxx.o:
- $(CXX) $(LD_FLAGS_PIC) $(CXX_FLAGS) -I$(BABEL_DIR)/include ${iGeom_SIDL_INCLUDES} -o $@ -c $<
-
-.cpp.o:
- $(CXX) $(LD_FLAGS_PIC) $(CXX_FLAGS) -I$(BABEL_DIR)/include ${iGeom_SIDL_INCLUDES} -o $@ -c $<
-
-.cc.o:
- $(CXX) $(LD_FLAGS_PIC) $(CXX_FLAGS) -I$(BABEL_DIR)/include ${iGeom_SIDL_INCLUDES} -o $@ -c $<
-
-.c.o:
- $(CC) $(LD_FLAGS_PIC) $(CC_FLAGS) -I$(BABEL_DIR)/include ${iGeom_SIDL_INCLUDES} -o $@ -c $<
-
-.f.o:
- $(FC) $(LD_FLAGS_PIC) $(FC_FLAGS) ${iGeom_SIDL_INCLUDES} -o $@ -c $<
-
-# Automake doesn't seem to have a directory defined for
-# platform-dependent data (or include) files. So put
-# in $(libdir). Define a $(cfgdir) to get around automake's
-# check that only libraries are going in $(libdir)
-cfgdir = $(libdir)
-cfg_DATA = iGeom-SIDL-Defs.inc
-
-# By default, iGeom-SIDL-Defs.inc will define these to $(srcdir). We
-# want to override that during the INSTALL of the file so
-# that the correct values are set (e.g. if someone does
-# 'make prefix=/foo install', we don't know the correct install
-# directory until we're doing the install.
-iGeom-SIDL-Defs.inc:
- @echo "include $(cfgdir)/iGeom-SIDL-Defs.inc" > $@
- @echo 'iGeom_SIDL_INCLUDES = $$(iGeom_INCLUDES) -I$(BABEL_DIR)/include' >> $@
- @echo 'iGeom_SIDL_CPPFLAGS = $$(iGeom_CPPFLAGS) -I$(BABEL_DIR)/include' >> $@
- @echo 'iGeom_SIDL_DEFINES = $$(iGeom_DEFINES)' >> $@
- @echo 'iGeom_SIDL_LDFLAGS = $$(iGeom_LDFLAGS) -L$(BABEL_DIR)/lib' >> $@
- @echo 'iGeom_SIDL_LTFLAGS = $$(iGeom_LDFLAGS) -R$(BABEL_DIR)/lib' >> $@
- @echo 'iGeom_SIDL_LIBS = $$(iGeom_LIBS) -lsidl -liGeomserver' >> $@
Added: cgm/trunk/itaps/SIDL/Makefile.in
===================================================================
--- cgm/trunk/itaps/SIDL/Makefile.in (rev 0)
+++ cgm/trunk/itaps/SIDL/Makefile.in 2009-01-31 01:28:22 UTC (rev 2618)
@@ -0,0 +1,276 @@
+ at SET_MAKE@
+
+MAKE_INC = iGeom-SIDL-Defs.inc
+SIDL_FILES = iBase.sidl iGeom.sidl iGeom_SIDL.sidl
+SIDL_FILES_PATH = $(srcdir)/iBase.sidl $(srcdir)/iGeom.sidl $(srcdir)/iGeom_SIDL.sidl
+SERVER_FILES = gserver/iBase_Error_Impl.cc \
+ gserver/iBase_Error_Impl.hh \
+ gserver/iGeom_SIDL_GeomSidl_Impl.cc \
+ gserver/iGeom_SIDL_GeomSidl_Impl.hh \
+ gserver/iGeom_Factory_Impl.cc
+SERVER_FILES_PATH = $(srcdir)/gserver/iBase_Error_Impl.cc \
+ $(srcdir)/gserver/iBase_Error_Impl.hh \
+ $(srcdir)/gserver/iGeom_SIDL_GeomSidl_Impl.cc \
+ $(srcdir)/gserver/iGeom_SIDL_GeomSidl_Impl.hh
+SOURCE_FILES = $(SIDL_FILES) $(SERVER_FILES) iBase_SIDL_defs.h
+DIST_FILES = $(SOURCE_FILES) testgeom.cpp \
+ gserver.make Cclient.make Fclient.make
+INCLUDES = -I$(BABEL_DIR)/include -Igserver
+
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL = @INSTALL@
+BABEL_DIR = @BABEL_DIR@
+USE_BABEL = @USE_BABEL@
+BABEL = $(BABEL_DIR)/bin/babel
+BABELFLAGS = "--suppress-timestamp"
+ECHO = @ECHO@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+LIBTOOL = @LIBTOOL@
+
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdir = itaps/SIDL
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+VPATH = @srcdir@
+
+all: $(MAKE_INC) recursive
+ if test "x$(USE_BABEL)" = "xyes"; then \
+ (cd gserver && $(MAKE) -f ../$(srcdir)/gserver.make $@) && \
+ (cd Cclient && $(MAKE) -f ../$(srcdir)/Cclient.make $@) && \
+ (cd Fclient && $(MAKE) -f ../$(srcdir)/Fclient.make $@) ; \
+ fi
+
+clean:
+ rm -rf Cclient Fclient
+ rm -rf testgeom testgeom.lo testgeom.o .deps .libs
+ if test "x$(srcdir)" != "x."; then \
+ rm -rf gserver; \
+ else \
+ for file in gserver/*; do \
+ found=0; \
+ for sfile in $(SERVER_FILES); do \
+ if test "x$$file" = "x$$sfile"; then \
+ found=1; \
+ fi ; \
+ done ; \
+ if test "$$found" -eq 0; then rm -f $$file; fi ; \
+ done ; \
+ fi
+
+distclean: clean
+ rm -f Makefile iGeom-SIDL-Defs.inc
+
+mostlyclean:
+ for dir in Cclient Fclient gclient; do \
+ rm -f $$dir/*.o $$dir/*.o $$dir/*.la $$dir/*.a $$dir/*.so; \
+ rm -rf $$dir/.libs; \
+ done
+
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+common.make: $(srcdir)/common.make.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+$(MAKE_INC): $(srcdir)/$(MAKE_INC).in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+install: $(SIDL_FILES) $(MAKE_INC) install-recursive
+ for file in $(SIDL_FILES); do \
+ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(includedir)/$$file ; \
+ done
+ $(INSTALL_DATA) $(MAKE_INC) $(DESTDIR)$(libdir)/$(MAKE_INC)
+ $(ECHO) "iGeom_SIDL_includes=-I$(includedir) -I$(includedir)/SIDL" >> $(DESTDIR)$(libdir)/$(MAKE_INC)
+ $(ECHO) "iGeom_SIDL_LFDFLAGS=-L${libdir}" >> $(DESTDIR)$(libdir)/$(MAKE_INC)
+
+uninstall: uninstall-recursive
+ for file in $(SIDL_FILES); do \
+ rm -f $(DESTDIR)$(includedir)/$$file ; \
+ done
+ rm -f $(DESTDIR)$(libdir)/$(MAKE_INC)
+
+install-recursive: recursive
+ if test "x$(USE_BABEL)" = "xyes"; then \
+ for lib in gserver Cclient Fclient; do \
+ (cd $$lib && \
+ $(MAKE) -f ../$(srcdir)/$${lib}.make install \
+ DESTDIR="$(DESTDIR)" \
+ prefix="$(prefix)" \
+ exec_prefix="$(exec_prefix)" \
+ libdir="$(libdir)" \
+ datarootdir="$(datarootdir)" \
+ datadir="$(datadir)" \
+ includedir="$(includedir)" \
+ ) || exit 1; \
+ done ; \
+ fi
+
+uninstall-recursive: recursive
+ if test "x$(USE_BABEL)" = "xyes"; then \
+ for lib in gserver Cclient Fclient; do \
+ (cd $$lib && \
+ $(MAKE) -f ../$(srcdir)/$${lib}.make uninstall \
+ DESTDIR="$(DESTDIR)" \
+ prefix="$(prefix)" \
+ exec_prefix="$(exec_prefix)" \
+ libdir="$(libdir)" \
+ datarootdir="$(datarootdir)" \
+ datadir="$(datadir)" \
+ includedir="$(includedir)" \
+ ) || exit 1; \
+ done ; \
+ fi
+
+distdir: $(DIST_FILES)
+ test -d $(distdir) || $(mkdir_p) $(distdir) || exit 1
+ test -d $(distdir)/gserver || $(mkdir_p) $(distdir)/gserver || exit 1
+ @for file in $(DIST_FILES); do \
+ $(ECHO) "cp -p $(srcdir)/$$file $(distdir)/$$file"; \
+ cp -p $(srcdir)/$$file $(distdir)/$$file || exit 1; \
+ done
+
+recursive: gserver/babel.make Cclient/babel.make Fclient/babel.make common.make
+
+# The --vpath option is broken for some versions of babel, so
+# copy files when doing out-of-tree build.
+# These should do nothing for in-tree builds because the target
+# and source files are the same file and therefore always have
+# the same timestamp.
+# Use 'cat' rather than 'cp' so that target files get a clean
+# set of permissions (writable, owned by person running make, etc.)
+gserver/babel.make: $(SIDL_FILES_PATH) $(SERVER_FILES_PATH)
+ test -d gserver || $(mkdir_p) gserver || exit 1
+ @if test "x$(srcdir)" != "x."; then \
+ for p in $(SERVER_FILES); do \
+ $(ECHO) "cat $(srcdir)/$$p > $$p"; \
+ cat $(srcdir)/$$p > $$p || exit 1; \
+ done \
+ fi
+ @if test "x$(USE_BABEL)" = "xyes"; then \
+ $(ECHO) '$(BABEL) $(BABELFLAGS) -sC++ $(SIDL_FILES_PATH) -o gserver' ; \
+ $(BABEL) $(BABELFLAGS) -sC++ $(SIDL_FILES_PATH) -o gserver && touch $@; \
+ fi
+
+Cclient/babel.make: $(SIDL_FILES)
+ test -d Cclient || $(mkdir_p) Cclient || exit 1
+ @if test "x$(USE_BABEL)" = "xyes"; then \
+ $(ECHO) '$(BABEL) $(BABELFLAGS) -cC $(SIDL_FILES_PATH) -o Cclient' ; \
+ $(BABEL) $(BABELFLAGS) -cC $(SIDL_FILES_PATH) -o Cclient && touch $@; \
+ fi
+
+Fclient/babel.make: $(SIDL_FILES)
+ test -d Fclient || $(mkdir_p) Fclient || exit 1
+ @if test "x$(USE_BABEL)" = "xyes"; then \
+ $(ECHO) '$(BABEL) $(BABELFLAGS) -cF77 $(SIDL_FILES_PATH) -o Fclient' ; \
+ $(BABEL) $(BABELFLAGS) -cF77 $(SIDL_FILES_PATH) -o Fclient && touch $@; \
+ fi
+
+.SUFFIXES: .cpp .cc .c .lo
+
+check:
+ @test "x$(USE_BABEL)" != "xyes" || $(MAKE) run_testgeom
+
+run_testgeom: testgeom
+ @$(ECHO) "./$<"
+ @./$< || $(ECHO) "<<<<<<<<<<<<<<<< testgeom FAILED >>>>>>>>>>>>>>>>>>>"
+
+testgeom : testgeom.lo gserver/libiGeomserver.la
+ $(CXXLINK) $< gserver/libiGeomserver.la
+
+gserver/libiGeomserver.la : all
+
+testgeom.lo : gserver/babel.make
+
+.cpp.lo:
+ $(LTCXXCOMPILE) -c -o $@ $<
+
+.c.lo:
+ $(LTCOMPILE) -c -o $@ $<
+
+dvi:
+
+pdf:
+
+ps:
+
+html:
+
+info:
+
+man:
+
+installcheck:
+
+.PHONEY: all clean distclean mostlyclean distdir check recursive \
+ install install-recursive uninstall uninstall-recursive \
+ dvi ps pdf html info man installcheck
+
+
+
Added: cgm/trunk/itaps/SIDL/common.make.in
===================================================================
--- cgm/trunk/itaps/SIDL/common.make.in (rev 0)
+++ cgm/trunk/itaps/SIDL/common.make.in 2009-01-31 01:28:22 UTC (rev 2618)
@@ -0,0 +1,229 @@
+ at SET_MAKE@
+
+LIBS = $(LTLIBS) -L$(BABEL_DIR)/lib -lsidl
+
+INCLUDES = -I$(BABEL_DIR)/include \
+ -I$(builddir) -I$(srcdir) \
+ -I$(igeom_srcdir) \
+ -I$(igeom_builddir) \
+ -I$(sidl_srcdir) \
+ -I$(top_srcdir) \
+ -I$(top_builddir)
+
+igeom_srcdir = $(sidl_srcdir)/..
+igeom_builddir = ../..
+sidl_srcdir = ../@srcdir@
+sidl_builddir = ..
+srcdir = ../@srcdir@/$(bdir)
+top_srcdir = ../@top_srcdir@
+VPATH =
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../@top_builddir@
+builddir = .
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = itaps/SIDL/$(bdir)
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABEL_DIR = @BABEL_DIR@
+BABEL = $(BABEL_DIR)/bin/babel
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+
+# Some variables
+DEFS =
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLEL_FALSE = @PARALLEL_FALSE@
+PARALLEL_HDF5_FALSE = @PARALLEL_HDF5_FALSE@
+PARALLEL_HDF5_TRUE = @PARALLEL_HDF5_TRUE@
+PARALLEL_TRUE = @PARALLEL_TRUE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+
+# Don't require GNU-standard files (Changelog, README, etc.)
+AUTOMAKE_OPTIONS = foreign
+
+# The list of source files, and any header files that do not need to be installed
+SOURCES = $(C_SRCS) $(CXX_SRCS)
+OBJECTS = $(C_SRCS:.c=.lo) $(CXX_SRCS:.cc=.lo)
+HEADERS = $(IMPLHDRS) $(IORHDRS) $(STUBHDRS)
+
+all: $(TARGET_LIB)
+
+install: install-lib install-headers
+
+uninstall: uninstall-lib uninstall-headers
+
+$(TARGET_LIB): $(OBJECTS) $(LTLIBS)
+ $(LIBLINK) -rpath $(libdir) $(LDFLAGS) $(OBJECTS) $(LIBADD) $(LIBS)
+
+
+install-lib: $(TARGET_LIB)
+ test -d "$(libdir)" || mkdir "$(libdir)"
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $< '$(DESTDIR)$(libdir)/$<'
+
+uninstall-lib:
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$(TARGET_LIB)"
+
+install-headers: $(HEADERS)
+ test -d "$(includedir)" || mkdir "$(includedir)"
+ @list='$(HEADERS)'; for p in $$list; do \
+ $(ECHO) $(INSTALL_HEADER) $$p $(DESTDIR)$(includedir)/$$p ; \
+ $(INSTALL_HEADER) "$$p" "$(DESTDIR)$(includedir)/$$p" ; \
+ done
+
+uninstall-headers:
+ @list='$(HEADERS)'; for p in $$list; do \
+ $(ECHO) "rm -f $(DESTDIR)$(includedir)/$$p" ; \
+ rm -f "$(DESTDIR)$(includedir)/$$p" ; \
+ done
+
+.cc.lo:
+ $(LTCXXCOMPILE) -c -o $@ $<
+
+.c.lo:
+ $(LTCOMPILE) -c -o $@ $<
+
+.SUFFIXES: .lo .cc .c
+
+.PHONEY: all install uninstall install-lib uninstall-lib install-headers uninstall-headers
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
+
+
+# dependencies
+#
+# babel generates a babel.make.dependencies, but at least for
+# 0.10.10, everything it lists depends either directly or
+# indirectly on the SIDL file. As we're using the 'babel.make'
+# as a timestamp, just depend on that to achieve nearly the
+# same effect.
+$(OBJECTS) : babel.make
+
+# server implementation files also depend on the C interface
+IGEOM_C_INC = $(igeom_srcdir)/iBase.h \
+ $(igeom_srcdir)/iGeom.h \
+ $(igeom_srcdir)/iGeom_protos.h
+
+IMPLOBJS = $(IMPLSRCS:.cc=.lo)
+$(IMPLOBJS) : $(IGEOM_C_INC)
Modified: cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.cc
===================================================================
--- cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.cc 2009-01-31 01:26:13 UTC (rev 2617)
+++ cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.cc 2009-01-31 01:28:22 UTC (rev 2618)
@@ -3,16 +3,11 @@
// Symbol: iGeom.Factory-v0.6.99
// Symbol Type: class
// Babel Version: 0.10.10
-// sidl Created: 20090126 14:50:17 CST
-// Generated: 20090126 14:50:21 CST
// Description: Server-side implementation for iGeom.Factory
//
// WARNING: Automatically generated; only changes within splicers preserved
//
// babel-version = 0.10.10
-// source-line = 1115
-// source-url = file:/home/jason/meshkit/cgm/itaps/SIDL/iGeom.sidl
-// xml-url = /home/jason/meshkit/cgm/itaps/SIDL/repo/iGeom.Factory-v0.6.99.xml
//
#include "iGeom_Factory_Impl.hh"
Modified: cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.hh
===================================================================
--- cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.hh 2009-01-31 01:26:13 UTC (rev 2617)
+++ cgm/trunk/itaps/SIDL/gserver/iGeom_Factory_Impl.hh 2009-01-31 01:28:22 UTC (rev 2618)
@@ -3,16 +3,11 @@
// Symbol: iGeom.Factory-v0.6.99
// Symbol Type: class
// Babel Version: 0.10.10
-// sidl Created: 20090126 14:50:17 CST
-// Generated: 20090126 14:50:21 CST
// Description: Server-side implementation for iGeom.Factory
//
// WARNING: Automatically generated; only changes within splicers preserved
//
// babel-version = 0.10.10
-// source-line = 1115
-// source-url = file:/home/jason/meshkit/cgm/itaps/SIDL/iGeom.sidl
-// xml-url = /home/jason/meshkit/cgm/itaps/SIDL/repo/iGeom.Factory-v0.6.99.xml
//
#ifndef included_iGeom_Factory_Impl_hh
Modified: cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.cc
===================================================================
--- cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.cc 2009-01-31 01:26:13 UTC (rev 2617)
+++ cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.cc 2009-01-31 01:28:22 UTC (rev 2618)
@@ -3,26 +3,32 @@
// Symbol: iGeom_SIDL.GeomSidl-v0.1
// Symbol Type: class
// Babel Version: 0.10.10
-// sidl Created: 20090126 14:50:19 CST
-// Generated: 20090126 14:50:21 CST
// Description: Server-side implementation for iGeom_SIDL.GeomSidl
//
// WARNING: Automatically generated; only changes within splicers preserved
//
// babel-version = 0.10.10
-// source-line = 5
-// source-url = file:/home/jason/meshkit/cgm/itaps/SIDL/iGeom_SIDL.sidl
//
#include "iGeom_SIDL_GeomSidl_Impl.hh"
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl._includes)
// Insert-Code-Here {iGeom_SIDL.GeomSidl._includes} (additional includes or code)
#include "sidlArray.h"
-#include "iBase.hh"
+#include "iBase.h"
#include "iGeom.h"
#include <iostream>
+#include <string.h>
-#define PROCESS_ERROR if (iGeom_LAST_ERROR.error_type != iBase_SUCCESS) this->processError()
+extern iBase_Error iGeom_LAST_ERROR;
+
+#define PROCESS_ERROR do { \
+ if (igeomError != iBase_SUCCESS) { \
+ iGeom_LAST_ERROR.error_type = iBase_ErrorType(igeomError); \
+ sprintf(iGeom_LAST_ERROR.description, "Undescribed error type"); \
+ this->processError(); \
+ } \
+} while (false)
+
#define PROCESS_ERROR_MSG(a,b) \
iGeom_LAST_ERROR.error_type = a; \
sprintf(iGeom_LAST_ERROR.description, "%s", b);\
@@ -39,7 +45,7 @@
void iGeom_SIDL::GeomSidl_impl::_ctor() {
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl._ctor)
// Insert-Code-Here {iGeom_SIDL.GeomSidl._ctor} (constructor)
- iGeom_ctor(&igeomInstance);
+ iGeom_newGeom( 0, &igeomInstance, &igeomError, 0 );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl._ctor)
}
@@ -48,7 +54,7 @@
void iGeom_SIDL::GeomSidl_impl::_dtor() {
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl._dtor)
// Insert-Code-Here {iGeom_SIDL.GeomSidl._dtor} (destructor)
- iGeom_dtor(igeomInstance);
+ iGeom_dtor(igeomInstance, &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl._dtor)
}
@@ -82,9 +88,11 @@
PROCESS_ERROR_MSG(iBase_INVALID_ARGUMENT, "Wrong tag value type");
return;
}
+ iBase_TagHandle handle;
iGeom_createTag(igeomInstance, tag_name.c_str(), number_of_values, (iBase_TagValueType)tag_type,
- &tag_handle);
+ &handle, &igeomError, tag_name.size());
PROCESS_ERROR;
+ tag_handle = handle;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.createTag)
}
@@ -100,7 +108,7 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.destroyTag)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.destroyTag} (destroyTag method)
- iGeom_destroyTag(igeomInstance, tag_handle, forced);
+ iGeom_destroyTag(igeomInstance, (iBase_TagHandle)tag_handle, forced, &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.destroyTag)
}
@@ -117,9 +125,11 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getTagName)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getTagName} (getTagName method)
- std::string retval = iGeom_getTagName(igeomInstance, tag_handle);
+ char buffer[256];
+ iGeom_getTagName(igeomInstance, (iBase_TagHandle)tag_handle,
+ buffer, &igeomError, sizeof(buffer));
PROCESS_ERROR;
- return retval;
+ tag_name = buffer;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getTagName)
}
@@ -135,9 +145,10 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getTagSizeValues)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getTagSizeValues} (getTagSizeValues method)
- int32_t retval = iGeom_getTagSizeValues(igeomInstance, tag_handle);
+ int size;
+ iGeom_getTagSizeValues(igeomInstance, (iBase_TagHandle)tag_handle, &size, &igeomError);
PROCESS_ERROR;
- return retval;
+ size_values = size;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getTagSizeValues)
}
@@ -153,9 +164,10 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getTagSizeBytes)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getTagSizeBytes} (getTagSizeBytes method)
- int32_t retval = iGeom_getTagSizeBytes(igeomInstance, tag_handle);
+ int size;
+ iGeom_getTagSizeBytes(igeomInstance, (iBase_TagHandle)tag_handle, &size, &igeomError);
PROCESS_ERROR;
- return retval;
+ size_bytes = size;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getTagSizeBytes)
}
@@ -171,9 +183,10 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getTagHandle)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getTagHandle} (getTagHandle method)
- void *retval = iGeom_getTagHandle(igeomInstance, tag_name.c_str());
+ iBase_TagHandle handle;
+ iGeom_getTagHandle(igeomInstance, tag_name.c_str(), &handle, &igeomError, tag_name.size() );
PROCESS_ERROR;
- return retval;
+ tag_handle = handle;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getTagHandle)
}
@@ -189,10 +202,10 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getTagType)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getTagType} (getTagType method)
- ::iBase::TagValueType retval = (::iBase::TagValueType) iGeom_getTagType(igeomInstance,
- tag_handle );
+ int type;
+ iGeom_getTagType( igeomInstance, (iBase_TagHandle)tag_handle, &type, &igeomError );
PROCESS_ERROR;
- return retval;
+ tag_data_type = (::iBase::TagValueType)type;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getTagType)
}
@@ -213,9 +226,10 @@
CREATE_TEMP_TAG_ARRAY(tag_value);
iGeom_getData (igeomInstance,
- entity_handle,
- tag_handle,
- TEMP_ARRAY_INOUT(tag_value));
+ (iBase_EntityHandle)entity_handle,
+ (iBase_TagHandle)tag_handle,
+ TEMP_ARRAY_INOUT(tag_value),
+ &igeomError);
PROCESS_ERROR;
ASSIGN_TAG_ARRAY(tag_value);
@@ -235,11 +249,13 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getIntData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getIntData} (getIntData method)
- int32_t retval = iGeom_getIntData(igeomInstance,
- entity_handle,
- tag_handle );
+ int data;
+ iGeom_getIntData(igeomInstance,
+ (iBase_EntityHandle)entity_handle,
+ (iBase_TagHandle)tag_handle,
+ &data, &igeomError );
PROCESS_ERROR;
- return retval;
+ int_data = data;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getIntData)
}
@@ -256,11 +272,11 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getDblData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getDblData} (getDblData method)
- double retval = iGeom_getDblData(igeomInstance,
- entity_handle,
- tag_handle );
+ iGeom_getDblData(igeomInstance,
+ (iBase_EntityHandle)entity_handle,
+ (iBase_TagHandle)tag_handle,
+ &dbl_data, &igeomError );
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getDblData)
}
@@ -277,11 +293,13 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEHData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEHData} (getEHData method)
- void *retval = iGeom_getEHData(igeomInstance,
- entity_handle,
- tag_handle );
+ iBase_EntityHandle data;
+ iGeom_getEHData(igeomInstance,
+ (iBase_EntityHandle)entity_handle,
+ (iBase_TagHandle)tag_handle,
+ &data, &igeomError );
PROCESS_ERROR;
- return retval;
+ eh_data = data;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEHData)
}
@@ -300,9 +318,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.setData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.setData} (setData method)
iGeom_setData(igeomInstance,
- entity_handle,
- tag_handle,
- TEMP_TAG_ARRAY_IN(tag_value));
+ (iBase_EntityHandle)entity_handle,
+ (iBase_TagHandle)tag_handle,
+ TEMP_TAG_ARRAY_IN(tag_value),
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.setData)
}
@@ -321,9 +340,9 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.setIntData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.setIntData} (setIntData method)
iGeom_setIntData (igeomInstance,
- entity_handle,
- tag_handle,
- tag_value );
+ (iBase_EntityHandle)entity_handle,
+ (iBase_TagHandle)tag_handle,
+ tag_value, &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.setIntData)
}
@@ -342,9 +361,9 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.setDblData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.setDblData} (setDblData method)
iGeom_setDblData (igeomInstance,
- entity_handle,
- tag_handle,
- tag_value );
+ (iBase_EntityHandle)entity_handle,
+ (iBase_TagHandle)tag_handle,
+ tag_value, &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.setDblData)
}
@@ -362,11 +381,13 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.setEHData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.setEHData} (setEHData method)
+ iBase_EntityHandle value;
iGeom_setEHData (igeomInstance,
- entity_handle,
- tag_handle,
- tag_value );
+ (iBase_EntityHandle)entity_handle,
+ (iBase_TagHandle)tag_handle,
+ value, &igeomError );
PROCESS_ERROR;
+ tag_value = value;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.setEHData)
}
@@ -383,13 +404,13 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getAllTags)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getAllTags} (getAllTags method)
- CREATE_TEMP_ARRAY(void*, tag_handles);
+ CREATE_TEMP_TH_ARRAY(tag_handles);
- iGeom_getAllTags(igeomInstance, entity_handle,
- TEMP_ARRAY_INOUT(tag_handles));
+ iGeom_getAllTags(igeomInstance, (iBase_EntityHandle)entity_handle,
+ TEMP_ARRAY_INOUT(tag_handles), &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(tag_handles);
+ ASSIGN_TYPED_ARRAY(void*, tag_handles);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getAllTags)
}
@@ -406,8 +427,8 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.rmvTag)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.rmvTag} (rmvTag method)
iGeom_rmvTag (igeomInstance,
- entity_handle,
- tag_handle );
+ (iBase_EntityHandle)entity_handle,
+ (iBase_TagHandle)tag_handle, &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.rmvTag)
}
@@ -430,9 +451,10 @@
CREATE_TEMP_TAG_ARRAY(value_array);
iGeom_getArrData(igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- tag_handle,
- TEMP_ARRAY_INOUT(value_array));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle, entity_handles),
+ (iBase_TagHandle)tag_handle,
+ TEMP_ARRAY_INOUT(value_array),
+ &igeomError);
PROCESS_ERROR;
ASSIGN_TAG_ARRAY(value_array);
@@ -457,12 +479,13 @@
CREATE_TEMP_ARRAY(int32_t, value_array);
iGeom_getIntArrData (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- tag_handle,
- TEMP_ARRAY_INOUT(value_array));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle, entity_handles),
+ (iBase_TagHandle)tag_handle,
+ TEMP_ARRAY_INOUT(value_array),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(value_array);
+ ASSIGN_TYPED_ARRAY(int, value_array);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getIntArrData)
}
@@ -484,12 +507,13 @@
CREATE_TEMP_ARRAY(double, value_array);
iGeom_getDblArrData (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- tag_handle,
- TEMP_ARRAY_INOUT(value_array));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ (iBase_TagHandle)tag_handle,
+ TEMP_ARRAY_INOUT(value_array),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(value_array);
+ ASSIGN_TYPED_ARRAY(double,value_array);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getDblArrData)
}
@@ -508,15 +532,16 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEHArrData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEHArrData} (getEHArrData method)
- CREATE_TEMP_ARRAY(void*, value_array);
+ CREATE_TEMP_EH_ARRAY(value_array);
iGeom_getEHArrData (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- tag_handle,
- TEMP_ARRAY_INOUT(value_array));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ (iBase_TagHandle)tag_handle,
+ TEMP_ARRAY_INOUT(value_array),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(value_array);
+ ASSIGN_TYPED_ARRAY(void*,value_array);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEHArrData)
}
@@ -536,9 +561,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.setArrData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.setArrData} (setArrData method)
iGeom_setArrData(igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- tag_handle,
- TEMP_TAG_ARRAY_IN(value_array));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ (iBase_TagHandle)tag_handle,
+ TEMP_TAG_ARRAY_IN(value_array),
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.setArrData)
}
@@ -559,9 +585,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.setIntArrData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.setIntArrData} (setIntArrData method)
iGeom_setIntArrData (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- tag_handle,
- TEMP_ARRAY_IN(value_array));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ (iBase_TagHandle)tag_handle,
+ TEMP_ARRAY_IN(value_array),
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.setIntArrData)
}
@@ -582,9 +609,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.setDblArrData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.setDblArrData} (setDblArrData method)
iGeom_setDblArrData (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- tag_handle,
- TEMP_ARRAY_IN(value_array));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ (iBase_TagHandle)tag_handle,
+ TEMP_ARRAY_IN(value_array),
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.setDblArrData)
}
@@ -605,9 +633,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.setEHArrData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.setEHArrData} (setEHArrData method)
iGeom_setEHArrData (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- tag_handle,
- TEMP_ARRAY_IN(value_array));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ (iBase_TagHandle)tag_handle,
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle, value_array),
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.setEHArrData)
}
@@ -626,8 +655,9 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.rmvArrTag)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.rmvArrTag} (rmvArrTag method)
iGeom_rmvArrTag (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- tag_handle );
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ (iBase_TagHandle)tag_handle,
+ &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.rmvArrTag)
}
@@ -646,8 +676,11 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.setEntSetData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.setEntSetData} (setEntSetData method)
- iGeom_setEntSetData(igeomInstance, entity_set, tag_handle,
- TEMP_TAG_ARRAY_IN(tag_value));
+ iGeom_setEntSetData(igeomInstance,
+ (iBase_EntitySetHandle)entity_set,
+ (iBase_TagHandle)tag_handle,
+ TEMP_TAG_ARRAY_IN(tag_value),
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.setEntSetData)
}
@@ -666,9 +699,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.setEntSetIntData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.setEntSetIntData} (setEntSetIntData method)
iGeom_setEntSetIntData (igeomInstance,
- entity_set,
- tag_handle,
- tag_value );
+ (iBase_EntitySetHandle)entity_set,
+ (iBase_TagHandle)tag_handle,
+ tag_value,
+ &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.setEntSetIntData)
}
@@ -687,9 +721,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.setEntSetDblData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.setEntSetDblData} (setEntSetDblData method)
iGeom_setEntSetDblData (igeomInstance,
- entity_set,
- tag_handle,
- tag_value );
+ (iBase_EntitySetHandle)entity_set,
+ (iBase_TagHandle)tag_handle,
+ tag_value,
+ &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.setEntSetDblData)
}
@@ -708,9 +743,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.setEntSetEHData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.setEntSetEHData} (setEntSetEHData method)
iGeom_setEntSetEHData (igeomInstance,
- entity_set,
- tag_handle,
- tag_value );
+ (iBase_EntitySetHandle)entity_set,
+ (iBase_TagHandle)tag_handle,
+ (iBase_EntityHandle)tag_value,
+ &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.setEntSetEHData)
}
@@ -732,9 +768,10 @@
CREATE_TEMP_TAG_ARRAY(tag_value);
iGeom_getEntSetData (igeomInstance,
- entity_set,
- tag_handle,
- TEMP_ARRAY_INOUT(tag_value));
+ (iBase_EntitySetHandle)entity_set,
+ (iBase_TagHandle)tag_handle,
+ TEMP_ARRAY_INOUT(tag_value),
+ &igeomError);
PROCESS_ERROR;
ASSIGN_TAG_ARRAY(tag_value);
@@ -754,11 +791,12 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntSetIntData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntSetIntData} (getEntSetIntData method)
- int32_t retval = iGeom_getEntSetIntData(igeomInstance,
- entity_set,
- tag_handle );
+ iGeom_getEntSetIntData(igeomInstance,
+ (iBase_EntitySetHandle)entity_set,
+ (iBase_TagHandle)tag_handle,
+ &int_data,
+ &igeomError );
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntSetIntData)
}
@@ -775,11 +813,12 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntSetDblData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntSetDblData} (getEntSetDblData method)
- double retval = iGeom_getEntSetDblData(igeomInstance,
- entity_set,
- tag_handle );
+ iGeom_getEntSetDblData(igeomInstance,
+ (iBase_EntitySetHandle)entity_set,
+ (iBase_TagHandle)tag_handle,
+ &dbl_data,
+ &igeomError );
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntSetDblData)
}
@@ -796,11 +835,14 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntSetEHData)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntSetEHData} (getEntSetEHData method)
- void *retval = iGeom_getEntSetEHData(igeomInstance,
- entity_set,
- tag_handle );
+ iBase_EntityHandle data;
+ iGeom_getEntSetEHData(igeomInstance,
+ (iBase_EntitySetHandle)entity_set,
+ (iBase_TagHandle)tag_handle,
+ &data,
+ &igeomError );
PROCESS_ERROR;
- return retval;
+ eh_data = data;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntSetEHData)
}
@@ -817,11 +859,12 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getAllEntSetTags)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getAllEntSetTags} (getAllEntSetTags method)
- CREATE_TEMP_ARRAY(void*, tag_handles);
+ CREATE_TEMP_TH_ARRAY(tag_handles);
iGeom_getAllEntSetTags (igeomInstance,
- entity_set,
- TEMP_ARRAY_INOUT(tag_handles));
+ (iBase_EntitySetHandle)entity_set,
+ TEMP_ARRAY_INOUT(tag_handles),
+ &igeomError);
PROCESS_ERROR;
ASSIGN_ARRAY(tag_handles);
@@ -841,8 +884,9 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.rmvEntSetTag)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.rmvEntSetTag} (rmvEntSetTag method)
iGeom_rmvEntSetTag (igeomInstance,
- entity_set,
- tag_handle );
+ (iBase_EntitySetHandle)entity_set,
+ (iBase_TagHandle)tag_handle,
+ &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.rmvEntSetTag)
}
@@ -859,8 +903,10 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.createEntSet)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.createEntSet} (createEntSet method)
- iGeom_createEntSet(igeomInstance, isList, &entity_set);
+ iBase_EntitySetHandle handle;
+ iGeom_createEntSet(igeomInstance, isList, &handle, &igeomError);
PROCESS_ERROR;
+ entity_set = handle;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.createEntSet)
}
@@ -875,7 +921,7 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.destroyEntSet)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.destroyEntSet} (destroyEntSet method)
- iGeom_destroyEntSet(igeomInstance, entity_set);
+ iGeom_destroyEntSet(igeomInstance, (iBase_EntitySetHandle)entity_set, &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.destroyEntSet)
}
@@ -892,9 +938,8 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.isList)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.isList} (isList method)
- bool retval = iGeom_isList(igeomInstance, entity_set);
+ iGeom_isList(igeomInstance, (iBase_EntitySetHandle)entity_set, &is_list, &igeomError);
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.isList)
}
@@ -911,9 +956,12 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getNumEntSets)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getNumEntSets} (getNumEntSets method)
- int32_t retval = iGeom_getNumEntSets(igeomInstance, entity_set, num_hops);
+ iGeom_getNumEntSets(igeomInstance,
+ (iBase_EntitySetHandle)entity_set,
+ num_hops,
+ &num_sets,
+ &igeomError);
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getNumEntSets)
}
@@ -931,18 +979,15 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntSets)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntSets} (getEntSets method)
- CREATE_TEMP_ARRAY(void*, contained_entset_handles);
+ CREATE_TEMP_ESH_ARRAY(contained_entset_handles);
- iGeom_getEntSets(igeomInstance, entity_set, num_hops,
- TEMP_ARRAY_INOUT(contained_entset_handles));
+ iGeom_getEntSets (igeomInstance,
+ reinterpret_cast<iBase_EntitySetHandle>(entity_set), num_hops,
+ TEMP_ARRAY_INOUT(contained_entset_handles), &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(contained_entset_handles);
- CREATE_TEMP_ARRAY(void*, contained_entset_handles);
- iGeom_getEntSets(igeomInstance, entity_set, num_hops,
- TEMP_ARRAY_INOUT(contained_entset_handles));
- PROCESS_ERROR;
- ASSIGN_ARRAY(contained_entset_handles);
+ ASSIGN_TYPED_ARRAY(void*, contained_entset_handles);
+
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntSets)
}
@@ -959,8 +1004,9 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.addEntToSet)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.addEntToSet} (addEntToSet method)
iGeom_addEntToSet (igeomInstance,
- entity_handle,
- &entity_set);
+ (iBase_EntityHandle)entity_handle,
+ (iBase_EntitySetHandle)entity_set,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.addEntToSet)
}
@@ -978,8 +1024,9 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.rmvEntFromSet)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.rmvEntFromSet} (rmvEntFromSet method)
iGeom_rmvEntFromSet (igeomInstance,
- entity_handle,
- &entity_set );
+ (iBase_EntityHandle)entity_handle,
+ (iBase_EntitySetHandle)entity_set,
+ &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.rmvEntFromSet)
}
@@ -1000,9 +1047,11 @@
entity_handles.addRef();
void **tmp_ptr1 = entity_handles._get_ior()->d_firstElement;
//void **tmp_ptr3 = entity_handles._get_ior()->d_firstElement;
- iGeom_addEntArrToSet(igeomInstance, tmp_ptr1,
+ iGeom_addEntArrToSet(igeomInstance,
+ (iBase_EntityHandle*)tmp_ptr1,
entity_handles_size,
- &entity_set);
+ (iBase_EntitySetHandle)entity_set,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.addEntArrToSet)
}
@@ -1020,8 +1069,10 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.rmvEntArrFromSet)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.rmvEntArrFromSet} (rmvEntArrFromSet method)
- iGeom_rmvEntArrFromSet(igeomInstance, TEMP_ARRAY_IN(entity_handles),
- &entity_set);
+ iGeom_rmvEntArrFromSet(igeomInstance,
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ (iBase_EntitySetHandle)entity_set,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.rmvEntArrFromSet)
}
@@ -1038,8 +1089,10 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.addEntSet)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.addEntSet} (addEntSet method)
- iGeom_addEntSet(igeomInstance, entity_set_to_add,
- &entity_set_handle);
+ iGeom_addEntSet(igeomInstance,
+ (iBase_EntitySetHandle)entity_set_to_add,
+ (iBase_EntitySetHandle)entity_set_handle,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.addEntSet)
}
@@ -1057,8 +1110,9 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.rmvEntSet)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.rmvEntSet} (rmvEntSet method)
iGeom_rmvEntSet (igeomInstance,
- entity_set_to_remove,
- &entity_set_handle );
+ (iBase_EntitySetHandle)entity_set_to_remove,
+ (iBase_EntitySetHandle)entity_set_handle,
+ &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.rmvEntSet)
}
@@ -1076,11 +1130,12 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.isEntContained)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.isEntContained} (isEntContained method)
- bool retval = iGeom_isEntContained(igeomInstance,
- containing_entity_set,
- entity_handle);
+ iGeom_isEntContained(igeomInstance,
+ (iBase_EntitySetHandle)containing_entity_set,
+ (iBase_EntityHandle)entity_handle,
+ &is_contained,
+ &igeomError);
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.isEntContained)
}
@@ -1097,7 +1152,15 @@
throw ()
{
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.isEntArrContained)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.isEntArrContained} (isEntArrContained method)
+
+ CREATE_TEMP_ARRAY(int32_t, is_contained);
+
+ iGeom_isEntArrContained( igeomInstance,
+ (iBase_EntitySetHandle)containing_set,
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle, entity_handles),
+ TEMP_ARRAY_INOUT(is_contained), &igeomError);
+ PROCESS_ERROR;
+
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.isEntArrContained)
}
@@ -1114,11 +1177,12 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.isEntSetContained)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.isEntSetContained} (isEntSetContained method)
- bool retval = iGeom_isEntSetContained(igeomInstance,
- containing_entity_set,
- contained_entity_set);
+ iGeom_isEntSetContained(igeomInstance,
+ (iBase_EntitySetHandle)containing_entity_set,
+ (iBase_EntitySetHandle)contained_entity_set,
+ &is_contained,
+ &igeomError);
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.isEntSetContained)
}
@@ -1134,7 +1198,10 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.addPrntChld)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.addPrntChld} (addPrntChld method)
- iGeom_addPrntChld(igeomInstance, &parent_entity_set, &child_entity_set);
+ iGeom_addPrntChld(igeomInstance,
+ (iBase_EntitySetHandle)parent_entity_set,
+ (iBase_EntitySetHandle)child_entity_set,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.addPrntChld)
}
@@ -1151,7 +1218,10 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.rmvPrntChld)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.rmvPrntChld} (rmvPrntChld method)
- iGeom_rmvPrntChld(igeomInstance, &parent_entity_set, &child_entity_set);
+ iGeom_rmvPrntChld(igeomInstance,
+ (iBase_EntitySetHandle)parent_entity_set,
+ (iBase_EntitySetHandle)child_entity_set,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.rmvPrntChld)
}
@@ -1169,10 +1239,12 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.isChildOf)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.isChildOf} (isChildOf method)
- bool retval = iGeom_isChildOf(igeomInstance, parent_entity_set,
- child_entity_set);
+ iGeom_isChildOf(igeomInstance,
+ (iBase_EntitySetHandle)parent_entity_set,
+ (iBase_EntitySetHandle)child_entity_set,
+ &is_child,
+ &igeomError);
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.isChildOf)
}
@@ -1189,9 +1261,12 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getNumChld)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getNumChld} (getNumChld method)
- int32_t retval = iGeom_getNumChld(igeomInstance, entity_set, num_hops);
+ iGeom_getNumChld(igeomInstance,
+ (iBase_EntitySetHandle)entity_set,
+ num_hops,
+ &num_child,
+ &igeomError);
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getNumChld)
}
@@ -1208,9 +1283,12 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getNumPrnt)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getNumPrnt} (getNumPrnt method)
- int32_t retval = iGeom_getNumPrnt(igeomInstance, entity_set, num_hops);
+ iGeom_getNumPrnt(igeomInstance,
+ (iBase_EntitySetHandle)entity_set,
+ num_hops,
+ &num_parent,
+ &igeomError);
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getNumPrnt)
}
@@ -1228,10 +1306,13 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getChldn)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getChldn} (getChldn method)
- CREATE_TEMP_ARRAY(void*, child_handles);
+ CREATE_TEMP_ESH_ARRAY(child_handles);
- iGeom_getChldn(igeomInstance, from_entity_set, num_hops,
- TEMP_ARRAY_INOUT(child_handles));
+ iGeom_getChldn(igeomInstance,
+ (iBase_EntitySetHandle)from_entity_set,
+ num_hops,
+ TEMP_ARRAY_INOUT(child_handles),
+ &igeomError);
PROCESS_ERROR;
ASSIGN_ARRAY(child_handles);
@@ -1252,10 +1333,13 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getPrnts)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getPrnts} (getPrnts method)
- CREATE_TEMP_ARRAY(void*, parent_handles);
+ CREATE_TEMP_ESH_ARRAY(parent_handles);
- iGeom_getPrnts(igeomInstance, from_entity_set, num_hops,
- TEMP_ARRAY_INOUT(parent_handles));
+ iGeom_getPrnts(igeomInstance,
+ (iBase_EntitySetHandle)from_entity_set,
+ num_hops,
+ TEMP_ARRAY_INOUT(parent_handles),
+ &igeomError);
PROCESS_ERROR;
ASSIGN_ARRAY(parent_handles);
@@ -1275,7 +1359,11 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.subtract)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.subtract} (subtract method)
- iGeom_subtract(igeomInstance, entity_set_1, entity_set_2, &result_entity_set);
+ iGeom_subtract(igeomInstance,
+ (iBase_EntitySetHandle)entity_set_1,
+ (iBase_EntitySetHandle)entity_set_2,
+ (iBase_EntitySetHandle*)&result_entity_set,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.subtract)
}
@@ -1293,7 +1381,11 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.intersect)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.intersect} (intersect method)
- iGeom_intersect(igeomInstance, entity_set_1, entity_set_2, &result_entity_set);
+ iGeom_intersect(igeomInstance,
+ (iBase_EntitySetHandle)entity_set_1,
+ (iBase_EntitySetHandle)entity_set_2,
+ (iBase_EntitySetHandle*)&result_entity_set,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.intersect)
}
@@ -1311,7 +1403,11 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.unite)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.unite} (unite method)
- iGeom_unite(igeomInstance, entity_set_1, entity_set_2, &result_entity_set);
+ iGeom_unite(igeomInstance,
+ (iBase_EntitySetHandle)entity_set_1,
+ (iBase_EntitySetHandle)entity_set_2,
+ (iBase_EntitySetHandle*)&result_entity_set,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.unite)
}
@@ -1333,18 +1429,8 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.load)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.load} (load method)
- const char **tmp_options = NULL;
- if (options_size > 0) {
- tmp_options = new const char*[options_size];
- for (int i = 0; i < options_size; i++)
- tmp_options[i] = (options.get(i)).c_str();
- }
-
- iGeom_load(igeomInstance, name.c_str(), tmp_options,
- options_size);
-
- delete [] tmp_options;
-
+ iGeom_load(igeomInstance, name.c_str(), options.c_str(), &igeomError,
+ name.size(), options.size());
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.load)
}
@@ -1366,18 +1452,8 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.save)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.save} (save method)
- const char **tmp_options = NULL;
- if (options_size > 0) {
- tmp_options = new const char*[options_size];
- for (int i = 0; i < options_size; i++)
- tmp_options[i] = (options.get(i)).c_str();
- }
-
- iGeom_save(igeomInstance, name.c_str(), tmp_options,
- options_size);
-
- delete [] tmp_options;
-
+ iGeom_save( igeomInstance, name.c_str(), options.c_str(), &igeomError,
+ name.size(), options.size());
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.save)
}
@@ -1399,21 +1475,22 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntities)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntities} (getEntities method)
- if (gentity_type > ::iGeom::EntityType_ALL_TYPES ||
- gentity_type < ::iGeom::EntityType_VERTEX) {
+ if (gentity_type > ::iBase::EntityType_ALL_TYPES ||
+ gentity_type < ::iBase::EntityType_VERTEX) {
PROCESS_ERROR_MSG(iBase_INVALID_ARGUMENT, "Wrong entity type");
return;
}
- CREATE_TEMP_ARRAY(void*, gentity_handles);
+ CREATE_TEMP_EH_ARRAY(gentity_handles);
iGeom_getEntities (igeomInstance,
- set_handle,
- (iGeom_EntityType)gentity_type,
- TEMP_ARRAY_INOUT(gentity_handles));
+ (iBase_EntitySetHandle)set_handle,
+ gentity_type,
+ TEMP_ARRAY_INOUT(gentity_handles),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(gentity_handles);
+ ASSIGN_TYPED_ARRAY(void*, gentity_handles);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntities)
}
@@ -1434,36 +1511,35 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getNumOfType)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getNumOfType} (getNumOfType method)
- if (gentity_type > ::iGeom::EntityType_ALL_TYPES ||
- gentity_type < ::iGeom::EntityType_VERTEX) {
- PROCESS_ERROR_MSG(iBase_INVALID_ARGUMENT, "Wrong entity type");
- return -1;
- }
- int32_t retval = iGeom_getNumOfType(igeomInstance,
- set_handle,
- (iGeom_EntityType)gentity_type);
+ iGeom_getNumOfType(igeomInstance,
+ (iBase_EntitySetHandle)set_handle,
+ gentity_type,
+ &num_type,
+ &igeomError);
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getNumOfType)
}
/**
* Method: getEntType[]
*/
-::iBase::EntityType
+void
iGeom_SIDL::GeomSidl_impl::getEntType (
- /* in */ void* handle )
+ /* in */ void* handle,
+ /* out */ ::iBase::EntityType& ent_type )
throw (
::iBase::Error
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntType)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntType} (getEntType method)
- iGeom_EntityType gtype;
- iGeom_getEntType (igeomInstance, handle, >ype );
-
+ int gtype;
+ iGeom_getEntType ( igeomInstance,
+ (iBase_EntityHandle)handle,
+ >ype,
+ &igeomError );
+ ent_type = (::iBase::EntityType)gtype;
PROCESS_ERROR;
- return static_cast< ::iGeom::EntityType >(gtype);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntType)
}
@@ -1482,11 +1558,12 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrType)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrType} (getArrType method)
- CREATE_TEMP_ENUM_ARRAY(iGeom_EntityType, gtype);
+ CREATE_TEMP_ENUM_ARRAY(int, gtype);
iGeom_getArrType (igeomInstance,
- TEMP_ARRAY_IN(gentity_handles),
- TEMP_ARRAY_INOUT(gtype));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
+ TEMP_ARRAY_INOUT(gtype),
+ &igeomError);
PROCESS_ERROR;
ASSIGN_ENUM_ARRAY(gtype);
@@ -1510,12 +1587,13 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntAdj)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntAdj} (getEntAdj method)
- CREATE_TEMP_ARRAY(void*, adj_gentities);
+ CREATE_TEMP_EH_ARRAY(adj_gentities);
iGeom_getEntAdj (igeomInstance,
- gentity_handle,
- static_cast<iGeom_EntityType>(to_dimension),
- TEMP_ARRAY_INOUT(adj_gentities));
+ (iBase_EntityHandle)entity_handle,
+ to_dimension,
+ TEMP_ARRAY_INOUT(adj_gentities),
+ &igeomError);
PROCESS_ERROR;
ASSIGN_ARRAY(adj_gentities);
@@ -1542,16 +1620,16 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrAdj)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrAdj} (getArrAdj method)
- CREATE_TEMP_ARRAY(iGeom_EntityHandle, adj_entity_handles);
+ CREATE_TEMP_EH_ARRAY(adj_entity_handles);
CREATE_TEMP_ARRAY(int32_t, offset);
iGeom_getArrAdj (igeomInstance,
// TEMP_ARRAY_IN(entity_handles)
- (entity_handles._get_ior() == NULL ? NULL : entity_handles._get_ior()->d_firstElement),
+ (const iBase_EntityHandle*)(entity_handles._get_ior() == NULL ? NULL : entity_handles._get_ior()->d_firstElement),
entity_handles_size,
- static_cast<iGeom_EntityType>(requested_entity_type),
+ requested_entity_type,
// TEMP_ARRAY_INOUT(adj_entity_handles),
&adj_entity_handles_temp,
@@ -1561,13 +1639,15 @@
// TEMP_ARRAY_INOUT(offset)
&offset_temp,
&offset_allocated_size,
- &offset_size
+ &offset_size,
+
+ &igeomError
);
PROCESS_ERROR;
- ASSIGN_ARRAY(adj_entity_handles);
- ASSIGN_ARRAY(offset);
+ ASSIGN_TYPED_ARRAY(void*, adj_entity_handles);
+ ASSIGN_TYPED_ARRAY(int32_t, offset);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrAdj)
}
@@ -1595,13 +1675,14 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEnt2ndAdj)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEnt2ndAdj} (getEnt2ndAdj method)
- CREATE_TEMP_ARRAY(void*, adjacent_gentities);
+ CREATE_TEMP_EH_ARRAY(adjacent_gentities);
iGeom_getEnt2ndAdj (igeomInstance,
- gentity_handle,
+ (iBase_EntityHandle)gentity_handle,
bridge_dimension,
to_dimension,
- TEMP_ARRAY_INOUT(adjacent_gentities));
+ TEMP_ARRAY_INOUT(adjacent_gentities),
+ &igeomError);
PROCESS_ERROR;
ASSIGN_ARRAY(adjacent_gentities);
@@ -1636,19 +1717,20 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArr2ndAdj)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArr2ndAdj} (getArr2ndAdj method)
- CREATE_TEMP_ARRAY(void*, adj_entity_handles);
+ CREATE_TEMP_EH_ARRAY(adj_entity_handles);
CREATE_TEMP_ARRAY(int32_t, offset);
iGeom_getArr2ndAdj (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- static_cast<iGeom_EntityType>(order_adjacent_key),
- static_cast<iGeom_EntityType>(requested_entity_type),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ order_adjacent_key,
+ requested_entity_type,
TEMP_ARRAY_INOUT(adj_entity_handles),
- TEMP_ARRAY_INOUT(offset));
+ TEMP_ARRAY_INOUT(offset),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(adj_entity_handles);
- ASSIGN_ARRAY(offset);
+ ASSIGN_TYPED_ARRAY(void*, adj_entity_handles);
+ ASSIGN_TYPED_ARRAY(int32_t, offset);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArr2ndAdj)
}
@@ -1658,7 +1740,7 @@
* @param gentity_handle2 2nd entity
* @param are_adjacent If true, entities are adjacent
*/
-int32_t
+void
iGeom_SIDL::GeomSidl_impl::isEntAdj (
/* in */ void* gentity_handle1,
/* in */ void* gentity_handle2,
@@ -1668,12 +1750,14 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.isEntAdj)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.isEntAdj} (isEntAdj method)
+ int adj;
iGeom_isEntAdj (igeomInstance,
- gentity_handle1,
- gentity_handle2,
- &are_adjacent);
+ (iBase_EntityHandle)gentity_handle1,
+ (iBase_EntityHandle)gentity_handle2,
+ &adj,
+ &igeomError);
PROCESS_ERROR;
- return are_adjacent;
+ are_adjacent = !!adj;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.isEntAdj)
}
@@ -1698,29 +1782,28 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.isArrAdj} (isArrAdj method)
CREATE_TEMP_ARRAY(int32_t, is_adjacent_info);
iGeom_isArrAdj (igeomInstance,
- TEMP_ARRAY_IN(entity_handles_1),
- TEMP_ARRAY_IN(entity_handles_2),
- TEMP_ARRAY_INOUT(is_adjacent_info));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles_1),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles_2),
+ TEMP_ARRAY_INOUT(is_adjacent_info),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(is_adjacent_info);
+ ASSIGN_TYPED_ARRAY(int32_t, is_adjacent_info);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.isArrAdj)
}
/**
* Method: getTopoLevel[]
*/
-int32_t
+void
iGeom_SIDL::GeomSidl_impl::getTopoLevel (
- /* in */ const ::std::string& model_name )
+ /* out */ int32_t& level )
throw (
::iBase::Error
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getTopoLevel)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getTopoLevel} (getTopoLevel method)
- int level;
- iGeom_getTopoLevel (igeomInstance, model_name.c_str(), &level);
+ iGeom_getTopoLevel (igeomInstance, &level, &igeomError);
PROCESS_ERROR;
- return level;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getTopoLevel)
}
@@ -1742,9 +1825,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntClosestPt)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntClosestPt} (getEntClosestPt method)
iGeom_getEntClosestPt (igeomInstance,
- entity_handle,
+ (iBase_EntityHandle)entity_handle,
near_x, near_y, near_z,
- &on_x, &on_y, &on_z);
+ &on_x, &on_y, &on_z,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntClosestPt)
}
@@ -1772,15 +1856,15 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrClosestPt)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrClosestPt} (getArrClosestPt method)
CREATE_TEMP_ARRAY(double, on_coordinates);
-
- iGeom_getArrClosestPt (igeomInstance,
- TEMP_ARRAY_IN(gentity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ iGeom_getArrClosestPt (igeomInstance,
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
+ storage_order,
TEMP_ARRAY_IN(near_coordinates),
- TEMP_ARRAY_INOUT(on_coordinates));
+ TEMP_ARRAY_INOUT(on_coordinates),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(on_coordinates);
+ ASSIGN_TYPED_ARRAY(double, on_coordinates);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrClosestPt)
}
@@ -1802,9 +1886,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntNrmlXYZ)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntNrmlXYZ} (getEntNrmlXYZ method)
iGeom_getEntNrmlXYZ (igeomInstance,
- entity_handle,
+ (iBase_EntityHandle)entity_handle,
x, y, z,
- &nrml_i, &nrml_j, &nrml_k);
+ &nrml_i, &nrml_j, &nrml_k,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntNrmlXYZ)
}
@@ -1832,15 +1917,15 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrNrmlXYZ)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrNrmlXYZ} (getArrNrmlXYZ method)
CREATE_TEMP_ARRAY(double, normals);
-
iGeom_getArrNrmlXYZ (igeomInstance,
- TEMP_ARRAY_IN(gentity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
+ storage_order,
TEMP_ARRAY_IN(coordinates),
- TEMP_ARRAY_INOUT(normals));
+ TEMP_ARRAY_INOUT(normals),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(normals);
+ ASSIGN_TYPED_ARRAY(double, normals);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrNrmlXYZ)
}
@@ -1865,10 +1950,11 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntNrmlPlXYZ)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntNrmlPlXYZ} (getEntNrmlPlXYZ method)
iGeom_getEntNrmlPlXYZ (igeomInstance,
- entity_handle,
+ (iBase_EntityHandle)entity_handle,
x, y, z,
&pt_x, &pt_y, &pt_z,
- &nrml_i, &nrml_j, &nrml_k);
+ &nrml_i, &nrml_j, &nrml_k,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntNrmlPlXYZ)
}
@@ -1900,17 +1986,17 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrNrmlPlXYZ} (getArrNrmlPlXYZ method)
CREATE_TEMP_ARRAY(double, on_coordinates);
CREATE_TEMP_ARRAY(double, normals);
-
iGeom_getArrNrmlPlXYZ (igeomInstance,
- TEMP_ARRAY_IN(gentity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
+ storage_order,
TEMP_ARRAY_IN(near_coordinates),
TEMP_ARRAY_INOUT(on_coordinates),
- TEMP_ARRAY_INOUT(normals));
+ TEMP_ARRAY_INOUT(normals),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(on_coordinates);
- ASSIGN_ARRAY(normals);
+ ASSIGN_TYPED_ARRAY(double, on_coordinates);
+ ASSIGN_TYPED_ARRAY(double, normals);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrNrmlPlXYZ)
}
@@ -1932,9 +2018,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntTgntXYZ)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntTgntXYZ} (getEntTgntXYZ method)
iGeom_getEntTgntXYZ (igeomInstance,
- entity_handle,
+ (iBase_EntityHandle)entity_handle,
x, y, z,
- &tgnt_i, &tgnt_j, &tgnt_k);
+ &tgnt_i, &tgnt_j, &tgnt_k,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntTgntXYZ)
}
@@ -1962,15 +2049,15 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrTgntXYZ)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrTgntXYZ} (getArrTgntXYZ method)
CREATE_TEMP_ARRAY(double, tangents);
-
iGeom_getArrTgntXYZ (igeomInstance,
- TEMP_ARRAY_IN(gentity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
+ storage_order,
TEMP_ARRAY_IN(coordinates),
- TEMP_ARRAY_INOUT(tangents));
+ TEMP_ARRAY_INOUT(tangents),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(tangents);
+ ASSIGN_TYPED_ARRAY(double, tangents);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrTgntXYZ)
}
@@ -1995,10 +2082,11 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getFcCvtrXYZ)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getFcCvtrXYZ} (getFcCvtrXYZ method)
iGeom_getFcCvtrXYZ (igeomInstance,
- face_handle,
+ (iBase_EntityHandle)face_handle,
x, y, z,
&cvtr1_i, &cvtr1_j, &cvtr1_k,
- &cvtr2_i, &cvtr2_j, &cvtr2_k);
+ &cvtr2_i, &cvtr2_j, &cvtr2_k,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getFcCvtrXYZ)
}
@@ -2021,9 +2109,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEgCvtrXYZ)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEgCvtrXYZ} (getEgCvtrXYZ method)
iGeom_getEgCvtrXYZ ( igeomInstance,
- edge_handle,
+ (iBase_EntityHandle)edge_handle,
x, y, z,
- &cvtr_i, &cvtr_j, &cvtr_k);
+ &cvtr_i, &cvtr_j, &cvtr_k,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEgCvtrXYZ)
}
@@ -2049,17 +2138,17 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntArrCvtrXYZ} (getEntArrCvtrXYZ method)
CREATE_TEMP_ARRAY(double, cvtr_1);
CREATE_TEMP_ARRAY(double, cvtr_2);
-
iGeom_getEntArrCvtrXYZ (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ storage_order,
TEMP_ARRAY_IN(coords),
TEMP_ARRAY_INOUT(cvtr_1),
- TEMP_ARRAY_INOUT(cvtr_2));
+ TEMP_ARRAY_INOUT(cvtr_2),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(cvtr_1);
- ASSIGN_ARRAY(cvtr_2);
+ ASSIGN_TYPED_ARRAY(double, cvtr_1);
+ ASSIGN_TYPED_ARRAY(double, cvtr_2);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntArrCvtrXYZ)
}
@@ -2087,11 +2176,12 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEgEvalXYZ)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEgEvalXYZ} (getEgEvalXYZ method)
iGeom_getEgEvalXYZ (igeomInstance,
- edge_handle,
+ (iBase_EntityHandle)edge_handle,
x, y, z,
&on_x, &on_y, &on_z,
&tgnt_i, &tgnt_j, &tgnt_k,
- &cvtr_i, &cvtr_j, &cvtr_k );
+ &cvtr_i, &cvtr_j, &cvtr_k,
+ &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEgEvalXYZ)
}
@@ -2123,12 +2213,13 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getFcEvalXYZ)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getFcEvalXYZ} (getFcEvalXYZ method)
iGeom_getFcEvalXYZ (igeomInstance,
- face_handle,
+ (iBase_EntityHandle)face_handle,
x, y, z,
&on_x, &on_y, &on_z,
&nrml_i, &nrml_j, &nrml_k,
&cvtr1_i, &cvtr1_j, &cvtr1_k,
- &cvtr2_i, &cvtr2_j, &cvtr2_k);
+ &cvtr2_i, &cvtr2_j, &cvtr2_k,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getFcEvalXYZ)
}
@@ -2157,19 +2248,20 @@
CREATE_TEMP_ARRAY(double, on_coords);
CREATE_TEMP_ARRAY(double, tangent);
CREATE_TEMP_ARRAY(double, cvtr);
-
+
iGeom_getArrEgEvalXYZ (igeomInstance,
- TEMP_ARRAY_IN(edge_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,edge_handles),
+ storage_order,
TEMP_ARRAY_IN(coords),
TEMP_ARRAY_INOUT(on_coords),
TEMP_ARRAY_INOUT(tangent),
- TEMP_ARRAY_INOUT(cvtr));
+ TEMP_ARRAY_INOUT(cvtr),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(on_coords);
- ASSIGN_ARRAY(tangent);
- ASSIGN_ARRAY(cvtr);
+ ASSIGN_TYPED_ARRAY(double, on_coords);
+ ASSIGN_TYPED_ARRAY(double, tangent);
+ ASSIGN_TYPED_ARRAY(double, cvtr);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrEgEvalXYZ)
}
@@ -2200,21 +2292,22 @@
CREATE_TEMP_ARRAY(double, normal);
CREATE_TEMP_ARRAY(double, cvtr_1);
CREATE_TEMP_ARRAY(double, cvtr_2);
-
+
iGeom_getArrFcEvalXYZ (igeomInstance,
- TEMP_ARRAY_IN(face_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,face_handles),
+ storage_order,
TEMP_ARRAY_IN(coords),
TEMP_ARRAY_INOUT(on_coords),
TEMP_ARRAY_INOUT(normal),
TEMP_ARRAY_INOUT(cvtr_1),
- TEMP_ARRAY_INOUT(cvtr_2));
+ TEMP_ARRAY_INOUT(cvtr_2),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(on_coords);
- ASSIGN_ARRAY(normal);
- ASSIGN_ARRAY(cvtr_1);
- ASSIGN_ARRAY(cvtr_2);
+ ASSIGN_TYPED_ARRAY(double, on_coords);
+ ASSIGN_TYPED_ARRAY(double, normal);
+ ASSIGN_TYPED_ARRAY(double, cvtr_1);
+ ASSIGN_TYPED_ARRAY(double, cvtr_2);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrFcEvalXYZ)
}
@@ -2236,9 +2329,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntBoundBox)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntBoundBox} (getEntBoundBox method)
iGeom_getEntBoundBox (igeomInstance,
- entity_handle,
+ (iBase_EntityHandle)entity_handle,
&min_x, &min_y, &min_z,
- &max_x, &max_y, &max_z);
+ &max_x, &max_y, &max_z,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntBoundBox)
}
@@ -2267,15 +2361,18 @@
CREATE_TEMP_ARRAY(double, max_corner);
CREATE_TEMP_ARRAY(double, min_corner);
+ int order = storage_order;
iGeom_getArrBoundBox (igeomInstance,
- TEMP_ARRAY_IN(gentity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
+ &order,
TEMP_ARRAY_INOUT(min_corner),
- TEMP_ARRAY_INOUT(max_corner));
+ TEMP_ARRAY_INOUT(max_corner),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(min_corner);
- ASSIGN_ARRAY(max_corner);
+ ASSIGN_TYPED_ARRAY(double, min_corner);
+ ASSIGN_TYPED_ARRAY(double, max_corner);
+ storage_order = (::iBase::StorageOrder)order;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrBoundBox)
}
@@ -2294,7 +2391,7 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getVtxCoord)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getVtxCoord} (getVtxCoord method)
- iGeom_getVtxCoord (igeomInstance, vertex_handle, &x, &y, &z);
+ iGeom_getVtxCoord (igeomInstance, (iBase_EntityHandle)vertex_handle, &x, &y, &z, &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getVtxCoord)
}
@@ -2319,21 +2416,24 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getVtxArrCoords} (getVtxArrCoords method)
CREATE_TEMP_ARRAY(double, coordinates);
+ int order = storage_order;
iGeom_getVtxArrCoords (igeomInstance,
- TEMP_ARRAY_IN(gentity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
- TEMP_ARRAY_INOUT(coordinates));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
+ &order,
+ TEMP_ARRAY_INOUT(coordinates),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(coordinates);
+ ASSIGN_TYPED_ARRAY(double, coordinates);
+ storage_order = (::iBase::StorageOrder)order;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getVtxArrCoords)
}
/**
- * Method: getPntIntsct[]
+ * Method: getPntRayIntsct[]
*/
void
-iGeom_SIDL::GeomSidl_impl::getPntIntsct (
+iGeom_SIDL::GeomSidl_impl::getPntRayIntsct (
/* in */ double x,
/* in */ double y,
/* in */ double z,
@@ -2350,25 +2450,26 @@
throw (
::iBase::Error
){
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getPntIntsct)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.getPntIntsct} (getPntIntsct method)
- CREATE_TEMP_ARRAY(void*, intersect_entity_handles);
+ // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getPntRayIntsct)
+ // Insert-Code-Here {iGeom_SIDL.GeomSidl.getPntRayIntsct} (getPntRayIntsct method)
+ CREATE_TEMP_EH_ARRAY(intersect_entity_handles);
CREATE_TEMP_ARRAY(double, intersect_coords);
CREATE_TEMP_ARRAY(double, param_coords);
- iBase_StorageOrder storage_order_tmp;
- iGeom_getPntIntsct (igeomInstance, x, y, z, dir_x, dir_y, dir_z,
+ int storage_order_tmp;
+ iGeom_getPntRayIntsct (igeomInstance, x, y, z, dir_x, dir_y, dir_z,
TEMP_ARRAY_INOUT( intersect_entity_handles ),
&storage_order_tmp,
TEMP_ARRAY_INOUT( intersect_coords ),
- TEMP_ARRAY_INOUT( param_coords ) );
+ TEMP_ARRAY_INOUT( param_coords ),
+ &igeomError );
PROCESS_ERROR;
storage_order = static_cast< ::iBase::StorageOrder >(storage_order_tmp);
- ASSIGN_ARRAY(intersect_entity_handles);
- ASSIGN_ARRAY(intersect_coords);
- ASSIGN_ARRAY(param_coords);
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getPntIntsct)
+ ASSIGN_TYPED_ARRAY(void*, intersect_entity_handles);
+ ASSIGN_TYPED_ARRAY(double, intersect_coords);
+ ASSIGN_TYPED_ARRAY(double, param_coords);
+ // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getPntRayIntsct)
}
/**
@@ -2394,25 +2495,27 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getPntArrRayIntsct)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getPntArrRayIntsct} (getPntArrRayIntsct method)
- CREATE_TEMP_ARRAY(void*, intersect_entity_handles);
+ CREATE_TEMP_EH_ARRAY(intersect_entity_handles);
CREATE_TEMP_ARRAY(int32_t, offset);
CREATE_TEMP_ARRAY(double, intersect_coords);
CREATE_TEMP_ARRAY(double, param_coords);
-
+ int order = storage_order;
iGeom_getPntArrRayIntsct (igeomInstance,
- static_cast<iBase_StorageOrder>(storage_order),
+ storage_order,
TEMP_ARRAY_IN( coords ),
TEMP_ARRAY_IN( directions ),
TEMP_ARRAY_INOUT( intersect_entity_handles ),
TEMP_ARRAY_INOUT( offset ),
TEMP_ARRAY_INOUT( intersect_coords ),
- TEMP_ARRAY_INOUT( param_coords ) );
+ TEMP_ARRAY_INOUT( param_coords ),
+ &igeomError );
PROCESS_ERROR;
- ASSIGN_ARRAY(intersect_entity_handles);
- ASSIGN_ARRAY(offset);
- ASSIGN_ARRAY(intersect_coords);
- ASSIGN_ARRAY(param_coords);
+ ASSIGN_TYPED_ARRAY(void*, intersect_entity_handles);
+ ASSIGN_TYPED_ARRAY(int32_t, offset);
+ ASSIGN_TYPED_ARRAY(double, intersect_coords);
+ ASSIGN_TYPED_ARRAY(double, param_coords);
+ storage_order = (::iBase::StorageOrder)order;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getPntArrRayIntsct)
}
@@ -2423,20 +2526,22 @@
* @param gface Gface whose sense is being queried.
* @param gregion Gregion gface is being queried with respect to
*/
-int32_t
+void
iGeom_SIDL::GeomSidl_impl::getEntNrmlSense (
/* in */ void* gface,
- /* in */ void* gregion )
+ /* in */ void* gregion,
+ /* out */ int32_t& sense )
throw (
::iBase::Error
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntNrmlSense)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntNrmlSense} (getEntNrmlSense method)
- int32_t retval = iGeom_getEntNrmlSense (igeomInstance,
- gface,
- gregion);
+ iGeom_getEntNrmlSense (igeomInstance,
+ (iBase_EntityHandle)gface,
+ (iBase_EntityHandle)gregion,
+ &sense,
+ &igeomError);
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntNrmlSense)
}
@@ -2458,11 +2563,12 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrNrmlSense} (getArrNrmlSense method)
CREATE_TEMP_ARRAY(int32_t, sense);
iGeom_getArrNrmlSense (igeomInstance,
- TEMP_ARRAY_IN(face_handles),
- TEMP_ARRAY_IN(region_handles),
- TEMP_ARRAY_INOUT(sense));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,face_handles),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,region_handles),
+ TEMP_ARRAY_INOUT(sense),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(sense);
+ ASSIGN_TYPED_ARRAY(int32_t, sense);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrNrmlSense)
}
@@ -2473,20 +2579,22 @@
* @param gedge Gedge whose sense is being queried.
* @param gface Gface gedge is being queried with respect to
*/
-int32_t
+void
iGeom_SIDL::GeomSidl_impl::getEgFcSense (
/* in */ void* gedge,
- /* in */ void* gface )
+ /* in */ void* gface,
+ /* out */ int32_t& sense )
throw (
::iBase::Error
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEgFcSense)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEgFcSense} (getEgFcSense method)
- int32_t retval = iGeom_getEgFcSense (igeomInstance,
- gedge,
- gface);
+ iGeom_getEgFcSense (igeomInstance,
+ (iBase_EntityHandle)gedge,
+ (iBase_EntityHandle)gface,
+ &sense,
+ &igeomError);
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEgFcSense)
}
@@ -2508,11 +2616,12 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEgFcArrSense} (getEgFcArrSense method)
CREATE_TEMP_ARRAY(int32_t, sense);
iGeom_getEgFcArrSense (igeomInstance,
- TEMP_ARRAY_IN(edge_handles),
- TEMP_ARRAY_IN(face_handles),
- TEMP_ARRAY_INOUT(sense));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,edge_handles),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,face_handles),
+ TEMP_ARRAY_INOUT(sense),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(sense);
+ ASSIGN_TYPED_ARRAY(int32_t, sense);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEgFcArrSense)
}
@@ -2526,22 +2635,24 @@
* @param gvertex1 First gvertex
* @param gvertex2 Second gvertex
*/
-int32_t
+void
iGeom_SIDL::GeomSidl_impl::getEgVtxSense (
/* in */ void* gedge,
/* in */ void* gvertex1,
- /* in */ void* gvertex2 )
+ /* in */ void* gvertex2,
+ /* out */ int32_t& sense )
throw (
::iBase::Error
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEgVtxSense)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEgVtxSense} (getEgVtxSense method)
- int32_t retval = iGeom_getEgVtxSense (igeomInstance,
- gedge,
- gvertex1,
- gvertex2);
+ iGeom_getEgVtxSense (igeomInstance,
+ (iBase_EntityHandle)gedge,
+ (iBase_EntityHandle)gvertex1,
+ (iBase_EntityHandle)gvertex2,
+ &sense,
+ &igeomError);
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEgVtxSense)
}
@@ -2565,12 +2676,13 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEgVtxArrSense} (getEgVtxArrSense method)
CREATE_TEMP_ARRAY(int32_t, sense);
iGeom_getEgVtxArrSense (igeomInstance,
- TEMP_ARRAY_IN(edge_handles),
- TEMP_ARRAY_IN(vertex_handles_1),
- TEMP_ARRAY_IN(vertex_handles_2),
- TEMP_ARRAY_INOUT(sense));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,edge_handles),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,vertex_handles_1),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,vertex_handles_2),
+ TEMP_ARRAY_INOUT(sense),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(sense);
+ ASSIGN_TYPED_ARRAY(int32_t, sense);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEgVtxArrSense)
}
@@ -2592,14 +2704,14 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.measure)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.measure} (measure method)
- CREATE_TEMP_ARRAY(int32_t, sense);
- iGeom_getEgVtxArrSense (igeomInstance,
- TEMP_ARRAY_IN(edge_handles),
- TEMP_ARRAY_IN(vertex_handles_1),
- TEMP_ARRAY_IN(vertex_handles_2),
- TEMP_ARRAY_INOUT(sense));
+ CREATE_TEMP_ARRAY(double, measures);
+ iGeom_measure(igeomInstance,
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
+ TEMP_ARRAY_INOUT(measures),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(sense);
+
+ ASSIGN_TYPED_ARRAY(double, measures);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.measure)
}
@@ -2617,35 +2729,31 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getFaceType)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getFaceType} (getFaceType method)
-
- iGeom_measure(igeomInstance,
- TEMP_ARRAY_IN(gentity_handles),
- TEMP_ARRAY_INOUT(measures));
+ char buffer[256];
+ int len = sizeof(buffer);
+ iGeom_getFaceType( igeomInstance,
+ (iBase_EntityHandle)gface_handle,
+ buffer,
+ &igeomError,
+ &len );
PROCESS_ERROR;
-
- ASSIGN_ARRAY(measures);
+ face_type = std::string(buffer,len);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getFaceType)
}
/**
* Method: getParametric[]
*/
-int32_t
-iGeom_SIDL::GeomSidl_impl::getParametric ()
+void
+iGeom_SIDL::GeomSidl_impl::getParametric (
+ /* out */ int32_t& parametric )
throw (
::iBase::Error
-)
-{
+){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getParametric)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getParametric} (getParametric method)
- CREATE_TEMP_ARRAY(int32_t, sense);
- iGeom_getEgVtxArrSense (igeomInstance,
- TEMP_ARRAY_IN(edge_handles),
- TEMP_ARRAY_IN(vertex_handles_1),
- TEMP_ARRAY_IN(vertex_handles_2),
- TEMP_ARRAY_INOUT(sense));
+ iGeom_getParametric( igeomInstance, ¶metric, &igeomError );
PROCESS_ERROR;
- ASSIGN_ARRAY(sense);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getParametric)
}
@@ -2655,16 +2763,19 @@
* when called on that entity.
* @param gentity_handle Gentity being queried.
*/
-int32_t
+void
iGeom_SIDL::GeomSidl_impl::isEntParametric (
- /* in */ void* gentity_handle )
+ /* in */ void* gentity_handle,
+ /* out */ int32_t& is_parametric )
throw (
::iBase::Error
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.isEntParametric)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.isEntParametric} (isEntParametric method)
- iGeom_getFaceType(igeomInstance, gface_handle, &this_type);
- if (NULL != this_type) face_type = this_type;
+ iGeom_isEntParametric( igeomInstance,
+ (iBase_EntityHandle)gentity_handle,
+ &is_parametric,
+ &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.isEntParametric)
}
@@ -2686,10 +2797,11 @@
CREATE_TEMP_ARRAY(int32_t, is_parametric);
iGeom_isArrParametric (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- TEMP_ARRAY_INOUT(is_parametric));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ TEMP_ARRAY_INOUT(is_parametric),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(is_parametric);
+ ASSIGN_TYPED_ARRAY(int32_t, is_parametric);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.isArrParametric)
}
@@ -2709,7 +2821,8 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntUVtoXYZ)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntUVtoXYZ} (getEntUVtoXYZ method)
- iGeom_getEntUVtoXYZ (igeomInstance, entity_handle, u, v, &x, &y, &z );
+ iGeom_getEntUVtoXYZ (igeomInstance, (iBase_EntityHandle)entity_handle,
+ u, v, &x, &y, &z, &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntUVtoXYZ)
}
@@ -2737,15 +2850,14 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrUVtoXYZ)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrUVtoXYZ} (getArrUVtoXYZ method)
CREATE_TEMP_ARRAY(double, coordinates);
-
iGeom_getArrUVtoXYZ (igeomInstance,
- TEMP_ARRAY_IN(gentity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
+ storage_order,
TEMP_ARRAY_IN(uv),
- TEMP_ARRAY_INOUT(coordinates));
+ TEMP_ARRAY_INOUT(coordinates),
+ &igeomError);
PROCESS_ERROR;
-
- ASSIGN_ARRAY(coordinates);
+ ASSIGN_TYPED_ARRAY(double, coordinates);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrUVtoXYZ)
}
@@ -2764,7 +2876,8 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntUtoXYZ)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntUtoXYZ} (getEntUtoXYZ method)
- iGeom_getEntUtoXYZ (igeomInstance, entity_handle, u, &x, &y, &z );
+ iGeom_getEntUtoXYZ (igeomInstance, (iBase_EntityHandle)entity_handle,
+ u, &x, &y, &z, &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntUtoXYZ)
}
@@ -2787,13 +2900,16 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrUtoXYZ)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrUtoXYZ} (getArrUtoXYZ method)
CREATE_TEMP_ARRAY(double, on_coords);
+ int order = storage_order;
iGeom_getArrUtoXYZ (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
- TEMP_ARRAY_IN(u),
- TEMP_ARRAY_INOUT(on_coords));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ TEMP_TYPED_ARRAY_IN(double,u),
+ &order,
+ TEMP_ARRAY_INOUT(on_coords),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(on_coords);
+ storage_order = (::iBase::StorageOrder)order;
+ ASSIGN_TYPED_ARRAY(double, on_coords);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrUtoXYZ)
}
@@ -2813,7 +2929,8 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntXYZtoUV)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntXYZtoUV} (getEntXYZtoUV method)
- iGeom_getEntXYZtoUV (igeomInstance, entity_handle, x, y, z, &u, &v );
+ iGeom_getEntXYZtoUV (igeomInstance, (iBase_EntityHandle)entity_handle,
+ x, y, z, &u, &v, &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntXYZtoUV)
}
@@ -2833,7 +2950,8 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntXYZtoU)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntXYZtoU} (getEntXYZtoU method)
- iGeom_getEntXYZtoU (igeomInstance, entity_handle, x, y, z, &u);
+ iGeom_getEntXYZtoU (igeomInstance, (iBase_EntityHandle)entity_handle,
+ x, y, z, &u, &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntXYZtoU)
}
@@ -2861,15 +2979,17 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrXYZtoUV)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrXYZtoUV} (getArrXYZtoUV method)
CREATE_TEMP_ARRAY(double, uv);
-
+ int order = storage_order;
iGeom_getArrXYZtoUV (igeomInstance,
- TEMP_ARRAY_IN(gentity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
+ storage_order,
TEMP_ARRAY_IN(coordinates),
- TEMP_ARRAY_INOUT(uv));
+ TEMP_ARRAY_INOUT(uv),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(uv);
+ storage_order = (::iBase::StorageOrder)order;
+ ASSIGN_TYPED_ARRAY(double, uv);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrXYZtoUV)
}
@@ -2891,15 +3011,17 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrXYZtoU)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrXYZtoU} (getArrXYZtoU method)
CREATE_TEMP_ARRAY(double, u);
-
+ int order = storage_order;
iGeom_getArrXYZtoU (igeomInstance,
- TEMP_ARRAY_IN(gentity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
+ storage_order,
TEMP_ARRAY_IN(coordinates),
- TEMP_ARRAY_INOUT(u));
+ TEMP_ARRAY_INOUT(u),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(u);
+ storage_order = (::iBase::StorageOrder)order;
+ ASSIGN_TYPED_ARRAY(double, u);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrXYZtoU)
}
@@ -2919,7 +3041,8 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntXYZtoUVHint)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntXYZtoUVHint} (getEntXYZtoUVHint method)
- iGeom_getEntXYZtoUVHint (igeomInstance, entity_handle, x, y, z, &u, &v );
+ iGeom_getEntXYZtoUVHint (igeomInstance, (iBase_EntityHandle)entity_handle,
+ x, y, z, &u, &v, &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntXYZtoUVHint)
}
@@ -2942,15 +3065,17 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrXYZtoUVHint)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrXYZtoUVHint} (getArrXYZtoUVHint method)
CREATE_TEMP_ARRAY(double, uv);
-
+ int order = storage_order;
iGeom_getArrXYZtoUVHint (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ storage_order,
TEMP_ARRAY_IN(coords),
- TEMP_ARRAY_INOUT(uv));
+ TEMP_ARRAY_INOUT(uv),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(uv);
+ storage_order = (::iBase::StorageOrder)order;
+ ASSIGN_TYPED_ARRAY(double, uv);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrXYZtoUVHint)
}
@@ -2970,8 +3095,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntUVRange)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntUVRange} (getEntUVRange method)
iGeom_getEntUVRange (igeomInstance,
- entity_handle,
- &u_min, &v_min, &u_max, &v_max);
+ (iBase_EntityHandle)entity_handle,
+ &u_min, &v_min,
+ &u_max, &v_max,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntUVRange)
}
@@ -2990,8 +3117,9 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntURange)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntURange} (getEntURange method)
iGeom_getEntURange (igeomInstance,
- entity_handle,
- &u_min, &u_max);
+ (iBase_EntityHandle)entity_handle,
+ &u_min, &u_max,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntURange)
}
@@ -3018,16 +3146,18 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrUVRange} (getArrUVRange method)
CREATE_TEMP_ARRAY(double, uv_max);
CREATE_TEMP_ARRAY(double, uv_min);
-
+ int order = storage_order;
iGeom_getArrUVRange (igeomInstance,
- TEMP_ARRAY_IN(gentity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gentity_handles),
+ &order,
TEMP_ARRAY_INOUT(uv_min),
- TEMP_ARRAY_INOUT(uv_max));
+ TEMP_ARRAY_INOUT(uv_max),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(uv_max);
- ASSIGN_ARRAY(uv_min);
+ storage_order = (::iBase::StorageOrder)order;
+ ASSIGN_TYPED_ARRAY(double, uv_max);
+ ASSIGN_TYPED_ARRAY(double, uv_min);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrUVRange)
}
@@ -3051,13 +3181,14 @@
CREATE_TEMP_ARRAY(double, u_min);
iGeom_getArrURange (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
TEMP_ARRAY_INOUT(u_min),
- TEMP_ARRAY_INOUT(u_max));
+ TEMP_ARRAY_INOUT(u_max),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(u_max);
- ASSIGN_ARRAY(u_min);
+ ASSIGN_TYPED_ARRAY(double, u_max);
+ ASSIGN_TYPED_ARRAY(double, u_min);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrURange)
}
@@ -3077,9 +3208,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntUtoUV)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntUtoUV} (getEntUtoUV method)
iGeom_getEntUtoUV (igeomInstance,
- edge_handle,
- face_handle,
- in_u, &u, &v);
+ (iBase_EntityHandle)edge_handle,
+ (iBase_EntityHandle)face_handle,
+ in_u, &u, &v,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntUtoUV)
}
@@ -3099,9 +3231,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getVtxToUV)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getVtxToUV} (getVtxToUV method)
iGeom_getVtxToUV (igeomInstance,
- vertex_handle,
- face_handle,
- &u, &v);
+ (iBase_EntityHandle)vertex_handle,
+ (iBase_EntityHandle)face_handle,
+ &u, &v,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getVtxToUV)
}
@@ -3120,9 +3253,10 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getVtxToU)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getVtxToU} (getVtxToU method)
iGeom_getVtxToU (igeomInstance,
- vertex_handle,
- edge_handle,
- &u);
+ (iBase_EntityHandle)vertex_handle,
+ (iBase_EntityHandle)edge_handle,
+ &u,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getVtxToU)
}
@@ -3147,16 +3281,17 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrUtoUV)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrUtoUV} (getArrUtoUV method)
CREATE_TEMP_ARRAY(double, uv);
- iBase_StorageOrder storage_order_tmp;
+ int storage_order_tmp;
iGeom_getArrUtoUV (igeomInstance,
- TEMP_ARRAY_IN(edge_handles),
- TEMP_ARRAY_IN(face_handles),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,edge_handles),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,face_handles),
TEMP_ARRAY_IN(u_in),
&storage_order_tmp,
- TEMP_ARRAY_INOUT(uv));
+ TEMP_ARRAY_INOUT(uv),
+ &igeomError);
PROCESS_ERROR;
storage_order = static_cast< ::iBase::StorageOrder >(storage_order_tmp);
- ASSIGN_ARRAY(uv);
+ ASSIGN_TYPED_ARRAY(double, uv);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrUtoUV)
}
@@ -3178,15 +3313,16 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getVtxArrToUV)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getVtxArrToUV} (getVtxArrToUV method)
CREATE_TEMP_ARRAY(double, uv);
- iBase_StorageOrder storage_order_tmp;
+ int storage_order_tmp;
iGeom_getVtxArrToUV (igeomInstance,
- TEMP_ARRAY_IN(vertex_handles),
- TEMP_ARRAY_IN(face_handles),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,vertex_handles),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,face_handles),
&storage_order_tmp,
- TEMP_ARRAY_INOUT(uv));
+ TEMP_ARRAY_INOUT(uv),
+ &igeomError);
PROCESS_ERROR;
storage_order = static_cast< ::iBase::StorageOrder >(storage_order_tmp);
- ASSIGN_ARRAY(uv);
+ ASSIGN_TYPED_ARRAY(double, uv);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getVtxArrToUV)
}
@@ -3208,11 +3344,12 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getVtxArrToU} (getVtxArrToU method)
CREATE_TEMP_ARRAY(double, u);
iGeom_getVtxArrToU (igeomInstance,
- TEMP_ARRAY_IN(vertex_handles),
- TEMP_ARRAY_IN(edge_handles),
- TEMP_ARRAY_INOUT(u));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,vertex_handles),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,edge_handles),
+ TEMP_ARRAY_INOUT(u),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(u);
+ ASSIGN_TYPED_ARRAY(double, u);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getVtxArrToU)
}
@@ -3232,7 +3369,8 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntNrmlUV)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntNrmlUV} (getEntNrmlUV method)
- iGeom_getEntNrmlUV (igeomInstance, entity_handle, u, v, &nrml_i, &nrml_j, &nrml_k );
+ iGeom_getEntNrmlUV (igeomInstance, (iBase_EntityHandle)entity_handle, u, v,
+ &nrml_i, &nrml_j, &nrml_k, &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntNrmlUV)
}
@@ -3260,15 +3398,15 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrNrmlUV)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrNrmlUV} (getArrNrmlUV method)
CREATE_TEMP_ARRAY(double, normals);
-
iGeom_getArrNrmlUV (igeomInstance,
- TEMP_ARRAY_IN(gface_handles),
- static_cast<iBase_StorageOrder>(storage_order),
- TEMP_ARRAY_IN(parameters),
- TEMP_ARRAY_INOUT(normals));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,gface_handles),
+ storage_order,
+ TEMP_TYPED_ARRAY_IN(double, parameters),
+ TEMP_ARRAY_INOUT(normals),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(normals);
+ ASSIGN_TYPED_ARRAY(double, normals);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrNrmlUV)
}
@@ -3287,7 +3425,8 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntTgntU)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntTgntU} (getEntTgntU method)
- iGeom_getEntTgntU (igeomInstance, entity_handle, param_coord, &tngt_i, &tngt_j, &tngt_k );
+ iGeom_getEntTgntU (igeomInstance, (iBase_EntityHandle)entity_handle, param_coord,
+ &tngt_i, &tngt_j, &tngt_k, &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntTgntU)
}
@@ -3315,15 +3454,15 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getArrTgntU)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getArrTgntU} (getArrTgntU method)
CREATE_TEMP_ARRAY(double, tangents);
-
iGeom_getArrTgntU (igeomInstance,
- TEMP_ARRAY_IN(gedge_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle, gedge_handles),
+ storage_order,
TEMP_ARRAY_IN(parameters),
- TEMP_ARRAY_INOUT(tangents));
+ TEMP_ARRAY_INOUT(tangents),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(tangents);
+ ASSIGN_TYPED_ARRAY(double, tangents);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrTgntU)
}
@@ -3348,13 +3487,14 @@
CREATE_TEMP_ARRAY(double, drvt_v);
iGeom_getEnt1stDrvt (igeomInstance,
- entity_handle, u, v,
+ (iBase_EntityHandle)entity_handle, u, v,
TEMP_ARRAY_INOUT(drvt_u),
- TEMP_ARRAY_INOUT(drvt_v));
+ TEMP_ARRAY_INOUT(drvt_v),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(drvt_u);
- ASSIGN_ARRAY(drvt_v);
+ ASSIGN_TYPED_ARRAY(double, drvt_u);
+ ASSIGN_TYPED_ARRAY(double, drvt_v);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEnt1stDrvt)
}
@@ -3385,21 +3525,21 @@
CREATE_TEMP_ARRAY(int32_t, u_offset);
CREATE_TEMP_ARRAY(double, drvt_v);
CREATE_TEMP_ARRAY(int32_t, v_offset);
-
iGeom_getArr1stDrvt (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ storage_order,
TEMP_ARRAY_IN(uv),
TEMP_ARRAY_INOUT(drvt_u),
TEMP_ARRAY_INOUT(u_offset),
TEMP_ARRAY_INOUT(drvt_v),
- TEMP_ARRAY_INOUT(v_offset));
+ TEMP_ARRAY_INOUT(v_offset),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(drvt_u);
- ASSIGN_ARRAY(u_offset);
- ASSIGN_ARRAY(drvt_v);
- ASSIGN_ARRAY(v_offset);
+ ASSIGN_TYPED_ARRAY(double, drvt_u);
+ ASSIGN_TYPED_ARRAY(int32_t, u_offset);
+ ASSIGN_TYPED_ARRAY(double, drvt_v);
+ ASSIGN_TYPED_ARRAY(int32_t, v_offset);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArr1stDrvt)
}
@@ -3427,15 +3567,16 @@
CREATE_TEMP_ARRAY(double, drvt_vv);
iGeom_getEnt2ndDrvt (igeomInstance,
- entity_handle, u, v,
+ (iBase_EntityHandle)entity_handle, u, v,
TEMP_ARRAY_INOUT(drvt_uu),
TEMP_ARRAY_INOUT(drvt_uv),
- TEMP_ARRAY_INOUT(drvt_vv));
+ TEMP_ARRAY_INOUT(drvt_vv),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(drvt_uu);
- ASSIGN_ARRAY(drvt_uv);
- ASSIGN_ARRAY(drvt_vv);
+ ASSIGN_TYPED_ARRAY(double, drvt_uu);
+ ASSIGN_TYPED_ARRAY(double, drvt_uv);
+ ASSIGN_TYPED_ARRAY(double, drvt_vv);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEnt2ndDrvt)
}
@@ -3472,25 +3613,25 @@
CREATE_TEMP_ARRAY(int32_t, uv_offset);
CREATE_TEMP_ARRAY(double, drvt_vv);
CREATE_TEMP_ARRAY(int32_t, vv_offset);
-
iGeom_getArr2ndDrvt (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ storage_order,
TEMP_ARRAY_IN(uv),
TEMP_ARRAY_INOUT(drvt_uu),
TEMP_ARRAY_INOUT(uu_offset),
TEMP_ARRAY_INOUT(drvt_uv),
TEMP_ARRAY_INOUT(uv_offset),
TEMP_ARRAY_INOUT(drvt_vv),
- TEMP_ARRAY_INOUT(vv_offset));
+ TEMP_ARRAY_INOUT(vv_offset),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(drvt_uu);
- ASSIGN_ARRAY(uu_offset);
- ASSIGN_ARRAY(drvt_uv);
- ASSIGN_ARRAY(uv_offset);
- ASSIGN_ARRAY(drvt_vv);
- ASSIGN_ARRAY(vv_offset);
+ ASSIGN_TYPED_ARRAY(double, drvt_uu);
+ ASSIGN_TYPED_ARRAY(int32_t, uu_offset);
+ ASSIGN_TYPED_ARRAY(double, drvt_uv);
+ ASSIGN_TYPED_ARRAY(int32_t, uv_offset);
+ ASSIGN_TYPED_ARRAY(double, drvt_vv);
+ ASSIGN_TYPED_ARRAY(int32_t, vv_offset);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArr2ndDrvt)
}
@@ -3513,9 +3654,11 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getFcCvtrUV)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getFcCvtrUV} (getFcCvtrUV method)
- iGeom_getFcCvtrUV (igeomInstance, entity_handle, u, v,
+ iGeom_getFcCvtrUV (igeomInstance, (iBase_EntityHandle)entity_handle,
+ u, v,
&cvtr1_i, &cvtr1_j, &cvtr1_k,
- &cvtr2_i, &cvtr2_j, &cvtr2_k );
+ &cvtr2_i, &cvtr2_j, &cvtr2_k,
+ &igeomError );
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getFcCvtrUV)
}
@@ -3541,17 +3684,17 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getFcArrCvtrUV} (getFcArrCvtrUV method)
CREATE_TEMP_ARRAY(double, cvtr_1);
CREATE_TEMP_ARRAY(double, cvtr_2);
-
iGeom_getFcArrCvtrUV (igeomInstance,
- TEMP_ARRAY_IN(face_handles),
- static_cast<iBase_StorageOrder>(storage_order),
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,face_handles),
+ storage_order,
TEMP_ARRAY_IN(uv),
TEMP_ARRAY_INOUT(cvtr_1),
- TEMP_ARRAY_INOUT(cvtr_2));
+ TEMP_ARRAY_INOUT(cvtr_2),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(cvtr_1);
- ASSIGN_ARRAY(cvtr_2);
+ ASSIGN_TYPED_ARRAY(double, cvtr_1);
+ ASSIGN_TYPED_ARRAY(double, cvtr_2);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getFcArrCvtrUV)
}
@@ -3569,8 +3712,9 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.isEntPeriodic)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.isEntPeriodic} (isEntPeriodic method)
iGeom_isEntPeriodic (igeomInstance,
- entity_handle,
- &in_u, &in_v);
+ (iBase_EntityHandle)entity_handle,
+ &in_u, &in_v,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.isEntPeriodic)
}
@@ -3591,27 +3735,28 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.isArrPeriodic} (isArrPeriodic method)
CREATE_TEMP_ARRAY(int32_t, in_uv);
iGeom_isArrPeriodic (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- TEMP_ARRAY_INOUT(in_uv));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ TEMP_ARRAY_INOUT(in_uv),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(in_uv);
+ ASSIGN_TYPED_ARRAY(int32_t, in_uv);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.isArrPeriodic)
}
/**
* Method: isFcDegenerate[]
*/
-int32_t
+void
iGeom_SIDL::GeomSidl_impl::isFcDegenerate (
- /* in */ void* face_handle )
+ /* in */ void* face_handle,
+ /* out */ int32_t& is_degenerate )
throw (
::iBase::Error
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.isFcDegenerate)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.isFcDegenerate} (isFcDegenerate method)
- int32_t retval = iGeom_isFcDegenerate (igeomInstance, face_handle);
+ iGeom_isFcDegenerate (igeomInstance, (iBase_EntityHandle)face_handle, &is_degenerate, &igeomError);
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.isFcDegenerate)
}
@@ -3631,10 +3776,11 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.isFcArrDegenerate} (isFcArrDegenerate method)
CREATE_TEMP_ARRAY(int32_t, degenerate);
iGeom_isFcArrDegenerate (igeomInstance,
- TEMP_ARRAY_IN(face_handles),
- TEMP_ARRAY_INOUT(degenerate));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,face_handles),
+ TEMP_ARRAY_INOUT(degenerate),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(degenerate);
+ ASSIGN_TYPED_ARRAY(int32_t, degenerate);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.isFcArrDegenerate)
}
@@ -3656,7 +3802,8 @@
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getTolerance} (getTolerance method)
iGeom_getTolerance (igeomInstance,
&type,
- &tolerance);
+ &tolerance,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getTolerance)
}
@@ -3664,17 +3811,20 @@
/**
* Method: getEntTolerance[]
*/
-double
+void
iGeom_SIDL::GeomSidl_impl::getEntTolerance (
- /* in */ void* entity_handle )
+ /* in */ void* entity_handle,
+ /* out */ double& tolerance )
throw (
::iBase::Error
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getEntTolerance)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getEntTolerance} (getEntTolerance method)
- double retval = iGeom_getEntTolerance (igeomInstance, entity_handle);
+ iGeom_getEntTolerance (igeomInstance,
+ (iBase_EntityHandle)entity_handle,
+ &tolerance,
+ &igeomError);
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getEntTolerance)
}
@@ -3700,11 +3850,12 @@
CREATE_TEMP_ARRAY(double, tolerances);
iGeom_getArrTolerance (igeomInstance,
- TEMP_ARRAY_IN(entity_handles),
- TEMP_ARRAY_INOUT(tolerances));
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,entity_handles),
+ TEMP_ARRAY_INOUT(tolerances),
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(tolerances);
+ ASSIGN_TYPED_ARRAY(double, tolerances);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getArrTolerance)
}
@@ -3715,6 +3866,7 @@
*/
void
iGeom_SIDL::GeomSidl_impl::initEntIter (
+ /* in */ void* entity_set_handle,
/* in */ int32_t gentity_dimension,
/* out */ void*& gentity_iterator )
throw (
@@ -3722,15 +3874,21 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.initEntIter)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.initEntIter} (initEntIter method)
- iGeom_initEntIter (igeomInstance, gentity_dimension, &gentity_iterator);
+ iGeom_EntityIterator iter;
+ iGeom_initEntIter (igeomInstance,
+ (iBase_EntitySetHandle)entity_set_handle,
+ gentity_dimension,
+ &iter,
+ &igeomError);
PROCESS_ERROR;
+ gentity_iterator = iter;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.initEntIter)
}
/**
* Method: initEntArrIter[]
*/
-bool
+void
iGeom_SIDL::GeomSidl_impl::initEntArrIter (
/* in */ void* entity_set_handle,
/* in */ ::iBase::EntityType requested_entity_type,
@@ -3741,13 +3899,15 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.initEntArrIter)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.initEntArrIter} (initEntArrIter method)
- bool result = iGeom_initEntArrIter (igeomInstance,
- entity_set_handle,
- static_cast<iGeom_EntityType>(requested_entity_type),
- requested_array_size,
- &entArr_iterator);
+ iGeom_EntityArrIterator iter;
+ iGeom_initEntArrIter (igeomInstance,
+ (iBase_EntitySetHandle)entity_set_handle,
+ requested_entity_type,
+ requested_array_size,
+ &iter,
+ &igeomError);
PROCESS_ERROR;
- return static_cast<bool>(result);
+ entArr_iterator = iter;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.initEntArrIter)
}
@@ -3757,43 +3917,47 @@
* @param gentity_handle Next gentity
* @return If true, there are more gentities, if false, this is the last one
*/
-bool
+void
iGeom_SIDL::GeomSidl_impl::getNextEntIter (
- /* inout */ void*& gentity_iterator,
- /* out */ void*& gentity_handle )
+ /* in */ void* entity_iterator,
+ /* out */ void*& entity_handle,
+ /* out */ int32_t& has_data )
throw (
::iBase::Error
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getNextEntIter)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getNextEntIter} (getNextEntIter method)
- bool retval = iGeom_getNextEntIter (igeomInstance,
- &gentity_iterator,
- &gentity_handle);
+ iGeom_getNextEntIter (igeomInstance,
+ (iGeom_EntityIterator)entity_iterator,
+ (iBase_EntityHandle*)&entity_handle,
+ &has_data,
+ &igeomError);
PROCESS_ERROR;
- return retval;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getNextEntIter)
}
/**
* Method: getNextEntArrIter[]
*/
-bool
+void
iGeom_SIDL::GeomSidl_impl::getNextEntArrIter (
/* in */ void* entArr_iterator,
/* inout */ ::sidl::array<void*>& entity_handles,
- /* inout */ int32_t& entity_handles_size )
+ /* out */ int32_t& entity_handles_size,
+ /* out */ int32_t& has_data )
throw (
::iBase::Error
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.getNextEntArrIter)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.getNextEntArrIter} (getNextEntArrIter method)
- CREATE_TEMP_ARRAY(void*, entity_handles);
- bool result = iGeom_getNextEntArrIter (igeomInstance,
- entArr_iterator,
- TEMP_ARRAY_INOUT(entity_handles));
+ CREATE_TEMP_EH_ARRAY(entity_handles);
+ iGeom_getNextEntArrIter (igeomInstance,
+ (iGeom_EntityArrIterator)entArr_iterator,
+ TEMP_ARRAY_INOUT(entity_handles),
+ &has_data,
+ &igeomError);
PROCESS_ERROR;
- ASSIGN_ARRAY(entity_handles);
- return result;
+ ASSIGN_TYPED_ARRAY(void*, entity_handles);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.getNextEntArrIter)
}
@@ -3809,7 +3973,9 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.resetEntIter)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.resetEntIter} (resetEntIter method)
- iGeom_resetEntIter (igeomInstance, gentity_iterator);
+ iGeom_resetEntIter (igeomInstance,
+ (iGeom_EntityIterator)gentity_iterator,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.resetEntIter)
}
@@ -3825,7 +3991,9 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.resetEntArrIter)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.resetEntArrIter} (resetEntArrIter method)
- iGeom_resetEntArrIter (igeomInstance, entArr_iterator);
+ iGeom_resetEntArrIter (igeomInstance,
+ (iGeom_EntityArrIterator)entArr_iterator,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.resetEntArrIter)
}
@@ -3843,7 +4011,8 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.endEntIter)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.endEntIter} (endEntIter method)
iGeom_endEntIter (igeomInstance,
- Gentity_dim_iterator);
+ (iGeom_EntityIterator)Gentity_dim_iterator,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.endEntIter)
}
@@ -3859,7 +4028,9 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.endEntArrIter)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.endEntArrIter} (endEntArrIter method)
- iGeom_endEntArrIter (igeomInstance, entArr_iterator);
+ iGeom_endEntArrIter (igeomInstance,
+ (iGeom_EntityArrIterator)entArr_iterator,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.endEntArrIter)
}
@@ -3876,7 +4047,10 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Copy)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.Copy} (Copy method)
- iGeom_Copy(igeomInstance, geom_entity, &geom_entity2);
+ iGeom_copyEnt(igeomInstance,
+ (iBase_EntityHandle)geom_entity,
+ (iBase_EntityHandle*)&geom_entity2,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Copy)
}
@@ -3897,9 +4071,12 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.SweepAboutAxis)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.SweepAboutAxis} (SweepAboutAxis method)
- iGeom_SweepAboutAxis(igeomInstance, geom_entity, angle,
- axis_normal_x, axis_normal_y, axis_normal_z,
- &geom_entity2);
+ iGeom_sweepEntAboutAxis( igeomInstance,
+ (iBase_EntityHandle)geom_entity,
+ angle,
+ axis_normal_x, axis_normal_y, axis_normal_z,
+ (iBase_EntityHandle*)&geom_entity2,
+ &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.SweepAboutAxis)
}
@@ -3915,33 +4092,36 @@
){
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Delete)
// Insert-Code-Here {iGeom_SIDL.GeomSidl.Delete} (Delete method)
- iGeom_Delete(igeomInstance, geom_entity);
+ iGeom_deleteEnt(igeomInstance, (iBase_EntityHandle)geom_entity, &igeomError);
PROCESS_ERROR;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Delete)
}
/**
- * Method: Sphere[]
+ * Method: createSphere[]
*/
void
-iGeom_SIDL::GeomSidl_impl::Sphere (
+iGeom_SIDL::GeomSidl_impl::createSphere (
/* in */ double radius,
/* out */ void*& geom_entity )
throw (
::iBase::Error
){
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Sphere)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.Sphere} (Sphere method)
- iGeom_Sphere(igeomInstance, radius, &geom_entity);
+ // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.createSphere)
+ // Insert-Code-Here {iGeom_SIDL.GeomSidl.createSphere} (createSphere method)
+ iGeom_createSphere( igeomInstance,
+ radius,
+ (iBase_EntityHandle*)&geom_entity,
+ &igeomError);
PROCESS_ERROR;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Sphere)
+ // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.createSphere)
}
/**
- * Method: Brick[]
+ * Method: createBrick[]
*/
void
-iGeom_SIDL::GeomSidl_impl::Brick (
+iGeom_SIDL::GeomSidl_impl::createBrick (
/* in */ double x,
/* in */ double y,
/* in */ double z,
@@ -3949,18 +4129,21 @@
throw (
::iBase::Error
){
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Brick)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.Brick} (Brick method)
- iGeom_Brick(igeomInstance, x, y, z, &geom_entity);
+ // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.createBrick)
+ // Insert-Code-Here {iGeom_SIDL.GeomSidl.createBrick} (createBrick method)
+ iGeom_createBrick( igeomInstance,
+ x, y, z,
+ (iBase_EntityHandle*)&geom_entity,
+ &igeomError);
PROCESS_ERROR;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Brick)
+ // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.createBrick)
}
/**
- * Method: Cylinder[]
+ * Method: createCylinder[]
*/
void
-iGeom_SIDL::GeomSidl_impl::Cylinder (
+iGeom_SIDL::GeomSidl_impl::createCylinder (
/* in */ double height,
/* in */ double major_rad,
/* in */ double minor_rad,
@@ -3968,56 +4151,62 @@
throw (
::iBase::Error
){
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Cylinder)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.Cylinder} (Cylinder method)
- iGeom_Cylinder(igeomInstance, height, major_rad, minor_rad, &geom_entity);
+ // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.createCylinder)
+ // Insert-Code-Here {iGeom_SIDL.GeomSidl.createCylinder} (createCylinder method)
+ iGeom_createCylinder( igeomInstance,
+ height, major_rad, minor_rad,
+ (iBase_EntityHandle*)&geom_entity,
+ &igeomError);
PROCESS_ERROR;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Cylinder)
+ // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.createCylinder)
}
/**
- * Method: Torus[]
+ * Method: createTorus[]
*/
void
-iGeom_SIDL::GeomSidl_impl::Torus (
+iGeom_SIDL::GeomSidl_impl::createTorus (
/* in */ double major_rad,
/* in */ double minor_rad,
/* out */ void*& geom_entity )
throw (
::iBase::Error
){
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Torus)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.Torus} (Torus method)
- iGeom_Torus(igeomInstance, major_rad, minor_rad, &geom_entity);
+ // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.createTorus)
+ // Insert-Code-Here {iGeom_SIDL.GeomSidl.createTorus} (createTorus method)
+ iGeom_createTorus( igeomInstance,
+ major_rad, minor_rad,
+ (iBase_EntityHandle*)&geom_entity,
+ &igeomError);
PROCESS_ERROR;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Torus)
+ // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.createTorus)
}
/**
- * Method: Move[]
+ * Method: moveEnt[]
*/
void
-iGeom_SIDL::GeomSidl_impl::Move (
- /* inout */ void*& geom_entity,
+iGeom_SIDL::GeomSidl_impl::moveEnt (
+ /* in */ void* geom_entity,
/* in */ double x,
/* in */ double y,
/* in */ double z )
throw (
::iBase::Error
){
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Move)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.Move} (Move method)
- iGeom_Move(igeomInstance, &geom_entity, x, y, z);
+ // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.moveEnt)
+ // Insert-Code-Here {iGeom_SIDL.GeomSidl.moveEnt} (moveEnt method)
+ iGeom_moveEnt(igeomInstance, (iBase_EntityHandle)geom_entity, x, y, z, &igeomError);
PROCESS_ERROR;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Move)
+ // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.moveEnt)
}
/**
- * Method: Rotate[]
+ * Method: rotateEnt[]
*/
void
-iGeom_SIDL::GeomSidl_impl::Rotate (
- /* inout */ void*& geom_entity,
+iGeom_SIDL::GeomSidl_impl::rotateEnt (
+ /* in */ void* geom_entity,
/* in */ double angle,
/* in */ double axis_normal_x,
/* in */ double axis_normal_y,
@@ -4025,96 +4214,106 @@
throw (
::iBase::Error
){
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Rotate)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.Rotate} (Rotate method)
- iGeom_Rotate(igeomInstance, &geom_entity, angle, axis_normal_x,
- axis_normal_y, axis_normal_z);
+ // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.rotateEnt)
+ // Insert-Code-Here {iGeom_SIDL.GeomSidl.rotateEnt} (rotateEnt method)
+ iGeom_rotateEnt(igeomInstance, (iBase_EntityHandle)geom_entity,
+ angle, axis_normal_x, axis_normal_y, axis_normal_z,
+ &igeomError);
PROCESS_ERROR;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Rotate)
+ // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.rotateEnt)
}
/**
- * Method: Reflect[]
+ * Method: reflectEnt[]
*/
void
-iGeom_SIDL::GeomSidl_impl::Reflect (
- /* inout */ void*& geom_entity,
+iGeom_SIDL::GeomSidl_impl::reflectEnt (
+ /* in */ void* geom_entity,
/* in */ double plane_normal_x,
/* in */ double plane_normal_y,
/* in */ double plane_normal_z )
throw (
::iBase::Error
){
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Reflect)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.Reflect} (Reflect method)
- iGeom_Reflect(igeomInstance, &geom_entity, plane_normal_x,
- plane_normal_y, plane_normal_z);
+ // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.reflectEnt)
+ // Insert-Code-Here {iGeom_SIDL.GeomSidl.reflectEnt} (reflectEnt method)
+ iGeom_reflectEnt(igeomInstance, (iBase_EntityHandle)geom_entity,
+ plane_normal_x, plane_normal_y, plane_normal_z,
+ &igeomError);
PROCESS_ERROR;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Reflect)
+ // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.reflectEnt)
}
/**
- * Method: Scale[]
+ * Method: scaleEnt[]
*/
void
-iGeom_SIDL::GeomSidl_impl::Scale (
- /* inout */ void*& geom_entity,
+iGeom_SIDL::GeomSidl_impl::scaleEnt (
+ /* in */ void* geom_entity,
/* in */ double scale_x,
/* in */ double scale_y,
/* in */ double scale_z )
throw (
::iBase::Error
){
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Scale)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.Scale} (Scale method)
- iGeom_Scale(igeomInstance, &geom_entity, scale_x, scale_y, scale_z);
+ // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.scaleEnt)
+ // Insert-Code-Here {iGeom_SIDL.GeomSidl.scaleEnt} (scaleEnt method)
+ iGeom_scaleEnt(igeomInstance, (iBase_EntityHandle)geom_entity,
+ scale_x, scale_y, scale_z,
+ &igeomError);
PROCESS_ERROR;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Scale)
+ // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.scaleEnt)
}
/**
- * Method: Unite[]
+ * Method: uniteEnts[]
*/
void
-iGeom_SIDL::GeomSidl_impl::Unite (
+iGeom_SIDL::GeomSidl_impl::uniteEnts (
/* in */ ::sidl::array<void*> geom_entities,
/* in */ int32_t geom_entities_size,
/* out */ void*& geom_entity )
throw (
::iBase::Error
){
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Unite)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.Unite} (Unite method)
- iGeom_Unite(igeomInstance,
- TEMP_ARRAY_IN(geom_entities), &geom_entity);
+ // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.uniteEnts)
+ // Insert-Code-Here {iGeom_SIDL.GeomSidl.uniteEnts} (uniteEnts method)
+ iGeom_uniteEnts(igeomInstance,
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle, geom_entities),
+ (iBase_EntityHandle*)&geom_entity,
+ &igeomError);
PROCESS_ERROR;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Unite)
+ // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.uniteEnts)
}
/**
- * Method: Subtract[]
+ * Method: subtractEnts[]
*/
void
-iGeom_SIDL::GeomSidl_impl::Subtract (
+iGeom_SIDL::GeomSidl_impl::subtractEnts (
/* in */ void* blank,
/* in */ void* tool,
/* out */ void*& geom_entity )
throw (
::iBase::Error
){
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Subtract)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.Subtract} (Subtract method)
- iGeom_Subtract(igeomInstance, blank, tool, &geom_entity);
+ // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.subtractEnts)
+ // Insert-Code-Here {iGeom_SIDL.GeomSidl.subtractEnts} (subtractEnts method)
+ iGeom_subtractEnts( igeomInstance,
+ (iBase_EntityHandle)blank,
+ (iBase_EntityHandle)tool,
+ (iBase_EntityHandle*)&geom_entity,
+ &igeomError);
PROCESS_ERROR;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Subtract)
+ // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.subtractEnts)
}
/**
- * Method: Section[]
+ * Method: sectionEnt[]
*/
void
-iGeom_SIDL::GeomSidl_impl::Section (
- /* inout */ void*& geom_entity,
+iGeom_SIDL::GeomSidl_impl::sectionEnt (
+ /* in */ void* geom_entity,
/* in */ double plane_normal_x,
/* in */ double plane_normal_y,
/* in */ double plane_normal_z,
@@ -4124,51 +4323,55 @@
throw (
::iBase::Error
){
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Section)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.Section} (Section method)
- iGeom_Section(igeomInstance, &geom_entity, plane_normal_x,
- plane_normal_y, plane_normal_z,
- offset, reverse, &geom_entity2);
+ // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.sectionEnt)
+ // Insert-Code-Here {iGeom_SIDL.GeomSidl.sectionEnt} (sectionEnt method)
+ iGeom_sectionEnt( igeomInstance,
+ (iBase_EntityHandle)geom_entity,
+ plane_normal_x, plane_normal_y, plane_normal_z,
+ offset, reverse,
+ (iBase_EntityHandle*)&geom_entity2,
+ &igeomError);
PROCESS_ERROR;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Section)
+ // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.sectionEnt)
}
/**
- * Method: Imprint[]
+ * Method: imprintEnts[]
*/
void
-iGeom_SIDL::GeomSidl_impl::Imprint (
+iGeom_SIDL::GeomSidl_impl::imprintEnts (
/* in */ ::sidl::array<void*> geom_entities,
/* in */ int32_t geom_entities_size )
throw (
::iBase::Error
){
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Imprint)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.Imprint} (Imprint method)
- iGeom_Imprint (igeomInstance,
- TEMP_ARRAY_IN(geom_entities));
+ // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.imprintEnts)
+ // Insert-Code-Here {iGeom_SIDL.GeomSidl.imprintEnts} (imprintEnts method)
+ iGeom_imprintEnts(igeomInstance,
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle, geom_entities),
+ &igeomError);
PROCESS_ERROR;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Imprint)
+ // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.imprintEnts)
}
/**
- * Method: Merge[]
+ * Method: mergeEnts[]
*/
void
-iGeom_SIDL::GeomSidl_impl::Merge (
+iGeom_SIDL::GeomSidl_impl::mergeEnts (
/* in */ ::sidl::array<void*> geom_entities,
/* in */ int32_t geom_entities_size,
/* in */ double tolerance )
throw (
::iBase::Error
){
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.Merge)
- // Insert-Code-Here {iGeom_SIDL.GeomSidl.Merge} (Merge method)
- iGeom_Merge (igeomInstance,
- TEMP_ARRAY_IN(geom_entities),
- tolerance);
+ // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl.mergeEnts)
+ // Insert-Code-Here {iGeom_SIDL.GeomSidl.mergeEnts} (mergeEnts method)
+ iGeom_mergeEnts(igeomInstance,
+ TEMP_TYPED_ARRAY_IN(iBase_EntityHandle,geom_entities),
+ tolerance, &igeomError);
PROCESS_ERROR;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.Merge)
+ // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl.mergeEnts)
}
@@ -4178,55 +4381,39 @@
void
iGeom_SIDL::GeomSidl_impl::processError() throw(::iBase::Error)
{
- static void *behavior_tag = NULL;
- static ::iBase::ErrorActions action = ::iBase::ErrorActions_THROW_ERROR;
+ iBase_TagHandle behavior_tag = 0;
+ iBase_ErrorActions action = iBase_THROW_ERROR;
// save this info before calling tag get function to get behavior
std::string this_desc(iGeom_LAST_ERROR.description);
iBase::ErrorType this_err = (iBase::ErrorType)iGeom_LAST_ERROR.error_type;
- if (0 == behavior_tag)
- behavior_tag = iGeom_getTagHandle(igeomInstance, "Error_Behavior");
+ if (0 == behavior_tag) {
+ int err;
+ iGeom_getTagHandle(igeomInstance, "Error_Behavior", &behavior_tag, &err, strlen("Error_Behavior"));
+ if (iBase_SUCCESS != err)
+ behavior_tag = 0;
+ }
if (0 != behavior_tag) {
- ::iBase::ErrorActions temp = (::iBase::ErrorActions) iGeom_getIntData (igeomInstance, NULL,
- behavior_tag);
- if (iBase_SUCCESS == iGeom_LAST_ERROR.error_type) action = temp;
+ int tmp_val;
+ iGeom_getIntData( igeomInstance, 0, behavior_tag, &tmp_val, &igeomError );
+ if (iBase_SUCCESS == iGeom_LAST_ERROR.error_type)
+ action = (iBase_ErrorActions) tmp_val;;
}
::iBase::Error this_error = ::iBase::Error::_create();
switch (action) {
- case ::iBase::ErrorActions_THROW_ERROR:
+ case iBase_THROW_ERROR:
this_error.set(this_err, this_desc);
throw this_error;
break;
- case ::iBase::ErrorActions_WARN_ONLY:
+ case iBase_WARN_ONLY:
std::cerr << this_desc << std::endl;
break;
- case ::iBase::ErrorActions_SILENT:
+ case iBase_SILENT:
break;
}
}
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl._misc)
-#error File has unused splicer blocks.
-/**
- * ================= BEGIN UNREFERENCED METHOD(S) ================
- * The following code segment(s) belong to unreferenced method(s).
- * This can result from a method rename/removal in the sidl file.
- * Move or remove the code in order to compile cleanly.
- */
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl_impl.getFaceType)
- const char *this_type = NULL;
- int32_t retval = iGeom_isEntParametric (igeomInstance,
- gentity_handle);
- PROCESS_ERROR;
- return retval;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl_impl.getFaceType)
- // DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl_impl.measure)
- CREATE_TEMP_ARRAY(double, measures);
- int32_t retval = iGeom_getParametric();
- PROCESS_ERROR;
- return retval;
- // DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl_impl.measure)
-// ================== END UNREFERENCED METHOD(S) =================
Modified: cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.hh
===================================================================
--- cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.hh 2009-01-31 01:26:13 UTC (rev 2617)
+++ cgm/trunk/itaps/SIDL/gserver/iGeom_SIDL_GeomSidl_Impl.hh 2009-01-31 01:28:22 UTC (rev 2618)
@@ -3,15 +3,11 @@
// Symbol: iGeom_SIDL.GeomSidl-v0.1
// Symbol Type: class
// Babel Version: 0.10.10
-// sidl Created: 20090126 14:50:19 CST
-// Generated: 20090126 14:50:21 CST
// Description: Server-side implementation for iGeom_SIDL.GeomSidl
//
// WARNING: Automatically generated; only changes within splicers preserved
//
// babel-version = 0.10.10
-// source-line = 5
-// source-url = file:/home/jason/meshkit/cgm/itaps/SIDL/iGeom_SIDL.sidl
//
#ifndef included_iGeom_SIDL_GeomSidl_Impl_hh
@@ -62,7 +58,6 @@
class GeomSidl_impl
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl._inherits)
// Insert-Code-Here {iGeom_SIDL.GeomSidl._inherits} (optional inheritance here)
- void processError() throw(::iBase::Error);
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl._inherits)
{
@@ -73,6 +68,8 @@
// DO-NOT-DELETE splicer.begin(iGeom_SIDL.GeomSidl._implementation)
// Insert-Code-Here {iGeom_SIDL.GeomSidl._implementation} (additional details)
+ int igeomError;
+ void processError() throw(::iBase::Error);
iGeom_Instance igeomInstance;
// DO-NOT-DELETE splicer.end(iGeom_SIDL.GeomSidl._implementation)
@@ -964,9 +961,10 @@
/**
* user defined non-static method.
*/
- ::iBase::EntityType
+ void
getEntType (
- /* in */ void* handle
+ /* in */ void* handle,
+ /* out */ ::iBase::EntityType& ent_type
)
throw (
::iBase::Error
@@ -1087,7 +1085,7 @@
* @param gentity_handle2 2nd entity
* @param are_adjacent If true, entities are adjacent
*/
- int32_t
+ void
isEntAdj (
/* in */ void* gentity_handle1,
/* in */ void* gentity_handle2,
@@ -1120,9 +1118,9 @@
/**
* user defined non-static method.
*/
- int32_t
+ void
getTopoLevel (
- /* in */ const ::std::string& model_name
+ /* out */ int32_t& level
)
throw (
::iBase::Error
@@ -1519,7 +1517,7 @@
* user defined non-static method.
*/
void
- getPntIntsct (
+ getPntRayIntsct (
/* in */ double x,
/* in */ double y,
/* in */ double z,
@@ -1569,10 +1567,11 @@
* @param gface Gface whose sense is being queried.
* @param gregion Gregion gface is being queried with respect to
*/
- int32_t
+ void
getEntNrmlSense (
/* in */ void* gface,
- /* in */ void* gregion
+ /* in */ void* gregion,
+ /* out */ int32_t& sense
)
throw (
::iBase::Error
@@ -1602,10 +1601,11 @@
* @param gedge Gedge whose sense is being queried.
* @param gface Gface gedge is being queried with respect to
*/
- int32_t
+ void
getEgFcSense (
/* in */ void* gedge,
- /* in */ void* gface
+ /* in */ void* gface,
+ /* out */ int32_t& sense
)
throw (
::iBase::Error
@@ -1638,11 +1638,12 @@
* @param gvertex1 First gvertex
* @param gvertex2 Second gvertex
*/
- int32_t
+ void
getEgVtxSense (
/* in */ void* gedge,
/* in */ void* gvertex1,
- /* in */ void* gvertex2
+ /* in */ void* gvertex2,
+ /* out */ int32_t& sense
)
throw (
::iBase::Error
@@ -1703,20 +1704,25 @@
/**
* user defined non-static method.
*/
- int32_t
- getParametric() throw (
+ void
+ getParametric (
+ /* out */ int32_t& parametric
+ )
+ throw (
::iBase::Error
);
+
/**
* Return whether a given gentity is parametric or not. If a gentity
* is not parametric, all of the following functions will return an error
* when called on that entity.
* @param gentity_handle Gentity being queried.
*/
- int32_t
+ void
isEntParametric (
- /* in */ void* gentity_handle
+ /* in */ void* gentity_handle,
+ /* out */ int32_t& is_parametric
)
throw (
::iBase::Error
@@ -2301,9 +2307,10 @@
/**
* user defined non-static method.
*/
- int32_t
+ void
isFcDegenerate (
- /* in */ void* face_handle
+ /* in */ void* face_handle,
+ /* out */ int32_t& is_degenerate
)
throw (
::iBase::Error
@@ -2343,9 +2350,10 @@
/**
* user defined non-static method.
*/
- double
+ void
getEntTolerance (
- /* in */ void* entity_handle
+ /* in */ void* entity_handle,
+ /* out */ double& tolerance
)
throw (
::iBase::Error
@@ -2379,6 +2387,7 @@
*/
void
initEntIter (
+ /* in */ void* entity_set_handle,
/* in */ int32_t gentity_dimension,
/* out */ void*& gentity_iterator
)
@@ -2389,7 +2398,7 @@
/**
* user defined non-static method.
*/
- bool
+ void
initEntArrIter (
/* in */ void* entity_set_handle,
/* in */ ::iBase::EntityType requested_entity_type,
@@ -2407,10 +2416,11 @@
* @param gentity_handle Next gentity
* @return If true, there are more gentities, if false, this is the last one
*/
- bool
+ void
getNextEntIter (
- /* inout */ void*& gentity_iterator,
- /* out */ void*& gentity_handle
+ /* in */ void* entity_iterator,
+ /* out */ void*& entity_handle,
+ /* out */ int32_t& has_data
)
throw (
::iBase::Error
@@ -2419,11 +2429,12 @@
/**
* user defined non-static method.
*/
- bool
+ void
getNextEntArrIter (
/* in */ void* entArr_iterator,
/* inout */ ::sidl::array<void*>& entity_handles,
- /* inout */ int32_t& entity_handles_size
+ /* out */ int32_t& entity_handles_size,
+ /* out */ int32_t& has_data
)
throw (
::iBase::Error
@@ -2520,7 +2531,7 @@
* user defined non-static method.
*/
void
- Sphere (
+ createSphere (
/* in */ double radius,
/* out */ void*& geom_entity
)
@@ -2532,7 +2543,7 @@
* user defined non-static method.
*/
void
- Brick (
+ createBrick (
/* in */ double x,
/* in */ double y,
/* in */ double z,
@@ -2546,7 +2557,7 @@
* user defined non-static method.
*/
void
- Cylinder (
+ createCylinder (
/* in */ double height,
/* in */ double major_rad,
/* in */ double minor_rad,
@@ -2560,7 +2571,7 @@
* user defined non-static method.
*/
void
- Torus (
+ createTorus (
/* in */ double major_rad,
/* in */ double minor_rad,
/* out */ void*& geom_entity
@@ -2573,8 +2584,8 @@
* user defined non-static method.
*/
void
- Move (
- /* inout */ void*& geom_entity,
+ moveEnt (
+ /* in */ void* geom_entity,
/* in */ double x,
/* in */ double y,
/* in */ double z
@@ -2587,8 +2598,8 @@
* user defined non-static method.
*/
void
- Rotate (
- /* inout */ void*& geom_entity,
+ rotateEnt (
+ /* in */ void* geom_entity,
/* in */ double angle,
/* in */ double axis_normal_x,
/* in */ double axis_normal_y,
@@ -2602,8 +2613,8 @@
* user defined non-static method.
*/
void
- Reflect (
- /* inout */ void*& geom_entity,
+ reflectEnt (
+ /* in */ void* geom_entity,
/* in */ double plane_normal_x,
/* in */ double plane_normal_y,
/* in */ double plane_normal_z
@@ -2616,8 +2627,8 @@
* user defined non-static method.
*/
void
- Scale (
- /* inout */ void*& geom_entity,
+ scaleEnt (
+ /* in */ void* geom_entity,
/* in */ double scale_x,
/* in */ double scale_y,
/* in */ double scale_z
@@ -2630,7 +2641,7 @@
* user defined non-static method.
*/
void
- Unite (
+ uniteEnts (
/* in */ ::sidl::array<void*> geom_entities,
/* in */ int32_t geom_entities_size,
/* out */ void*& geom_entity
@@ -2643,7 +2654,7 @@
* user defined non-static method.
*/
void
- Subtract (
+ subtractEnts (
/* in */ void* blank,
/* in */ void* tool,
/* out */ void*& geom_entity
@@ -2656,8 +2667,8 @@
* user defined non-static method.
*/
void
- Section (
- /* inout */ void*& geom_entity,
+ sectionEnt (
+ /* in */ void* geom_entity,
/* in */ double plane_normal_x,
/* in */ double plane_normal_y,
/* in */ double plane_normal_z,
@@ -2673,7 +2684,7 @@
* user defined non-static method.
*/
void
- Imprint (
+ imprintEnts (
/* in */ ::sidl::array<void*> geom_entities,
/* in */ int32_t geom_entities_size
)
@@ -2685,7 +2696,7 @@
* user defined non-static method.
*/
void
- Merge (
+ mergeEnts (
/* in */ ::sidl::array<void*> geom_entities,
/* in */ int32_t geom_entities_size,
/* in */ double tolerance
Added: cgm/trunk/itaps/SIDL/gserver.make
===================================================================
--- cgm/trunk/itaps/SIDL/gserver.make (rev 0)
+++ cgm/trunk/itaps/SIDL/gserver.make 2009-01-31 01:28:22 UTC (rev 2618)
@@ -0,0 +1,10 @@
+include babel.make
+
+TARGET_LIB = libiGeomserver.la
+LTLIBS = ../../libiGeom.la
+C_SRCS = $(IORSRCS)
+CXX_SRCS = $(IMPLSRCS) $(SKELSRCS) $(STUBSRCS)
+LIBLINK = $(CXXLINK)
+bdir = gserver
+
+include ../common.make
Modified: cgm/trunk/itaps/SIDL/iGeom.sidl
===================================================================
--- cgm/trunk/itaps/SIDL/iGeom.sidl 2009-01-31 01:26:13 UTC (rev 2617)
+++ cgm/trunk/itaps/SIDL/iGeom.sidl 2009-01-31 01:28:22 UTC (rev 2618)
@@ -81,7 +81,7 @@
out int num_type)
throws iBase.Error;
- EntityType getEntType( in opaque handle ) throws iBase.Error;
+ void getEntType( in opaque handle, out EntityType ent_type ) throws iBase.Error;
//==========================getArrType=================
/**
@@ -174,7 +174,7 @@
* @param gentity_handle2 2nd entity
* @param are_adjacent If true, entities are adjacent
*/
- int isEntAdj(in opaque gentity_handle1, in opaque gentity_handle2,
+ void isEntAdj(in opaque gentity_handle1, in opaque gentity_handle2,
out bool are_adjacent)
throws iBase.Error;
@@ -194,7 +194,7 @@
) throws iBase.Error;
- int getTopoLevel( in string model_name ) throws iBase.Error;
+ void getTopoLevel( out int level ) throws iBase.Error;
}
//===========================================================================
@@ -409,7 +409,7 @@
throws iBase.Error;
//==========================getPntIntsct=================
- void getPntIntsct( in double x, in double y, in double z,
+ void getPntRayIntsct( in double x, in double y, in double z,
in double dir_x, in double dir_y, in double dir_z,
inout array<opaque> intersect_entity_handles,
inout int intersect_entity_handles_size,
@@ -444,8 +444,9 @@
* @param gface Gface whose sense is being queried.
* @param gregion Gregion gface is being queried with respect to
*/
- int getEntNrmlSense(in opaque gface,
- in opaque gregion)
+ void getEntNrmlSense(in opaque gface,
+ in opaque gregion,
+ out int sense)
throws iBase.Error;
//==========================getArrNrmlSense=================
@@ -465,8 +466,9 @@
* @param gedge Gedge whose sense is being queried.
* @param gface Gface gedge is being queried with respect to
*/
- int getEgFcSense(in opaque gedge,
- in opaque gface)
+ void getEgFcSense(in opaque gedge,
+ in opaque gface,
+ out int sense)
throws iBase.Error;
//==========================getEgFcArrSense=================
@@ -489,9 +491,10 @@
* @param gvertex1 First gvertex
* @param gvertex2 Second gvertex
*/
- int getEgVtxSense(in opaque gedge,
+ void getEgVtxSense(in opaque gedge,
in opaque gvertex1,
- in opaque gvertex2)
+ in opaque gvertex2,
+ out int sense)
throws iBase.Error;
//==========================getEgVtxArrSense=================
@@ -537,7 +540,7 @@
interface Parametric extends Geometry {
//==========================getParametric=================
- int getParametric() throws iBase.Error;
+ void getParametric(out int parametric) throws iBase.Error;
//==========================isEntParametric=================
/**
@@ -546,7 +549,7 @@
* when called on that entity.
* @param gentity_handle Gentity being queried.
*/
- int isEntParametric(in opaque gentity_handle)
+ void isEntParametric(in opaque gentity_handle, out int is_parametric)
throws iBase.Error;
//==========================isArrParametric=================
@@ -834,7 +837,7 @@
) throws iBase.Error;
//==========================isFcDegenerate=================
- int isFcDegenerate( in opaque face_handle) throws iBase.Error;
+ void isFcDegenerate( in opaque face_handle, out int is_degenerate) throws iBase.Error;
//==========================isFcArrDegenerate=================
void isFcArrDegenerate( in array<opaque> face_handles,
@@ -867,7 +870,8 @@
throws iBase.Error;
//==========================getEntTolerance=================
- double getEntTolerance( in opaque entity_handle) throws iBase.Error;
+ void getEntTolerance( in opaque entity_handle,
+ out double tolerance ) throws iBase.Error;
//==========================getArrTolerance=================
/**
@@ -901,16 +905,16 @@
* @param gentity_dimension Dimension of gentities to be iterated over
* @param gentity_iterator Iterator initialized by this function
*/
- void initEntIter(in int gentity_dimension,
+ void initEntIter(in opaque entity_set_handle,
+ in int gentity_dimension,
out opaque gentity_iterator)
throws iBase.Error;
//==========================initEntArrIter=================
- bool initEntArrIter( in opaque entity_set_handle,
- in EntityType requested_entity_type,
+ void initEntArrIter( in opaque entity_set_handle,
+ in EntityType requested_entity_type,
in int requested_array_size,
- out opaque entArr_iterator
- ) throws iBase.Error;
+ out opaque entArr_iterator ) throws iBase.Error;
//==========================getNextEntIter=================
/**
@@ -919,14 +923,15 @@
* @param gentity_handle Next gentity
* @return If true, there are more gentities, if false, this is the last one
*/
- bool getNextEntIter(inout opaque gentity_iterator,
- out opaque gentity_handle)
- throws iBase.Error;
+ void getNextEntIter( in opaque entity_iterator,
+ out opaque entity_handle,
+ out int has_data) throws iBase.Error;
//==========================getNextEntArrIter=================
- bool getNextEntArrIter( in opaque entArr_iterator,
+ void getNextEntArrIter( in opaque entArr_iterator,
inout array<opaque> entity_handles,
- inout int entity_handles_size) throws iBase.Error;
+ out int entity_handles_size,
+ out int has_data) throws iBase.Error;
//==========================resetEntIter=================
/**
@@ -991,7 +996,7 @@
{
//==========================Sphere=================
/* Construct a Sphere with specified radius. */
- void Sphere(in double radius,
+ void createSphere(in double radius,
out opaque geom_entity)
throws iBase.Error;
@@ -1000,7 +1005,7 @@
* zero, a cube of dimension x is constructed.
* Result is undefined if only one dimension is zero.
*/
- void Brick(in double x, in double y, in double z,
+ void createBrick(in double x, in double y, in double z,
out opaque geom_entity)
throws iBase.Error;
@@ -1009,7 +1014,7 @@
* Major radius is along x axis, minor along y axis, and height along z.
* If minor radius is zero, a circular cylinder is produced.
*/
- void Cylinder(in double height, in double major_rad, in double minor_rad,
+ void createCylinder(in double height, in double major_rad, in double minor_rad,
out opaque geom_entity)
throws iBase.Error;
@@ -1018,44 +1023,44 @@
* radii specified. Torus is aligned with z axis, i.e. the locus of points
* defined by the cross-section centers lies in the xy plane.
*/
- void Torus(in double major_rad, in double minor_rad,
+ void createTorus(in double major_rad, in double minor_rad,
out opaque geom_entity)
throws iBase.Error;
}
interface Transforms extends Modify
{
-//==========================Move=================
- /* Move the specified entity by the specified vector
+//==========================moveEnt=================
+ /* moveEnt the specified entity by the specified vector
*/
- void Move(inout opaque geom_entity,
+ void moveEnt(in opaque geom_entity,
in double x, in double y, in double z)
throws iBase.Error;
-//==========================Rotate=================
- /* Rotate the specified entity the specified angle (in degrees) about the
+//==========================rotateEnt=================
+ /* rotateEnt the specified entity the specified angle (in degrees) about the
* specified axis; axis_normal is assumed to pass through the origin.
*/
- void Rotate(inout opaque geom_entity,
+ void rotateEnt(in opaque geom_entity,
in double angle,
in double axis_normal_x,
in double axis_normal_y,
in double axis_normal_z)
throws iBase.Error;
-//==========================Reflect=================
- /* Reflect the specified entity through a plane defined by the specified normal
+//==========================reflectEnt=================
+ /* reflectEnt the specified entity through a plane defined by the specified normal
*/
- void Reflect(inout opaque geom_entity,
+ void reflectEnt(in opaque geom_entity,
in double plane_normal_x,
in double plane_normal_y,
in double plane_normal_z)
throws iBase.Error;
-//==========================Scale=================
+//==========================scaleEnt=================
/* scale the specified entity
*/
- void Scale(inout opaque geom_entity,
+ void scaleEnt(in opaque geom_entity,
in double scale_x,
in double scale_y,
in double scale_z)
@@ -1064,31 +1069,31 @@
interface Booleans extends Modify
{
-//==========================Unite=================
- /* Unite the specified entities, resulting in a new entity; original entities
+//==========================uniteEnts=================
+ /* uniteEnts the specified entities, resulting in a new entity; original entities
* are unmodified
*/
- void Unite(in array<opaque> geom_entities,
+ void uniteEnts(in array<opaque> geom_entities,
in int geom_entities_size,
out opaque geom_entity)
throws iBase.Error;
-//==========================Subtract=================
- /* Subtract the tool from the blank, resulting in a new entity; original
+//==========================subtractEnts=================
+ /* subtractEnts the tool from the blank, resulting in a new entity; original
* entities are unmodified
*/
- void Subtract(in opaque blank, in opaque tool,
+ void subtractEnts(in opaque blank, in opaque tool,
out opaque geom_entity)
throws iBase.Error;
-//==========================Section=================
+//==========================sectionEnt=================
/* Cut the specified entity with a plane containing the origin defined by
* the specified normal, discarding anything on the negative side of the
* plane (as defined by the normal direction). If offset is specified,
* plane is offset along the normal direction by the specified distance.
* If reverse is true, positive side of the plane is discarded instead.
*/
- void Section(inout opaque geom_entity,
+ void sectionEnt(in opaque geom_entity,
in double plane_normal_x,
in double plane_normal_y,
in double plane_normal_z,
@@ -1096,17 +1101,17 @@
out opaque geom_entity2)
throws iBase.Error;
-//==========================Imprint=================
- /* Imprint the entities in the input list together.
+//==========================imprintEnts=================
+ /* imprintEnts the entities in the input list together.
*/
- void Imprint(in array<opaque> geom_entities,
+ void imprintEnts(in array<opaque> geom_entities,
in int geom_entities_size)
throws iBase.Error;
-//==========================Merge=================
- /* Merge coincident topology in the entities in the input list.
+//==========================mergeEnts=================
+ /* mergeEnts coincident topology in the entities in the input list.
*/
- void Merge(in array<opaque> geom_entities,
+ void mergeEnts(in array<opaque> geom_entities,
in int geom_entities_size,
in double tolerance)
throws iBase.Error;
More information about the cgma-dev
mailing list