projects
/
platform
/
framework
/
web
/
crosswalk-tizen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6a37188
)
Fix build errors of PR 43
author
WonYoung Choi
<wy80.choi@samsung.com>
Wed, 23 Dec 2015 04:54:44 +0000
(13:54 +0900)
committer
WonYoung Choi
<wy80.choi@samsung.com>
Wed, 23 Dec 2015 04:54:44 +0000
(13:54 +0900)
The PR#43 has some build errors.
common/resource_manager.cc
patch
|
blob
|
history
diff --git
a/common/resource_manager.cc
b/common/resource_manager.cc
index
6550efb
..
4d5f7b0
100644
(file)
--- a/
common/resource_manager.cc
+++ b/
common/resource_manager.cc
@@
-205,7
+205,7
@@
ResourceManager::GetDefaultResource() {
std::shared_ptr<const wgt::parse::ContentInfo> content_info;
if (application_data_) {
- content_info
.reset(application_data_->content_info()
);
+ content_info
= application_data_->content_info(
);
if (content_info) {
src = content_info->src();
type = content_info->type();
@@
-616,7
+616,6
@@
std::string ResourceManager::DecryptResource(const std::string& path) {
static bool is_global = false;
static bool is_preload = false;
- int ret;
std::string pkg_id = application_data_->pkg_id();
if (!inited) {
inited = true;