Changeset 19717

Timestamp:

11/12/15 21:08:05 (9 years ago)

Author:

Eric.Larour

Message:

CHG: shuffling things around. wrapper_macros does not define WRAPPER for the javascript
but instead the specific wrapper header file.

Location:

issm/trunk-jpl/src/wrappers

Files:

• ElementConnectivity/ElementConnectivity.h (modified) (1 diff)
• NodeConnectivity/NodeConnectivity.h (modified) (1 diff)
• TriMesh/TriMesh.h (modified) (1 diff)
• javascript/include/wrapper_macros.h (modified) (1 diff)

issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.h ¶

@@ -51 +51 @@
 /* serial output macros: */
 #define ELEMENTCONNECTIVITY pelementconnectivity,NULL,NULL
-#undef WRAPPER
 #define WRAPPER(modulename) extern "C" { int  ElementConnectivityModule(double** pelementconnectivity, int* elementsin, int* nodeconnectivityin, int nelsin, int nodsin, int widthin)
 #endif

issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.h ¶

@@ -51 +51 @@
 /* serial output macros: */
 #define CONNECTIVITY pconnectivity,pnods,pwidth
-#undef WRAPPER
 #define WRAPPER(modulename) extern "C" { int  NodeConnectivityModule(double** pconnectivity, int* pnods, int *pwidth, int* elementsin, int nelsin, int nodsin)
 #endif

issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.h ¶

@@ -71 +71 @@
 #define SEGMENTS          psegments,pnsegs
 #define SEGMENTMARKERLIST psegmentmarkers,pnsegs
-#undef WRAPPER
 #define WRAPPER(modulename) extern "C" { int  TriMeshModule(double** pindex, double** px, double** py, int* pnel, int* pnods, double** psegments, double** psegmentmarkers, int* pnsegs, double* domainx, double* domainy, int domainnods, double areain)
 #define _DO_NOT_LOAD_GLOBALS_//we only load globals for TriMeshModule.js, not other modules!

issm/trunk-jpl/src/wrappers/javascript/include/wrapper_macros.h ¶

@@ -34 +34 @@
         }
 /*}}}*/
-/* WRAPPER {{{*/
-#define WRAPPER(modulename,...) extern "C" { int  modulename##Module(__VA_ARGS__) 
-/*}}}*/
 /* CHECKARGUMENTS {{{*/
 #define CHECKARGUMENTS(NLHS,NRHS,functionpointer)  //do nothing, we are not creating a dynamic library here!