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
e8718a1f
Commit
e8718a1f
authored
Mar 18, 2014
by
Peter Eastman
Browse files
Fixed compilation errors on Windows, plus an error in a test case
parent
6674de99
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
platforms/cpu/tests/TestCpuCustomNonbondedForce.cpp
platforms/cpu/tests/TestCpuCustomNonbondedForce.cpp
+4
-0
platforms/reference/include/ReferenceTabulatedFunction.h
platforms/reference/include/ReferenceTabulatedFunction.h
+1
-1
platforms/reference/src/ReferenceTabulatedFunction.cpp
platforms/reference/src/ReferenceTabulatedFunction.cpp
+1
-1
No files found.
platforms/cpu/tests/TestCpuCustomNonbondedForce.cpp
View file @
e8718a1f
...
@@ -843,6 +843,10 @@ void testInteractionGroupLongRangeCorrection() {
...
@@ -843,6 +843,10 @@ void testInteractionGroupLongRangeCorrection() {
int
main
()
{
int
main
()
{
try
{
try
{
if
(
!
CpuPlatform
::
isProcessorSupported
())
{
cout
<<
"CPU is not supported. Exiting."
<<
endl
;
return
0
;
}
testSimpleExpression
();
testSimpleExpression
();
testParameters
();
testParameters
();
testExclusions
();
testExclusions
();
...
...
platforms/reference/include/ReferenceTabulatedFunction.h
View file @
e8718a1f
...
@@ -42,7 +42,7 @@ namespace OpenMM {
...
@@ -42,7 +42,7 @@ namespace OpenMM {
/**
/**
* Given a TabulatedFunction, wrap it in an appropriate subclass of Lepton::CustomFunction.
* Given a TabulatedFunction, wrap it in an appropriate subclass of Lepton::CustomFunction.
*/
*/
extern
"C"
Lepton
::
CustomFunction
*
createReferenceTabulatedFunction
(
const
TabulatedFunction
&
function
);
extern
"C"
OPENMM_EXPORT
Lepton
::
CustomFunction
*
createReferenceTabulatedFunction
(
const
TabulatedFunction
&
function
);
/**
/**
* This class adapts a Continuous1DFunction into a Lepton::CustomFunction.
* This class adapts a Continuous1DFunction into a Lepton::CustomFunction.
...
...
platforms/reference/src/ReferenceTabulatedFunction.cpp
View file @
e8718a1f
...
@@ -48,7 +48,7 @@ using namespace OpenMM;
...
@@ -48,7 +48,7 @@ using namespace OpenMM;
using
namespace
std
;
using
namespace
std
;
using
Lepton
::
CustomFunction
;
using
Lepton
::
CustomFunction
;
extern
"C"
CustomFunction
*
createReferenceTabulatedFunction
(
const
TabulatedFunction
&
function
)
{
extern
"C"
OPENMM_EXPORT
CustomFunction
*
createReferenceTabulatedFunction
(
const
TabulatedFunction
&
function
)
{
if
(
dynamic_cast
<
const
Continuous1DFunction
*>
(
&
function
)
!=
NULL
)
if
(
dynamic_cast
<
const
Continuous1DFunction
*>
(
&
function
)
!=
NULL
)
return
new
ReferenceContinuous1DFunction
(
dynamic_cast
<
const
Continuous1DFunction
&>
(
function
));
return
new
ReferenceContinuous1DFunction
(
dynamic_cast
<
const
Continuous1DFunction
&>
(
function
));
if
(
dynamic_cast
<
const
Continuous2DFunction
*>
(
&
function
)
!=
NULL
)
if
(
dynamic_cast
<
const
Continuous2DFunction
*>
(
&
function
)
!=
NULL
)
...
...
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