diff --git a/include/core/SkStringView.h b/include/core/SkStringView.h index 184e681d265101d3dbd25461e4f888449c999886..7486fcc3829f592376c720e6debcdbdf129a3155 100644 --- a/include/core/SkStringView.h +++ b/include/core/SkStringView.h @@ -8,6 +8,8 @@ #ifndef SkStringView_DEFINED #define SkStringView_DEFINED +#include "include/core/SkTypes.h" + #include #include #include @@ -156,17 +158,17 @@ private: size_type fLength; }; -bool operator==(string_view left, string_view right); +SK_API bool operator==(string_view left, string_view right); -bool operator!=(string_view left, string_view right); +SK_API bool operator!=(string_view left, string_view right); -bool operator<(string_view left, string_view right); +SK_API bool operator<(string_view left, string_view right); -bool operator<=(string_view left, string_view right); +SK_API bool operator<=(string_view left, string_view right); -bool operator>(string_view left, string_view right); +SK_API bool operator>(string_view left, string_view right); -bool operator>=(string_view left, string_view right); +SK_API bool operator>=(string_view left, string_view right); } // namespace skstd diff --git a/include/private/SkSLString.h b/include/private/SkSLString.h index 06c449fc139cc1d77621376d9208dd417dec280e..bbb56ef86779b754e6e1cec1d4731846ce7bdbb9 100644 --- a/include/private/SkSLString.h +++ b/include/private/SkSLString.h @@ -50,19 +50,19 @@ public: String& operator+=(const char* s); String& operator+=(const String& s); String& operator+=(skstd::string_view s); - friend String operator+(const char* s1, const String& s2); + SK_API friend String operator+(const char* s1, const String& s2); private: using INHERITED = std::string; }; -String operator+(skstd::string_view left, skstd::string_view right); +SK_API String operator+(skstd::string_view left, skstd::string_view right); -String to_string(double value); -String to_string(int32_t value); -String to_string(uint32_t value); -String to_string(int64_t value); -String to_string(uint64_t value); +SK_API String to_string(double value); +SK_API String to_string(int32_t value); +SK_API String to_string(uint32_t value); +SK_API String to_string(int64_t value); +SK_API String to_string(uint64_t value); bool stod(const skstd::string_view& s, SKSL_FLOAT* value); bool stoi(const skstd::string_view& s, SKSL_INT* value); diff --git a/src/sksl/SkSLOperators.h b/src/sksl/SkSLOperators.h index 4a936b0a41c0230d6e57b04a52a2440e9b0ac3b8..b6b8dfdacb5f1a3bef4d1072e539a9a75cd88baa 100644 --- a/src/sksl/SkSLOperators.h +++ b/src/sksl/SkSLOperators.h @@ -16,7 +16,7 @@ namespace SkSL { class Context; class Type; -class Operator { +class SK_API Operator { public: using Kind = Token::Kind; diff --git a/src/sksl/SkSLPool.h b/src/sksl/SkSLPool.h index 0b3d33a0d602bd436ee31dd5f9b2e2228bc16994..a2abb320c43bc1d6c929ab3142f131664e7084a5 100644 --- a/src/sksl/SkSLPool.h +++ b/src/sksl/SkSLPool.h @@ -21,7 +21,7 @@ namespace SkSL { * All allocated memory must be released back to the pool before it can be destroyed or recycled. */ -class Pool { +class SK_API Pool { public: ~Pool(); diff --git a/src/sksl/SkSLUtil.h b/src/sksl/SkSLUtil.h index 0f8fbf9bd4e4e2872a7a7c4f7c979215e8edc71e..4384c8c41e8a3d2ec2f632395f3227f0ce1a619d 100644 --- a/src/sksl/SkSLUtil.h +++ b/src/sksl/SkSLUtil.h @@ -289,7 +289,7 @@ using ShaderCapsPointer = std::unique_ptr; #endif // defined(SKSL_STANDALONE) || !SK_SUPPORT_GPU // Various sets of caps for use in tests -class ShaderCapsFactory { +class SK_API ShaderCapsFactory { public: static ShaderCapsPointer Default() { ShaderCapsPointer result = MakeShaderCaps(); diff --git a/src/sksl/ir/SkSLExpression.h b/src/sksl/ir/SkSLExpression.h index 786e11de9d52e5640d0501e0333640802052d7d2..52ed36a6f4d3a6441e50c7ee2a7f4f744af742e0 100644 --- a/src/sksl/ir/SkSLExpression.h +++ b/src/sksl/ir/SkSLExpression.h @@ -25,7 +25,7 @@ class Variable; /** * Abstract supertype of all expressions. */ -class Expression : public IRNode { +class SK_API Expression : public IRNode { public: enum class Kind { kBinary = (int) Statement::Kind::kLast + 1,