Skip to content

GitLab

Commit f6eaf2bd authored by peastman's avatar peastman
Browse files

Merge pull request #320 from peastman/master 

Fixed segfaults caused by errors in Fortran wrapper generation
parents a2c68a6f 6b6f7f19
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
plugins/amoeba/wrappers/generateAmoebaWrappers.py
View file @ f6eaf2bd
...@@ -1136,14 +1136,14 @@ class FortranSourceGenerator(WrapperGenerator): ...@@ -1136,14 +1136,14 @@ class FortranSourceGenerator(WrapperGenerator):
return type return type
def isHandleType(self, type): def isHandleType(self, type):
if type.startswith('OpenMM_'): if type == 'OpenMM_Vec3':
return True; return False
if type == 'Vec3':
return True
if type.endswith('*') or type.endswith('&'): if type.endswith('*') or type.endswith('&'):
return self.isHandleType(type[:-1].strip()) return self.isHandleType(type[:-1].strip())
if type.startswith('const '): if type.startswith('const '):
return self.isHandleType(type[6:].strip()) return self.isHandleType(type[6:].strip())
if type.startswith('OpenMM_'):
return True;
return False return False
def writeOutput(self): def writeOutput(self):
......
wrappers/generateWrappers.py
View file @ f6eaf2bd
...@@ -1667,14 +1667,14 @@ class FortranSourceGenerator(WrapperGenerator): ...@@ -1667,14 +1667,14 @@ class FortranSourceGenerator(WrapperGenerator):
return type return type
def isHandleType(self, type): def isHandleType(self, type):
if type.startswith('OpenMM_'): if type == 'OpenMM_Vec3':
return True; return False
if type == 'Vec3':
return True
if type.endswith('*') or type.endswith('&'): if type.endswith('*') or type.endswith('&'):
return self.isHandleType(type[:-1].strip()) return self.isHandleType(type[:-1].strip())
if type.startswith('const '): if type.startswith('const '):
return self.isHandleType(type[6:].strip()) return self.isHandleType(type[6:].strip())
if type.startswith('OpenMM_'):
return True;
return False return False
def writeOutput(self): def writeOutput(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment