Compile updates for Emscripten 3.1.47

coder137 · coder137 · commit e0a737ab753e · 2024-02-09T15:55:39.000-08:00
diff --git a/include/behaviortree_cpp/action_node.h b/include/behaviortree_cpp/action_node.h
@@ -186,6 +186,8 @@ class StatefulActionNode : public ActionNodeBase
   std::atomic_bool halt_requested_;
 };
 
+#ifndef __EMSCRIPTEN__
+
 /**
  * @brief The CoroActionNode class is an a good candidate for asynchronous actions
  * which need to communicate with an external service using an async request/reply interface.
@@ -228,6 +230,7 @@ class CoroActionNode : public ActionNodeBase
   void destroyCoroutine();
 };
 
+#endif
 
 }   // namespace BT
 
diff --git a/src/action_node.cpp b/src/action_node.cpp
@@ -11,8 +11,11 @@
 *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#ifndef __EMSCRIPTEN__
 #define MINICORO_IMPL
 #include "minicoro/minicoro.h"
+#endif
+
 #include "behaviortree_cpp/action_node.h"
 
 using namespace BT;
@@ -64,6 +67,7 @@ NodeStatus SyncActionNode::executeTick()
 }
 
 //-------------------------------------
+#ifdef MINICORO_IMPL
 
 struct CoroActionNode::Pimpl
 {
@@ -145,6 +149,7 @@ void CoroActionNode::destroyCoroutine()
   }
 }
 
+#endif
 
 bool StatefulActionNode::isHaltRequested() const
 {

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,11 @@`
`11`	`11`	`* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.`
`12`	`12`	`*/`
`13`	`13`
	`14`	`+#ifndef __EMSCRIPTEN__`
`14`	`15`	`#define MINICORO_IMPL`
`15`	`16`	`#include "minicoro/minicoro.h"`
	`17`	`+#endif`
	`18`	`+`
`16`	`19`	`#include "behaviortree_cpp/action_node.h"`
`17`	`20`
`18`	`21`	`using namespace BT;`
`@@ -64,6 +67,7 @@ NodeStatus SyncActionNode::executeTick()`
`64`	`67`	`}`
`65`	`68`
`66`	`69`	`//-------------------------------------`
	`70`	`+#ifdef MINICORO_IMPL`
`67`	`71`
`68`	`72`	`struct CoroActionNode::Pimpl`
`69`	`73`	`{`
`@@ -145,6 +149,7 @@ void CoroActionNode::destroyCoroutine()`
`145`	`149`	`}`
`146`	`150`	`}`
`147`	`151`
	`152`	`+#endif`
`148`	`153`
`149`	`154`	`bool StatefulActionNode::isHaltRequested() const`
`150`	`155`	`{`