Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use " instead of < for JSIStoreValueUser.h include #1768

Merged
merged 2 commits into from
Mar 1, 2021
Merged

Use " instead of < for JSIStoreValueUser.h include #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
633d0a9
Use `"` instead of `<` for `JSIStoreValueUser.h` include
mrousavy Feb 27, 2021
b8a2ef7
Also fix " import for ValueWrapper.h
mrousavy Feb 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Common/cpp/headers/SharedItems/ShareableValue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
#include "Logger.h"
#include "ValueWrapper.h"
#include "HostFunctionHandler.h"
#include "JSIStoreValueUser.h"
#include <string>
#include <mutex>
#include <unordered_map>
#include <jsi/jsi.h>
#include <JSIStoreValueUser.h>

using namespace facebook;

Expand All @@ -30,7 +30,7 @@ friend void extractMutables(jsi::Runtime &rt,
bool containsHostFunction = false;

ShareableValue(NativeReanimatedModule *module, std::shared_ptr<Scheduler> s): StoreUser(s), module(module) {}

jsi::Value toJSValue(jsi::Runtime &rt);
jsi::Object createHost(jsi::Runtime &rt, std::shared_ptr<jsi::HostObject> host);
void adapt(jsi::Runtime &rt, const jsi::Value &value, ValueType objectType);
Expand Down
10 changes: 5 additions & 5 deletions Common/cpp/headers/SharedItems/ValueWrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include "WorkletsCache.h"
#include "SharedParent.h"
#include <jsi/jsi.h>
#include <JSIStoreValueUser.h>
#include <string>
#include "JSIStoreValueUser.h"
#include "HostFunctionHandler.h"

namespace reanimated {
Expand All @@ -18,9 +18,9 @@ class ValueWrapper {
ValueType getType() const {
return type;
}

virtual ~ValueWrapper() {}

static inline bool asBoolean(const std::unique_ptr<ValueWrapper>& valueContainer);
static inline double asNumber(const std::unique_ptr<ValueWrapper>& valueContainer);
static inline const std::string& asString(const std::unique_ptr<ValueWrapper>& valueContainer);
Expand All @@ -29,9 +29,9 @@ class ValueWrapper {
static inline const std::shared_ptr<RemoteObject>& asRemoteObject(const std::unique_ptr<ValueWrapper>& valueContainer);
static inline std::vector<std::shared_ptr<ShareableValue>>& asFrozenArray(const std::unique_ptr<ValueWrapper>& valueContainer);
static inline const std::shared_ptr<MutableValue>& asMutableValue(const std::unique_ptr<ValueWrapper>& valueContainer);

static const HostFunctionWrapper* asHostFunctionWrapper(const std::unique_ptr<ValueWrapper>& valueContainer);

protected:
ValueType type;
};
Expand Down