projects
/
platform
/
core
/
context
/
context-provider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Rename the class Json to avoid symbol conflicts with Jsoncpp
[platform/core/context/context-provider.git]
/
src
/
battery-stats
/
BatteryUsage.h
diff --git
a/src/battery-stats/BatteryUsage.h
b/src/battery-stats/BatteryUsage.h
index
bc748ba
..
cfcee56
100644
(file)
--- a/
src/battery-stats/BatteryUsage.h
+++ b/
src/battery-stats/BatteryUsage.h
@@
-26,7
+26,7
@@
namespace ctx {
BatteryUsageProvider();
~BatteryUsageProvider();
- int read(
Json option, Json
*requestResult);
+ int read(
CtxJson1 option, CtxJson1
*requestResult);
};
}