Changeset c6a1e8a for src/Common

Timestamp:

Jun 5, 2019, 8:36:48 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

866545b

Parents:

67130fe (diff), 3cd5fdd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix conflicit

File:

• src/Common/Indenter.h (modified) (1 diff)

src/Common/Indenter.h

@@ -18 +18 @@
 
 struct Indenter {
-        static unsigned tabsize;
+        static unsigned tabsize;  ///< default number of spaces in one level of indentation
 
-        Indenter( unsigned int amt = tabsize, unsigned int indent = 0 ) : amt( amt ), indent( indent ) {}
-        unsigned int amt;  // amount 1 level increases indent by (i.e. how much to increase by in operator++)
-        unsigned int indent;
+        unsigned int indent;      ///< number of spaces to indent
+        unsigned int amt;         ///< spaces in one level of indentation
 
+        Indenter( unsigned int indent = 0, unsigned int amt = tabsize ) 
+        : indent( indent*amt ), amt( amt ) {}
+        
         Indenter & operator+=(int nlevels) { indent += amt*nlevels; return *this; }
         Indenter & operator-=(int nlevels) { indent -= amt*nlevels; return *this; }