fix conflict

[modules/med.git] / medtool / src / ParaMEDMEM / Topology.hxx

diff --git a/medtool/src/ParaMEDMEM/Topology.hxx b/medtool/src/ParaMEDMEM/Topology.hxx
index 4b10f8b43cdbfe74a7c0ce85801b35e6d0ee49c2..19ce03458904097b0348449b32ddd1172e3b8a4f 100644 (file)
--- a/medtool/src/ParaMEDMEM/Topology.hxx
+++ b/medtool/src/ParaMEDMEM/Topology.hxx
@@ -20,12 +20,17 @@
 #ifndef __TOPOLOGY_HXX__
 #define __TOPOLOGY_HXX__
 
-#include <utility>
-
 namespace ParaMEDMEM
 {
   class ProcessorGroup;
 
+  /*!
+   * Topology of a group of processors within a processor group. Abstract class, see derivations.
+   *
+   * \sa BlockTopology
+   * \sa ExplicitTopology
+   * \sa MPIProcessorGroup
+   */
   class Topology
   {
   public: