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
535710ec
"ssh:/git@developer.sourcefind.cn:2222/tsoc/openmm.git" did not exist on "eb1293f52263e49536cb2004799fe9cd293a0712"
Commit
535710ec
authored
Dec 01, 2009
by
Peter Eastman
Browse files
Fixed a compilation error under Windows
parent
832b8a42
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
17 deletions
+12
-17
olla/include/openmm/Platform.h
olla/include/openmm/Platform.h
+0
-5
olla/src/Platform.cpp
olla/src/Platform.cpp
+12
-12
No files found.
olla/include/openmm/Platform.h
View file @
535710ec
...
@@ -229,11 +229,6 @@ private:
...
@@ -229,11 +229,6 @@ private:
std
::
map
<
std
::
string
,
KernelFactory
*>
kernelFactories
;
std
::
map
<
std
::
string
,
KernelFactory
*>
kernelFactories
;
std
::
map
<
std
::
string
,
std
::
string
>
defaultProperties
;
std
::
map
<
std
::
string
,
std
::
string
>
defaultProperties
;
static
std
::
vector
<
Platform
*>&
getPlatforms
();
static
std
::
vector
<
Platform
*>&
getPlatforms
();
#ifdef WIN32
static
std
::
vector
<
HMODULE
>&
getPlugins
();
#else
static
std
::
vector
<
void
*>&
getPlugins
();
#endif
};
};
}
// namespace OpenMM
}
// namespace OpenMM
...
...
olla/src/Platform.cpp
View file @
535710ec
...
@@ -114,6 +114,18 @@ Kernel Platform::createKernel(const string& name, ContextImpl& context) const {
...
@@ -114,6 +114,18 @@ Kernel Platform::createKernel(const string& name, ContextImpl& context) const {
return
Kernel
(
kernelFactories
.
find
(
name
)
->
second
->
createKernelImpl
(
name
,
*
this
,
context
));
return
Kernel
(
kernelFactories
.
find
(
name
)
->
second
->
createKernelImpl
(
name
,
*
this
,
context
));
}
}
#ifdef WIN32
static
vector
<
HMODULE
>&
getPlugins
()
{
static
vector
<
HMODULE
>
plugins
;
return
plugins
;
}
#else
static
vector
<
void
*>&
getPlugins
()
{
static
vector
<
void
*>
plugins
;
return
plugins
;
}
#endif
vector
<
Platform
*>&
Platform
::
getPlatforms
()
{
vector
<
Platform
*>&
Platform
::
getPlatforms
()
{
if
(
getPlugins
().
size
()
>
0
)
{
if
(
getPlugins
().
size
()
>
0
)
{
// Initialize plugins before returning the list of platforms.
// Initialize plugins before returning the list of platforms.
...
@@ -154,18 +166,6 @@ vector<Platform*>& Platform::getPlatforms() {
...
@@ -154,18 +166,6 @@ vector<Platform*>& Platform::getPlatforms() {
return
platforms
;
return
platforms
;
}
}
#ifdef WIN32
vector
<
HMODULE
>&
Platform
::
getPlugins
()
{
static
vector
<
HMODULE
>
plugins
;
return
plugins
;
}
#else
vector
<
void
*>&
Platform
::
getPlugins
()
{
static
vector
<
void
*>
plugins
;
return
plugins
;
}
#endif
void
Platform
::
registerPlatform
(
Platform
*
platform
)
{
void
Platform
::
registerPlatform
(
Platform
*
platform
)
{
getPlatforms
().
push_back
(
platform
);
getPlatforms
().
push_back
(
platform
);
}
}
...
...
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