diff options
Diffstat (limited to 'cpp/src')
205 files changed, 843 insertions, 227 deletions
diff --git a/cpp/src/Freeze/BackgroundSaveEvictorI.h b/cpp/src/Freeze/BackgroundSaveEvictorI.h index 5d8132f9afc..805086a0eca 100644 --- a/cpp/src/Freeze/BackgroundSaveEvictorI.h +++ b/cpp/src/Freeze/BackgroundSaveEvictorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_BACKGROUND_SAVE_EVICTOR_I_H +#define FREEZE_BACKGROUND_SAVE_EVICTOR_I_H #include <Freeze/EvictorI.h> #include <Freeze/BackgroundSaveEvictor.h> @@ -212,3 +213,5 @@ private: }; } + +#endif diff --git a/cpp/src/Freeze/ConnectionI.h b/cpp/src/Freeze/ConnectionI.h index 86cca9d0216..46acecec3ab 100644 --- a/cpp/src/Freeze/ConnectionI.h +++ b/cpp/src/Freeze/ConnectionI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_CONNECTIONI_H +#define FREEZE_CONNECTIONI_H #include <Freeze/Connection.h> #include <Freeze/Initialize.h> @@ -167,3 +168,5 @@ ConnectionI::deadlockWarning() const } } + +#endif diff --git a/cpp/src/Freeze/EvictorI.h b/cpp/src/Freeze/EvictorI.h index eb42dbb5951..c2d5d93aa31 100755 --- a/cpp/src/Freeze/EvictorI.h +++ b/cpp/src/Freeze/EvictorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_EVICTOR_I_H +#define FREEZE_EVICTOR_I_H #include <IceUtil/IceUtil.h> #include <Ice/Ice.h> @@ -342,3 +343,5 @@ checkIdentity(const Ice::Identity& ident) } } + +#endif diff --git a/cpp/src/Freeze/EvictorIteratorI.h b/cpp/src/Freeze/EvictorIteratorI.h index 4c740782c32..fd075645f86 100644 --- a/cpp/src/Freeze/EvictorIteratorI.h +++ b/cpp/src/Freeze/EvictorIteratorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_EVICTOR_ITERATOR_I_H +#define FREEZE_EVICTOR_ITERATOR_I_H #include <Ice/Ice.h> #include <Freeze/Freeze.h> @@ -48,3 +49,5 @@ private: }; } + +#endif diff --git a/cpp/src/Freeze/IndexI.h b/cpp/src/Freeze/IndexI.h index 3fe2d6018e0..ea850a3be02 100644 --- a/cpp/src/Freeze/IndexI.h +++ b/cpp/src/Freeze/IndexI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_INDEX_I_H +#define FREEZE_INDEX_I_H #include <Ice/Ice.h> #include <Freeze/Index.h> @@ -48,3 +49,5 @@ private: }; } +#endif + diff --git a/cpp/src/Freeze/MapDb.h b/cpp/src/Freeze/MapDb.h index c158b4de1d5..5bc9a6f6373 100644 --- a/cpp/src/Freeze/MapDb.h +++ b/cpp/src/Freeze/MapDb.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_MAP_DB_H +#define FREEZE_MAP_DB_H #include <IceUtil/Config.h> #include <db_cxx.h> @@ -119,3 +120,4 @@ MapDb::getKeyCompare() const } } +#endif diff --git a/cpp/src/Freeze/MapI.h b/cpp/src/Freeze/MapI.h index 89583728ce8..dc1e421d97a 100644 --- a/cpp/src/Freeze/MapI.h +++ b/cpp/src/Freeze/MapI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_MAP_I_H +#define FREEZE_MAP_I_H #include <Freeze/Map.h> #include <Freeze/ConnectionI.h> @@ -186,3 +187,5 @@ IteratorHelperI::tx() const } } + +#endif diff --git a/cpp/src/Freeze/ObjectStore.h b/cpp/src/Freeze/ObjectStore.h index ff2574fa931..cb69c38a1c0 100644 --- a/cpp/src/Freeze/ObjectStore.h +++ b/cpp/src/Freeze/ObjectStore.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_OBJECT_STORE_H +#define FREEZE_OBJECT_STORE_H #include <Ice/Ice.h> #include <Ice/Identity.h> @@ -171,3 +172,6 @@ ObjectStoreBase::sampleServant() const } } + +#endif + diff --git a/cpp/src/Freeze/SharedDbEnv.h b/cpp/src/Freeze/SharedDbEnv.h index 53c54988bb7..0afd4b9098f 100644 --- a/cpp/src/Freeze/SharedDbEnv.h +++ b/cpp/src/Freeze/SharedDbEnv.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SHARED_DB_ENV_H +#define FREEZE_SHARED_DB_ENV_H #include <Freeze/Map.h> #include <IceUtil/FileUtil.h> @@ -126,3 +127,4 @@ SharedDbEnv::getEncoding() const } } +#endif diff --git a/cpp/src/Freeze/TransactionI.h b/cpp/src/Freeze/TransactionI.h index 993a50d4ae8..456e9f9b883 100644 --- a/cpp/src/Freeze/TransactionI.h +++ b/cpp/src/Freeze/TransactionI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_TRANSACTIONI_H +#define FREEZE_TRANSACTIONI_H #include <Ice/CommunicatorF.h> #include <Freeze/Transaction.h> @@ -84,3 +85,4 @@ private: typedef IceUtil::Handle<TransactionI> TransactionIPtr; } +#endif diff --git a/cpp/src/Freeze/TransactionalEvictorContext.h b/cpp/src/Freeze/TransactionalEvictorContext.h index 45a6afd1074..0278d6f5ad3 100644 --- a/cpp/src/Freeze/TransactionalEvictorContext.h +++ b/cpp/src/Freeze/TransactionalEvictorContext.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_TRANSACTIONAL_EVICTOR_CONTEXT_H +#define FREEZE_TRANSACTIONAL_EVICTOR_CONTEXT_H #include <Ice/Ice.h> #include <Freeze/TransactionalEvictor.h> @@ -163,3 +164,6 @@ private: typedef IceUtil::Handle<TransactionalEvictorContext> TransactionalEvictorContextPtr; } + + +#endif diff --git a/cpp/src/Freeze/TransactionalEvictorI.h b/cpp/src/Freeze/TransactionalEvictorI.h index 73c140b0db4..d8c9a9375d4 100644 --- a/cpp/src/Freeze/TransactionalEvictorI.h +++ b/cpp/src/Freeze/TransactionalEvictorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_TRANSACTIONAL_EVICTOR_I_H +#define FREEZE_TRANSACTIONAL_EVICTOR_I_H #include <Freeze/EvictorI.h> #include <Freeze/TransactionalEvictor.h> @@ -123,3 +124,5 @@ private: typedef IceUtil::Handle<TransactionalEvictorI> TransactionalEvictorIPtr; } + +#endif diff --git a/cpp/src/Freeze/Util.h b/cpp/src/Freeze/Util.h index f848e873bd2..9423a707f6f 100644 --- a/cpp/src/Freeze/Util.h +++ b/cpp/src/Freeze/Util.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_UTIL_H +#define FREEZE_UTIL_H #include <Ice/Ice.h> #include <Freeze/DB.h> @@ -67,3 +68,7 @@ handleDbException(const DbException&, Key&, Dbt&, Value&, Dbt&, const char*, int); } + + +#endif + diff --git a/cpp/src/FreezeScript/AssignVisitor.h b/cpp/src/FreezeScript/AssignVisitor.h index 71f9091967c..388dde01b60 100644 --- a/cpp/src/FreezeScript/AssignVisitor.h +++ b/cpp/src/FreezeScript/AssignVisitor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_ASSIGN_VISITOR_H +#define FREEZE_SCRIPT_ASSIGN_VISITOR_H #include <FreezeScript/Data.h> @@ -49,3 +50,5 @@ private: }; } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/Data.h b/cpp/src/FreezeScript/Data.h index 7f2524f06df..6e4e24a0168 100644 --- a/cpp/src/FreezeScript/Data.h +++ b/cpp/src/FreezeScript/Data.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_DATA_H +#define FREEZE_SCRIPT_DATA_H #include <Ice/Ice.h> #include <Slice/Parser.h> @@ -613,3 +614,5 @@ public: }; } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/DumpDescriptors.h b/cpp/src/FreezeScript/DumpDescriptors.h index a4d900df06c..25af7437a0f 100644 --- a/cpp/src/FreezeScript/DumpDescriptors.h +++ b/cpp/src/FreezeScript/DumpDescriptors.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_DUMP_DESCRIPTORS_H +#define FREEZE_SCRIPT_DUMP_DESCRIPTORS_H #include <FreezeScript/Parser.h> #include <IceXML/Parser.h> @@ -301,3 +302,5 @@ private: typedef IceUtil::Handle<DumpDBDescriptor> DumpDBDescriptorPtr; } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/Error.h b/cpp/src/FreezeScript/Error.h index 4cbf3ff2272..8e52a549cbd 100644 --- a/cpp/src/FreezeScript/Error.h +++ b/cpp/src/FreezeScript/Error.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_ERROR_H +#define FREEZE_SCRIPT_ERROR_H #include <Slice/Parser.h> @@ -63,3 +64,5 @@ private: }; } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/Exception.h b/cpp/src/FreezeScript/Exception.h index b5f5e8c8c2c..6486c5958c4 100644 --- a/cpp/src/FreezeScript/Exception.h +++ b/cpp/src/FreezeScript/Exception.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_EXCEPTION_H +#define FREEZE_SCRIPT_EXCEPTION_H #include <IceUtil/Exception.h> @@ -34,3 +35,5 @@ private: }; } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/Functions.h b/cpp/src/FreezeScript/Functions.h index c1194051e3b..d3b63146ba7 100644 --- a/cpp/src/FreezeScript/Functions.h +++ b/cpp/src/FreezeScript/Functions.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_FUNCTIONS_H +#define FREEZE_SCRIPT_FUNCTIONS_H #include <FreezeScript/Data.h> @@ -21,3 +22,5 @@ bool invokeMemberFunction(const std::string&, const DataPtr&, const DataList&, D const ErrorReporterPtr&); } + +#endif diff --git a/cpp/src/FreezeScript/GrammarUtil.h b/cpp/src/FreezeScript/GrammarUtil.h index 9b42a92351a..2ca8fa22eda 100644 --- a/cpp/src/FreezeScript/GrammarUtil.h +++ b/cpp/src/FreezeScript/GrammarUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_GRAMMAR_UTIL_H +#define FREEZE_SCRIPT_GRAMMAR_UTIL_H #include <FreezeScript/Parser.h> @@ -131,3 +132,5 @@ int freeze_script_parse(); // yyoverflow. // #define yyoverflow(a, b, c, d, e, f) freeze_script_error(a) + +#endif diff --git a/cpp/src/FreezeScript/Parser.h b/cpp/src/FreezeScript/Parser.h index e5c79800fb8..83e2a74fce2 100644 --- a/cpp/src/FreezeScript/Parser.h +++ b/cpp/src/FreezeScript/Parser.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_PARSER_H +#define FREEZE_SCRIPT_PARSER_H #include <FreezeScript/Data.h> @@ -246,3 +247,5 @@ private: } // End of namespace FreezeScript std::ostream& operator<<(std::ostream&, const FreezeScript::EntityNodePtr&); + +#endif diff --git a/cpp/src/FreezeScript/Print.h b/cpp/src/FreezeScript/Print.h index ce548612c77..6d6d57efbd1 100644 --- a/cpp/src/FreezeScript/Print.h +++ b/cpp/src/FreezeScript/Print.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_PRINT_H +#define FREEZE_SCRIPT_PRINT_H #include <FreezeScript/Data.h> @@ -17,3 +18,5 @@ namespace FreezeScript void printData(const DataPtr&, std::ostream&); } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/TransformAnalyzer.h b/cpp/src/FreezeScript/TransformAnalyzer.h index 1ebbf1a91a6..2d0d5719bcc 100644 --- a/cpp/src/FreezeScript/TransformAnalyzer.h +++ b/cpp/src/FreezeScript/TransformAnalyzer.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_TRANSFORM_ANALYZER_H +#define FREEZE_SCRIPT_TRANSFORM_ANALYZER_H #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -39,3 +40,5 @@ private: }; } + +#endif diff --git a/cpp/src/FreezeScript/TransformVisitor.h b/cpp/src/FreezeScript/TransformVisitor.h index 1a53d7954ca..c1365e340a1 100644 --- a/cpp/src/FreezeScript/TransformVisitor.h +++ b/cpp/src/FreezeScript/TransformVisitor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_TRANSFORM_VISITOR_H +#define FREEZE_SCRIPT_TRANSFORM_VISITOR_H #include <FreezeScript/Data.h> @@ -115,3 +116,5 @@ private: }; } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/Transformer.h b/cpp/src/FreezeScript/Transformer.h index 323f285c26a..724688b11de 100644 --- a/cpp/src/FreezeScript/Transformer.h +++ b/cpp/src/FreezeScript/Transformer.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_TRANSFORMER_H +#define FREEZE_SCRIPT_TRANSFORMER_H #include <Ice/Ice.h> #include <Slice/Parser.h> @@ -28,3 +29,5 @@ transformDatabase(const Ice::CommunicatorPtr&, std::ostream&, bool, std::istream&); } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/FreezeScript/Util.h b/cpp/src/FreezeScript/Util.h index cb81adf7b8f..4ad93167c7e 100644 --- a/cpp/src/FreezeScript/Util.h +++ b/cpp/src/FreezeScript/Util.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_SCRIPT_UTIL_H +#define FREEZE_SCRIPT_UTIL_H #include <Slice/Parser.h> #include <Ice/CommunicatorF.h> @@ -62,3 +63,5 @@ typedef std::map<std::string, Freeze::CatalogData> CatalogDataMap; CatalogDataMap readCatalog(const Ice::CommunicatorPtr&, const std::string&); } // End of namespace FreezeScript + +#endif diff --git a/cpp/src/Glacier2/Blobject.h b/cpp/src/Glacier2/Blobject.h index dff1fbe91ca..3bdea766b46 100644 --- a/cpp/src/Glacier2/Blobject.h +++ b/cpp/src/Glacier2/Blobject.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef BLOBJECT_H +#define BLOBJECT_H #include <Ice/Ice.h> #include <Glacier2/RequestQueue.h> @@ -69,3 +70,5 @@ private: }; } + +#endif diff --git a/cpp/src/Glacier2/ClientBlobject.h b/cpp/src/Glacier2/ClientBlobject.h index 0e1143051b6..0dcf4c728e4 100644 --- a/cpp/src/Glacier2/ClientBlobject.h +++ b/cpp/src/Glacier2/ClientBlobject.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef CLIENT_BLOBJECT_H +#define CLIENT_BLOBJECT_H #include <Glacier2/Blobject.h> #include <Glacier2/Session.h> @@ -49,3 +50,5 @@ private: const int _rejectTraceLevel; }; } + +#endif diff --git a/cpp/src/Glacier2/CryptPermissionsVerifierI.h b/cpp/src/Glacier2/CryptPermissionsVerifierI.h index b7a61847c62..143c1afa1d9 100644 --- a/cpp/src/Glacier2/CryptPermissionsVerifierI.h +++ b/cpp/src/Glacier2/CryptPermissionsVerifierI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GLACIER2_CRYPT_PERMISSIONS_VERIFIER_I_H +#define GLACIER2_CRYPT_PERMISSIONS_VERIFIER_I_H #include <Ice/Ice.h> #include <Glacier2/PermissionsVerifier.h> @@ -29,3 +30,5 @@ private: }; } + +#endif diff --git a/cpp/src/Glacier2/FilterI.h b/cpp/src/Glacier2/FilterI.h index 20a9cb873c8..e2c81f0f221 100644 --- a/cpp/src/Glacier2/FilterI.h +++ b/cpp/src/Glacier2/FilterI.h @@ -6,8 +6,8 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** - -#pragma once +#ifndef FILTER_I_H +#define FILTER_I_H #include <Glacier2/Session.h> @@ -176,3 +176,5 @@ typedef FilterT<std::string, Glacier2::StringSet> StringSetI; typedef IceUtil::Handle< FilterT<std::string, Glacier2::StringSet> > StringSetIPtr; }; + +#endif diff --git a/cpp/src/Glacier2/FilterManager.h b/cpp/src/Glacier2/FilterManager.h index 0c0e8108981..0506c9c197b 100644 --- a/cpp/src/Glacier2/FilterManager.h +++ b/cpp/src/Glacier2/FilterManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FILTER_MANAGER_H +#define FILTER_MANAGER_H // // It'd be better if we didn't have to include this everywhere, but @@ -83,3 +84,6 @@ private: FilterManager(const InstancePtr& , const StringSetIPtr&, const StringSetIPtr&, const IdentitySetIPtr&); }; }; + +#endif /* FILTER_MANAGER_H */ + diff --git a/cpp/src/Glacier2/Instance.h b/cpp/src/Glacier2/Instance.h index 4bde3b585db..fe49c0ddcad 100644 --- a/cpp/src/Glacier2/Instance.h +++ b/cpp/src/Glacier2/Instance.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GLACIER2_INSTANCE_H +#define GLACIER2_INSTANCE_H #include <Ice/CommunicatorF.h> #include <Ice/ObjectAdapterF.h> @@ -59,3 +60,5 @@ private: typedef IceUtil::Handle<Instance> InstancePtr; } // End namespace Glacier2 + +#endif diff --git a/cpp/src/Glacier2/ProxyVerifier.h b/cpp/src/Glacier2/ProxyVerifier.h index 38133aaa271..9a281d7f176 100644 --- a/cpp/src/Glacier2/ProxyVerifier.h +++ b/cpp/src/Glacier2/ProxyVerifier.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PROXY_VERIFIER_H +#define ICE_PROXY_VERIFIER_H #include <Ice/Ice.h> #include <vector> @@ -55,3 +56,4 @@ private: typedef IceUtil::Handle<ProxyVerifier> ProxyVerifierPtr; } +#endif diff --git a/cpp/src/Glacier2/RequestQueue.h b/cpp/src/Glacier2/RequestQueue.h index 5fecdff2879..949b6bf1b2a 100644 --- a/cpp/src/Glacier2/RequestQueue.h +++ b/cpp/src/Glacier2/RequestQueue.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef REQUEST_H +#define REQUEST_H #include <IceUtil/Thread.h> #include <IceUtil/Monitor.h> @@ -113,3 +114,5 @@ private: }; } + +#endif diff --git a/cpp/src/Glacier2/RouterI.h b/cpp/src/Glacier2/RouterI.h index 30ddb91024e..be4a9f26201 100644 --- a/cpp/src/Glacier2/RouterI.h +++ b/cpp/src/Glacier2/RouterI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GLACIER2_ROUTER_I_H +#define GLACIER2_ROUTER_I_H #include <Ice/Ice.h> #include <Glacier2/Router.h> @@ -74,3 +75,5 @@ private: }; } + +#endif diff --git a/cpp/src/Glacier2/RoutingTable.h b/cpp/src/Glacier2/RoutingTable.h index b49894d4e49..20ab0b0d212 100644 --- a/cpp/src/Glacier2/RoutingTable.h +++ b/cpp/src/Glacier2/RoutingTable.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ROUTING_TABLE_H +#define ICE_ROUTING_TABLE_H #include <Ice/Ice.h> #include <IceUtil/Mutex.h> @@ -54,3 +55,5 @@ private: }; } + +#endif diff --git a/cpp/src/Glacier2/ServerBlobject.h b/cpp/src/Glacier2/ServerBlobject.h index 56fabf9e88f..2d1481e44a4 100644 --- a/cpp/src/Glacier2/ServerBlobject.h +++ b/cpp/src/Glacier2/ServerBlobject.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SERVER_BLOBJECT_H +#define SERVER_BLOBJECT_H #include <Glacier2/Blobject.h> @@ -29,3 +30,5 @@ public: }; } + +#endif diff --git a/cpp/src/Glacier2/SessionRouterI.h b/cpp/src/Glacier2/SessionRouterI.h index ecf6ff120fc..916e9f58a8d 100644 --- a/cpp/src/Glacier2/SessionRouterI.h +++ b/cpp/src/Glacier2/SessionRouterI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GLACIER2_SESSION_ROUTER_I_H +#define GLACIER2_SESSION_ROUTER_I_H #include <IceUtil/Thread.h> #include <IceUtil/Monitor.h> @@ -162,3 +163,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/Acceptor.h b/cpp/src/Ice/Acceptor.h index bc6dba9c43c..27fdba1a1cb 100644 --- a/cpp/src/Ice/Acceptor.h +++ b/cpp/src/Ice/Acceptor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ACCEPTOR_H +#define ICE_ACCEPTOR_H #include <IceUtil/Shared.h> #include <Ice/AcceptorF.h> @@ -33,3 +34,5 @@ public: }; } + +#endif diff --git a/cpp/src/Ice/AcceptorF.h b/cpp/src/Ice/AcceptorF.h index d1dd06c669e..6e2bc1d60f8 100644 --- a/cpp/src/Ice/AcceptorF.h +++ b/cpp/src/Ice/AcceptorF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ACCEPTOR_F_H +#define ICE_ACCEPTOR_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(Acceptor*); typedef Handle<Acceptor> AcceptorPtr; } + +#endif diff --git a/cpp/src/Ice/Base64.h b/cpp/src/Ice/Base64.h index 0de84d1b15c..64d16c04823 100644 --- a/cpp/src/Ice/Base64.h +++ b/cpp/src/Ice/Base64.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_BASE_64_H +#define ICE_BASE_64_H #include <Ice/Config.h> #include <string> @@ -31,3 +32,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h index c2d1d40c010..64f5c7352ef 100644 --- a/cpp/src/Ice/CommunicatorI.h +++ b/cpp/src/Ice/CommunicatorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_COMMUNICATOR_I_H +#define ICE_COMMUNICATOR_I_H #include <IceUtil/RecMutex.h> @@ -107,3 +108,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h index 35a9fe87216..491d5b6639a 100644 --- a/cpp/src/Ice/ConnectRequestHandler.h +++ b/cpp/src/Ice/ConnectRequestHandler.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECT_REQUEST_HANDLER_H +#define ICE_CONNECT_REQUEST_HANDLER_H #include <IceUtil/Monitor.h> #include <IceUtil/Mutex.h> @@ -88,3 +89,5 @@ private: typedef IceUtil::Handle<ConnectRequestHandler> ConnectRequestHandlerPtr; } + +#endif diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h index 1ca9233a7bf..846248b8e40 100644 --- a/cpp/src/Ice/ConnectionFactory.h +++ b/cpp/src/Ice/ConnectionFactory.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTION_FACTORY_H +#define ICE_CONNECTION_FACTORY_H #include <IceUtil/Mutex.h> #include <IceUtil/Monitor.h> @@ -221,3 +222,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index 68f82317893..c181452d99b 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTION_I_H +#define ICE_CONNECTION_I_H #include <IceUtil/Mutex.h> #include <IceUtil/Monitor.h> @@ -340,3 +341,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ConnectionMonitor.h b/cpp/src/Ice/ConnectionMonitor.h index 19e8a353280..5f09f67405f 100644 --- a/cpp/src/Ice/ConnectionMonitor.h +++ b/cpp/src/Ice/ConnectionMonitor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTION_MONITOR_H +#define ICE_CONNECTION_MONITOR_H #include <IceUtil/Mutex.h> #include <IceUtil/Monitor.h> @@ -46,3 +47,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h index c05f7d8bf5a..45b5678d35f 100644 --- a/cpp/src/Ice/ConnectionRequestHandler.h +++ b/cpp/src/Ice/ConnectionRequestHandler.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTION_REQUEST_HANDLER_H +#define ICE_CONNECTION_REQUEST_HANDLER_H #include <Ice/RequestHandler.h> #include <Ice/ReferenceF.h> @@ -42,3 +43,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/Connector.h b/cpp/src/Ice/Connector.h index 79e7060421a..58bd62bf900 100644 --- a/cpp/src/Ice/Connector.h +++ b/cpp/src/Ice/Connector.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTOR_H +#define ICE_CONNECTOR_H #include <IceUtil/Shared.h> #include <Ice/ConnectorF.h> @@ -31,3 +32,5 @@ public: }; } + +#endif diff --git a/cpp/src/Ice/ConnectorF.h b/cpp/src/Ice/ConnectorF.h index 91318a048df..0e7872c4dbf 100644 --- a/cpp/src/Ice/ConnectorF.h +++ b/cpp/src/Ice/ConnectorF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_CONNECTOR_F_H +#define ICE_CONNECTOR_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(Connector*); typedef Handle<Connector> ConnectorPtr; } + +#endif diff --git a/cpp/src/Ice/DefaultsAndOverrides.h b/cpp/src/Ice/DefaultsAndOverrides.h index b0d7dee0f59..d2f624470d1 100644 --- a/cpp/src/Ice/DefaultsAndOverrides.h +++ b/cpp/src/Ice/DefaultsAndOverrides.h @@ -8,7 +8,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_DEFAULTS_AND_OVERRIDES_H +#define ICE_DEFAULTS_AND_OVERRIDES_H #include <IceUtil/Shared.h> #include <Ice/DefaultsAndOverridesF.h> @@ -47,3 +48,5 @@ public: }; } + +#endif diff --git a/cpp/src/Ice/DefaultsAndOverridesF.h b/cpp/src/Ice/DefaultsAndOverridesF.h index 845e2c0ca4a..9d2b40287c4 100644 --- a/cpp/src/Ice/DefaultsAndOverridesF.h +++ b/cpp/src/Ice/DefaultsAndOverridesF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_DEFAULTS_AND_OVERRIDES_F_H +#define ICE_DEFAULTS_AND_OVERRIDES_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ IceUtil::Shared* upCast(DefaultsAndOverrides*); typedef Handle<DefaultsAndOverrides> DefaultsAndOverridesPtr; } + +#endif diff --git a/cpp/src/Ice/EndpointFactoryManager.h b/cpp/src/Ice/EndpointFactoryManager.h index cc8e5fdb21a..89bdc493cef 100644 --- a/cpp/src/Ice/EndpointFactoryManager.h +++ b/cpp/src/Ice/EndpointFactoryManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ENDPOINT_FACTORY_MANAGER_H +#define ICE_ENDPOINT_FACTORY_MANAGER_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -42,3 +43,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/EndpointFactoryManagerF.h b/cpp/src/Ice/EndpointFactoryManagerF.h index 570249ed5e7..9123c7dec89 100644 --- a/cpp/src/Ice/EndpointFactoryManagerF.h +++ b/cpp/src/Ice/EndpointFactoryManagerF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ENDPOINT_FACTORY_MANAGER_F_H +#define ICE_ENDPOINT_FACTORY_MANAGER_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ IceUtil::Shared* upCast(EndpointFactoryManager*); typedef Handle<EndpointFactoryManager> EndpointFactoryManagerPtr; } + +#endif diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h index 7a048bd6039..02b194cd9e1 100644 --- a/cpp/src/Ice/EndpointI.h +++ b/cpp/src/Ice/EndpointI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ENDPOINT_I_H +#define ICE_ENDPOINT_I_H #include <IceUtil/Config.h> #include <IceUtil/Shared.h> @@ -214,3 +215,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h index 04200f2d29e..fdb0f6d31f2 100644 --- a/cpp/src/Ice/EventHandler.h +++ b/cpp/src/Ice/EventHandler.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_EVENT_HANDLER_H +#define ICE_EVENT_HANDLER_H #include <IceUtil/Shared.h> #include <Ice/EventHandlerF.h> @@ -71,3 +72,5 @@ protected: }; } + +#endif diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h index 3947e19ca6f..9b16cb492dc 100644 --- a/cpp/src/Ice/EventHandlerF.h +++ b/cpp/src/Ice/EventHandlerF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_EVENT_HANDLER_F_H +#define ICE_EVENT_HANDLER_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(EventHandler*); typedef Handle<EventHandler> EventHandlerPtr; } + +#endif diff --git a/cpp/src/Ice/EventLoggerMsg.h b/cpp/src/Ice/EventLoggerMsg.h index be8c37e8213..5934c1f104f 100755 --- a/cpp/src/Ice/EventLoggerMsg.h +++ b/cpp/src/Ice/EventLoggerMsg.h @@ -1,11 +1,11 @@ -// ********************************************************************** -// -// 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. -// -// ********************************************************************** + // ********************************************************************** + // + // 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. + // + // ********************************************************************** // // Values are 32 bit values laid out as follows: // diff --git a/cpp/src/Ice/GC.h b/cpp/src/Ice/GC.h index a73d8ff722b..90a7072e958 100644 --- a/cpp/src/Ice/GC.h +++ b/cpp/src/Ice/GC.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GC_H +#define ICE_GC_H #include <Ice/Config.h> #include <IceUtil/Thread.h> @@ -46,3 +47,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/HashUtil.h b/cpp/src/Ice/HashUtil.h index d23ee90ff0c..299f3dd0246 100644 --- a/cpp/src/Ice/HashUtil.h +++ b/cpp/src/Ice/HashUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_HASH_UTIL_H +#define ICE_HASH_UTIL_H namespace IceInternal { @@ -53,3 +54,6 @@ hashAdd(Ice::Int& hashCode, const std::map<K, V>& map) } } + +#endif + diff --git a/cpp/src/Ice/ImplicitContextI.h b/cpp/src/Ice/ImplicitContextI.h index b781db796bc..8125f7a92a3 100644 --- a/cpp/src/Ice/ImplicitContextI.h +++ b/cpp/src/Ice/ImplicitContextI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_IMPLICIT_CONTEXT_I_H +#define ICE_IMPLICIT_CONTEXT_I_H #include <Ice/ImplicitContext.h> @@ -47,3 +48,4 @@ public: typedef IceInternal::Handle<ImplicitContextI> ImplicitContextIPtr; } +#endif diff --git a/cpp/src/Ice/IncomingRequest.h b/cpp/src/Ice/IncomingRequest.h index 2cb1ca7e785..b163c86a39a 100644 --- a/cpp/src/Ice/IncomingRequest.h +++ b/cpp/src/Ice/IncomingRequest.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_INCOMING_REQUEST_H +#define ICE_INCOMING_REQUEST_H #include <Ice/Incoming.h> #include <Ice/Object.h> @@ -33,3 +34,5 @@ public: Incoming& _in; }; } + +#endif diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index 91a97009de6..b39e88ce838 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_INSTANCE_H +#define ICE_INSTANCE_H #include <IceUtil/Config.h> #include <IceUtil/Shared.h> @@ -158,3 +159,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h index b33beadf8b0..266756fc0db 100644 --- a/cpp/src/Ice/LocatorInfo.h +++ b/cpp/src/Ice/LocatorInfo.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_LOCATOR_INFO_H +#define ICE_LOCATOR_INFO_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -180,3 +181,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/LocatorInfoF.h b/cpp/src/Ice/LocatorInfoF.h index 817aa6cb651..3666e182700 100644 --- a/cpp/src/Ice/LocatorInfoF.h +++ b/cpp/src/Ice/LocatorInfoF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_LOCATOR_INFO_F_H +#define ICE_LOCATOR_INFO_F_H #include <IceUtil/Shared.h> @@ -29,3 +30,5 @@ IceUtil::Shared* upCast(LocatorTable*); typedef Handle<LocatorTable> LocatorTablePtr; } + +#endif diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h index 6f1ce6457b0..dfab4451764 100644 --- a/cpp/src/Ice/LoggerI.h +++ b/cpp/src/Ice/LoggerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_LOGGER_I_H +#define ICE_LOGGER_I_H #include <Ice/Logger.h> #include <IceUtil/FileUtil.h> @@ -40,3 +41,5 @@ private: typedef IceUtil::Handle<LoggerI> LoggerIPtr; } + +#endif diff --git a/cpp/src/Ice/Network.h b/cpp/src/Ice/Network.h index 1643c5eae8f..6103f98f109 100644 --- a/cpp/src/Ice/Network.h +++ b/cpp/src/Ice/Network.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_NETWORK_H +#define ICE_NETWORK_H #ifdef __hpux # define _XOPEN_SOURCE_EXTENDED @@ -253,3 +254,5 @@ ICE_API void doConnectAsync(SOCKET, const Address&, AsyncInfo&); ICE_API void doFinishConnectAsync(SOCKET, AsyncInfo&); #endif } + +#endif diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h index dc7003e7950..9523f65748f 100644 --- a/cpp/src/Ice/ObjectAdapterFactory.h +++ b/cpp/src/Ice/ObjectAdapterFactory.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_OBJECT_ADAPTER_FACTORY_H +#define ICE_OBJECT_ADAPTER_FACTORY_H #include <Ice/ObjectAdapterI.h> #include <IceUtil/RecMutex.h> @@ -45,3 +46,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index c74f8bec8ed..d3eed147890 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_OBJECT_ADAPTER_I_H +#define ICE_OBJECT_ADAPTER_I_H #include <IceUtil/Shared.h> #include <IceUtil/RecMutex.h> @@ -140,3 +141,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ObjectFactoryManager.h b/cpp/src/Ice/ObjectFactoryManager.h index 0c963b509eb..424610d5131 100644 --- a/cpp/src/Ice/ObjectFactoryManager.h +++ b/cpp/src/Ice/ObjectFactoryManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SERVANT_FACTORY_MANAGER_H +#define ICE_SERVANT_FACTORY_MANAGER_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -38,3 +39,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ObjectFactoryManagerF.h b/cpp/src/Ice/ObjectFactoryManagerF.h index 5befe55a0d0..9223e8290e8 100644 --- a/cpp/src/Ice/ObjectFactoryManagerF.h +++ b/cpp/src/Ice/ObjectFactoryManagerF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SERVANT_FACTORY_MANAGER_F_H +#define ICE_SERVANT_FACTORY_MANAGER_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ IceUtil::Shared* upCast(ObjectFactoryManager*); typedef Handle<ObjectFactoryManager> ObjectFactoryManagerPtr; } + +#endif diff --git a/cpp/src/Ice/OpaqueEndpointI.h b/cpp/src/Ice/OpaqueEndpointI.h index d08f927af28..c9e3e05a20d 100644 --- a/cpp/src/Ice/OpaqueEndpointI.h +++ b/cpp/src/Ice/OpaqueEndpointI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UNKNOWN_ENDPOINT_I_H +#define ICE_UNKNOWN_ENDPOINT_I_H #include <Ice/EndpointI.h> #include <Ice/EndpointFactory.h> @@ -59,3 +60,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h index a7b7578ebaa..b44d397c46d 100644 --- a/cpp/src/Ice/PluginManagerI.h +++ b/cpp/src/Ice/PluginManagerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PLUGIN_MANAGER_I_H +#define ICE_PLUGIN_MANAGER_I_H #include <Ice/Plugin.h> #include <Ice/InstanceF.h> @@ -66,3 +67,6 @@ private: typedef IceUtil::Handle<PluginManagerI> PluginManagerIPtr; } + + +#endif diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h index ee6df06c1bb..79a94e7af37 100644 --- a/cpp/src/Ice/PropertiesI.h +++ b/cpp/src/Ice/PropertiesI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PROPERTIES_I_H +#define ICE_PROPERTIES_I_H #include <IceUtil/Mutex.h> #include <Ice/Properties.h> @@ -88,3 +89,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 4cf079d262f..bc0c7f946f6 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -12,7 +12,8 @@ // IMPORTANT: Do not edit this file -- any edits made here will be lost! -#pragma once +#ifndef ICE_INTERNAL_PropertyNames_H +#define ICE_INTERNAL_PropertyNames_H #include <Ice/Config.h> @@ -74,3 +75,5 @@ public: }; } + +#endif diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h index 80dcd548bb7..0c94420816c 100644 --- a/cpp/src/Ice/ProxyFactory.h +++ b/cpp/src/Ice/ProxyFactory.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PROXY_FACTORY_H +#define ICE_PROXY_FACTORY_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -52,3 +53,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h index 09737cde019..4fad67eab08 100644 --- a/cpp/src/Ice/Reference.h +++ b/cpp/src/Ice/Reference.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_REFERENCE_H +#define ICE_REFERENCE_H #include <IceUtil/Shared.h> #include <Ice/ReferenceF.h> @@ -297,3 +298,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ReferenceFactory.h b/cpp/src/Ice/ReferenceFactory.h index cafd428f07e..dd1982f96de 100644 --- a/cpp/src/Ice/ReferenceFactory.h +++ b/cpp/src/Ice/ReferenceFactory.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_REFERENCE_FACTORY_H +#define ICE_REFERENCE_FACTORY_H #include <IceUtil/Shared.h> #include <Ice/ReferenceFactoryF.h> @@ -75,3 +76,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ReferenceFactoryF.h b/cpp/src/Ice/ReferenceFactoryF.h index 4ed346064ca..52c8ea0a17c 100644 --- a/cpp/src/Ice/ReferenceFactoryF.h +++ b/cpp/src/Ice/ReferenceFactoryF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_REFERENCE_FACTORY_F_H +#define ICE_REFERENCE_FACTORY_F_H #include <Ice/Handle.h> @@ -19,3 +20,5 @@ IceUtil::Shared* upCast(ReferenceFactory*); typedef Handle<ReferenceFactory> ReferenceFactoryPtr; } + +#endif diff --git a/cpp/src/Ice/ReplyStatus.h b/cpp/src/Ice/ReplyStatus.h index ff6929ca72a..0f3dccad897 100644 --- a/cpp/src/Ice/ReplyStatus.h +++ b/cpp/src/Ice/ReplyStatus.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_REPLY_STATUS_H +#define ICE_REPLY_STATUS_H #include <Ice/Config.h> @@ -24,3 +25,5 @@ static const Ice::Byte replyUnknownUserException = 6; static const Ice::Byte replyUnknownException = 7; } + +#endif diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h index 1dd85e9ace3..3efd72108fb 100644 --- a/cpp/src/Ice/RequestHandler.h +++ b/cpp/src/Ice/RequestHandler.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_REQUEST_HANDLER_H +#define ICE_REQUEST_HANDLER_H #include <IceUtil/Shared.h> @@ -51,3 +52,5 @@ protected: }; } + +#endif diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h index b0a875d1a32..fdfcaa1fe70 100644 --- a/cpp/src/Ice/RetryQueue.h +++ b/cpp/src/Ice/RetryQueue.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_RETRY_QUEUE_H +#define ICE_RETRY_QUEUE_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -56,3 +57,6 @@ private: }; } + +#endif + diff --git a/cpp/src/Ice/RetryQueueF.h b/cpp/src/Ice/RetryQueueF.h index ca39e18b7e5..2cdea2a6c53 100644 --- a/cpp/src/Ice/RetryQueueF.h +++ b/cpp/src/Ice/RetryQueueF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_RETRY_QUEUE_F_H +#define ICE_RETRY_QUEUE_F_H #include <Ice/Handle.h> @@ -19,3 +20,5 @@ IceUtil::Shared* upCast(RetryQueue*); typedef Handle<RetryQueue> RetryQueuePtr; } + +#endif diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h index b1c80ed07fb..b3508d7edba 100644 --- a/cpp/src/Ice/RouterInfo.h +++ b/cpp/src/Ice/RouterInfo.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ROUTER_INFO_H +#define ICE_ROUTER_INFO_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -135,3 +136,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/RouterInfoF.h b/cpp/src/Ice/RouterInfoF.h index e05324c01cf..ecdb4074873 100644 --- a/cpp/src/Ice/RouterInfoF.h +++ b/cpp/src/Ice/RouterInfoF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_ROUTER_INFO_F_H +#define ICE_ROUTER_INFO_F_H #include <IceUtil/Shared.h> @@ -25,3 +26,5 @@ IceUtil::Shared* upCast(RouterInfo*); typedef Handle<RouterInfo> RouterInfoPtr; } + +#endif diff --git a/cpp/src/Ice/Selector.h b/cpp/src/Ice/Selector.h index cf3e152ff55..4ba45a9e4f3 100644 --- a/cpp/src/Ice/Selector.h +++ b/cpp/src/Ice/Selector.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SELECTOR_H +#define ICE_SELECTOR_H #include <IceUtil/StringUtil.h> @@ -224,3 +225,5 @@ private: #endif } + +#endif diff --git a/cpp/src/Ice/ServantManager.h b/cpp/src/Ice/ServantManager.h index 3f2f63402e8..5ee56eb4e02 100644 --- a/cpp/src/Ice/ServantManager.h +++ b/cpp/src/Ice/ServantManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SERVANT_MANAGER_H +#define ICE_SERVANT_MANAGER_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -69,3 +70,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/SharedContext.h b/cpp/src/Ice/SharedContext.h index 8e906d8527e..48910f7270b 100644 --- a/cpp/src/Ice/SharedContext.h +++ b/cpp/src/Ice/SharedContext.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SHARED_CONTEXT_H +#define ICE_SHARED_CONTEXT_H #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -46,3 +47,5 @@ private: }; typedef IceUtil::Handle<SharedContext> SharedContextPtr; } + +#endif diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h index 0ccf35a8e6a..7c2e8546d9a 100644 --- a/cpp/src/Ice/StreamI.h +++ b/cpp/src/Ice/StreamI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_STREAM_I_H +#define ICE_STREAM_I_H #include <Ice/Stream.h> @@ -172,3 +173,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/SysLoggerI.h b/cpp/src/Ice/SysLoggerI.h index 7675fb77fe7..5074f6af57f 100644 --- a/cpp/src/Ice/SysLoggerI.h +++ b/cpp/src/Ice/SysLoggerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SYS_LOGGER_I_H +#define ICE_SYS_LOGGER_I_H #include <IceUtil/Mutex.h> #include <Ice/Logger.h> @@ -36,3 +37,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/TcpAcceptor.h b/cpp/src/Ice/TcpAcceptor.h index 8f4a8f78cc6..c54ae4dbb27 100644 --- a/cpp/src/Ice/TcpAcceptor.h +++ b/cpp/src/Ice/TcpAcceptor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TCP_ACCEPTOR_H +#define ICE_TCP_ACCEPTOR_H #include <Ice/TransceiverF.h> #include <Ice/InstanceF.h> @@ -63,4 +64,5 @@ private: }; } +#endif diff --git a/cpp/src/Ice/TcpConnector.h b/cpp/src/Ice/TcpConnector.h index 422c36083b0..341696087ef 100644 --- a/cpp/src/Ice/TcpConnector.h +++ b/cpp/src/Ice/TcpConnector.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TCP_CONNECTOR_H +#define ICE_TCP_CONNECTOR_H #include <Ice/TransceiverF.h> #include <Ice/InstanceF.h> @@ -51,3 +52,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h index 389c94fc0cc..c92f14c1374 100644 --- a/cpp/src/Ice/TcpEndpointI.h +++ b/cpp/src/Ice/TcpEndpointI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TCP_ENDPOINT_I_H +#define ICE_TCP_ENDPOINT_I_H #include <IceUtil/Config.h> #include <Ice/EndpointI.h> @@ -84,3 +85,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/TcpTransceiver.h b/cpp/src/Ice/TcpTransceiver.h index 01fd7ac3d11..82099820416 100644 --- a/cpp/src/Ice/TcpTransceiver.h +++ b/cpp/src/Ice/TcpTransceiver.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TCP_TRANSCEIVER_H +#define ICE_TCP_TRANSCEIVER_H #include <Ice/InstanceF.h> #include <Ice/TraceLevelsF.h> @@ -80,3 +81,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h index c9084d46a28..9bf068ddc61 100644 --- a/cpp/src/Ice/ThreadPool.h +++ b/cpp/src/Ice/ThreadPool.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_THREAD_POOL_H +#define ICE_THREAD_POOL_H #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -355,3 +356,6 @@ private: #endif }; + + +#endif diff --git a/cpp/src/Ice/ThreadPoolF.h b/cpp/src/Ice/ThreadPoolF.h index a658181cf6c..0c44f48db9a 100644 --- a/cpp/src/Ice/ThreadPoolF.h +++ b/cpp/src/Ice/ThreadPoolF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_THREAD_POOL_F_H +#define ICE_THREAD_POOL_F_H #include <IceUtil/Shared.h> @@ -27,3 +28,5 @@ typedef Handle<ThreadPoolWorkItem> ThreadPoolWorkItemPtr; class ThreadPoolCurrent; } + +#endif diff --git a/cpp/src/Ice/TraceLevels.h b/cpp/src/Ice/TraceLevels.h index 34841ab0a9f..c562c3e4be4 100644 --- a/cpp/src/Ice/TraceLevels.h +++ b/cpp/src/Ice/TraceLevels.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TRACE_LEVELS_H +#define ICE_TRACE_LEVELS_H #include <IceUtil/Shared.h> #include <Ice/TraceLevelsF.h> @@ -45,3 +46,5 @@ public: }; } + +#endif diff --git a/cpp/src/Ice/TraceLevelsF.h b/cpp/src/Ice/TraceLevelsF.h index 42dc6fc5380..da3a12d0b98 100644 --- a/cpp/src/Ice/TraceLevelsF.h +++ b/cpp/src/Ice/TraceLevelsF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TRACE_LEVELS_F_H +#define ICE_TRACE_LEVELS_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(TraceLevels*); typedef Handle<TraceLevels> TraceLevelsPtr; } + +#endif diff --git a/cpp/src/Ice/TraceUtil.h b/cpp/src/Ice/TraceUtil.h index c0b787a4921..c45cb8b01a0 100644 --- a/cpp/src/Ice/TraceUtil.h +++ b/cpp/src/Ice/TraceUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TRACE_UTIL_H +#define ICE_TRACE_UTIL_H #include <Ice/LoggerF.h> #include <Ice/TraceLevelsF.h> @@ -23,3 +24,5 @@ void trace(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const Trace void traceSlicing(const char*, const ::std::string&, const char *, const ::Ice::LoggerPtr&); } + +#endif diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h index 5c48034ab45..3cf9b9d867a 100644 --- a/cpp/src/Ice/Transceiver.h +++ b/cpp/src/Ice/Transceiver.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TRANSCEIVER_H +#define ICE_TRANSCEIVER_H #include <IceUtil/Shared.h> #include <Ice/TransceiverF.h> @@ -41,3 +42,5 @@ public: }; } + +#endif diff --git a/cpp/src/Ice/TransceiverF.h b/cpp/src/Ice/TransceiverF.h index 407540d0c9d..0c6eae51720 100644 --- a/cpp/src/Ice/TransceiverF.h +++ b/cpp/src/Ice/TransceiverF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TRANSCEIVER_F_H +#define ICE_TRANSCEIVER_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ ICE_API IceUtil::Shared* upCast(Transceiver*); typedef Handle<Transceiver> TransceiverPtr; } + +#endif diff --git a/cpp/src/Ice/UdpConnector.h b/cpp/src/Ice/UdpConnector.h index 92011e4a9a5..148c767407b 100644 --- a/cpp/src/Ice/UdpConnector.h +++ b/cpp/src/Ice/UdpConnector.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UDP_CONNECTOR_H +#define ICE_UDP_CONNECTOR_H #include <Ice/TransceiverF.h> #include <Ice/InstanceF.h> @@ -49,3 +50,4 @@ private: }; } +#endif diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h index 7f278646416..c82ef8aa2fb 100644 --- a/cpp/src/Ice/UdpEndpointI.h +++ b/cpp/src/Ice/UdpEndpointI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UDP_ENDPOINT_I_H +#define ICE_UDP_ENDPOINT_I_H #include <IceUtil/Config.h> #include <Ice/EndpointI.h> @@ -86,3 +87,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/UdpTransceiver.h b/cpp/src/Ice/UdpTransceiver.h index a189f5263f9..0a1fc7155ba 100644 --- a/cpp/src/Ice/UdpTransceiver.h +++ b/cpp/src/Ice/UdpTransceiver.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UDP_TRANSCEIVER_H +#define ICE_UDP_TRANSCEIVER_H #include <Ice/InstanceF.h> #include <Ice/TraceLevelsF.h> @@ -116,4 +117,4 @@ private: }; } - +#endif diff --git a/cpp/src/Ice/winrt/StreamAcceptor.h b/cpp/src/Ice/winrt/StreamAcceptor.h index f18d5f3439e..d5f84422442 100644 --- a/cpp/src/Ice/winrt/StreamAcceptor.h +++ b/cpp/src/Ice/winrt/StreamAcceptor.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_STREAM_ACCEPTOR_H +#define ICE_STREAM_ACCEPTOR_H #include <Ice/TransceiverF.h> #include <Ice/InstanceF.h> @@ -64,3 +65,5 @@ private: }; } +#endif + diff --git a/cpp/src/Ice/winrt/StreamConnector.h b/cpp/src/Ice/winrt/StreamConnector.h index 6a316792c06..ab156177e55 100644 --- a/cpp/src/Ice/winrt/StreamConnector.h +++ b/cpp/src/Ice/winrt/StreamConnector.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TCP_CONNECTOR_H +#define ICE_TCP_CONNECTOR_H #include <Ice/TransceiverF.h> #include <Ice/InstanceF.h> @@ -51,3 +52,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/winrt/StreamEndpointI.h b/cpp/src/Ice/winrt/StreamEndpointI.h index cd7a4cc6549..6d102ff3647 100644 --- a/cpp/src/Ice/winrt/StreamEndpointI.h +++ b/cpp/src/Ice/winrt/StreamEndpointI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_TCP_ENDPOINT_I_H +#define ICE_TCP_ENDPOINT_I_H #include <IceUtil/Config.h> #include <Ice/EndpointI.h> @@ -85,3 +86,5 @@ private: }; } + +#endif diff --git a/cpp/src/Ice/winrt/StreamTransceiver.h b/cpp/src/Ice/winrt/StreamTransceiver.h index ffab6874589..11d27eee6ff 100644 --- a/cpp/src/Ice/winrt/StreamTransceiver.h +++ b/cpp/src/Ice/winrt/StreamTransceiver.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_STREAM_TRANSCEIVER_H +#define ICE_STREAM_TRANSCEIVER_H #include <Ice/InstanceF.h> #include <Ice/TraceLevelsF.h> @@ -88,3 +89,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h index 9c381941b49..0a06eb84186 100644 --- a/cpp/src/IceBox/ServiceManagerI.h +++ b/cpp/src/IceBox/ServiceManagerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SERVICE_MANAGER_I_H +#define SERVICE_MANAGER_I_H #include <IceBox/IceBox.h> #include <Ice/LoggerF.h> @@ -86,3 +87,5 @@ private: typedef IceUtil::Handle<ServiceManagerI> ServiceManagerIPtr; } + +#endif diff --git a/cpp/src/IceDB/FreezeTypes.h b/cpp/src/IceDB/FreezeTypes.h index d10645b7197..835e308fee3 100644 --- a/cpp/src/IceDB/FreezeTypes.h +++ b/cpp/src/IceDB/FreezeTypes.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_TYPES_H +#define FREEZE_TYPES_H #include <IceDB/IceDB.h> #include <Freeze/Freeze.h> @@ -193,3 +194,6 @@ protected: }; } + +#endif + diff --git a/cpp/src/IceDB/IceDB.h b/cpp/src/IceDB/IceDB.h index 53053b326de..fbf4c9ebbcb 100644 --- a/cpp/src/IceDB/IceDB.h +++ b/cpp/src/IceDB/IceDB.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_DB_H +#define ICE_DB_H #include <IceUtil/Exception.h> #include <IceUtil/Shared.h> @@ -109,3 +110,5 @@ public: }; } + +#endif diff --git a/cpp/src/IceDB/SqlTypes.h b/cpp/src/IceDB/SqlTypes.h index ad310c755f9..b908c13df98 100644 --- a/cpp/src/IceDB/SqlTypes.h +++ b/cpp/src/IceDB/SqlTypes.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_TYPES_H +#define SQL_TYPES_H #include <IceDB/IceDB.h> @@ -205,3 +206,5 @@ protected: }; } + +#endif diff --git a/cpp/src/IceGrid/Activator.h b/cpp/src/IceGrid/Activator.h index 3e0ecc14c6e..99af1b1fa84 100644 --- a/cpp/src/IceGrid/Activator.h +++ b/cpp/src/IceGrid/Activator.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_ACTIVATOR_H +#define ICE_GRID_ACTIVATOR_H #include <IceUtil/Thread.h> #include <IceGrid/Internal.h> @@ -94,3 +95,5 @@ private: typedef IceUtil::Handle<Activator> ActivatorPtr; } + +#endif diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h index 9a466b37933..9a42d62b645 100644 --- a/cpp/src/IceGrid/AdapterCache.h +++ b/cpp/src/IceGrid/AdapterCache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_ADAPTERCACHE_H +#define ICE_GRID_ADAPTERCACHE_H #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> @@ -145,3 +146,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/AdminCallbackRouter.h b/cpp/src/IceGrid/AdminCallbackRouter.h index 8ae022f5759..cdeb6b01adf 100644 --- a/cpp/src/IceGrid/AdminCallbackRouter.h +++ b/cpp/src/IceGrid/AdminCallbackRouter.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_ADMIN_CALLBACK_ROUTER_H +#define ICE_GRID_ADMIN_CALLBACK_ROUTER_H #include <Ice/Ice.h> #include <IceUtil/IceUtil.h> @@ -65,3 +66,4 @@ private: typedef IceUtil::Handle<AdminCallbackRouter> AdminCallbackRouterPtr; } +#endif diff --git a/cpp/src/IceGrid/AdminI.h b/cpp/src/IceGrid/AdminI.h index 5ed1c5ee11c..14bb30ea639 100644 --- a/cpp/src/IceGrid/AdminI.h +++ b/cpp/src/IceGrid/AdminI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_ADMIN_I_H +#define ICE_GRID_ADMIN_I_H #include <IceGrid/Admin.h> @@ -101,3 +102,5 @@ private: typedef IceUtil::Handle<AdminI> AdminIPtr; } + +#endif diff --git a/cpp/src/IceGrid/AdminSessionI.h b/cpp/src/IceGrid/AdminSessionI.h index 65a699fa3fd..ff234953ab3 100644 --- a/cpp/src/IceGrid/AdminSessionI.h +++ b/cpp/src/IceGrid/AdminSessionI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_ADMINSESSIONI_H +#define ICEGRID_ADMINSESSIONI_H #include <IceGrid/SessionI.h> #include <IceGrid/Topics.h> @@ -146,3 +147,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/Allocatable.h b/cpp/src/IceGrid/Allocatable.h index 12f1bd25f91..bcbc018053e 100644 --- a/cpp/src/IceGrid/Allocatable.h +++ b/cpp/src/IceGrid/Allocatable.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_ALLOCATABLE_H +#define ICE_GRID_ALLOCATABLE_H #include <IceUtil/Handle.h> #include <IceUtil/Mutex.h> @@ -112,3 +113,5 @@ protected: }; }; + +#endif diff --git a/cpp/src/IceGrid/AllocatableObjectCache.h b/cpp/src/IceGrid/AllocatableObjectCache.h index a00c1dd24c6..ef304e712ea 100644 --- a/cpp/src/IceGrid/AllocatableObjectCache.h +++ b/cpp/src/IceGrid/AllocatableObjectCache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_ALLOCATABLEOBJECTCACHE_H +#define ICE_GRID_ALLOCATABLEOBJECTCACHE_H #include <IceUtil/Mutex.h> #include <Ice/CommunicatorF.h> @@ -113,3 +114,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/Cache.h b/cpp/src/IceGrid/Cache.h index e1bf02705e3..6e85ed1044c 100644 --- a/cpp/src/IceGrid/Cache.h +++ b/cpp/src/IceGrid/Cache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_CACHE_H +#define ICE_GRID_CACHE_H #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> @@ -154,3 +155,5 @@ public: }; }; + +#endif diff --git a/cpp/src/IceGrid/DB.h b/cpp/src/IceGrid/DB.h index 2fa0daf11b6..29184783f3a 100644 --- a/cpp/src/IceGrid/DB.h +++ b/cpp/src/IceGrid/DB.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef DATABASE_CACHE_H +#define DATABASE_CACHE_H #include <Ice/Plugin.h> #include <IceDB/IceDB.h> @@ -57,3 +58,6 @@ public: typedef IceUtil::Handle<DatabasePlugin> DatabasePluginPtr; } + + +#endif diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h index 4f7d415399c..2136808f73f 100644 --- a/cpp/src/IceGrid/Database.h +++ b/cpp/src/IceGrid/Database.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_DATABASE_H +#define ICE_GRID_DATABASE_H #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> @@ -236,3 +237,5 @@ private: typedef IceUtil::Handle<Database> DatabasePtr; }; + +#endif diff --git a/cpp/src/IceGrid/DescriptorBuilder.h b/cpp/src/IceGrid/DescriptorBuilder.h index 3ce9b7ab64b..8472e4bf4fd 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.h +++ b/cpp/src/IceGrid/DescriptorBuilder.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_DESCRIPTOR_BUILDER_H +#define ICE_GRID_DESCRIPTOR_BUILDER_H #include <Ice/Logger.h> #include <IceXML/Parser.h> @@ -310,3 +311,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h index b2b012c5e49..dbc72e919c9 100644 --- a/cpp/src/IceGrid/DescriptorHelper.h +++ b/cpp/src/IceGrid/DescriptorHelper.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_DESCRIPTOR_HELPER_H +#define ICE_GRID_DESCRIPTOR_HELPER_H #include <IceUtil/OutputUtil.h> #include <IceXML/Parser.h> @@ -343,3 +344,5 @@ bool descriptorEqual(const ServerDescriptorPtr&, const ServerDescriptorPtr&); ServerHelperPtr createHelper(const ServerDescriptorPtr&); } + +#endif diff --git a/cpp/src/IceGrid/DescriptorParser.h b/cpp/src/IceGrid/DescriptorParser.h index 3404a87f7cb..ed808d01ad3 100644 --- a/cpp/src/IceGrid/DescriptorParser.h +++ b/cpp/src/IceGrid/DescriptorParser.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_DESCRIPTOR_PARSER_H +#define ICEGRID_DESCRIPTOR_PARSER_H namespace IceGrid { @@ -27,3 +28,5 @@ public: }; } + +#endif diff --git a/cpp/src/IceGrid/FileCache.h b/cpp/src/IceGrid/FileCache.h index 70de97d1d09..eeded1132a2 100644 --- a/cpp/src/IceGrid/FileCache.h +++ b/cpp/src/IceGrid/FileCache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_FILE_CACHE_H +#define ICE_GRID_FILE_CACHE_H #include <IceUtil/Shared.h> #include <Ice/BuiltinSequences.h> @@ -32,3 +33,5 @@ private: typedef IceUtil::Handle<FileCache> FileCachePtr; }; + +#endif diff --git a/cpp/src/IceGrid/FileParserI.h b/cpp/src/IceGrid/FileParserI.h index 11c2b63f407..811236ed729 100644 --- a/cpp/src/IceGrid/FileParserI.h +++ b/cpp/src/IceGrid/FileParserI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_FILE_PARSERI_H +#define ICE_GRID_FILE_PARSERI_H #include <IceGrid/FileParser.h> @@ -18,3 +19,5 @@ public: IceGrid::ApplicationDescriptor parse(const std::string& file, const IceGrid::AdminPrx& admin, const Ice::Current&); }; + +#endif diff --git a/cpp/src/IceGrid/FileUserAccountMapperI.h b/cpp/src/IceGrid/FileUserAccountMapperI.h index 4112621bd88..f2e978ab102 100644 --- a/cpp/src/IceGrid/FileUserAccountMapperI.h +++ b/cpp/src/IceGrid/FileUserAccountMapperI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_FILEUSERACCOUNTMAPPERI_H +#define ICE_GRID_FILEUSERACCOUNTMAPPERI_H #include <IceGrid/UserAccountMapper.h> @@ -28,3 +29,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/FreezeDB/FreezeDB.h b/cpp/src/IceGrid/FreezeDB/FreezeDB.h index 6604c5ece55..a730cb83091 100644 --- a/cpp/src/IceGrid/FreezeDB/FreezeDB.h +++ b/cpp/src/IceGrid/FreezeDB/FreezeDB.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_DATABASE_CACHE_H +#define FREEZE_DATABASE_CACHE_H #include <IceDB/FreezeTypes.h> @@ -47,3 +48,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceGrid/InternalRegistryI.h b/cpp/src/IceGrid/InternalRegistryI.h index 42400f346b3..613bbef367c 100644 --- a/cpp/src/IceGrid/InternalRegistryI.h +++ b/cpp/src/IceGrid/InternalRegistryI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_INTERNALREGISTRYI_H +#define ICE_GRID_INTERNALREGISTRYI_H #include <IceGrid/Registry.h> #include <IceGrid/Internal.h> @@ -72,3 +73,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/LocatorI.h b/cpp/src/IceGrid/LocatorI.h index 1ea9447380e..6e5fb87618b 100644 --- a/cpp/src/IceGrid/LocatorI.h +++ b/cpp/src/IceGrid/LocatorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_LOCATOR_I_H +#define ICE_GRID_LOCATOR_I_H #include <IceGrid/Internal.h> #include <IceGrid/Locator.h> @@ -79,3 +80,5 @@ protected: }; } + +#endif diff --git a/cpp/src/IceGrid/LocatorRegistryI.h b/cpp/src/IceGrid/LocatorRegistryI.h index b20ad40ccbc..91b4e110af0 100644 --- a/cpp/src/IceGrid/LocatorRegistryI.h +++ b/cpp/src/IceGrid/LocatorRegistryI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_LOCATOR_REGISTRY_I_H +#define ICE_GRID_LOCATOR_REGISTRY_I_H #include <IceGrid/Internal.h> #include <Ice/Locator.h> @@ -64,3 +65,5 @@ private: typedef IceUtil::Handle<LocatorRegistryI> LocatorRegistryIPtr; } + +#endif diff --git a/cpp/src/IceGrid/NodeCache.h b/cpp/src/IceGrid/NodeCache.h index 03b3a1a914d..a00f2ce3ba2 100644 --- a/cpp/src/IceGrid/NodeCache.h +++ b/cpp/src/IceGrid/NodeCache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_NODECACHE_H +#define ICE_GRID_NODECACHE_H #include <IceUtil/RecMutex.h> #include <IceUtil/Shared.h> @@ -103,3 +104,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/NodeI.h b/cpp/src/IceGrid/NodeI.h index 508de0f2a48..27daa4e0bb7 100644 --- a/cpp/src/IceGrid/NodeI.h +++ b/cpp/src/IceGrid/NodeI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_NODE_I_H +#define ICE_GRID_NODE_I_H #include <IceUtil/Timer.h> #include <IcePatch2/FileServer.h> @@ -177,3 +178,5 @@ private: typedef IceUtil::Handle<NodeI> NodeIPtr; } + +#endif diff --git a/cpp/src/IceGrid/NodeServerAdminRouter.h b/cpp/src/IceGrid/NodeServerAdminRouter.h index 744e13af22d..c649a874152 100644 --- a/cpp/src/IceGrid/NodeServerAdminRouter.h +++ b/cpp/src/IceGrid/NodeServerAdminRouter.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_NODE_SERVER_ADMIN_ROUTER_H +#define ICE_GRID_NODE_SERVER_ADMIN_ROUTER_H #include <IceGrid/NodeI.h> @@ -28,3 +29,4 @@ private: NodeIPtr _node; }; } +#endif diff --git a/cpp/src/IceGrid/NodeSessionI.h b/cpp/src/IceGrid/NodeSessionI.h index 55c18fc8e81..4e813f26332 100644 --- a/cpp/src/IceGrid/NodeSessionI.h +++ b/cpp/src/IceGrid/NodeSessionI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_NODE_SESSION_H +#define ICEGRID_NODE_SESSION_H #include <IceGrid/Internal.h> #include <set> @@ -100,3 +101,5 @@ private: typedef IceUtil::Handle<NodeSessionI> NodeSessionIPtr; }; + +#endif diff --git a/cpp/src/IceGrid/NodeSessionManager.h b/cpp/src/IceGrid/NodeSessionManager.h index 2d8c4694345..71bd1d032ea 100644 --- a/cpp/src/IceGrid/NodeSessionManager.h +++ b/cpp/src/IceGrid/NodeSessionManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_NODE_SESSION_MANAGER_H +#define ICE_GRID_NODE_SESSION_MANAGER_H #include <IceUtil/Handle.h> #include <IceUtil/Mutex.h> @@ -136,3 +137,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceGrid/ObjectCache.h b/cpp/src/IceGrid/ObjectCache.h index c1e77dd5e9c..523b90f231e 100644 --- a/cpp/src/IceGrid/ObjectCache.h +++ b/cpp/src/IceGrid/ObjectCache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_OBJECTCACHE_H +#define ICE_GRID_OBJECTCACHE_H #include <IceUtil/Mutex.h> #include <Ice/CommunicatorF.h> @@ -80,3 +81,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h index fb5491a2c36..f53b3a94002 100644 --- a/cpp/src/IceGrid/Parser.h +++ b/cpp/src/IceGrid/Parser.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_PARSER_H +#define ICE_GRID_PARSER_H #include <IceUtil/Handle.h> #include <IceGrid/Admin.h> @@ -164,3 +165,5 @@ private: extern Parser* parser; // The current parser for bison/flex } + +#endif diff --git a/cpp/src/IceGrid/PlatformInfo.h b/cpp/src/IceGrid/PlatformInfo.h index 1eece75e606..1afc7bdb932 100644 --- a/cpp/src/IceGrid/PlatformInfo.h +++ b/cpp/src/IceGrid/PlatformInfo.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_PLATFORM_INFO_H +#define ICE_GRID_PLATFORM_INFO_H #include <IceUtil/Thread.h> #include <IceGrid/Internal.h> @@ -87,3 +88,5 @@ private: }; + +#endif diff --git a/cpp/src/IceGrid/QueryI.h b/cpp/src/IceGrid/QueryI.h index b1b8baa26c0..b64e5cceaac 100644 --- a/cpp/src/IceGrid/QueryI.h +++ b/cpp/src/IceGrid/QueryI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_QUERY_I_H +#define ICE_GRID_QUERY_I_H #include <IceGrid/Query.h> #include <Ice/CommunicatorF.h> @@ -43,3 +44,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceGrid/ReapThread.h b/cpp/src/IceGrid/ReapThread.h index 2e7906cb6af..9d4322dd3d6 100644 --- a/cpp/src/IceGrid/ReapThread.h +++ b/cpp/src/IceGrid/ReapThread.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_REAPER_THREAD_H +#define ICEGRID_REAPER_THREAD_H #include <IceUtil/Thread.h> #include <IceUtil/Mutex.h> @@ -112,3 +113,5 @@ private: typedef IceUtil::Handle<ReapThread> ReapThreadPtr; }; + +#endif diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h index aa9c7fcb68c..a17dbb729f9 100644 --- a/cpp/src/IceGrid/RegistryI.h +++ b/cpp/src/IceGrid/RegistryI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_REGISTRYI_H +#define ICE_GRID_REGISTRYI_H #include <IceUtil/Timer.h> #include <IceGrid/Registry.h> @@ -132,3 +133,5 @@ private: typedef IceUtil::Handle<RegistryI> RegistryIPtr; } + +#endif diff --git a/cpp/src/IceGrid/RegistryServerAdminRouter.h b/cpp/src/IceGrid/RegistryServerAdminRouter.h index e8bb41b7c91..15ed8161626 100644 --- a/cpp/src/IceGrid/RegistryServerAdminRouter.h +++ b/cpp/src/IceGrid/RegistryServerAdminRouter.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_REGISTRY_SERVER_ADMIN_ROUTER_H +#define ICE_GRID_REGISTRY_SERVER_ADMIN_ROUTER_H #include <IceGrid/Database.h> @@ -30,3 +31,4 @@ private: }; } +#endif diff --git a/cpp/src/IceGrid/ReplicaCache.h b/cpp/src/IceGrid/ReplicaCache.h index 2eaa7c38229..76c9fa5481e 100644 --- a/cpp/src/IceGrid/ReplicaCache.h +++ b/cpp/src/IceGrid/ReplicaCache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_REPLICACACHE_H +#define ICE_GRID_REPLICACACHE_H #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> @@ -73,3 +74,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/ReplicaSessionI.h b/cpp/src/IceGrid/ReplicaSessionI.h index 27dfd08ee68..9ca0ead61ac 100644 --- a/cpp/src/IceGrid/ReplicaSessionI.h +++ b/cpp/src/IceGrid/ReplicaSessionI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_REPLICA_SESSION_H +#define ICEGRID_REPLICA_SESSION_H #include <IceGrid/Registry.h> #include <IceGrid/Internal.h> @@ -71,3 +72,5 @@ private: typedef IceUtil::Handle<ReplicaSessionI> ReplicaSessionIPtr; }; + +#endif diff --git a/cpp/src/IceGrid/ReplicaSessionManager.h b/cpp/src/IceGrid/ReplicaSessionManager.h index 28f626a45a0..84d9da6aa61 100644 --- a/cpp/src/IceGrid/ReplicaSessionManager.h +++ b/cpp/src/IceGrid/ReplicaSessionManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_REPLICA_SESSION_MANAGER_H +#define ICE_GRID_REPLICA_SESSION_MANAGER_H #include <IceUtil/Handle.h> #include <IceUtil/Mutex.h> @@ -108,3 +109,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceGrid/ServerAdapterI.h b/cpp/src/IceGrid/ServerAdapterI.h index c2ad30f8c9b..db4ce4cc3fb 100644 --- a/cpp/src/IceGrid/ServerAdapterI.h +++ b/cpp/src/IceGrid/ServerAdapterI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_SERVER_ADAPTER_I_H +#define ICE_GRID_SERVER_ADAPTER_I_H #include <IceUtil/Mutex.h> #include <IceGrid/Internal.h> @@ -55,3 +56,5 @@ private: typedef IceUtil::Handle<ServerAdapterI> ServerAdapterIPtr; } + +#endif diff --git a/cpp/src/IceGrid/ServerCache.h b/cpp/src/IceGrid/ServerCache.h index f1db17fa9b6..c7986a9813e 100644 --- a/cpp/src/IceGrid/ServerCache.h +++ b/cpp/src/IceGrid/ServerCache.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_SERVERCACHE_H +#define ICE_GRID_SERVERCACHE_H #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> @@ -142,3 +143,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/ServerI.h b/cpp/src/IceGrid/ServerI.h index e40cd51c877..d84542c050d 100644 --- a/cpp/src/IceGrid/ServerI.h +++ b/cpp/src/IceGrid/ServerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_SERVER_I_H +#define ICE_GRID_SERVER_I_H #include <IceUtil/Mutex.h> #include <IceUtil/Timer.h> @@ -321,3 +322,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceGrid/SessionI.h b/cpp/src/IceGrid/SessionI.h index b1660792e13..e7ca6f3b863 100644 --- a/cpp/src/IceGrid/SessionI.h +++ b/cpp/src/IceGrid/SessionI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_SESSIONI_H +#define ICEGRID_SESSIONI_H #include <IceUtil/Mutex.h> #include <IceUtil/Timer.h> @@ -156,3 +157,5 @@ private: }; }; + +#endif diff --git a/cpp/src/IceGrid/SessionManager.h b/cpp/src/IceGrid/SessionManager.h index 756c564cea5..e23ed3aee6a 100644 --- a/cpp/src/IceGrid/SessionManager.h +++ b/cpp/src/IceGrid/SessionManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_SESSION_MANAGER_H +#define ICE_GRID_SESSION_MANAGER_H #include <IceUtil/Handle.h> #include <IceUtil/Mutex.h> @@ -313,3 +314,5 @@ protected: }; }; + +#endif diff --git a/cpp/src/IceGrid/SessionServantManager.h b/cpp/src/IceGrid/SessionServantManager.h index 411b9bde459..76dfd1f801a 100644 --- a/cpp/src/IceGrid/SessionServantManager.h +++ b/cpp/src/IceGrid/SessionServantManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_SESSIONSERVANTLOCATOR_H +#define ICE_GRID_SESSIONSERVANTLOCATOR_H #include <IceGrid/AdminCallbackRouter.h> #include <IceUtil/Mutex.h> @@ -83,3 +84,5 @@ private: typedef IceUtil::Handle<SessionServantManager> SessionServantManagerPtr; }; + +#endif diff --git a/cpp/src/IceGrid/SqlDB/SqlDB.h b/cpp/src/IceGrid/SqlDB/SqlDB.h index 9f3f3d11767..fe518e2a790 100644 --- a/cpp/src/IceGrid/SqlDB/SqlDB.h +++ b/cpp/src/IceGrid/SqlDB/SqlDB.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_DATABASE_CACHE_H +#define SQL_DATABASE_CACHE_H #include <IceGrid/DB.h> @@ -63,3 +64,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceGrid/SqlDB/SqlIdentityObjectInfoDict.h b/cpp/src/IceGrid/SqlDB/SqlIdentityObjectInfoDict.h index dbe90d6509a..effb29dff56 100644 --- a/cpp/src/IceGrid/SqlDB/SqlIdentityObjectInfoDict.h +++ b/cpp/src/IceGrid/SqlDB/SqlIdentityObjectInfoDict.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_IDENTITY_OBJECT_INFO_DICT_H +#define SQL_IDENTITY_OBJECT_INFO_DICT_H #include <Ice/CommunicatorF.h> #include <IceGrid/Admin.h> @@ -42,3 +43,5 @@ private: typedef IceUtil::Handle<SqlIdentityObjectInfoDict> SqlIdentityObjectInfoDictPtr; } + +#endif diff --git a/cpp/src/IceGrid/SqlDB/SqlStringAdapterInfoDict.h b/cpp/src/IceGrid/SqlDB/SqlStringAdapterInfoDict.h index e30395789b9..ab846be3d1f 100644 --- a/cpp/src/IceGrid/SqlDB/SqlStringAdapterInfoDict.h +++ b/cpp/src/IceGrid/SqlDB/SqlStringAdapterInfoDict.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_STRING_ADAPTER_INFO_DICT_H +#define SQL_STRING_ADAPTER_INFO_DICT_H #include <Ice/CommunicatorF.h> #include <IceGrid/Admin.h> @@ -42,3 +43,5 @@ private: typedef IceUtil::Handle<SqlStringAdapterInfoDict> SqlStringAdapterInfoDictPtr; } + +#endif diff --git a/cpp/src/IceGrid/SqlDB/SqlStringApplicationInfoDict.h b/cpp/src/IceGrid/SqlDB/SqlStringApplicationInfoDict.h index f7452ab9ec0..c92d3eb807a 100644 --- a/cpp/src/IceGrid/SqlDB/SqlStringApplicationInfoDict.h +++ b/cpp/src/IceGrid/SqlDB/SqlStringApplicationInfoDict.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_STRING_APPLICATION_INFO_DICT_H +#define SQL_STRING_APPLICATION_INFO_DICT_H #include <Ice/CommunicatorF.h> #include <IceGrid/Admin.h> @@ -41,3 +42,5 @@ private: typedef IceUtil::Handle<SqlStringApplicationInfoDict> SqlStringApplicationInfoDictPtr; } + +#endif diff --git a/cpp/src/IceGrid/Topics.h b/cpp/src/IceGrid/Topics.h index 2ee85df44bb..7399457d35e 100644 --- a/cpp/src/IceGrid/Topics.h +++ b/cpp/src/IceGrid/Topics.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICEGRID_TOPICS_H +#define ICEGRID_TOPICS_H #include <IceUtil/Mutex.h> #include <IceStorm/IceStorm.h> @@ -160,3 +161,5 @@ private: typedef IceUtil::Handle<ObjectObserverTopic> ObjectObserverTopicPtr; }; + +#endif diff --git a/cpp/src/IceGrid/TraceLevels.h b/cpp/src/IceGrid/TraceLevels.h index 127f378fcec..a3f687b0ebf 100644 --- a/cpp/src/IceGrid/TraceLevels.h +++ b/cpp/src/IceGrid/TraceLevels.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_TRACE_LEVELS_H +#define ICE_GRID_TRACE_LEVELS_H #include <IceUtil/Shared.h> #include <Ice/CommunicatorF.h> @@ -59,3 +60,5 @@ public: typedef IceUtil::Handle<TraceLevels> TraceLevelsPtr; } // End namespace IceGrid + +#endif diff --git a/cpp/src/IceGrid/Util.h b/cpp/src/IceGrid/Util.h index c15ec35e0c3..9ba84619693 100755 --- a/cpp/src/IceGrid/Util.h +++ b/cpp/src/IceGrid/Util.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_UTIL_H +#define ICE_GRID_UTIL_H #include <IceGrid/Descriptor.h> #include <IceUtil/StringUtil.h> @@ -117,3 +118,5 @@ inline getMatchingKeys(const T& m, const std::string& expression) } }; + +#endif diff --git a/cpp/src/IceGrid/WaitQueue.h b/cpp/src/IceGrid/WaitQueue.h index 83345b2f171..09691c9c04b 100644 --- a/cpp/src/IceGrid/WaitQueue.h +++ b/cpp/src/IceGrid/WaitQueue.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_WAIT_QUEUE_H +#define ICE_GRID_WAIT_QUEUE_H #include <IceUtil/Thread.h> #include <IceUtil/Monitor.h> @@ -57,3 +58,5 @@ private: typedef IceUtil::Handle<WaitQueue> WaitQueuePtr; } + +#endif diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.h b/cpp/src/IceGrid/WellKnownObjectsManager.h index fd1661150fc..5ef741840b4 100644 --- a/cpp/src/IceGrid/WellKnownObjectsManager.h +++ b/cpp/src/IceGrid/WellKnownObjectsManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H +#define ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H #include <IceGrid/Internal.h> @@ -46,3 +47,5 @@ private: typedef IceUtil::Handle<WellKnownObjectsManager> WellKnownObjectsManagerPtr; }; + +#endif diff --git a/cpp/src/IcePatch2/FileServerI.h b/cpp/src/IcePatch2/FileServerI.h index ba9190b2b88..5f32dcddafd 100644 --- a/cpp/src/IcePatch2/FileServerI.h +++ b/cpp/src/IcePatch2/FileServerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_PATCH2_FILE_SERVER_I_H +#define ICE_PATCH2_FILE_SERVER_I_H #include <IcePatch2/Util.h> #include <IcePatch2/FileServer.h> @@ -37,3 +38,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceSSL/AcceptorI.h b/cpp/src/IceSSL/AcceptorI.h index 44daa2f261f..7a4fab4df00 100644 --- a/cpp/src/IceSSL/AcceptorI.h +++ b/cpp/src/IceSSL/AcceptorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_ACCEPTOR_I_H +#define ICE_SSL_ACCEPTOR_I_H #include <Ice/LoggerF.h> #include <Ice/TransceiverF.h> @@ -66,3 +67,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceSSL/ConnectorI.h b/cpp/src/IceSSL/ConnectorI.h index ffa8a0c41e3..5e00e714678 100644 --- a/cpp/src/IceSSL/ConnectorI.h +++ b/cpp/src/IceSSL/ConnectorI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_CONNECTOR_I_H +#define ICE_SSL_CONNECTOR_I_H #include <Ice/LoggerF.h> #include <Ice/TransceiverF.h> @@ -57,3 +58,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h index 732a2c2949c..d551bd0626a 100644 --- a/cpp/src/IceSSL/EndpointI.h +++ b/cpp/src/IceSSL/EndpointI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_ENDPOINT_I_H +#define ICE_SSL_ENDPOINT_I_H #include <Ice/EndpointI.h> #include <Ice/EndpointFactory.h> @@ -84,3 +85,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceSSL/Instance.h b/cpp/src/IceSSL/Instance.h index 8c42ab53b86..55af46a6c99 100644 --- a/cpp/src/IceSSL/Instance.h +++ b/cpp/src/IceSSL/Instance.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_INSTANCE_H +#define ICE_SSL_INSTANCE_H #include <IceSSL/InstanceF.h> #include <IceSSL/UtilF.h> @@ -87,3 +88,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceSSL/InstanceF.h b/cpp/src/IceSSL/InstanceF.h index 3fd831308ad..0f731a0c174 100644 --- a/cpp/src/IceSSL/InstanceF.h +++ b/cpp/src/IceSSL/InstanceF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_INSTANCE_F_H +#define ICE_SSL_INSTANCE_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ IceUtil::Shared* upCast(IceSSL::Instance*); typedef IceInternal::Handle<Instance> InstancePtr; } + +#endif diff --git a/cpp/src/IceSSL/PluginI.h b/cpp/src/IceSSL/PluginI.h index 9b54513d38d..10488ad6226 100644 --- a/cpp/src/IceSSL/PluginI.h +++ b/cpp/src/IceSSL/PluginI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_PLUGIN_I_H +#define ICE_SSL_PLUGIN_I_H #include <IceSSL/Plugin.h> #include <IceSSL/InstanceF.h> @@ -42,3 +43,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceSSL/RFC2253.h b/cpp/src/IceSSL/RFC2253.h index 0e769c20bb2..c70fb157d9f 100644 --- a/cpp/src/IceSSL/RFC2253.h +++ b/cpp/src/IceSSL/RFC2253.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_RFC_2253_H +#define ICE_SSL_RFC_2253_H #include <IceUtil/Config.h> #include <list> @@ -62,3 +63,5 @@ std::string unescape(const std::string&); } } + +#endif diff --git a/cpp/src/IceSSL/TransceiverI.h b/cpp/src/IceSSL/TransceiverI.h index d932895736f..dd94b787a7c 100644 --- a/cpp/src/IceSSL/TransceiverI.h +++ b/cpp/src/IceSSL/TransceiverI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_TRANSCEIVER_I_H +#define ICE_SSL_TRANSCEIVER_I_H #include <IceSSL/InstanceF.h> #include <IceSSL/Plugin.h> @@ -104,3 +105,5 @@ private: typedef IceUtil::Handle<TransceiverI> TransceiverIPtr; } + +#endif diff --git a/cpp/src/IceSSL/TrustManager.h b/cpp/src/IceSSL/TrustManager.h index 25cb1a4714a..5db65c2e978 100644 --- a/cpp/src/IceSSL/TrustManager.h +++ b/cpp/src/IceSSL/TrustManager.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_TRUST_MANAGER_H +#define ICE_SSL_TRUST_MANAGER_H #include <Ice/CommunicatorF.h> #include <IceSSL/TrustManagerF.h> @@ -46,3 +47,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceSSL/TrustManagerF.h b/cpp/src/IceSSL/TrustManagerF.h index 43333664258..e715c188ea8 100644 --- a/cpp/src/IceSSL/TrustManagerF.h +++ b/cpp/src/IceSSL/TrustManagerF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_TRUST_MANAGER_F_H +#define ICE_SSL_TRUST_MANAGER_F_H #include <IceUtil/Shared.h> @@ -21,3 +22,5 @@ IceUtil::Shared* upCast(IceSSL::TrustManager*); typedef IceInternal::Handle<TrustManager> TrustManagerPtr; } + +#endif diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h index 1e9f39dea91..80f5625a63b 100644 --- a/cpp/src/IceSSL/Util.h +++ b/cpp/src/IceSSL/Util.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_UTIL_H +#define ICE_SSL_UTIL_H #include <IceSSL/UtilF.h> #include <Ice/Network.h> @@ -57,3 +58,5 @@ bool checkPath(std::string&, const std::string&, bool); std::string getSslErrors(bool); } + +#endif diff --git a/cpp/src/IceSSL/UtilF.h b/cpp/src/IceSSL/UtilF.h index acb311f7595..ee49435777d 100644 --- a/cpp/src/IceSSL/UtilF.h +++ b/cpp/src/IceSSL/UtilF.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SSL_UTIL_F_H +#define ICE_SSL_UTIL_F_H #include <IceUtil/Shared.h> @@ -25,3 +26,5 @@ typedef IceInternal::Handle<DHParams> DHParamsPtr; } #endif + +#endif diff --git a/cpp/src/IceStorm/DB.h b/cpp/src/IceStorm/DB.h index 87501b61f0d..0413ed11780 100644 --- a/cpp/src/IceStorm/DB.h +++ b/cpp/src/IceStorm/DB.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef DATABASE_CACHE_H +#define DATABASE_CACHE_H #include <Ice/Plugin.h> #include <IceDB/IceDB.h> @@ -56,3 +57,6 @@ public: typedef IceUtil::Handle<DatabasePlugin> DatabasePluginPtr; } + + +#endif diff --git a/cpp/src/IceStorm/FreezeDB/FreezeDB.h b/cpp/src/IceStorm/FreezeDB/FreezeDB.h index d52d5e7f8c8..923d417b331 100644 --- a/cpp/src/IceStorm/FreezeDB/FreezeDB.h +++ b/cpp/src/IceStorm/FreezeDB/FreezeDB.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef FREEZE_DATABASE_CACHE_H +#define FREEZE_DATABASE_CACHE_H #include <IceDB/FreezeTypes.h> @@ -44,3 +45,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceStorm/Instance.h b/cpp/src/IceStorm/Instance.h index 71f9aa333eb..80f6c1a019d 100644 --- a/cpp/src/IceStorm/Instance.h +++ b/cpp/src/IceStorm/Instance.h @@ -7,7 +7,9 @@ // // ********************************************************************** -#pragma once +#ifndef INSTANCE_H +#define INSTANCE_H + #include <Ice/CommunicatorF.h> #include <Ice/ObjectAdapterF.h> @@ -102,3 +104,5 @@ private: typedef IceUtil::Handle<Instance> InstancePtr; } // End namespace IceStorm + +#endif diff --git a/cpp/src/IceStorm/NodeI.h b/cpp/src/IceStorm/NodeI.h index e8387da2961..f32de3a5d6a 100644 --- a/cpp/src/IceStorm/NodeI.h +++ b/cpp/src/IceStorm/NodeI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ELECTION_I_H +#define ELECTION_I_H #include <IceUtil/IceUtil.h> #include <Ice/Ice.h> @@ -197,3 +198,5 @@ private: }; } + +#endif // ELECTION_I_H diff --git a/cpp/src/IceStorm/Observers.h b/cpp/src/IceStorm/Observers.h index 1cac54a8b8e..23e326938f8 100644 --- a/cpp/src/IceStorm/Observers.h +++ b/cpp/src/IceStorm/Observers.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef OBSERVERS_H +#define OBSERVERS_H #include <Ice/Ice.h> #include <IceUtil/IceUtil.h> @@ -64,3 +65,5 @@ private: typedef IceUtil::Handle<Observers> ObserversPtr; } + +#endif // OBSERVERS_H diff --git a/cpp/src/IceStorm/Parser.h b/cpp/src/IceStorm/Parser.h index 2649be8a6db..aba6bd522fc 100644 --- a/cpp/src/IceStorm/Parser.h +++ b/cpp/src/IceStorm/Parser.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_STORM_PARSER_H +#define ICE_STORM_PARSER_H #include <IceUtil/Handle.h> #include <IceStorm/IceStorm.h> @@ -104,3 +105,5 @@ private: extern Parser* parser; // The current parser for bison/flex } // End namespace IceStorm + +#endif diff --git a/cpp/src/IceStorm/Replica.h b/cpp/src/IceStorm/Replica.h index 7e131904bf1..be76437a499 100644 --- a/cpp/src/IceStorm/Replica.h +++ b/cpp/src/IceStorm/Replica.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef REPLICA_H +#define REPLICA_H #include <Ice/Ice.h> #include <IceStorm/Election.h> @@ -48,3 +49,5 @@ public: typedef IceUtil::Handle<Replica> ReplicaPtr; } + +#endif // RELICA_H diff --git a/cpp/src/IceStorm/Service.h b/cpp/src/IceStorm/Service.h index f514f1b0040..9b9753e5db0 100644 --- a/cpp/src/IceStorm/Service.h +++ b/cpp/src/IceStorm/Service.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICESTORM_SERVICE_H +#define ICESTORM_SERVICE_H #include <IceBox/IceBox.h> #include <IceStorm/IceStorm.h> @@ -43,3 +44,5 @@ public: }; }; + +#endif diff --git a/cpp/src/IceStorm/SqlDB/SqlDB.h b/cpp/src/IceStorm/SqlDB/SqlDB.h index cf8cf750a84..a41b624fa43 100644 --- a/cpp/src/IceStorm/SqlDB/SqlDB.h +++ b/cpp/src/IceStorm/SqlDB/SqlDB.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_DATABASE_CACHE_H +#define SQL_DATABASE_CACHE_H #include <IceStorm/DB.h> @@ -56,3 +57,5 @@ private: }; } + +#endif diff --git a/cpp/src/IceStorm/SqlDB/SqlLLU.h b/cpp/src/IceStorm/SqlDB/SqlLLU.h index 5fbdd87f067..b2f70652f55 100644 --- a/cpp/src/IceStorm/SqlDB/SqlLLU.h +++ b/cpp/src/IceStorm/SqlDB/SqlLLU.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_LLU_H +#define SQL_LLU_H #include <IceDB/SqlTypes.h> @@ -33,3 +34,5 @@ private: typedef IceUtil::Handle<SqlLLU> SqlLLUPtr; } + +#endif diff --git a/cpp/src/IceStorm/SqlDB/SqlSubscriberMap.h b/cpp/src/IceStorm/SqlDB/SqlSubscriberMap.h index 6509941b499..397e88bce12 100644 --- a/cpp/src/IceStorm/SqlDB/SqlSubscriberMap.h +++ b/cpp/src/IceStorm/SqlDB/SqlSubscriberMap.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SQL_SUBSCRIBER_MAP_H +#define SQL_SUBSCRIBER_MAP_H #include <Ice/CommunicatorF.h> #include <IceStorm/SubscriberRecord.h> @@ -63,3 +64,5 @@ private: typedef IceUtil::Handle<SqlSubscriberMap> SqlSubscriberMapPtr; } + +#endif diff --git a/cpp/src/IceStorm/Subscriber.h b/cpp/src/IceStorm/Subscriber.h index 52e07c2b137..ba66ac9e91c 100644 --- a/cpp/src/IceStorm/Subscriber.h +++ b/cpp/src/IceStorm/Subscriber.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SUBSCRIBER_H +#define SUBSCRIBER_H #include <IceStorm/IceStormInternal.h> #include <IceStorm/SubscriberRecord.h> @@ -92,3 +93,5 @@ bool operator!=(const IceStorm::Subscriber&, const IceStorm::Subscriber&); bool operator<(const IceStorm::Subscriber&, const IceStorm::Subscriber&); } + +#endif // SUBSCRIBER_H diff --git a/cpp/src/IceStorm/TopicI.h b/cpp/src/IceStorm/TopicI.h index 023665ffbae..1de972c1856 100644 --- a/cpp/src/IceStorm/TopicI.h +++ b/cpp/src/IceStorm/TopicI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef TOPIC_I_H +#define TOPIC_I_H #include <IceStorm/IceStormInternal.h> #include <IceStorm/Election.h> @@ -103,3 +104,5 @@ private: typedef IceUtil::Handle<TopicImpl> TopicImplPtr; } // End namespace IceStorm + +#endif diff --git a/cpp/src/IceStorm/TopicManagerI.h b/cpp/src/IceStorm/TopicManagerI.h index bb04b96a73f..98a9a32da51 100644 --- a/cpp/src/IceStorm/TopicManagerI.h +++ b/cpp/src/IceStorm/TopicManagerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef TOPIC_MANAGER_I_H +#define TOPIC_MANAGER_I_H #include <IceStorm/IceStorm.h> @@ -90,3 +91,5 @@ private: typedef IceUtil::Handle<TopicManagerImpl> TopicManagerImplPtr; } // End namespace IceStorm + +#endif diff --git a/cpp/src/IceStorm/TraceLevels.h b/cpp/src/IceStorm/TraceLevels.h index b232bb9505a..bd860b4256f 100644 --- a/cpp/src/IceStorm/TraceLevels.h +++ b/cpp/src/IceStorm/TraceLevels.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_STORM_TRACE_LEVELS_H +#define ICE_STORM_TRACE_LEVELS_H #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -45,3 +46,5 @@ public: typedef IceUtil::Handle<TraceLevels> TraceLevelsPtr; } // End namespace IceStorm + +#endif diff --git a/cpp/src/IceStorm/TransientTopicI.h b/cpp/src/IceStorm/TransientTopicI.h index ac19a9493f0..f051ba3e5e0 100644 --- a/cpp/src/IceStorm/TransientTopicI.h +++ b/cpp/src/IceStorm/TransientTopicI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef TRANSIENT_TOPIC_I_H +#define TRANSIENT_TOPIC_I_H #include <IceStorm/IceStormInternal.h> @@ -75,3 +76,5 @@ private: typedef IceUtil::Handle<TransientTopicImpl> TransientTopicImplPtr; } // End namespace IceStorm + +#endif diff --git a/cpp/src/IceStorm/TransientTopicManagerI.h b/cpp/src/IceStorm/TransientTopicManagerI.h index a00988a7a81..9edb2ec3c77 100644 --- a/cpp/src/IceStorm/TransientTopicManagerI.h +++ b/cpp/src/IceStorm/TransientTopicManagerI.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef TRANSIENT_TOPIC_MANAGER_I_H +#define TRANSIENT_TOPIC_MANAGER_I_H #include <IceStorm/IceStormInternal.h> @@ -54,3 +55,5 @@ private: typedef IceUtil::Handle<TransientTopicManagerImpl> TransientTopicManagerImplPtr; } // End namespace IceStorm + +#endif diff --git a/cpp/src/IceStorm/Util.h b/cpp/src/IceStorm/Util.h index cb73d662280..128133e3bac 100644 --- a/cpp/src/IceStorm/Util.h +++ b/cpp/src/IceStorm/Util.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef UTIL_H +#define UTIL_H #include <string> @@ -20,3 +21,4 @@ std::string describeEndpoints(const Ice::ObjectPrx&); } +#endif diff --git a/cpp/src/IceUtil/ConvertUTF.h b/cpp/src/IceUtil/ConvertUTF.h index ae4e3d1c989..46155f9fa22 100644 --- a/cpp/src/IceUtil/ConvertUTF.h +++ b/cpp/src/IceUtil/ConvertUTF.h @@ -29,7 +29,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_UTIL_CONVERT_UTF_H +#define ICE_UTIL_CONVERT_UTF_H #include <IceUtil/Unicode.h> @@ -140,3 +141,4 @@ ConversionResult ConvertUTF32toUTF8( /* --------------------------------------------------------------------- */ } +#endif diff --git a/cpp/src/Slice/GrammarUtil.h b/cpp/src/Slice/GrammarUtil.h index 756eda5d17b..c803152dd24 100644 --- a/cpp/src/Slice/GrammarUtil.h +++ b/cpp/src/Slice/GrammarUtil.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SLICE_GRAMMAR_UTIL_H +#define SLICE_GRAMMAR_UTIL_H #include <Slice/Parser.h> @@ -214,3 +215,5 @@ int slice_parse(); // yyoverflow. // #define yyoverflow(a, b, c, d, e, f) yyerror(a) + +#endif diff --git a/cpp/src/Slice/MD5.h b/cpp/src/Slice/MD5.h index e9bad070237..ac9c02e2af0 100644 --- a/cpp/src/Slice/MD5.h +++ b/cpp/src/Slice/MD5.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef SLICE_MD5_H +#define SLICE_MD5_H #include <IceUtil/Config.h> @@ -39,3 +40,5 @@ private: }; } + +#endif diff --git a/cpp/src/Slice/MD5I.h b/cpp/src/Slice/MD5I.h index 2ab51829250..66588283e83 100644 --- a/cpp/src/Slice/MD5I.h +++ b/cpp/src/Slice/MD5I.h @@ -47,7 +47,8 @@ 1999-05-03 lpd Original version. */ -#pragma once +#ifndef md5_INCLUDED +# define md5_INCLUDED /* * This package supports both compile-time and run-time determination of CPU @@ -86,3 +87,5 @@ void md5_finish(md5_state_t *pms, md5_byte_t digest[16]); #ifdef __cplusplus } /* end extern "C" */ #endif + +#endif /* md5_INCLUDED */ diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.h b/cpp/src/iceserviceinstall/ServiceInstaller.h index 8efa7d3287e..b061276e776 100644 --- a/cpp/src/iceserviceinstall/ServiceInstaller.h +++ b/cpp/src/iceserviceinstall/ServiceInstaller.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef ICE_SERVICE_INSTALLER_H +#define ICE_SERVICE_INSTALLER_H #include <Ice/Ice.h> #include <AccCtrl.h> @@ -66,3 +67,5 @@ private: bool _debug; }; + +#endif 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 diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 8227dc8f445..b0c4f5666db 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -214,12 +214,12 @@ Slice::Gen::Gen(const string& base, const string& headerExtension, const string& Slice::Gen::~Gen() { - H << '\n'; + H << "\n\n#endif\n"; C << '\n'; if(_impl) { - implH << '\n'; + implH << "\n\n#endif\n"; implC << '\n'; } } @@ -280,7 +280,15 @@ Slice::Gen::generate(const UnitPtr& p) } FileTracker::instance()->addFile(fileImplC); - implH << "#pragma once\n"; + string s = fileImplH; + if(_include.size()) + { + s = _include + '/' + s; + } + transform(s.begin(), s.end(), s.begin(), ToIfdef()); + implH << "#ifndef __" << s << "__"; + implH << "\n#define __" << s << "__"; + implH << '\n'; } string fileH = _base + "." + _headerExtension; @@ -314,7 +322,16 @@ Slice::Gen::generate(const UnitPtr& p) printHeader(C); printGeneratedHeader(C, _base + ".ice"); - H << "#pragma once\n"; + + string s = fileH; + if(_include.size()) + { + s = _include + '/' + s; + } + transform(s.begin(), s.end(), s.begin(), ToIfdef()); + H << "\n#ifndef __" << s << "__"; + H << "\n#define __" << s << "__"; + H << '\n'; validateMetaData(p); diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h index 941b2a90e12..9d05ca2a8b5 100644 --- a/cpp/src/slice2cpp/Gen.h +++ b/cpp/src/slice2cpp/Gen.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GEN_H +#define GEN_H #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -450,3 +451,5 @@ private: }; } + +#endif diff --git a/cpp/src/slice2cs/Gen.h b/cpp/src/slice2cs/Gen.h index 597bf5a11d4..a8ff7998842 100644 --- a/cpp/src/slice2cs/Gen.h +++ b/cpp/src/slice2cs/Gen.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GEN_H +#define GEN_H #include <Slice/CsUtil.h> @@ -314,3 +315,5 @@ private: }; } + +#endif diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp index 2d2020f10a2..bc855817352 100644 --- a/cpp/src/slice2freeze/Main.cpp +++ b/cpp/src/slice2freeze/Main.cpp @@ -1454,7 +1454,11 @@ gen(const string& name, const UnitPtr& u, const vector<string>& includePaths, co } } - H << "#pragma once\n"; + string s = fileH; + transform(s.begin(), s.end(), s.begin(), ToIfdef()); + H << "\n#ifndef __" << s << "__"; + H << "\n#define __" << s << "__"; + H << '\n'; if(dicts.size() > 0) { @@ -1503,7 +1507,7 @@ gen(const string& name, const UnitPtr& u, const vector<string>& includePaths, co } } - H << "\n\n"; + H << "\n\n#endif\n"; CPP << '\n'; H.close(); diff --git a/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h index 1d526ccd15c..e0ecdc58651 100644 --- a/cpp/src/slice2html/Gen.h +++ b/cpp/src/slice2html/Gen.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GEN_H +#define GEN_H #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -266,3 +267,5 @@ private: }; } + +#endif diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h index e8b12e3743b..94f0dc95a2d 100644 --- a/cpp/src/slice2java/Gen.h +++ b/cpp/src/slice2java/Gen.h @@ -7,7 +7,8 @@ // // ********************************************************************** -#pragma once +#ifndef GEN_H +#define GEN_H #include <Slice/Parser.h> #include <Slice/JavaUtil.h> @@ -336,3 +337,5 @@ private: }; } + +#endif |