Merge pull request #38433 from ZhilkinSerg/build-osx-conditionals

Guard explicit instantiation for OSX builds
CleverRaven · Feb 28, 2020 · e995a6e · e995a6e
2 parents 167b0b4 + 5858116
commit e995a6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/condition.cpp b/src/condition.cpp
@@ -1160,7 +1160,9 @@ conditional_t<T>::conditional_t( const std::string &type )
 template struct conditional_t<dialogue>;
 template void read_condition<dialogue>( const JsonObject &jo, const std::string &member_name,
                                         std::function<bool( const dialogue & )> &condition, bool default_val );
+#if !defined(MACOSX)
 template struct conditional_t<mission_goal_condition_context>;
+#endif
 template void read_condition<mission_goal_condition_context>( const JsonObject &jo,
         const std::string &member_name,
         std::function<bool( const mission_goal_condition_context & )> &condition, bool default_val );
diff --git a/src/condition.h b/src/condition.h
@@ -145,6 +145,7 @@ struct conditional_t {
         }
 };
 
+#if !defined(MACOSX)
 struct dialogue;
 extern template struct conditional_t<dialogue>;
 extern template void read_condition<dialogue>( const JsonObject &jo, const std::string &member_name,
@@ -154,5 +155,6 @@ extern template struct conditional_t<mission_goal_condition_context>;
 extern template void read_condition<mission_goal_condition_context>( const JsonObject &jo,
         const std::string &member_name,
         std::function<bool( const mission_goal_condition_context & )> &condition, bool default_val );
+#endif
 
 #endif