projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 0.9.1
[platform/upstream/iotivity.git]
/
service
/
protocol-plugin
/
plugin-manager
/
src
/
PluginManagerImpl.h
diff --git
a/service/protocol-plugin/plugin-manager/src/PluginManagerImpl.h
b/service/protocol-plugin/plugin-manager/src/PluginManagerImpl.h
index
3beb8e8
..
c49768b
100644
(file)
--- a/
service/protocol-plugin/plugin-manager/src/PluginManagerImpl.h
+++ b/
service/protocol-plugin/plugin-manager/src/PluginManagerImpl.h
@@
-20,14
+20,17
@@
/// @file PluginManagerImpl.h
/// @file PluginManagerImpl.h
-/// @brief
+/// @brief
PluginManagerImple provides abstraction of the plugin manager interface
#ifndef __PLUGINMANAGERIMPL_H__
#define __PLUGINMANAGERIMPL_H__
#include "Plugin.h"
#include "CpluffAdapter.h"
#ifndef __PLUGINMANAGERIMPL_H__
#define __PLUGINMANAGERIMPL_H__
#include "Plugin.h"
#include "CpluffAdapter.h"
+
+#ifdef ANDROID
#include "FelixAdapter.h"
#include "FelixAdapter.h"
+#endif
namespace OIC
{
namespace OIC
{
@@
-40,7
+43,7
@@
namespace OIC
* During construction time, all plugins under the root plugin path will be loaded.
*
*/
* During construction time, all plugins under the root plugin path will be loaded.
*
*/
- PluginManagerImpl();
+ PluginManagerImpl(
void *args
);
/**
* Virtual destructor
/**
* Virtual destructor
@@
-61,7
+64,6
@@
namespace OIC
int registerPlugin(std::string path);
int registerPlugin(std::string path);
-
/**
* A function to register pluins in the path.
* This function will load plugins in plugin manager table.
/**
* A function to register pluins in the path.
* This function will load plugins in plugin manager table.
@@
-174,11
+176,11
@@
namespace OIC
*/
virtual std::vector<Plugin> &getAllPlugins(void);
*/
virtual std::vector<Plugin> &getAllPlugins(void);
- static PluginManagerImpl *Getinstance()
+ static PluginManagerImpl *Getinstance(
void *args
)
{
if (NULL == s_pinstance)
{
{
if (NULL == s_pinstance)
{
- s_pinstance = new PluginManagerImpl();
+ s_pinstance = new PluginManagerImpl(
args
);
}
return s_pinstance;
}
return s_pinstance;
@@
-187,7
+189,10
@@
namespace OIC
private:
CpluffAdapter *cppm;
private:
CpluffAdapter *cppm;
+ void *m_args;
+#ifdef ANDROID
FelixAdapter *javappm;
FelixAdapter *javappm;
+#endif
std::vector<Plugin> m_plugins;
static PluginManagerImpl *s_pinstance;
std::vector<Plugin> m_plugins;
static PluginManagerImpl *s_pinstance;