Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
cfd815ec
Commit
cfd815ec
authored
Sep 09, 2013
by
peastman
Browse files
Merge pull request #134 from peastman/master
Fixed compilation errors on some platforms
parents
9f9cac52
a1c0f183
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
wrappers/python/src/swig_doxygen/swig_lib/python/extend.i
wrappers/python/src/swig_doxygen/swig_lib/python/extend.i
+6
-6
No files found.
wrappers/python/src/swig_doxygen/swig_lib/python/extend.i
View file @
cfd815ec
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
int
enforcePeriodic
,
int
enforcePeriodic
,
int
groups
)
{
int
groups
)
{
State
state
;
State
state
;
Py
_BEGIN_ALLOW_THREADS
Py
ThreadState
*
_savePythonThreadState
=
PyEval_SaveThread
()
;
int
types
=
0
;
int
types
=
0
;
if
(
getPositions
)
types
|=
State
::
Positions
;
if
(
getPositions
)
types
|=
State
::
Positions
;
if
(
getVelocities
)
types
|=
State
::
Velocities
;
if
(
getVelocities
)
types
|=
State
::
Velocities
;
...
@@ -18,10 +18,10 @@
...
@@ -18,10 +18,10 @@
state
=
self-
>
getState
(
types
,
enforcePeriodic
,
groups
)
;
state
=
self-
>
getState
(
types
,
enforcePeriodic
,
groups
)
;
}
}
catch
(
...
)
{
catch
(
...
)
{
Py
_END_ALLOW_THREADS
Py
Eval_RestoreThread
(
_savePythonThreadState
)
;
throw
;
throw
;
}
}
Py
_END_ALLOW_THREADS
Py
Eval_RestoreThread
(
_savePythonThreadState
)
;
return
_convertStateToLists
(
state
)
;
return
_convertStateToLists
(
state
)
;
}
}
...
@@ -156,7 +156,7 @@ Parameters:
...
@@ -156,7 +156,7 @@ Parameters:
int
enforcePeriodic
,
int
enforcePeriodic
,
int
groups
)
{
int
groups
)
{
State
state
;
State
state
;
Py
_BEGIN_ALLOW_THREADS
Py
ThreadState
*
_savePythonThreadState
=
PyEval_SaveThread
()
;
int
types
=
0
;
int
types
=
0
;
if
(
getPositions
)
types
|=
State
::
Positions
;
if
(
getPositions
)
types
|=
State
::
Positions
;
if
(
getVelocities
)
types
|=
State
::
Velocities
;
if
(
getVelocities
)
types
|=
State
::
Velocities
;
...
@@ -167,10 +167,10 @@ Parameters:
...
@@ -167,10 +167,10 @@ Parameters:
state
=
self-
>
getState
(
copy
,
types
,
enforcePeriodic
,
groups
)
;
state
=
self-
>
getState
(
copy
,
types
,
enforcePeriodic
,
groups
)
;
}
}
catch
(
...
)
{
catch
(
...
)
{
Py
_END_ALLOW_THREADS
Py
Eval_RestoreThread
(
_savePythonThreadState
)
;
throw
;
throw
;
}
}
Py
_END_ALLOW_THREADS
Py
Eval_RestoreThread
(
_savePythonThreadState
)
;
return
_convertStateToLists
(
state
)
;
return
_convertStateToLists
(
state
)
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment