Changeset 1ed33fed for src/Common/utility.h

Timestamp:

May 11, 2017, 2:49:34 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

3476a0d

Parents:

6ac2ada (diff), 6a4f3d4 (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:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

• src/Common/utility.h (modified) (4 diffs)

src/Common/utility.h

@@ -322 +322 @@
         std::string filename;
 
-    /// Create a new unset CodeLocation.
+        /// Create a new unset CodeLocation.
         CodeLocation()
                 : linenumber( -1 )
@@ -328 +328 @@
         {}
 
-    /// Create a new CodeLocation with the given values.
+        /// Create a new CodeLocation with the given values.
         CodeLocation( const char* filename, int lineno )
                 : linenumber( lineno )
@@ -334 +334 @@
         {}
 
-    bool isSet () const {
-        return -1 != linenumber;
-    }
-
-    bool isUnset () const {
-        return !isSet();
-    }
+        bool isSet () const {
+                return -1 != linenumber;
+        }
+
+        bool isUnset () const {
+                return !isSet();
+        }
 
         void unset () {
@@ -353 +353 @@
         return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
 }
+
 #endif // _UTILITY_H