Revision: 70232
http://sourceforge.net/p/brlcad/code/70232
Author: brlcad
Date: 2017-09-06 23:35:24 +0000 (Wed, 06 Sep 2017)
Log Message:
-----------
use int instead of bool to keep all the shimmed types more consistent and
warning free.
Modified Paths:
--------------
brlcad/trunk/src/external/Creo/shim.cpp
brlcad/trunk/src/external/Creo/shim.h
Modified: brlcad/trunk/src/external/Creo/shim.cpp
===================================================================
--- brlcad/trunk/src/external/Creo/shim.cpp 2017-09-06 21:31:55 UTC (rev
70231)
+++ brlcad/trunk/src/external/Creo/shim.cpp 2017-09-06 23:35:24 UTC (rev
70232)
@@ -14,10 +14,10 @@
extern "C" int ProAsmcompMdlGet(ProFeature*,void**) {return 0;}
extern "C" int ProAsmcompMdlNameGet(ProFeature*,int*,wchar_t*) {return 0;}
extern "C" int ProAsmcomppathInit(void*,ProIdTable,int,void**) {return 0;}
-extern "C" int ProAsmcomppathTrfGet(void**,bool,ProMatrix) {return 0;}
-extern "C" int ProAssemblyIsExploded(void*,bool*) {return 0;}
+extern "C" int ProAsmcomppathTrfGet(void**,int,ProMatrix) {return 0;}
+extern "C" int ProAssemblyIsExploded(void*,int*) {return 0;}
extern "C" int
ProBsplinesrfdataGet(void**,int[2],double**,double**,double**,ProVector**,int*,int*,int*)
{return 0;}
-extern "C" int ProCmdActionAdd(const
char*,int(*)(int,int*,void*),int,int(*)(int),bool,bool,int*) {return 0;}
+extern "C" int ProCmdActionAdd(const
char*,int(*)(int,int*,void*),int,int(*)(int),int,int,int*) {return 0;}
extern "C" int ProDimensionTypeGet(void**,int*) {return 0;}
extern "C" int ProDimensionValueGet(void**,double *) {return 0;}
extern "C" int ProElementFree(void**) {return 0;}
@@ -41,7 +41,7 @@
extern "C" int ProMdlTypeGet(void*,int*) {return 0;}
extern "C" int ProMdlVerstampGet(void*, void**) {return 0;}
extern "C" int ProMdlnameInit(void*,int,void*) {return 0;}
-extern "C" int ProMenubarmenuPushbuttonAdd(const char*,const char*,const
char*,const char*,const char*,bool,int,wchar_t*) {return 0;}
+extern "C" int ProMenubarmenuPushbuttonAdd(const char*,const char*,const
char*,const char*,const char*,int,int,wchar_t*) {return 0;}
extern "C" int ProMessageDisplay(wchar_t *,const char *,const char *) {return
0;}
extern "C" int ProParameterInit(void *,wchar_t *,void *) {return 0;}
extern "C" int ProParameterValueGet(ProParameter *,void *) {return 0;}
@@ -50,7 +50,7 @@
extern "C" int ProParamvalueValueGet(void **,int,wchar_t *) {return 0;}
extern "C" int ProPartMaterialNameGet(void*,wchar_t *) {return 0;}
extern "C" int ProPartMaterialdataGet(void*,wchar_t*,ProMaterialProps*)
{return 0;}
-extern "C" int
ProPartTessellate(void*,double,double,bool,ProSurfaceTessellationData**)
{return 0;}
+extern "C" int
ProPartTessellate(void*,double,double,int,ProSurfaceTessellationData**) {return
0;}
extern "C" int ProSolidFeatVisit(void*,int (*)(ProFeature*,int,void*),int
(*)(ProFeature*,void*),void*) {return 0;}
extern "C" int ProSolidMassPropertyGet(void*,void*,ProMassProperty*) {return
0;}
extern "C" int ProSolidOutlineGet(void*, Pro3dPnt*) {return 0;}
@@ -58,7 +58,7 @@
extern "C" int ProStringarrayFree(char**,int) {return 0;}
extern "C" int ProSurfaceAppearancepropsGet(void**,ProSurfaceAppearanceProps*)
{return 0;}
extern "C" int ProUICheckbuttonActivateActionSet(const char*,const
char*,void(*)(char*,char*,void*),void*) {return 0;}
-extern "C" int ProUICheckbuttonGetState(const char*,const char*,bool*) {return
0;}
+extern "C" int ProUICheckbuttonGetState(const char*,const char*,int*) {return
0;}
extern "C" int ProUIDialogActivate(const char*,int*) {return 0;}
extern "C" int ProUIDialogCreate(const char *,const char *) {return 0;}
extern "C" int ProUIDialogDestroy(const char *) {return 0;}
@@ -82,7 +82,7 @@
extern "C" void ProAssemblyUnexplode(void*) {}
extern "C" void
ProContourEdgeVisit(void*,void*,int(*)(void*,int,void*),int(*)(void*,void*),void*)
{}
extern "C" void ProContourTraversalGet(void*,int*) {}
-extern "C" void ProMdlIsSkeleton(void*, bool*) {}
+extern "C" void ProMdlIsSkeleton(void*, int*) {}
extern "C" void ProMdlMdlNameGet(void*,int*,wchar_t*) {}
extern "C" void ProMdlMdlnameGet(void*,wchar_t*) {}
extern "C" void ProMessageClear() {}
Modified: brlcad/trunk/src/external/Creo/shim.h
===================================================================
--- brlcad/trunk/src/external/Creo/shim.h 2017-09-06 21:31:55 UTC (rev
70231)
+++ brlcad/trunk/src/external/Creo/shim.h 2017-09-06 23:35:24 UTC (rev
70232)
@@ -85,8 +85,8 @@
#define PRO_VALUE_UNUSED 77
#define uiProe2ndImmediate 78
-typedef bool ProBool;
-typedef bool ProBoolean;
+typedef int ProBool;
+typedef int ProBoolean;
typedef char* ProCharLine;
typedef int ProContourTraversal;
typedef int ProDimensiontype;
@@ -164,10 +164,10 @@
extern "C" int ProAsmcompMdlNameGet(ProFeature*,int*,wchar_t*);
extern "C" int ProAsmcompMdlNameGet(ProFeature*,int*,wchar_t*);
extern "C" int ProAsmcomppathInit(void*,ProIdTable,int,void**);
-extern "C" int ProAsmcomppathTrfGet(void**,bool,ProMatrix);
-extern "C" int ProAssemblyIsExploded(void*,bool*);
+extern "C" int ProAsmcomppathTrfGet(void**,int,ProMatrix);
+extern "C" int ProAssemblyIsExploded(void*,int*);
extern "C" int
ProBsplinesrfdataGet(void**,int[2],double**,double**,double**,ProVector**,int*,int*,int*);
-extern "C" int ProCmdActionAdd(const
char*,int(*)(int,int*,void*),int,int(*)(int),bool,bool,int*);
+extern "C" int ProCmdActionAdd(const
char*,int(*)(int,int*,void*),int,int(*)(int),int,int,int*);
extern "C" int ProDimensionTypeGet(void**,int*);
extern "C" int ProDimensionValueGet(void**,double *);
extern "C" int ProElementFree(void**);
@@ -191,7 +191,7 @@
extern "C" int ProMdlTypeGet(void*,int*);
extern "C" int ProMdlVerstampGet(void*, void**);
extern "C" int ProMdlnameInit(void*,int,void*);
-extern "C" int ProMenubarmenuPushbuttonAdd(const char*,const char*,const
char*,const char*,const char*,bool,int,wchar_t*);
+extern "C" int ProMenubarmenuPushbuttonAdd(const char*,const char*,const
char*,const char*,const char*,int,int,wchar_t*);
extern "C" int ProMessageDisplay(wchar_t *,const char *,const char *);
extern "C" int ProParameterInit(void *,wchar_t *,void *);
extern "C" int ProParameterValueGet(ProParameter *,void *);
@@ -200,7 +200,7 @@
extern "C" int ProParamvalueValueGet(void **,int,wchar_t *);
extern "C" int ProPartMaterialNameGet(void*,wchar_t *);
extern "C" int ProPartMaterialdataGet(void*,wchar_t*,ProMaterialProps*);
-extern "C" int
ProPartTessellate(void*,double,double,bool,ProSurfaceTessellationData**);
+extern "C" int
ProPartTessellate(void*,double,double,int,ProSurfaceTessellationData**);
extern "C" int ProSolidFeatVisit(void*,int (*)(ProFeature*,int,void*),int
(*)(ProFeature*,void*),void*);
extern "C" int ProSolidMassPropertyGet(void*,void*,ProMassProperty*);
extern "C" int ProSolidOutlineGet(void*, Pro3dPnt*);
@@ -208,7 +208,7 @@
extern "C" int ProStringarrayFree(char**,int);
extern "C" int ProSurfaceAppearancepropsGet(void**,ProSurfaceAppearanceProps*);
extern "C" int ProUICheckbuttonActivateActionSet(const char*,const
char*,void(*)(char*,char*,void*),void*);
-extern "C" int ProUICheckbuttonGetState(const char*,const char*,bool*);
+extern "C" int ProUICheckbuttonGetState(const char*,const char*,int*);
extern "C" int ProUIDialogActivate(const char*,int*);
extern "C" int ProUIDialogCreate(const char *,const char *);
extern "C" int ProUIDialogDestroy(const char *);
@@ -232,7 +232,7 @@
extern "C" void ProAssemblyUnexplode(void*);
extern "C" void
ProContourEdgeVisit(void*,void*,int(*)(void*,int,void*),int(*)(void*,void*),void*);
extern "C" void ProContourTraversalGet(void*,int*);
-extern "C" void ProMdlIsSkeleton(void*, bool*);
+extern "C" void ProMdlIsSkeleton(void*, int*);
extern "C" void ProMdlMdlnameGet(void*,wchar_t*);
extern "C" void ProMessageClear();
extern "C" void ProPartTessellationFree(ProSurfaceTessellationData**);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
