summaryrefslogtreecommitdiff
path: root/cpp/src/slice2confluence
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-07-19 16:39:19 +0200
committerJose <jose@zeroc.com>2012-07-19 16:39:19 +0200
commit96c87b5868d7f01320923fae307870538501acd5 (patch)
tree0b691b63b9859cad897753ae930ed334cfba4b42 /cpp/src/slice2confluence
parentWinRT support (diff)
downloadice-96c87b5868d7f01320923fae307870538501acd5.tar.bz2
ice-96c87b5868d7f01320923fae307870538501acd5.tar.xz
ice-96c87b5868d7f01320923fae307870538501acd5.zip
ICE-4782 Generate "#pragma once" for include-guards in generated C++ header files.
Diffstat (limited to 'cpp/src/slice2confluence')
-rw-r--r--cpp/src/slice2confluence/ConfluenceOutput.h14
-rw-r--r--cpp/src/slice2confluence/Gen.h5
2 files changed, 11 insertions, 8 deletions
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.h b/cpp/src/slice2confluence/ConfluenceOutput.h
index 90d02809368..5caa7521e50 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.h
+++ b/cpp/src/slice2confluence/ConfluenceOutput.h
@@ -1,5 +1,13 @@
-#ifndef CONFLUENCE_OUTPUT
-#define CONFLUENCE_OUTPUT
+// **********************************************************************
+//
+// Copyright (c) 2003-2012 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#pragma once
#include <IceUtil/OutputUtil.h>
#include <list>
@@ -188,5 +196,3 @@ operator<<(ConfluenceOutput& o, const EndEscapes&)
ConfluenceOutput& operator<<(ConfluenceOutput&, std::ios_base& (*)(std::ios_base&));
}
-
-#endif
diff --git a/cpp/src/slice2confluence/Gen.h b/cpp/src/slice2confluence/Gen.h
index 65469d5dc05..2b563fe04b4 100644
--- a/cpp/src/slice2confluence/Gen.h
+++ b/cpp/src/slice2confluence/Gen.h
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef GEN_H
-#define GEN_H
+#pragma once
#include <Slice/Parser.h>
#include <IceUtil/OutputUtil.h>
@@ -292,5 +291,3 @@ private:
};
}
-
-#endif