From b8e02e7f1f75c58770be52b987208ebe52ac3fa1 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 22 Dec 2009 22:18:58 +0000
Subject: [PATCH] setConstructor does not compile on mac -- removing for now,
which will break lua bindings
---
Common/Bindings.h | 5 +++--
Numeric/fullMatrix.cpp | 5 +++--
Post/OctreePost.cpp | 2 --
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Common/Bindings.h b/Common/Bindings.h
index 2a02084ef0..14a51e2a64 100644
--- a/Common/Bindings.h
+++ b/Common/Bindings.h
@@ -3,6 +3,7 @@
#include <string>
#include <list>
#include <typeinfo>
+#include "GmshConfig.h"
class methodBinding{
public:
@@ -32,9 +33,9 @@ tObj *constructorPtr(){
return new tObj();
}
-#ifdef HAVE_LUA //no bindings
+#if defined(HAVE_LUA)
#include "LuaBindings.h"
-#else
+#else //no bindings
#include "DummyBindings.h"
#endif
diff --git a/Numeric/fullMatrix.cpp b/Numeric/fullMatrix.cpp
index d660be5003..8eee380ac2 100644
--- a/Numeric/fullMatrix.cpp
+++ b/Numeric/fullMatrix.cpp
@@ -289,6 +289,8 @@ bool fullMatrix<double>::svd(fullMatrix<double> &V, fullVector<double> &S)
return false;
}
+#endif
+
#include "Bindings.h"
template<>
void fullMatrix<double>::registerBindings(binding *b){
@@ -299,6 +301,5 @@ void fullMatrix<double>::registerBindings(binding *b){
cb->addMethod("get",&fullMatrix<double>::get);
cb->addMethod("set",&fullMatrix<double>::set);
cb->addMethod("gemm",&fullMatrix<double>::gemm);
- cb->setConstructor(constructorPtr<fullMatrix<double>,int,int>);
+ // cb->setConstructor(constructorPtr<fullMatrix<double>,int,int>);
}
-#endif
diff --git a/Post/OctreePost.cpp b/Post/OctreePost.cpp
index 3df1fa6191..90c8bfc4a7 100644
--- a/Post/OctreePost.cpp
+++ b/Post/OctreePost.cpp
@@ -353,8 +353,6 @@ bool OctreePost::_getValue(void *in, int nbComp, double P[3], int timestep,
double U[3];
e->xyz2uvw(P, U);
- //printf("hey!\n");
-
double nodeval[8 * 9];
for(int step = 0; step < _theViewDataGModel->getNumTimeSteps(); step++){
if(timestep < 0 || step == timestep){
--
GitLab