diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-09-05 12:53:04 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-09-05 12:53:04 -0400 |
| commit | 5a6991e90533828da9d6672fcba41138993bdb91 (patch) | |
| tree | 27331a029e806b06b94094eb4dfa891e3069df6b /cpp/src/slice2confluence | |
| parent | use Optional for C# one-shot constructors (diff) | |
| download | ice-5a6991e90533828da9d6672fcba41138993bdb91.tar.bz2 ice-5a6991e90533828da9d6672fcba41138993bdb91.tar.xz ice-5a6991e90533828da9d6672fcba41138993bdb91.zip | |
Undo pragma-once-in-header enhancement
Diffstat (limited to 'cpp/src/slice2confluence')
| -rw-r--r-- | cpp/src/slice2confluence/ConfluenceOutput.h | 14 | ||||
| -rw-r--r-- | cpp/src/slice2confluence/Gen.h | 5 |
2 files changed, 8 insertions, 11 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 diff --git a/cpp/src/slice2confluence/Gen.h b/cpp/src/slice2confluence/Gen.h index 2b563fe04b4..65469d5dc05 100644 --- a/cpp/src/slice2confluence/Gen.h +++ b/cpp/src/slice2confluence/Gen.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GEN_H +#define GEN_H #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -291,3 +292,5 @@ private: }; } + +#endif |