Changeset 11995 for issm/trunk/src/c/objects/Inputs/BoolInput.h

Timestamp:

04/16/12 14:57:18 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 11994M

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src/c/objects/Inputs/BoolInput.h (modified) (1 diff)

issm/trunk

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in

issm/trunk/src/c/objects/Inputs/BoolInput.h

@@ -81 +81 @@
                 void Extrude(void);
                 void VerticallyIntegrate(Input* thickness_input){_error_("not supported yet");};
-                void GetVectorFromInputs(Vec vector,int* doflist);
+                void GetVectorFromInputs(Vector* vector,int* doflist);
                 void GetValuesPtr(double** pvalues,int* pnum_values);
                 /*}}}*/

@@ -7 +7 @@
 config.status
 configure
-doxygen
 ISSM.paf
 ISSM.ppf
 ISSM.ppf_cache
 libtool
-list
 Makefile
 Makefile.in