Sort all includes in src/gromacs

[alexxy/gromacs.git] / src / gromacs / options / optionflags.h

diff --git a/src/gromacs/options/optionflags.h b/src/gromacs/options/optionflags.h
index 41a6514e4f4300cf22c996978c4185617c8707d8..9157ecba9dabaf72dfc55cb5134a2954dff33fe9 100644 (file)
--- a/src/gromacs/options/optionflags.h
+++ b/src/gromacs/options/optionflags.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2010,2011,2012, by the GROMACS development team, led by
+ * Copyright (c) 2010,2011,2012,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.
@@ -46,7 +46,7 @@
 #ifndef GMX_OPTIONS_OPTIONFLAGS_H
 #define GMX_OPTIONS_OPTIONFLAGS_H
 
-#include "../utility/flags.h"
+#include "gromacs/utility/flags.h"
 
 namespace gmx
 {
@@ -69,7 +69,7 @@ enum OptionFlag
     //! The current value of the option is a programmatic default value.
     efOption_HasDefaultValue            = 1<<1,
     //! An explicit default value has been provided for the option.
-    efOption_ExplicitDefaultValue      = 1<<2,
+    efOption_ExplicitDefaultValue       = 1<<2,
     /*! \brief
      * Next assignment to the option clears old values.
      *
@@ -89,6 +89,8 @@ enum OptionFlag
      * \see AbstractOption::setVector()
      */
     efOption_Vector                     = 1<<8,
+    //! %Option has a defaultValueIfSet() specified.
+    efOption_DefaultValueIfSetExists    = 1<<11,
     //! %Option does not support default values.
     efOption_NoDefaultValue             = 1<<9,
     /*! \brief