From f2a3ecd0146f0a35ba21241a095b12f088c83e40 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Thu, 12 Sep 2019 17:19:36 -0400 Subject: [PATCH] Don't generate doxygen for serialization helpers --- vtkm/cont/ArrayHandle.h | 2 ++ vtkm/cont/ArrayHandle.hxx | 1 + vtkm/cont/ArrayHandleCartesianProduct.h | 2 ++ vtkm/cont/ArrayHandleCast.h | 2 ++ vtkm/cont/ArrayHandleCompositeVector.h | 3 ++- vtkm/cont/ArrayHandleConcatenate.h | 2 ++ vtkm/cont/ArrayHandleConstant.h | 2 ++ vtkm/cont/ArrayHandleCounting.h | 2 ++ vtkm/cont/ArrayHandleExtractComponent.h | 2 ++ vtkm/cont/ArrayHandleExtrudeCoords.h | 2 ++ vtkm/cont/ArrayHandleExtrudeField.h | 2 ++ vtkm/cont/ArrayHandleGroupVec.h | 2 ++ vtkm/cont/ArrayHandleGroupVecVariable.h | 2 ++ vtkm/cont/ArrayHandleImplicit.h | 2 ++ vtkm/cont/ArrayHandleIndex.h | 2 ++ vtkm/cont/ArrayHandlePermutation.h | 2 ++ vtkm/cont/ArrayHandleReverse.h | 2 ++ vtkm/cont/ArrayHandleSOA.h | 1 + vtkm/cont/ArrayHandleSwizzle.h | 2 ++ vtkm/cont/ArrayHandleTransform.h | 2 ++ vtkm/cont/ArrayHandleUniformPointCoordinates.h | 2 ++ vtkm/cont/ArrayHandleVirtual.h | 1 + vtkm/cont/ArrayHandleVirtual.hxx | 1 + vtkm/cont/ArrayHandleVirtualCoordinates.h | 2 ++ vtkm/cont/ArrayHandleZip.h | 2 ++ vtkm/cont/CellSetExplicit.h | 2 ++ vtkm/cont/CellSetExtrude.h | 2 ++ vtkm/cont/CellSetPermutation.h | 2 ++ vtkm/cont/CellSetSingleType.h | 2 ++ vtkm/cont/CellSetStructured.h | 2 ++ vtkm/cont/CoordinateSystem.h | 2 ++ vtkm/cont/DataSet.h | 2 ++ vtkm/cont/DynamicCellSet.h | 2 ++ vtkm/cont/Field.h | 2 ++ vtkm/cont/SerializableTypeString.h | 2 ++ vtkm/cont/VariantArrayHandle.h | 2 ++ 36 files changed, 68 insertions(+), 1 deletion(-) diff --git a/vtkm/cont/ArrayHandle.h b/vtkm/cont/ArrayHandle.h index 644d41a5b..bb3d6025d 100644 --- a/vtkm/cont/ArrayHandle.h +++ b/vtkm/cont/ArrayHandle.h @@ -675,6 +675,7 @@ VTKM_NEVER_EXPORT VTKM_CONT inline void printSummary_ArrayHandle( //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -716,6 +717,7 @@ struct Serialization> }; } // diy +/// @endcond SERIALIZATION #ifndef vtk_m_cont_ArrayHandle_hxx #include diff --git a/vtkm/cont/ArrayHandle.hxx b/vtkm/cont/ArrayHandle.hxx index c66514b1a..45f3f8f55 100644 --- a/vtkm/cont/ArrayHandle.hxx +++ b/vtkm/cont/ArrayHandle.hxx @@ -419,5 +419,6 @@ VTKM_CONT void Serialization>::load(BinaryBuffer& bb, } } } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_ArrayHandle_hxx diff --git a/vtkm/cont/ArrayHandleCartesianProduct.h b/vtkm/cont/ArrayHandleCartesianProduct.h index f76626271..83bb6f487 100644 --- a/vtkm/cont/ArrayHandleCartesianProduct.h +++ b/vtkm/cont/ArrayHandleCartesianProduct.h @@ -422,6 +422,7 @@ VTKM_CONT //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -489,5 +490,6 @@ struct Serialization< { }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_ArrayHandleCartesianProduct_h diff --git a/vtkm/cont/ArrayHandleCast.h b/vtkm/cont/ArrayHandleCast.h index 3daa8ff8b..9e185bd31 100644 --- a/vtkm/cont/ArrayHandleCast.h +++ b/vtkm/cont/ArrayHandleCast.h @@ -154,6 +154,7 @@ VTKM_CONT //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { @@ -203,5 +204,6 @@ struct Serialization> }; } // diy +/// @endcond SERIALIZATION #endif // vtk_m_cont_ArrayHandleCast_h diff --git a/vtkm/cont/ArrayHandleCompositeVector.h b/vtkm/cont/ArrayHandleCompositeVector.h index dac2df378..5b7e19681 100644 --- a/vtkm/cont/ArrayHandleCompositeVector.h +++ b/vtkm/cont/ArrayHandleCompositeVector.h @@ -715,7 +715,7 @@ VTKM_CONT ArrayHandleCompositeVector make_ArrayHandleCompositeVector //============================================================================= // Specializations of serialization related classes - +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -829,5 +829,6 @@ struct Serialization make_ArrayH //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -376,5 +377,6 @@ struct Serialization< { }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_ArrayHandleConcatenate_h diff --git a/vtkm/cont/ArrayHandleConstant.h b/vtkm/cont/ArrayHandleConstant.h index 3829888a5..361be491e 100644 --- a/vtkm/cont/ArrayHandleConstant.h +++ b/vtkm/cont/ArrayHandleConstant.h @@ -75,6 +75,7 @@ vtkm::cont::ArrayHandleConstant make_ArrayHandleConstant(T value, vtkm::Id nu //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -108,5 +109,6 @@ struct Serialization> }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_ArrayHandleConstant_h diff --git a/vtkm/cont/ArrayHandleCounting.h b/vtkm/cont/ArrayHandleCounting.h index 3c4076349..437a76176 100644 --- a/vtkm/cont/ArrayHandleCounting.h +++ b/vtkm/cont/ArrayHandleCounting.h @@ -133,6 +133,7 @@ make_ArrayHandleCounting(CountingValueType start, CountingValueType step, vtkm:: //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -196,5 +197,6 @@ struct Serialization< { }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_ArrayHandleCounting_h diff --git a/vtkm/cont/ArrayHandleExtractComponent.h b/vtkm/cont/ArrayHandleExtractComponent.h index 5b4af37ca..ed65c81f4 100644 --- a/vtkm/cont/ArrayHandleExtractComponent.h +++ b/vtkm/cont/ArrayHandleExtractComponent.h @@ -300,6 +300,7 @@ VTKM_CONT ArrayHandleExtractComponent make_ArrayHandleExtractCo //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -362,5 +363,6 @@ struct Serialization< { }; } // diy +/// @endcond SERIALIZATION #endif // vtk_m_cont_ArrayHandleExtractComponent_h diff --git a/vtkm/cont/ArrayHandleExtrudeCoords.h b/vtkm/cont/ArrayHandleExtrudeCoords.h index c6185144d..0dc3c409f 100644 --- a/vtkm/cont/ArrayHandleExtrudeCoords.h +++ b/vtkm/cont/ArrayHandleExtrudeCoords.h @@ -100,6 +100,7 @@ vtkm::cont::ArrayHandleExtrudeCoords make_ArrayHandleExtrudeCoords( //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -149,5 +150,6 @@ public: }; } // diy +/// @endcond SERIALIZATION #endif diff --git a/vtkm/cont/ArrayHandleExtrudeField.h b/vtkm/cont/ArrayHandleExtrudeField.h index 72a309de5..4bedd6e60 100644 --- a/vtkm/cont/ArrayHandleExtrudeField.h +++ b/vtkm/cont/ArrayHandleExtrudeField.h @@ -92,6 +92,7 @@ vtkm::cont::ArrayHandleExtrudeField make_ArrayHandleExtrudeField( //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -141,5 +142,6 @@ public: }; } // diy +/// @endcond SERIALIZATION #endif diff --git a/vtkm/cont/ArrayHandleGroupVec.h b/vtkm/cont/ArrayHandleGroupVec.h index 048b2441b..183a5499f 100644 --- a/vtkm/cont/ArrayHandleGroupVec.h +++ b/vtkm/cont/ArrayHandleGroupVec.h @@ -358,6 +358,7 @@ VTKM_CONT vtkm::cont::ArrayHandleGroupVec make_ //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -418,5 +419,6 @@ struct Serialization< }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_ArrayHandleGroupVec_h diff --git a/vtkm/cont/ArrayHandleGroupVecVariable.h b/vtkm/cont/ArrayHandleGroupVecVariable.h index b23a11025..de9b0a855 100644 --- a/vtkm/cont/ArrayHandleGroupVecVariable.h +++ b/vtkm/cont/ArrayHandleGroupVecVariable.h @@ -499,6 +499,7 @@ VTKM_CONT vtkm::cont::ArrayHandle ConvertNumComponentsToOffsets( //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -562,5 +563,6 @@ struct Serialization< { }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_ArrayHandleGroupVecVariable_h diff --git a/vtkm/cont/ArrayHandleImplicit.h b/vtkm/cont/ArrayHandleImplicit.h index 4ab0dd959..b42ef9f6e 100644 --- a/vtkm/cont/ArrayHandleImplicit.h +++ b/vtkm/cont/ArrayHandleImplicit.h @@ -128,6 +128,7 @@ VTKM_CONT vtkm::cont::ArrayHandleImplicit make_ArrayHandleImplicit( //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -191,5 +192,6 @@ struct Serialization }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_ArrayHandleIndex_h diff --git a/vtkm/cont/ArrayHandlePermutation.h b/vtkm/cont/ArrayHandlePermutation.h index b66ca015d..f2ee1faa5 100644 --- a/vtkm/cont/ArrayHandlePermutation.h +++ b/vtkm/cont/ArrayHandlePermutation.h @@ -362,6 +362,7 @@ make_ArrayHandlePermutation(IndexArrayHandleType indexArray, ValueArrayHandleTyp //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -427,5 +428,6 @@ struct Serialization< }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_ArrayHandlePermutation_h diff --git a/vtkm/cont/ArrayHandleReverse.h b/vtkm/cont/ArrayHandleReverse.h index 6799c1b43..88a497404 100644 --- a/vtkm/cont/ArrayHandleReverse.h +++ b/vtkm/cont/ArrayHandleReverse.h @@ -233,6 +233,7 @@ VTKM_CONT ArrayHandleReverse make_ArrayHandleReverse(const HandleTyp //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -289,5 +290,6 @@ struct Serialization< }; } // diy +/// @endcond SERIALIZATION #endif // vtk_m_cont_ArrayHandleReverse_h diff --git a/vtkm/cont/ArrayHandleSOA.h b/vtkm/cont/ArrayHandleSOA.h index efcbea5cb..607bd36e3 100644 --- a/vtkm/cont/ArrayHandleSOA.h +++ b/vtkm/cont/ArrayHandleSOA.h @@ -614,6 +614,7 @@ VTKM_CONT //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { diff --git a/vtkm/cont/ArrayHandleSwizzle.h b/vtkm/cont/ArrayHandleSwizzle.h index 4f9400e04..a8f6d0420 100644 --- a/vtkm/cont/ArrayHandleSwizzle.h +++ b/vtkm/cont/ArrayHandleSwizzle.h @@ -388,6 +388,7 @@ make_ArrayHandleSwizzle(const ArrayHandleType& array, //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -451,5 +452,6 @@ struct Serialization struct SerializableTypeString> { diff --git a/vtkm/cont/ArrayHandleVirtual.hxx b/vtkm/cont/ArrayHandleVirtual.hxx index 034d04824..c2db99f1f 100644 --- a/vtkm/cont/ArrayHandleVirtual.hxx +++ b/vtkm/cont/ArrayHandleVirtual.hxx @@ -44,6 +44,7 @@ ArrayHandleType inline ArrayHandleVirtual::CastToType( //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace mangled_diy_namespace { diff --git a/vtkm/cont/ArrayHandleVirtualCoordinates.h b/vtkm/cont/ArrayHandleVirtualCoordinates.h index 4270fd9d1..c4b196745 100644 --- a/vtkm/cont/ArrayHandleVirtualCoordinates.h +++ b/vtkm/cont/ArrayHandleVirtualCoordinates.h @@ -71,6 +71,7 @@ struct SerializableTypeString //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace mangled_diy_namespace { @@ -151,5 +152,6 @@ public: }; } // diy +/// @endcond SERIALIZATION #endif // vtk_m_cont_ArrayHandleVirtualCoordinates_h diff --git a/vtkm/cont/ArrayHandleZip.h b/vtkm/cont/ArrayHandleZip.h index cdd79a77c..ec6f6efc7 100644 --- a/vtkm/cont/ArrayHandleZip.h +++ b/vtkm/cont/ArrayHandleZip.h @@ -376,6 +376,7 @@ VTKM_CONT vtkm::cont::ArrayHandleZip make_Arr //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -441,5 +442,6 @@ struct Serialization< }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_ArrayHandleZip_h diff --git a/vtkm/cont/CellSetExplicit.h b/vtkm/cont/CellSetExplicit.h index c5189ebc7..577daf00f 100644 --- a/vtkm/cont/CellSetExplicit.h +++ b/vtkm/cont/CellSetExplicit.h @@ -342,6 +342,7 @@ extern template class VTKM_CONT_TEMPLATE_EXPORT CellSetExplicit< //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -407,6 +408,7 @@ public: }; } // diy +/// @endcond SERIALIZATION #include diff --git a/vtkm/cont/CellSetExtrude.h b/vtkm/cont/CellSetExtrude.h index 8decc2111..c5d88680e 100644 --- a/vtkm/cont/CellSetExtrude.h +++ b/vtkm/cont/CellSetExtrude.h @@ -158,6 +158,7 @@ CellSetExtrude make_CellSetExtrude(const std::vector& conn, //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -213,6 +214,7 @@ public: }; } // diy +/// @endcond SERIALIZATION #include diff --git a/vtkm/cont/CellSetPermutation.h b/vtkm/cont/CellSetPermutation.h index b6687a1d5..b9df0be52 100644 --- a/vtkm/cont/CellSetPermutation.h +++ b/vtkm/cont/CellSetPermutation.h @@ -484,6 +484,7 @@ vtkm::cont::CellSetPermutation make //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -530,5 +531,6 @@ public: }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_CellSetPermutation_h diff --git a/vtkm/cont/CellSetSingleType.h b/vtkm/cont/CellSetSingleType.h index e46d60366..ea9f038c2 100644 --- a/vtkm/cont/CellSetSingleType.h +++ b/vtkm/cont/CellSetSingleType.h @@ -291,6 +291,7 @@ private: //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -346,5 +347,6 @@ public: }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_CellSetSingleType_h diff --git a/vtkm/cont/CellSetStructured.h b/vtkm/cont/CellSetStructured.h index c7f030bd9..6282c9574 100644 --- a/vtkm/cont/CellSetStructured.h +++ b/vtkm/cont/CellSetStructured.h @@ -133,6 +133,7 @@ extern template class VTKM_CONT_TEMPLATE_EXPORT CellSetStructured<3>; //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -179,6 +180,7 @@ public: }; } // diy +/// @endcond SERIALIZATION #include diff --git a/vtkm/cont/CoordinateSystem.h b/vtkm/cont/CoordinateSystem.h index 6335f58fa..76b31512f 100644 --- a/vtkm/cont/CoordinateSystem.h +++ b/vtkm/cont/CoordinateSystem.h @@ -142,6 +142,7 @@ struct DynamicTransformTraits //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace mangled_diy_namespace { @@ -165,5 +166,6 @@ struct Serialization }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_CoordinateSystem_h diff --git a/vtkm/cont/DataSet.h b/vtkm/cont/DataSet.h index 1bce95554..76c53d590 100644 --- a/vtkm/cont/DataSet.h +++ b/vtkm/cont/DataSet.h @@ -218,6 +218,7 @@ private: //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -300,5 +301,6 @@ public: }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_DataSet_h diff --git a/vtkm/cont/DynamicCellSet.h b/vtkm/cont/DynamicCellSet.h index 494d447db..94ececeed 100644 --- a/vtkm/cont/DynamicCellSet.h +++ b/vtkm/cont/DynamicCellSet.h @@ -338,6 +338,7 @@ struct DynamicCellSetCheck> //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace mangled_diy_namespace { @@ -410,5 +411,6 @@ public: }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_DynamicCellSet_h diff --git a/vtkm/cont/Field.h b/vtkm/cont/Field.h index 7fd02ef7c..37335d7f0 100644 --- a/vtkm/cont/Field.h +++ b/vtkm/cont/Field.h @@ -243,6 +243,7 @@ struct DynamicTransformTraits //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace vtkm { namespace cont @@ -298,5 +299,6 @@ public: }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_cont_Field_h diff --git a/vtkm/cont/SerializableTypeString.h b/vtkm/cont/SerializableTypeString.h index 40d0e96b0..b10640495 100644 --- a/vtkm/cont/SerializableTypeString.h +++ b/vtkm/cont/SerializableTypeString.h @@ -51,6 +51,7 @@ std::string GetVariadicSerializableTypeString(const T&) } // internal +/// @cond SERIALIZATION template <> struct SerializableTypeString { @@ -174,5 +175,6 @@ struct SerializableTypeString> }; } } // vtkm::cont +/// @endcond SERIALIZATION #endif // vtk_m_cont_SerializableTypeString_h diff --git a/vtkm/cont/VariantArrayHandle.h b/vtkm/cont/VariantArrayHandle.h index 70b1d7edb..64556d26a 100644 --- a/vtkm/cont/VariantArrayHandle.h +++ b/vtkm/cont/VariantArrayHandle.h @@ -557,6 +557,7 @@ struct DynamicTransformTraits> //============================================================================= // Specializations of serialization related classes +/// @cond SERIALIZATION namespace mangled_diy_namespace { @@ -626,6 +627,7 @@ public: }; } // diy +/// @endcond SERIALIZATION #endif //vtk_m_virts_VariantArrayHandle_h