aboutsummaryrefslogtreecommitdiff
path: root/src/libutil
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-18 14:59:03 -0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-18 14:59:03 -0400
commitb7fd2c28224a69476434d69b5d9da3d150c07226 (patch)
tree7bff185e6c7974605740718233fe052e1ce149cd /src/libutil
parent58337e0e6122a97061dcf803954f72469f67afca (diff)
Use "#pragma once" to prevent repeated header file inclusion
Diffstat (limited to 'src/libutil')
-rw-r--r--src/libutil/archive.hh6
-rw-r--r--src/libutil/hash.hh6
-rw-r--r--src/libutil/immutable.hh5
-rw-r--r--src/libutil/serialise.hh6
-rw-r--r--src/libutil/types.hh6
-rw-r--r--src/libutil/util.hh6
-rw-r--r--src/libutil/xml-writer.hh6
7 files changed, 7 insertions, 34 deletions
diff --git a/src/libutil/archive.hh b/src/libutil/archive.hh
index fff620313..ccac92074 100644
--- a/src/libutil/archive.hh
+++ b/src/libutil/archive.hh
@@ -1,5 +1,4 @@
-#ifndef __ARCHIVE_H
-#define __ARCHIVE_H
+#pragma once
#include "types.hh"
#include "serialise.hh"
@@ -74,6 +73,3 @@ void restorePath(const Path & path, Source & source);
}
-
-
-#endif /* !__ARCHIVE_H */
diff --git a/src/libutil/hash.hh b/src/libutil/hash.hh
index e0b6478cc..781f51742 100644
--- a/src/libutil/hash.hh
+++ b/src/libutil/hash.hh
@@ -1,5 +1,4 @@
-#ifndef __HASH_H
-#define __HASH_H
+#pragma once
#include "types.hh"
#include "serialise.hh"
@@ -109,6 +108,3 @@ public:
}
-
-
-#endif /* !__HASH_H */
diff --git a/src/libutil/immutable.hh b/src/libutil/immutable.hh
index 5a42a4610..8af419004 100644
--- a/src/libutil/immutable.hh
+++ b/src/libutil/immutable.hh
@@ -1,5 +1,4 @@
-#ifndef __IMMUTABLE_H
-#define __IMMUTABLE_H
+#pragma once
#include <types.hh>
@@ -15,5 +14,3 @@ void makeImmutable(const Path & path);
void makeMutable(const Path & path);
}
-
-#endif /* !__IMMUTABLE_H */
diff --git a/src/libutil/serialise.hh b/src/libutil/serialise.hh
index ded4b12a0..42dd27117 100644
--- a/src/libutil/serialise.hh
+++ b/src/libutil/serialise.hh
@@ -1,5 +1,4 @@
-#ifndef __SERIALISE_H
-#define __SERIALISE_H
+#pragma once
#include "types.hh"
@@ -130,6 +129,3 @@ MakeError(SerialisationError, Error)
}
-
-
-#endif /* !__SERIALISE_H */
diff --git a/src/libutil/types.hh b/src/libutil/types.hh
index 844ad6f76..165a46fa2 100644
--- a/src/libutil/types.hh
+++ b/src/libutil/types.hh
@@ -1,5 +1,4 @@
-#ifndef __TYPES_H
-#define __TYPES_H
+#pragma once
#include <string>
#include <list>
@@ -74,6 +73,3 @@ typedef enum {
}
-
-
-#endif /* !__TYPES_H */
diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index ee0f3862a..362d0f65e 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -1,5 +1,4 @@
-#ifndef __UTIL_H
-#define __UTIL_H
+#pragma once
#include "types.hh"
@@ -333,6 +332,3 @@ void ignoreException();
}
-
-
-#endif /* !__UTIL_H */
diff --git a/src/libutil/xml-writer.hh b/src/libutil/xml-writer.hh
index e5cc5f8c5..fee2eb495 100644
--- a/src/libutil/xml-writer.hh
+++ b/src/libutil/xml-writer.hh
@@ -1,5 +1,4 @@
-#ifndef __XML_WRITER_H
-#define __XML_WRITER_H
+#pragma once
#include <iostream>
#include <string>
@@ -70,6 +69,3 @@ public:
}
-
-
-#endif /* !__XML_WRITER_H */