diff --git a/pxr/base/tf/diagnosticBase.h b/pxr/base/tf/diagnosticBase.h index c14d416909..72014beb31 100644 --- a/pxr/base/tf/diagnosticBase.h +++ b/pxr/base/tf/diagnosticBase.h @@ -38,13 +38,13 @@ #include "pxr/base/arch/attributes.h" #include "pxr/base/arch/function.h" -#include +#include #include #include PXR_NAMESPACE_OPEN_SCOPE -typedef boost::any TfDiagnosticInfo; +typedef std::any TfDiagnosticInfo; class TfDiagnosticMgr; @@ -160,7 +160,7 @@ class TfDiagnosticBase { /// then GetInfo() returns NULL. template const T* GetInfo() const { - return boost::any_cast(&_info); + return std::any_cast(&_info); } /// Set the info object associated with this diagnostic message. diff --git a/pxr/base/tf/diagnosticHelper.h b/pxr/base/tf/diagnosticHelper.h index f4c6b1592a..2552c1fab6 100644 --- a/pxr/base/tf/diagnosticHelper.h +++ b/pxr/base/tf/diagnosticHelper.h @@ -32,12 +32,12 @@ // incompatible macro definitions in pyport.h on macOS. #include -#include +#include #include PXR_NAMESPACE_OPEN_SCOPE -typedef boost::any TfDiagnosticInfo; +typedef std::any TfDiagnosticInfo; class TfCallContext; enum TfDiagnosticType : int; class TfEnum; diff --git a/pxr/base/tf/diagnosticMgr.cpp b/pxr/base/tf/diagnosticMgr.cpp index e42acffd56..5e9e48dbb8 100644 --- a/pxr/base/tf/diagnosticMgr.cpp +++ b/pxr/base/tf/diagnosticMgr.cpp @@ -42,11 +42,10 @@ #include "pxr/base/arch/stackTrace.h" #include "pxr/base/arch/threads.h" -#include - #include #include +#include #include #include @@ -673,7 +672,7 @@ TfDiagnosticMgr::FormatDiagnostic(const TfEnum &code, #ifdef PXR_PYTHON_SUPPORT_ENABLED if (const TfPyExceptionState* exc = - boost::any_cast(&info)) { + std::any_cast(&info)) { output += TfStringPrintf("%s\n", exc->GetExceptionString().c_str()); } #endif // PXR_PYTHON_SUPPORT_ENABLED