Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / selection / sm_merge.cpp

diff --git a/src/gromacs/selection/sm_merge.cpp b/src/gromacs/selection/sm_merge.cpp
index 45f191d9f6aeb11600a5edb7d6d327a7307bedcf..9c8d2e3041d188cb7d6936a48bf825b7f1b52446 100644 (file)
--- a/src/gromacs/selection/sm_merge.cpp
+++ b/src/gromacs/selection/sm_merge.cpp
@@ -1,10 +1,10 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2009,2010,2011,2012,2013, by the GROMACS development team, led by
- * David van der Spoel, Berk Hess, Erik Lindahl, and including many
- * others, as listed in the AUTHORS file in the top-level source
- * directory and at http://www.gromacs.org.
+ * Copyright (c) 2009,2010,2011,2012,2013,2014, by the GROMACS development team, led by
+ * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
+ * and including many others, as listed in the AUTHORS file in the
+ * top-level source directory and at http://www.gromacs.org.
  *
  * GROMACS is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -39,14 +39,16 @@
  * \author Teemu Murtola <teemu.murtola@gmail.com>
  * \ingroup module_selection
  */
-#include "gromacs/legacyheaders/macros.h"
-#include "gromacs/legacyheaders/smalloc.h"
-#include "gromacs/legacyheaders/vec.h"
+#include "gmxpre.h"
 
+#include "gromacs/legacyheaders/macros.h"
+#include "gromacs/math/vec.h"
 #include "gromacs/selection/position.h"
-#include "gromacs/selection/selmethod.h"
 #include "gromacs/utility/common.h"
 #include "gromacs/utility/exceptions.h"
+#include "gromacs/utility/smalloc.h"
+
+#include "selmethod.h"
 
 /*! \internal \brief
  * Data structure for the merging selection modifiers.
@@ -144,7 +146,7 @@ static const char *help_merge[] = {
     "subexpressions.",
 };
 
-/** \internal Selection method data for the \p plus modifier. */
+/** Selection method data for the \p plus modifier. */
 gmx_ana_selmethod_t sm_merge = {
     "merge", POS_VALUE, SMETH_MODIFIER,
     asize(smparams_merge), smparams_merge,
@@ -159,7 +161,7 @@ gmx_ana_selmethod_t sm_merge = {
     {"merge POSEXPR", asize(help_merge), help_merge},
 };
 
-/** \internal Selection method data for the \p plus modifier. */
+/** Selection method data for the \p plus modifier. */
 gmx_ana_selmethod_t sm_plus = {
     "plus", POS_VALUE, SMETH_MODIFIER,
     asize(smparams_merge)-1, smparams_merge,