Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion addons/ofxGui/src/ofxInputField.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,6 @@ template class ofxInputField<double>;
template class ofxInputField<std::string>;

//for some reason osx errors if this isn't defined
#if defined TARGET_OSX || defined TARGET_EMSCRIPTEN
#if defined (__APPLE__) || defined TARGET_EMSCRIPTEN
template class ofxInputField<typename std::conditional<std::is_same<uint32_t, size_t>::value || std::is_same<uint64_t, size_t>::value, bool, size_t>::type>;
#endif
2 changes: 1 addition & 1 deletion addons/ofxGui/src/ofxSlider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ template class ofxSlider<float>;
template class ofxSlider<double>;

//for some reason osx errors if this isn't defined
#if defined TARGET_OSX || defined TARGET_EMSCRIPTEN
#if defined (__APPLE__) || defined TARGET_EMSCRIPTEN
template class ofxSlider<typename std::conditional<std::is_same<uint32_t, size_t>::value || std::is_same<uint64_t, size_t>::value, bool, size_t>::type>;
#endif