#2387: callback: add forward declaration to fix circular dependency

Author: cwschilly

src/vt/objgroup/proxy/proxy_objgroup.h

@@ -50,7 +50,7 @@
 #include "vt/objgroup/proxy/proxy_objgroup_elm.h"
 #include "vt/objgroup/active_func/active_func.h"
 #include "vt/messaging/message/smart_ptr.h"
-#include "vt/pipe/pipe_callback_only.h"
+#include "vt/pipe/callback/cb_union/cb_raw_base.fwd.h"
 #include "vt/collective/reduce/operators/functors/none_op.h"
 #include "vt/collective/reduce/operators/callback_op.h"
 #include "vt/collective/reduce/reduce_scope.h"

src/vt/pipe/callback/cb_union/cb_raw_base.fwd.h

@@ -0,0 +1,62 @@
+/*
+//@HEADER
+// *****************************************************************************
+//
+//                             cb_raw_base_fwd.h
+//                       DARMA/vt => Virtual Transport
+//
+// Copyright 2019-2024 National Technology & Engineering Solutions of Sandia, LLC
+// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
+// Government retains certain rights in this software.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+//
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+//
+// * Neither the name of the copyright holder nor the names of its
+//   contributors may be used to endorse or promote products derived from this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Questions? Contact darma@sandia.gov
+//
+// *****************************************************************************
+//@HEADER
+*/
+
+#if !defined INCLUDED_VT_PIPE_CALLBACK_CB_UNION_CB_RAW_BASE_FWD_H
+#define INCLUDED_VT_PIPE_CALLBACK_CB_UNION_CB_RAW_BASE_FWD_H
+
+namespace vt { namespace pipe { namespace callback { namespace cbunion {
+
+template <typename... Args> struct CallbackTyped;
+
+struct CallbackRawBaseSingle;
+
+}}} // end namespace pipe::callback::cbunion
+
+template <typename... Args>
+using Callback = pipe::callback::cbunion::CallbackTyped<Args...>;
+
+using CallbackU = pipe::callback::cbunion::CallbackRawBaseSingle;
+
+} // end namespace vt
+
+#endif /*INCLUDED_VT_PIPE_CALLBACK_CB_UNION_CB_RAW_BASE_FWD_H*/

src/vt/pipe/callback/cb_union/cb_raw_base.h

@@ -45,6 +45,8 @@
 #define INCLUDED_VT_PIPE_CALLBACK_CB_UNION_CB_RAW_BASE_H
 
 #include "vt/config.h"
+#include "vt/pipe/pipe_callback_only.h"
+#include "vt/pipe/callback/cb_union/cb_raw_base.fwd.h"
 #include "vt/pipe/callback/cb_union/cb_raw.h"
 #include "vt/pipe/signal/signal.h"
 #include "vt/registry/auto/auto_registry_common.h"
@@ -69,9 +71,6 @@ static struct RawSendObjGrpTagType  { } RawSendObjGrpTag  { };
 static struct RawBcastObjGrpTagType { } RawBcastObjGrpTag { };
 #pragma GCC diagnostic pop
 
-template <typename... Args>
-struct CallbackTyped;
-
 struct CallbackRawBaseSingle {
   using AutoHandlerType = auto_registry::AutoHandlerType;
 
@@ -308,15 +307,6 @@ struct CallbackTyped : CallbackRawBaseSingle {
 
 }}}} /* end namespace vt::pipe::callback::cbunion */
 
-namespace vt {
-
-template <typename... Args>
-using Callback = pipe::callback::cbunion::CallbackTyped<Args...>;
-
-using CallbackU = pipe::callback::cbunion::CallbackRawBaseSingle;
-
-} /* end namespace vt */
-
 #include "vt/pipe/callback/cb_union/cb_raw_base.impl.h"
 
 #endif /*INCLUDED_VT_PIPE_CALLBACK_CB_UNION_CB_RAW_BASE_H*/

src/vt/trace/trace.h

@@ -49,6 +49,7 @@
 #include "vt/trace/trace_log.h"
 #include "vt/trace/trace_registry.h"
 #include "vt/trace/trace_lite.h"
+#include "vt/objgroup/proxy/proxy_objgroup.h"
 #include "vt/runtime/component/component_pack.h"
 
 #include "vt/timing/timing.h"