Skip to content

Commit a4dd08c

Browse files
authored
[Packager] Make it build again (#350)
1 parent e3200e6 commit a4dd08c

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

Packager/Packager.cpp

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
#include "Packager.h"
2121

22+
#include <interfaces/json/JPackager.h>
23+
2224
namespace Thunder {
2325
namespace Plugin {
2426
namespace {
@@ -56,7 +58,15 @@ namespace {
5658
result = _T("Couldn't create PACKAGER instance ");
5759

5860
} else {
59-
if (_implementation->Configure(_service) != Core::ERROR_NONE) {
61+
62+
PUSH_WARNING(DISABLE_WARNING_DEPRECATED_USE)
63+
64+
if (_implementation->Configure(_service) == Core::ERROR_NONE) {
65+
66+
POP_WARNING()
67+
68+
Exchange::JPackager::Register(*this, _implementation);
69+
} else {
6070
result = _T("Couldn't initialize PACKAGER instance");
6171
}
6272
}
@@ -73,6 +83,8 @@ namespace {
7383

7484
if (_implementation != nullptr) {
7585

86+
Exchange::JPackager::Unregister(*this);
87+
7688
RPC::IRemoteConnection* connection(_service->RemoteConnection(_connectionId));
7789

7890
VARIABLE_IS_NOT_USED uint32_t result = _implementation->Release();

Packager/PackagerImplementation.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,9 @@ namespace Plugin {
128128
, _isUpgrade(false)
129129
, _isSyncing(false)
130130
{
131-
Exchange::JPackager::Register(*this, this);
132131
}
133132

134-
~PackagerImplementation() override
135-
{
136-
Exchange::JPackager::Unregister(*this);
137-
}
133+
~PackagerImplementation() override;
138134

139135
BEGIN_INTERFACE_MAP(PackagerImplementation)
140136
INTERFACE_ENTRY(Exchange::IPackager)

0 commit comments

Comments
 (0)