summaryrefslogtreecommitdiff
path: root/cpp/src/slice2confluence/ConfluenceOutput.h
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2012-09-05 12:53:04 -0400
committerBernard Normier <bernard@zeroc.com>2012-09-05 12:53:04 -0400
commit5a6991e90533828da9d6672fcba41138993bdb91 (patch)
tree27331a029e806b06b94094eb4dfa891e3069df6b /cpp/src/slice2confluence/ConfluenceOutput.h
parentuse Optional for C# one-shot constructors (diff)
downloadice-5a6991e90533828da9d6672fcba41138993bdb91.tar.bz2
ice-5a6991e90533828da9d6672fcba41138993bdb91.tar.xz
ice-5a6991e90533828da9d6672fcba41138993bdb91.zip
Undo pragma-once-in-header enhancement
Diffstat (limited to 'cpp/src/slice2confluence/ConfluenceOutput.h')
-rw-r--r--cpp/src/slice2confluence/ConfluenceOutput.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/cpp/src/slice2confluence/ConfluenceOutput.h b/cpp/src/slice2confluence/ConfluenceOutput.h
index 5caa7521e50..90d02809368 100644
--- a/cpp/src/slice2confluence/ConfluenceOutput.h
+++ b/cpp/src/slice2confluence/ConfluenceOutput.h
@@ -1,13 +1,5 @@
-// **********************************************************************
-//
-// 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
+#ifndef CONFLUENCE_OUTPUT
+#define CONFLUENCE_OUTPUT
#include <IceUtil/OutputUtil.h>
#include <list>
@@ -196,3 +188,5 @@ operator<<(ConfluenceOutput& o, const EndEscapes&)
ConfluenceOutput& operator<<(ConfluenceOutput&, std::ios_base& (*)(std::ios_base&));
}
+
+#endif