diff options
Diffstat (limited to 'cpp/include')
116 files changed, 118 insertions, 463 deletions
diff --git a/cpp/include/Freeze/Freeze.h b/cpp/include/Freeze/Freeze.h index 1e1c6df5f32..9165f30d948 100644 --- a/cpp/include/Freeze/Freeze.h +++ b/cpp/include/Freeze/Freeze.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef FREEZE_FREEZE_H -#define FREEZE_FREEZE_H +#pragma once #include <Freeze/Initialize.h> #include <Freeze/BackgroundSaveEvictor.h> @@ -17,4 +16,3 @@ #include <Freeze/TransactionHolder.h> #include <Freeze/Catalog.h> -#endif diff --git a/cpp/include/Freeze/Index.h b/cpp/include/Freeze/Index.h index 46b968e066a..4e9a7c30312 100644 --- a/cpp/include/Freeze/Index.h +++ b/cpp/include/Freeze/Index.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef FREEZE_INDEX_H -#define FREEZE_INDEX_H +#pragma once #include <Ice/Ice.h> #include <Freeze/DB.h> @@ -55,6 +54,3 @@ private: typedef IceUtil::Handle<Index> IndexPtr; } - -#endif - diff --git a/cpp/include/Freeze/Initialize.h b/cpp/include/Freeze/Initialize.h index f355c80f5fa..29a165e5506 100644 --- a/cpp/include/Freeze/Initialize.h +++ b/cpp/include/Freeze/Initialize.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef FREEZE_INITIALIZE_H -#define FREEZE_INITIALIZE_H +#pragma once #include <Ice/Ice.h> #include <Freeze/EvictorF.h> @@ -108,5 +107,3 @@ typedef void (*FatalErrorCallback)(const BackgroundSaveEvictorPtr&, const Ice::C FREEZE_API FatalErrorCallback registerFatalErrorCallback(FatalErrorCallback); } - -#endif diff --git a/cpp/include/Freeze/Map.h b/cpp/include/Freeze/Map.h index edb419354f7..58096e34fc6 100644 --- a/cpp/include/Freeze/Map.h +++ b/cpp/include/Freeze/Map.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef FREEZE_MAP_H -#define FREEZE_MAP_H +#pragma once #include <Ice/Ice.h> #include <iterator> @@ -1227,5 +1226,3 @@ inline ptrdiff_t* distance_type(const Freeze::IteratorBase&) { return (ptrdiff_t } #endif - -#endif diff --git a/cpp/include/Freeze/TransactionHolder.h b/cpp/include/Freeze/TransactionHolder.h index 84e973150a2..d3fec8c675c 100644 --- a/cpp/include/Freeze/TransactionHolder.h +++ b/cpp/include/Freeze/TransactionHolder.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef FREEZE_TRANSACTION_HOLDER_H -#define FREEZE_TRANSACTION_HOLDER_H +#pragma once #include <Freeze/Connection.h> #include <Freeze/Transaction.h> @@ -44,5 +43,3 @@ private: }; } - -#endif diff --git a/cpp/include/Glacier2/Application.h b/cpp/include/Glacier2/Application.h index 1cabe12b7c8..6bf8334af94 100644 --- a/cpp/include/Glacier2/Application.h +++ b/cpp/include/Glacier2/Application.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef GLACIER2_APPLICATION_H -#define GLACIER2_APPLICATION_H +#pragma once #include <Ice/Application.h> @@ -217,5 +216,3 @@ private: }; } - -#endif diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h index a970ac4d11a..f0490cdad44 100644 --- a/cpp/include/Glacier2/Glacier2.h +++ b/cpp/include/Glacier2/Glacier2.h @@ -7,8 +7,8 @@ // // ********************************************************************** -#ifndef GLACIER2_H -#define GLACIER2_H +#pragma once + #include <IceUtil/Config.h> #include <Glacier2/Router.h> #include <Glacier2/Session.h> @@ -17,5 +17,3 @@ # include <Glacier2/Application.h> #endif #include <Glacier2/SessionHelper.h> - -#endif diff --git a/cpp/include/Glacier2/SessionHelper.h b/cpp/include/Glacier2/SessionHelper.h index 687c680ce04..41dac3a908e 100644 --- a/cpp/include/Glacier2/SessionHelper.h +++ b/cpp/include/Glacier2/SessionHelper.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef GLACIER2_SESSION_HELPER_H -#define GLACIER2_SESSION_HELPER_H +#pragma once #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -112,5 +111,3 @@ private: typedef IceUtil::Handle<SessionFactoryHelper> SessionFactoryHelperPtr; } - -#endif diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h index 448c88eb97d..d5d41de58e9 100644 --- a/cpp/include/Ice/Application.h +++ b/cpp/include/Ice/Application.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_APPLICATION_H -#define ICE_APPLICATION_H +#pragma once #include <Ice/Ice.h> @@ -152,5 +151,3 @@ protected: }; } - -#endif diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h index 60858fe8a57..a55e659799c 100644 --- a/cpp/include/Ice/BasicStream.h +++ b/cpp/include/Ice/BasicStream.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_BASIC_STREAM_H -#define ICE_BASIC_STREAM_H +#pragma once #include <Ice/InstanceF.h> #include <Ice/ObjectF.h> @@ -669,5 +668,3 @@ private: }; } // End namespace IceInternal - -#endif diff --git a/cpp/include/Ice/Buffer.h b/cpp/include/Ice/Buffer.h index 37f69eb3725..8c1c4339023 100644 --- a/cpp/include/Ice/Buffer.h +++ b/cpp/include/Ice/Buffer.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICEE_BUFFER_H -#define ICEE_BUFFER_H +#pragma once #include <Ice/Config.h> @@ -150,5 +149,3 @@ public: }; } - -#endif diff --git a/cpp/include/Ice/CommunicatorAsync.h b/cpp/include/Ice/CommunicatorAsync.h index 301daa893f4..e1cd14ac7df 100644 --- a/cpp/include/Ice/CommunicatorAsync.h +++ b/cpp/include/Ice/CommunicatorAsync.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_COMMUNICATOR_ASYNC_H -#define ICE_COMMUNICATOR_ASYNC_H +#pragma once #include <Ice/Communicator.h> @@ -120,5 +119,3 @@ newCallback_Communicator_flushBatchRequests(T* instance, void (T::*excb)(const : } } - -#endif diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h index 5322bb31717..bb3231c3a76 100644 --- a/cpp/include/Ice/Config.h +++ b/cpp/include/Ice/Config.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_CONFIG_H -#define ICE_CONFIG_H +#pragma once #include <IceUtil/Config.h> @@ -78,5 +77,3 @@ inline int getSystemErrno() { return errno; } #endif } - -#endif diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h index f33569f083d..a53fe50e002 100644 --- a/cpp/include/Ice/ConnectionAsync.h +++ b/cpp/include/Ice/ConnectionAsync.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_CONNECTION_ASYNC_H -#define ICE_CONNECTION_ASYNC_H +#pragma once #include <Ice/Connection.h> @@ -120,5 +119,3 @@ newCallback_Connection_flushBatchRequests(T* instance, void (T::*excb)(const ::I } } - -#endif diff --git a/cpp/include/Ice/ConnectionFactoryF.h b/cpp/include/Ice/ConnectionFactoryF.h index 5a5b3c123a1..8e2d62712c3 100644 --- a/cpp/include/Ice/ConnectionFactoryF.h +++ b/cpp/include/Ice/ConnectionFactoryF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_CONNECTION_FACTORY_F_H -#define ICE_CONNECTION_FACTORY_F_H +#pragma once #include <IceUtil/Shared.h> @@ -26,5 +25,3 @@ ICE_API IceUtil::Shared* upCast(IncomingConnectionFactory*); typedef IceInternal::Handle<IncomingConnectionFactory> IncomingConnectionFactoryPtr; } - -#endif diff --git a/cpp/include/Ice/ConnectionIF.h b/cpp/include/Ice/ConnectionIF.h index 2c3b922edaa..114bc0f8a5f 100644 --- a/cpp/include/Ice/ConnectionIF.h +++ b/cpp/include/Ice/ConnectionIF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_CONNECTIONI_F_H -#define ICE_CONNECTIONI_F_H +#pragma once #include <Ice/Handle.h> #include <Ice/LocalObject.h> @@ -33,5 +32,3 @@ enum AsyncStatus }; } - -#endif diff --git a/cpp/include/Ice/ConnectionMonitorF.h b/cpp/include/Ice/ConnectionMonitorF.h index ebf80a9f02c..5c61810e5a5 100644 --- a/cpp/include/Ice/ConnectionMonitorF.h +++ b/cpp/include/Ice/ConnectionMonitorF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_CONNECTION_MONITOR_F_H -#define ICE_CONNECTION_MONITOR_F_H +#pragma once #include <IceUtil/Shared.h> @@ -22,5 +21,3 @@ ICE_API IceUtil::Shared* upCast(ConnectionMonitor*); typedef IceInternal::Handle<ConnectionMonitor> ConnectionMonitorPtr; } - -#endif diff --git a/cpp/include/Ice/Direct.h b/cpp/include/Ice/Direct.h index 90a8944689f..fde47a9e6cc 100644 --- a/cpp/include/Ice/Direct.h +++ b/cpp/include/Ice/Direct.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_DIRECT_H -#define ICE_DIRECT_H +#pragma once #include <Ice/ServantLocatorF.h> #include <Ice/ReferenceF.h> @@ -55,5 +54,3 @@ private: }; } - -#endif diff --git a/cpp/include/Ice/DispatchInterceptor.h b/cpp/include/Ice/DispatchInterceptor.h index 1949e810983..0515161c9c5 100644 --- a/cpp/include/Ice/DispatchInterceptor.h +++ b/cpp/include/Ice/DispatchInterceptor.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_DISPATCH_INTERCEPTOR_H -#define ICE_DISPATCH_INTERCEPTOR_H +#pragma once #include <Ice/Object.h> @@ -32,5 +31,3 @@ public: typedef IceInternal::Handle<DispatchInterceptor> DispatchInterceptorPtr; } - -#endif diff --git a/cpp/include/Ice/Dispatcher.h b/cpp/include/Ice/Dispatcher.h index cc1126f64e2..323ca7afa68 100644 --- a/cpp/include/Ice/Dispatcher.h +++ b/cpp/include/Ice/Dispatcher.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_DISPATCHER_H -#define ICE_DISPATCHER_H +#pragma once #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -38,5 +37,3 @@ public: typedef IceUtil::Handle<Dispatcher> DispatcherPtr; } - -#endif diff --git a/cpp/include/Ice/DynamicLibrary.h b/cpp/include/Ice/DynamicLibrary.h index 3a1d79de0a8..3e4d6e1c257 100644 --- a/cpp/include/Ice/DynamicLibrary.h +++ b/cpp/include/Ice/DynamicLibrary.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_DYNAMIC_LIBRARY_H -#define ICE_DYNAMIC_LIBRARY_H +#pragma once #include <Ice/DynamicLibraryF.h> #include <Ice/StringConverter.h> @@ -105,4 +104,3 @@ private: } -#endif diff --git a/cpp/include/Ice/DynamicLibraryF.h b/cpp/include/Ice/DynamicLibraryF.h index 32b9a01f8d1..184b15a8e57 100644 --- a/cpp/include/Ice/DynamicLibraryF.h +++ b/cpp/include/Ice/DynamicLibraryF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_DYNAMIC_LIBRARY_F_H -#define ICE_DYNAMIC_LIBRARY_F_H +#pragma once #include <IceUtil/Shared.h> @@ -26,4 +25,4 @@ ICE_API IceUtil::Shared* upCast(DynamicLibraryList*); typedef Handle<DynamicLibraryList> DynamicLibraryListPtr; } -#endif + diff --git a/cpp/include/Ice/EndpointFactory.h b/cpp/include/Ice/EndpointFactory.h index 61734728d8c..6f344587828 100644 --- a/cpp/include/Ice/EndpointFactory.h +++ b/cpp/include/Ice/EndpointFactory.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_ENDPOINT_FACTORY_H -#define ICE_ENDPOINT_FACTORY_H +#pragma once #include <IceUtil/Shared.h> #include <Ice/EndpointIF.h> @@ -38,5 +37,3 @@ protected: }; } - -#endif diff --git a/cpp/include/Ice/EndpointFactoryF.h b/cpp/include/Ice/EndpointFactoryF.h index b5a03c4c35a..dc8bbfdb72f 100644 --- a/cpp/include/Ice/EndpointFactoryF.h +++ b/cpp/include/Ice/EndpointFactoryF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_ENDPOINT_FACTORY_F_H -#define ICE_ENDPOINT_FACTORY_F_H +#pragma once #include <IceUtil/Shared.h> @@ -22,5 +21,3 @@ ICE_API IceUtil::Shared* upCast(EndpointFactory*); typedef Handle<EndpointFactory> EndpointFactoryPtr; } - -#endif diff --git a/cpp/include/Ice/EndpointIF.h b/cpp/include/Ice/EndpointIF.h index 4e9c69d1b8b..d1da6324f2a 100644 --- a/cpp/include/Ice/EndpointIF.h +++ b/cpp/include/Ice/EndpointIF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_ENDPOINT_I_F_H -#define ICE_ENDPOINT_I_F_H +#pragma once #include <Ice/Handle.h> #include <Ice/LocalObject.h> @@ -25,5 +24,3 @@ ICE_API IceUtil::Shared* upCast(EndpointHostResolver*); typedef Handle<EndpointHostResolver> EndpointHostResolverPtr; } - -#endif diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h index fff6c741922..d7cf1fb2c4b 100644 --- a/cpp/include/Ice/Exception.h +++ b/cpp/include/Ice/Exception.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_EXCEPTION_H -#define ICE_EXCEPTION_H +#pragma once #include <IceUtil/Exception.h> #include <Ice/Config.h> @@ -98,5 +97,3 @@ ICE_API std::ostream& operator<<(std::ostream&, const SystemException&); #endif } - -#endif diff --git a/cpp/include/Ice/FactoryTable.h b/cpp/include/Ice/FactoryTable.h index 1350c39db14..fe71694cfb2 100644 --- a/cpp/include/Ice/FactoryTable.h +++ b/cpp/include/Ice/FactoryTable.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_FACTORYTABLE_H -#define ICE_FACTORYTABLE_H +#pragma once #include <IceUtil/Mutex.h> #include <Ice/UserExceptionFactory.h> @@ -45,5 +44,3 @@ private: }; } - -#endif diff --git a/cpp/include/Ice/FactoryTableInit.h b/cpp/include/Ice/FactoryTableInit.h index 2e793e0c980..09a18ee8429 100644 --- a/cpp/include/Ice/FactoryTableInit.h +++ b/cpp/include/Ice/FactoryTableInit.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_FACTORYTABLEINIT_H -#define ICE_FACTORYTABLEINIT_H +#pragma once #include <Ice/FactoryTable.h> @@ -28,5 +27,3 @@ static FactoryTableInit factoryTableInitializer; // Dummy variable to force i extern ICE_API FactoryTable* factoryTable; } - -#endif diff --git a/cpp/include/Ice/Functional.h b/cpp/include/Ice/Functional.h index 6349a1d371a..28926302e9b 100644 --- a/cpp/include/Ice/Functional.h +++ b/cpp/include/Ice/Functional.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_FUNCTIONAL_H -#define ICE_FUNCTIONAL_H +#pragma once #include <IceUtil/Functional.h> #include <Ice/Handle.h> @@ -134,5 +133,3 @@ secondConstVoidMemFun1(void (T::*p)(A) const) } } - -#endif diff --git a/cpp/include/Ice/GCCountMap.h b/cpp/include/Ice/GCCountMap.h index fded894b317..a27f9465c1a 100644 --- a/cpp/include/Ice/GCCountMap.h +++ b/cpp/include/Ice/GCCountMap.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_GCCOUNTMAP_H -#define ICE_GCCOUNTMAP_H +#pragma once #include <map> @@ -20,5 +19,3 @@ class GCShared; typedef ::std::map<GCShared*, int> GCCountMap; } - -#endif diff --git a/cpp/include/Ice/GCShared.h b/cpp/include/Ice/GCShared.h index e83332c1649..3edcf98ee33 100644 --- a/cpp/include/Ice/GCShared.h +++ b/cpp/include/Ice/GCShared.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_GC_SHARED_H -#define ICE_GC_SHARED_H +#pragma once #include <IceUtil/Shared.h> #include <Ice/Config.h> @@ -49,5 +48,3 @@ protected: }; } - -#endif diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h index e38a02ffb61..7ee19c57c6a 100644 --- a/cpp/include/Ice/Handle.h +++ b/cpp/include/Ice/Handle.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_HANDLE_H -#define ICE_HANDLE_H +#pragma once #include <IceUtil/Handle.h> #include <Ice/Config.h> @@ -207,5 +206,3 @@ public: }; } - -#endif diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h index 472784f3471..c2c5076e1eb 100644 --- a/cpp/include/Ice/Ice.h +++ b/cpp/include/Ice/Ice.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_ICE_H -#define ICE_ICE_H +#pragma once #include <IceUtil/Config.h> #include <Ice/Initialize.h> @@ -43,5 +42,3 @@ #ifndef _WIN32 #include <Ice/IconvStringConverter.h> #endif - -#endif diff --git a/cpp/include/Ice/IconvStringConverter.h b/cpp/include/Ice/IconvStringConverter.h index 2ab569ebbb4..5df0dacf802 100644 --- a/cpp/include/Ice/IconvStringConverter.h +++ b/cpp/include/Ice/IconvStringConverter.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_ICONV_STRING_CONVERTER -#define ICE_ICONV_STRING_CONVERTER +#pragma once #include <Ice/StringConverter.h> #include <Ice/UndefSysMacros.h> @@ -368,5 +367,3 @@ IconvStringConverter<charT>::fromUTF8(const Ice::Byte* sourceStart, const Ice::B } } - -#endif diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h index 8d7cbf3f93a..ca44d7dea37 100644 --- a/cpp/include/Ice/Incoming.h +++ b/cpp/include/Ice/Incoming.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_INCOMING_H -#define ICE_INCOMING_H +#pragma once #include <Ice/InstanceF.h> #include <Ice/ConnectionIF.h> @@ -98,5 +97,3 @@ private: }; } - -#endif diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h index f3b1dd1c2ad..e266cb779fa 100644 --- a/cpp/include/Ice/IncomingAsync.h +++ b/cpp/include/Ice/IncomingAsync.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_INCOMING_ASYNC_H -#define ICE_INCOMING_ASYNC_H +#pragma once #include <Ice/IncomingAsyncF.h> #include <Ice/Incoming.h> @@ -107,5 +106,3 @@ public: } } - -#endif diff --git a/cpp/include/Ice/IncomingAsyncF.h b/cpp/include/Ice/IncomingAsyncF.h index 5b0d0790745..7e7087f1dc3 100644 --- a/cpp/include/Ice/IncomingAsyncF.h +++ b/cpp/include/Ice/IncomingAsyncF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_INCOMING_ASYNC_F_H -#define ICE_INCOMING_ASYNC_F_H +#pragma once #include <IceUtil/Shared.h> @@ -31,5 +30,3 @@ ICE_API IceUtil::Shared* upCast(::Ice::AMD_Object_ice_invoke*); typedef IceInternal::Handle<AMD_Object_ice_invoke> AMD_Object_ice_invokePtr; } - -#endif diff --git a/cpp/include/Ice/Initialize.h b/cpp/include/Ice/Initialize.h index 57a0fc55a56..0979547366d 100644 --- a/cpp/include/Ice/Initialize.h +++ b/cpp/include/Ice/Initialize.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_INITIALIZE_H -#define ICE_INITIALIZE_H +#pragma once #include <Ice/CommunicatorF.h> #include <Ice/PropertiesF.h> @@ -121,5 +120,3 @@ namespace IceInternal ICE_API InstancePtr getInstance(const ::Ice::CommunicatorPtr&); } - -#endif diff --git a/cpp/include/Ice/InstanceF.h b/cpp/include/Ice/InstanceF.h index 9ce92354595..2e1dd7dedc1 100644 --- a/cpp/include/Ice/InstanceF.h +++ b/cpp/include/Ice/InstanceF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_INSTANCE_F_H -#define ICE_INSTANCE_F_H +#pragma once #include <IceUtil/Shared.h> @@ -22,5 +21,3 @@ ICE_API IceUtil::Shared* upCast(Instance*); typedef IceInternal::Handle<Instance> InstancePtr; } - -#endif diff --git a/cpp/include/Ice/LocalObject.h b/cpp/include/Ice/LocalObject.h index 657136182b2..39d9cb2aca1 100644 --- a/cpp/include/Ice/LocalObject.h +++ b/cpp/include/Ice/LocalObject.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_LOCAL_OBJECT_H -#define ICE_LOCAL_OBJECT_H +#pragma once #include <IceUtil/Shared.h> #include <Ice/LocalObjectF.h> @@ -38,5 +37,3 @@ public: }; } - -#endif diff --git a/cpp/include/Ice/LocalObjectF.h b/cpp/include/Ice/LocalObjectF.h index c8591c24352..4c87038d5a6 100644 --- a/cpp/include/Ice/LocalObjectF.h +++ b/cpp/include/Ice/LocalObjectF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_LOCAL_OBJECT_F_H -#define ICE_LOCAL_OBJECT_F_H +#pragma once #include <IceUtil/Shared.h> @@ -22,5 +21,3 @@ ICE_API IceUtil::Shared* upCast(::Ice::LocalObject*); typedef IceInternal::Handle< LocalObject > LocalObjectPtr; } - -#endif diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h index fec7e79f75b..ab056984b9b 100644 --- a/cpp/include/Ice/LoggerUtil.h +++ b/cpp/include/Ice/LoggerUtil.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_LOGGER_UTIL_H -#define ICE_LOGGER_UTIL_H +#pragma once #include <Ice/LoggerF.h> #include <Ice/CommunicatorF.h> @@ -119,5 +118,3 @@ public: }; } - -#endif diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h index a36e006fd1a..bc21030f7f6 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_OBJECT_H -#define ICE_OBJECT_H +#pragma once #include <IceUtil/Mutex.h> #include <IceUtil/Shared.h> @@ -160,5 +159,3 @@ ICE_API void ice_writeObject(const OutputStreamPtr&, const ObjectPtr&); ICE_API void ice_readObject(const InputStreamPtr&, ObjectPtr&); } - -#endif diff --git a/cpp/include/Ice/ObjectAdapterFactoryF.h b/cpp/include/Ice/ObjectAdapterFactoryF.h index 7e2a937cadd..145ec884c15 100644 --- a/cpp/include/Ice/ObjectAdapterFactoryF.h +++ b/cpp/include/Ice/ObjectAdapterFactoryF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_OBJECT_ADAPTER_FACTORY_F_H -#define ICE_OBJECT_ADAPTER_FACTORY_F_H +#pragma once #include <IceUtil/Shared.h> @@ -22,5 +21,3 @@ IceUtil::Shared* upCast(ObjectAdapterFactory*); typedef IceInternal::Handle<ObjectAdapterFactory> ObjectAdapterFactoryPtr; } - -#endif diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h index 15b664d0638..7b05fdc0a38 100644 --- a/cpp/include/Ice/ObjectF.h +++ b/cpp/include/Ice/ObjectF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_OBJECT_F_H -#define ICE_OBJECT_F_H +#pragma once #include <IceUtil/Shared.h> #include <Ice/Handle.h> @@ -23,5 +22,3 @@ typedef IceInternal::Handle< Object > ObjectPtr; void ICE_API __patch__ObjectPtr(void*, ObjectPtr&); } - -#endif diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h index 8dc3ba363f1..7ddd5f7b176 100644 --- a/cpp/include/Ice/Outgoing.h +++ b/cpp/include/Ice/Outgoing.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_OUTGOING_H -#define ICE_OUTGOING_H +#pragma once #include <IceUtil/Mutex.h> #include <IceUtil/Monitor.h> @@ -150,5 +149,3 @@ private: }; } - -#endif diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h index a880edb9e5d..a1056bc5793 100644 --- a/cpp/include/Ice/OutgoingAsync.h +++ b/cpp/include/Ice/OutgoingAsync.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_OUTGOING_ASYNC_H -#define ICE_OUTGOING_ASYNC_H +#pragma once #include <IceUtil/Monitor.h> #include <IceUtil/Mutex.h> @@ -429,5 +428,3 @@ public: }; } - -#endif diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h index 5b6f4daa1e4..1feb42cead2 100644 --- a/cpp/include/Ice/OutgoingAsyncF.h +++ b/cpp/include/Ice/OutgoingAsyncF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_OUTGOING_ASYNC_F_H -#define ICE_OUTGOING_ASYNC_F_H +#pragma once #include <IceUtil/Shared.h> @@ -51,5 +50,3 @@ ICE_API IceUtil::Shared* upCast(CommunicatorBatchOutgoingAsync*); typedef IceInternal::Handle<CommunicatorBatchOutgoingAsync> CommunicatorBatchOutgoingAsyncPtr; } - -#endif diff --git a/cpp/include/Ice/Protocol.h b/cpp/include/Ice/Protocol.h index 43b751dd1b8..cb3d9f0a981 100644 --- a/cpp/include/Ice/Protocol.h +++ b/cpp/include/Ice/Protocol.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_PROTOCOL_H -#define ICE_PROTOCOL_H +#pragma once #include <Ice/Config.h> @@ -69,5 +68,3 @@ enum ProtocolSupport }; } - -#endif diff --git a/cpp/include/Ice/ProtocolPluginFacade.h b/cpp/include/Ice/ProtocolPluginFacade.h index 1c255f23a71..006aa991cc0 100644 --- a/cpp/include/Ice/ProtocolPluginFacade.h +++ b/cpp/include/Ice/ProtocolPluginFacade.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_PROTOCOL_PLUGIN_FACADE_H -#define ICE_PROTOCOL_PLUGIN_FACADE_H +#pragma once #include <IceUtil/Config.h> #include <IceUtil/Shared.h> @@ -84,5 +83,3 @@ private: }; } - -#endif diff --git a/cpp/include/Ice/ProtocolPluginFacadeF.h b/cpp/include/Ice/ProtocolPluginFacadeF.h index 9e8f0d1c7c1..02e2e8ea999 100644 --- a/cpp/include/Ice/ProtocolPluginFacadeF.h +++ b/cpp/include/Ice/ProtocolPluginFacadeF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_PROTOCOL_PLUGIN_FACADE_F_H -#define ICE_PROTOCOL_PLUGIN_FACADE_F_H +#pragma once #include <IceUtil/Shared.h> @@ -22,5 +21,3 @@ ICE_API IceUtil::Shared* upCast(ProtocolPluginFacade*); typedef Handle<ProtocolPluginFacade> ProtocolPluginFacadePtr; } - -#endif diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h index da2de626405..2b9b2995d50 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_PROXY_H -#define ICE_PROXY_H +#pragma once #include <IceUtil/Shared.h> #include <IceUtil/Mutex.h> @@ -2198,5 +2197,3 @@ newCallback_Object_ice_flushBatchRequests(T* instance, } } - -#endif diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h index 82bf18c497e..108cdee7447 100644 --- a/cpp/include/Ice/ProxyF.h +++ b/cpp/include/Ice/ProxyF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_PROXY_F_H -#define ICE_PROXY_F_H +#pragma once #include <IceUtil/Shared.h> @@ -73,6 +72,3 @@ namespace Ice typedef IceInternal::ProxyHandle< ::IceProxy::Ice::Object> ObjectPrx; } - - -#endif diff --git a/cpp/include/Ice/ProxyFactoryF.h b/cpp/include/Ice/ProxyFactoryF.h index a450f9e4c99..c915ffaa6ee 100644 --- a/cpp/include/Ice/ProxyFactoryF.h +++ b/cpp/include/Ice/ProxyFactoryF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_PROXY_FACTORY_F_H -#define ICE_PROXY_FACTORY_F_H +#pragma once #include <IceUtil/Shared.h> @@ -22,5 +21,3 @@ IceUtil::Shared* upCast(ProxyFactory*); typedef IceInternal::Handle<ProxyFactory> ProxyFactoryPtr; } - -#endif diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h index 2d245f44674..8a271c7e834 100644 --- a/cpp/include/Ice/ProxyHandle.h +++ b/cpp/include/Ice/ProxyHandle.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_PROXY_HANDLE_H -#define ICE_PROXY_HANDLE_H +#pragma once #include <IceUtil/Handle.h> #include <Ice/Config.h> @@ -332,5 +331,3 @@ std::ostream& operator<<(std::ostream& os, ::IceInternal::ProxyHandle<Y> p) { return os << (p ? p->ice_toString() : std::string("")); } - -#endif diff --git a/cpp/include/Ice/ReferenceF.h b/cpp/include/Ice/ReferenceF.h index 80f4d87d08d..99af2a09af2 100644 --- a/cpp/include/Ice/ReferenceF.h +++ b/cpp/include/Ice/ReferenceF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_REFERENCE_F_H -#define ICE_REFERENCE_F_H +#pragma once #include <IceUtil/Shared.h> @@ -30,5 +29,3 @@ ICE_API IceUtil::Shared* upCast(RoutableReference*); typedef IceInternal::Handle<RoutableReference> RoutableReferencePtr; } - -#endif diff --git a/cpp/include/Ice/RequestHandlerF.h b/cpp/include/Ice/RequestHandlerF.h index cc5df85be4a..d637da51f10 100644 --- a/cpp/include/Ice/RequestHandlerF.h +++ b/cpp/include/Ice/RequestHandlerF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_REQUEST_HANDLER_F_H -#define ICE_REQUEST_HANDLER_F_H +#pragma once #include <IceUtil/Shared.h> #include <Ice/Handle.h> @@ -21,5 +20,3 @@ ICE_API IceUtil::Shared* upCast(RequestHandler*); typedef IceInternal::Handle<RequestHandler> RequestHandlerPtr; } - -#endif diff --git a/cpp/include/Ice/ServantManagerF.h b/cpp/include/Ice/ServantManagerF.h index 4ae03595ad5..395349506bd 100644 --- a/cpp/include/Ice/ServantManagerF.h +++ b/cpp/include/Ice/ServantManagerF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_SERVANT_MANAGER_F_H -#define ICE_SERVANT_MANAGER_F_H +#pragma once #include <IceUtil/Shared.h> @@ -22,5 +21,3 @@ ICE_API IceUtil::Shared* upCast(ServantManager*); typedef Handle<ServantManager> ServantManagerPtr; } - -#endif diff --git a/cpp/include/Ice/Service.h b/cpp/include/Ice/Service.h index 77108a14db5..8b24f58e192 100644 --- a/cpp/include/Ice/Service.h +++ b/cpp/include/Ice/Service.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_SERVICE_H -#define ICE_SERVICE_H +#pragma once #include <Ice/Ice.h> @@ -262,5 +261,3 @@ public: }; } // End of namespace Ice - -#endif diff --git a/cpp/include/Ice/SliceChecksums.h b/cpp/include/Ice/SliceChecksums.h index cfbdc7c997f..8fec4b60c86 100644 --- a/cpp/include/Ice/SliceChecksums.h +++ b/cpp/include/Ice/SliceChecksums.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_SLICE_CHECKSUM_H -#define ICE_SLICE_CHECKSUM_H +#pragma once #include <Ice/SliceChecksumDict.h> @@ -30,5 +29,3 @@ public: }; } - -#endif diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h index de8a6b44bec..839ce185b62 100644 --- a/cpp/include/Ice/Stream.h +++ b/cpp/include/Ice/Stream.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_STREAM_H -#define ICE_STREAM_H +#pragma once #include <Ice/StreamF.h> #include <Ice/CommunicatorF.h> @@ -791,5 +790,3 @@ protected: }; } - -#endif diff --git a/cpp/include/Ice/StreamF.h b/cpp/include/Ice/StreamF.h index 9fec3ce1d71..92ad61869cf 100644 --- a/cpp/include/Ice/StreamF.h +++ b/cpp/include/Ice/StreamF.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_STREAM_F_H -#define ICE_STREAM_F_H +#pragma once #include <IceUtil/Shared.h> @@ -26,5 +25,3 @@ ICE_API IceUtil::Shared* upCast(::Ice::OutputStream*); typedef IceInternal::Handle< OutputStream > OutputStreamPtr; } - -#endif diff --git a/cpp/include/Ice/StringConverter.h b/cpp/include/Ice/StringConverter.h index 28ee9bb3b9b..7452b90c845 100644 --- a/cpp/include/Ice/StringConverter.h +++ b/cpp/include/Ice/StringConverter.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_STRING_CONVERTER_H -#define ICE_STRING_CONVERTER_H +#pragma once #include <Ice/Config.h> #include <Ice/CommunicatorF.h> @@ -157,5 +156,3 @@ ICE_API std::string UTF8ToNative(const Ice::CommunicatorPtr&, const std::string&); } - -#endif diff --git a/cpp/include/Ice/UndefSysMacros.h b/cpp/include/Ice/UndefSysMacros.h index d412fd1b26d..32ccd926258 100644 --- a/cpp/include/Ice/UndefSysMacros.h +++ b/cpp/include/Ice/UndefSysMacros.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UNDEF_SYS_MACROS_H -#define ICE_UNDEF_SYS_MACROS_H +#pragma once // // This header includes macros that can end up being dragged into @@ -38,5 +37,3 @@ #ifdef max #undef max #endif - -#endif diff --git a/cpp/include/Ice/UserExceptionFactory.h b/cpp/include/Ice/UserExceptionFactory.h index 42c709167f0..2a6f7a805f5 100644 --- a/cpp/include/Ice/UserExceptionFactory.h +++ b/cpp/include/Ice/UserExceptionFactory.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_USER_EXCEPTION_FACTORY_H -#define ICE_USER_EXCEPTION_FACTORY_H +#pragma once #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -28,5 +27,3 @@ public: typedef ::IceUtil::Handle<UserExceptionFactory> UserExceptionFactoryPtr; }; - -#endif diff --git a/cpp/include/IceGrid/IceGrid.h b/cpp/include/IceGrid/IceGrid.h index 34e1ed0d854..e2f87bf9d43 100644 --- a/cpp/include/IceGrid/IceGrid.h +++ b/cpp/include/IceGrid/IceGrid.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICEGRID_H -#define ICEGRID_H +#pragma once #include <IceGrid/Admin.h> #include <IceGrid/Descriptor.h> @@ -20,5 +19,3 @@ #include <IceGrid/Registry.h> #include <IceGrid/Session.h> #include <IceGrid/UserAccountMapper.h> - -#endif diff --git a/cpp/include/IcePatch2/ClientUtil.h b/cpp/include/IcePatch2/ClientUtil.h index 917abc28f2e..4e110f301d1 100644 --- a/cpp/include/IcePatch2/ClientUtil.h +++ b/cpp/include/IcePatch2/ClientUtil.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_PATCH2_CLIENT_UTIL_H -#define ICE_PATCH2_CLIENT_UTIL_H +#pragma once #include <Ice/Ice.h> #include <IceUtil/Thread.h> @@ -161,5 +160,3 @@ private: typedef IceUtil::Handle<Patcher> PatcherPtr; } - -#endif diff --git a/cpp/include/IcePatch2/Util.h b/cpp/include/IcePatch2/Util.h index 8b92ba88afe..3813d675bc1 100644 --- a/cpp/include/IcePatch2/Util.h +++ b/cpp/include/IcePatch2/Util.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_PATCH2_UTIL_H -#define ICE_PATCH2_UTIL_H +#pragma once #include <Ice/Ice.h> #include <IcePatch2/FileInfo.h> @@ -188,5 +187,3 @@ struct FileTree0 ICE_PATCH2_API void getFileTree0(const FileInfoSeq&, FileTree0&); } - -#endif diff --git a/cpp/include/IceSSL/IceSSL.h b/cpp/include/IceSSL/IceSSL.h index 8ffa97c6618..450e3c2b34e 100644 --- a/cpp/include/IceSSL/IceSSL.h +++ b/cpp/include/IceSSL/IceSSL.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_SSL_ICE_SSL_H -#define ICE_SSL_ICE_SSL_H +#pragma once #include <IceUtil/Config.h> #ifndef ICE_OS_WINRT @@ -16,5 +15,3 @@ #endif #include <IceSSL/EndpointInfo.h> #include <IceSSL/ConnectionInfo.h> - -#endif diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h index b9cf292a41b..ff67ba55a43 100644 --- a/cpp/include/IceSSL/Plugin.h +++ b/cpp/include/IceSSL/Plugin.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_SSL_PLUGIN_H -#define ICE_SSL_PLUGIN_H +#pragma once #include <IceUtil/Time.h> #include <Ice/Plugin.h> @@ -454,5 +453,3 @@ public: typedef IceUtil::Handle<Plugin> PluginPtr; } - -#endif diff --git a/cpp/include/IceUtil/AbstractMutex.h b/cpp/include/IceUtil/AbstractMutex.h index 13fd6855234..8b757cfa771 100644 --- a/cpp/include/IceUtil/AbstractMutex.h +++ b/cpp/include/IceUtil/AbstractMutex.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_ABSTRACT_MUTEX_H -#define ICE_UTIL_ABSTRACT_MUTEX_H +#pragma once #include <IceUtil/Config.h> #include <IceUtil/Lock.h> @@ -120,5 +119,3 @@ public: } - -#endif diff --git a/cpp/include/IceUtil/ArgVector.h b/cpp/include/IceUtil/ArgVector.h index 813f7c873d0..0cf29c4de9e 100644 --- a/cpp/include/IceUtil/ArgVector.h +++ b/cpp/include/IceUtil/ArgVector.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_ARGVECTOR_H -#define ICE_UTIL_ARGVECTOR_H +#pragma once #include <IceUtil/Config.h> #include <vector> @@ -37,5 +36,3 @@ private: }; } - -#endif diff --git a/cpp/include/IceUtil/Cache.h b/cpp/include/IceUtil/Cache.h index e11830ead39..b0fd325522b 100644 --- a/cpp/include/IceUtil/Cache.h +++ b/cpp/include/IceUtil/Cache.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_CACHE_H -#define ICE_UTIL_CACHE_H +#pragma once #include <IceUtil/Handle.h> #include <IceUtil/Mutex.h> @@ -368,5 +367,3 @@ Cache<Key, Value>::pinImpl(const Key& key, const Handle<Value>& newObj) } } - -#endif diff --git a/cpp/include/IceUtil/Cond.h b/cpp/include/IceUtil/Cond.h index 901b779ebc1..ff4aa2a4f4d 100644 --- a/cpp/include/IceUtil/Cond.h +++ b/cpp/include/IceUtil/Cond.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_COND_H -#define ICE_UTIL_COND_H +#pragma once #include <IceUtil/Config.h> #include <IceUtil/Time.h> @@ -268,5 +267,3 @@ Cond::timedWaitImpl(const M& mutex, const Time& timeout) const #endif } // End namespace IceUtil - -#endif diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 643408d5c6c..64d101366c3 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_CONFIG_H -#define ICE_UTIL_CONFIG_H +#pragma once // // Endianness @@ -249,5 +248,3 @@ public: } #endif -#endif - diff --git a/cpp/include/IceUtil/CountDownLatch.h b/cpp/include/IceUtil/CountDownLatch.h index ef0d774abd4..bb6305224ef 100644 --- a/cpp/include/IceUtil/CountDownLatch.h +++ b/cpp/include/IceUtil/CountDownLatch.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_COUNT_DOWN_LATCH_H -#define ICE_UTIL_COUNT_DOWN_LATCH_H +#pragma once #include <IceUtil/Config.h> @@ -46,5 +45,3 @@ private: }; } - -#endif diff --git a/cpp/include/IceUtil/CtrlCHandler.h b/cpp/include/IceUtil/CtrlCHandler.h index 5770bbaec79..6614b601c58 100644 --- a/cpp/include/IceUtil/CtrlCHandler.h +++ b/cpp/include/IceUtil/CtrlCHandler.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_CTRL_C_HANDLER_H -#define ICE_UTIL_CTRL_C_HANDLER_H +#pragma once #include <IceUtil/Config.h> #include <IceUtil/Exception.h> @@ -67,4 +66,3 @@ public: } -#endif diff --git a/cpp/include/IceUtil/DisableWarnings.h b/cpp/include/IceUtil/DisableWarnings.h index a8041ef9b49..cf27472aa3c 100644 --- a/cpp/include/IceUtil/DisableWarnings.h +++ b/cpp/include/IceUtil/DisableWarnings.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_DISABLEWARNINGS_H -#define ICE_UTIL_DISABLEWARNINGS_H +#pragma once // // This header file disables various annoying compiler warnings that @@ -27,5 +26,3 @@ #if defined(_MSC_VER) && _MSC_VER >= 1300 # pragma warning( 4 : 4996 ) // C4996 'std::<function>' was declared deprecated #endif - -#endif diff --git a/cpp/include/IceUtil/Exception.h b/cpp/include/IceUtil/Exception.h index 18b1296b303..d91940237f6 100644 --- a/cpp/include/IceUtil/Exception.h +++ b/cpp/include/IceUtil/Exception.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_EXCEPTION_H -#define ICE_UTIL_EXCEPTION_H +#pragma once #include <IceUtil/Config.h> @@ -120,5 +119,3 @@ private: }; } - -#endif diff --git a/cpp/include/IceUtil/FileUtil.h b/cpp/include/IceUtil/FileUtil.h index 351c597c7c9..cad934ca36c 100644 --- a/cpp/include/IceUtil/FileUtil.h +++ b/cpp/include/IceUtil/FileUtil.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_FILE_UTIL_H -#define ICE_FILE_UTIL_H +#pragma once #include <IceUtil/Config.h> #include <IceUtil/Shared.h> @@ -160,4 +159,3 @@ private: }; } -#endif diff --git a/cpp/include/IceUtil/Functional.h b/cpp/include/IceUtil/Functional.h index 47281bfa476..6ddbd824461 100644 --- a/cpp/include/IceUtil/Functional.h +++ b/cpp/include/IceUtil/Functional.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_FUNCTIONAL_H -#define ICE_UTIL_FUNCTIONAL_H +#pragma once #include <IceUtil/Handle.h> #include <functional> @@ -448,5 +447,3 @@ voidbind2nd(const _Operation& __fn, const _Tp& __x) _STLP_END_NAMESPACE #endif - -#endif diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h index 2eeb58c8830..a57dd25b04a 100644 --- a/cpp/include/IceUtil/Handle.h +++ b/cpp/include/IceUtil/Handle.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_HANDLE_H -#define ICE_UTIL_HANDLE_H +#pragma once #include <IceUtil/Exception.h> #include <algorithm> @@ -281,5 +280,3 @@ public: }; } - -#endif diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h index 783bcb6f945..87459b1d6f2 100644 --- a/cpp/include/IceUtil/IceUtil.h +++ b/cpp/include/IceUtil/IceUtil.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_ICE_UTIL_H -#define ICE_UTIL_ICE_UTIL_H +#pragma once // // This file must include *all* other headers of IceUtil, except @@ -38,5 +37,3 @@ #include <IceUtil/Timer.h> #include <IceUtil/UUID.h> #include <IceUtil/Unicode.h> - -#endif diff --git a/cpp/include/IceUtil/InputUtil.h b/cpp/include/IceUtil/InputUtil.h index 4bbe0f08780..5428b4754d5 100644 --- a/cpp/include/IceUtil/InputUtil.h +++ b/cpp/include/IceUtil/InputUtil.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_INPUT_UTIL_H -#define ICE_UTIL_INPUT_UTIL_H +#pragma once #include <IceUtil/Config.h> #include <string> @@ -43,5 +42,3 @@ ICE_UTIL_API IceUtil::Int64 strToInt64(const char*, char**, int); ICE_UTIL_API bool stringToInt64(const std::string&, IceUtil::Int64&); } - -#endif diff --git a/cpp/include/IceUtil/Iterator.h b/cpp/include/IceUtil/Iterator.h index c3cc6222a35..e64446121b8 100644 --- a/cpp/include/IceUtil/Iterator.h +++ b/cpp/include/IceUtil/Iterator.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_ITERATOR_H -#define ICE_UTIL_ITERATOR_H +#pragma once #include <iterator> @@ -33,4 +32,3 @@ distance(ForwardIterator first, ForwardIterator last) } } -#endif diff --git a/cpp/include/IceUtil/Lock.h b/cpp/include/IceUtil/Lock.h index cf5ba793e0b..573ee546653 100644 --- a/cpp/include/IceUtil/Lock.h +++ b/cpp/include/IceUtil/Lock.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_LOCK_H -#define ICE_UTIL_LOCK_H +#pragma once #include <IceUtil/Config.h> #include <IceUtil/ThreadException.h> @@ -131,5 +130,3 @@ public: }; } // End namespace IceUtil - -#endif diff --git a/cpp/include/IceUtil/Monitor.h b/cpp/include/IceUtil/Monitor.h index 48733926cce..2b3404aedf1 100644 --- a/cpp/include/IceUtil/Monitor.h +++ b/cpp/include/IceUtil/Monitor.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_MONITOR_H -#define ICE_UTIL_MONITOR_H +#pragma once #include <IceUtil/Config.h> #include <IceUtil/Lock.h> @@ -245,5 +244,3 @@ IceUtil::Monitor<T>::notifyImpl(int nnotify) const } } } - -#endif diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h index 68c810cf475..3914e325dc3 100644 --- a/cpp/include/IceUtil/Mutex.h +++ b/cpp/include/IceUtil/Mutex.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_MUTEX_H -#define ICE_UTIL_MUTEX_H +#pragma once #include <IceUtil/Config.h> #include <IceUtil/Lock.h> @@ -325,5 +324,3 @@ Mutex::willUnlock() const } } // End namespace IceUtil - -#endif diff --git a/cpp/include/IceUtil/MutexProtocol.h b/cpp/include/IceUtil/MutexProtocol.h index a74589f468a..61a956a4b00 100644 --- a/cpp/include/IceUtil/MutexProtocol.h +++ b/cpp/include/IceUtil/MutexProtocol.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_MUTEX_PROTOCOL_H -#define ICE_UTIL_MUTEX_PROTOCOL_H +#pragma once #include <IceUtil/Config.h> @@ -24,5 +23,3 @@ enum MutexProtocol ICE_UTIL_API MutexProtocol getDefaultMutexProtocol(); } // End namespace IceUtil - -#endif diff --git a/cpp/include/IceUtil/MutexPtrLock.h b/cpp/include/IceUtil/MutexPtrLock.h index 3574a95a442..c2e4a389c5c 100644 --- a/cpp/include/IceUtil/MutexPtrLock.h +++ b/cpp/include/IceUtil/MutexPtrLock.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_MUTEX_PTR_LOCK_H -#define ICE_UTIL_MUTEX_PTR_LOCK_H +#pragma once #include <IceUtil/Config.h> #include <IceUtil/ThreadException.h> @@ -79,5 +78,3 @@ private: }; } // End namespace IceUtilInternal - -#endif diff --git a/cpp/include/IceUtil/MutexPtrTryLock.h b/cpp/include/IceUtil/MutexPtrTryLock.h index 7eb64d242c8..c4b81d47ce7 100644 --- a/cpp/include/IceUtil/MutexPtrTryLock.h +++ b/cpp/include/IceUtil/MutexPtrTryLock.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_MUTEX_PTR_TRY_LOCK_H -#define ICE_UTIL_MUTEX_PTR_TRY_LOCK_H +#pragma once #include <IceUtil/Config.h> #include <IceUtil/Mutex.h> @@ -78,5 +77,3 @@ private: }; } // End namespace IceUtilInternal - -#endif diff --git a/cpp/include/IceUtil/Options.h b/cpp/include/IceUtil/Options.h index d0edaee22bb..364df237821 100644 --- a/cpp/include/IceUtil/Options.h +++ b/cpp/include/IceUtil/Options.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_OPTIONS_H -#define ICE_UTIL_OPTIONS_H +#pragma once #include <IceUtil/Config.h> #include <IceUtil/RecMutex.h> @@ -137,5 +136,3 @@ private: }; } - -#endif diff --git a/cpp/include/IceUtil/OutputUtil.h b/cpp/include/IceUtil/OutputUtil.h index d282369c69c..034a4214543 100644 --- a/cpp/include/IceUtil/OutputUtil.h +++ b/cpp/include/IceUtil/OutputUtil.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_OUTPUT_UTIL_H -#define ICE_UTIL_OUTPUT_UTIL_H +#pragma once #include <IceUtil/Config.h> #include <fstream> @@ -378,5 +377,3 @@ operator<<(XMLOutput& o, const EndEscapes&) ICE_UTIL_API XMLOutput& operator<<(XMLOutput&, std::ios_base& (*)(std::ios_base&)); } - -#endif diff --git a/cpp/include/IceUtil/Random.h b/cpp/include/IceUtil/Random.h index eb9b2ca0051..9bdd9caad53 100644 --- a/cpp/include/IceUtil/Random.h +++ b/cpp/include/IceUtil/Random.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_RANDOM_H -#define ICE_UTIL_RANDOM_H +#pragma once #include <IceUtil/Config.h> #include <IceUtil/Exception.h> @@ -20,5 +19,3 @@ ICE_UTIL_API void generateRandom(char*, int); ICE_UTIL_API unsigned int random(int = 0); } - -#endif diff --git a/cpp/include/IceUtil/ScopedArray.h b/cpp/include/IceUtil/ScopedArray.h index b5001ea96ff..0634e203cd3 100644 --- a/cpp/include/IceUtil/ScopedArray.h +++ b/cpp/include/IceUtil/ScopedArray.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_SCOPED_ARRAY_H -#define ICE_UTIL_SCOPED_ARRAY_H +#pragma once #include <IceUtil/Config.h> @@ -74,5 +73,3 @@ private: }; } // End of namespace IceUtil - -#endif diff --git a/cpp/include/IceUtil/Shared.h b/cpp/include/IceUtil/Shared.h index 2412ec1210c..5b3e1b610c4 100644 --- a/cpp/include/IceUtil/Shared.h +++ b/cpp/include/IceUtil/Shared.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_SHARED_H -#define ICE_UTIL_SHARED_H +#pragma once #include <IceUtil/Config.h> @@ -144,5 +143,3 @@ protected: }; } - -#endif diff --git a/cpp/include/IceUtil/StringUtil.h b/cpp/include/IceUtil/StringUtil.h index f2786340b4c..3439d040e36 100644 --- a/cpp/include/IceUtil/StringUtil.h +++ b/cpp/include/IceUtil/StringUtil.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_STRING_UTIL_H -#define ICE_STRING_UTIL_H +#pragma once #include <IceUtil/Config.h> #include <vector> @@ -87,5 +86,3 @@ ICE_UTIL_API bool isDigit(char); ICE_UTIL_API std::string removeWhitespace(const std::string&); } - -#endif diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h index 6658ef8740f..e75adf60476 100644 --- a/cpp/include/IceUtil/Thread.h +++ b/cpp/include/IceUtil/Thread.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_THREAD_H -#define ICE_UTIL_THREAD_H +#pragma once #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -161,6 +160,3 @@ private: typedef Handle<Thread> ThreadPtr; } - -#endif - diff --git a/cpp/include/IceUtil/ThreadException.h b/cpp/include/IceUtil/ThreadException.h index c475b499117..d0444c20573 100644 --- a/cpp/include/IceUtil/ThreadException.h +++ b/cpp/include/IceUtil/ThreadException.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_THREAD_EXCEPTION_H -#define ICE_UTIL_THREAD_EXCEPTION_H +#pragma once #include <IceUtil/Exception.h> #include <IceUtil/Time.h> @@ -103,6 +102,3 @@ private: }; } - -#endif - diff --git a/cpp/include/IceUtil/Time.h b/cpp/include/IceUtil/Time.h index d987ca3cd00..8dcd0699d4f 100644 --- a/cpp/include/IceUtil/Time.h +++ b/cpp/include/IceUtil/Time.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_TIME_H -#define ICE_UTIL_TIME_H +#pragma once #include <IceUtil/Config.h> @@ -205,5 +204,3 @@ private: ICE_UTIL_API std::ostream& operator<<(std::ostream&, const Time&); } // End namespace IceUtil - -#endif diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h index 00087365b33..f6eed95058e 100644 --- a/cpp/include/IceUtil/Timer.h +++ b/cpp/include/IceUtil/Timer.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_TIMER_H -#define ICE_UTIL_TIMER_H +#pragma once #include <IceUtil/Shared.h> #include <IceUtil/Thread.h> @@ -137,6 +136,3 @@ Timer::Token::operator<(const Timer::Token& r) const } } - -#endif - diff --git a/cpp/include/IceUtil/UUID.h b/cpp/include/IceUtil/UUID.h index 4cc1d85f87a..838b97d8e4e 100644 --- a/cpp/include/IceUtil/UUID.h +++ b/cpp/include/IceUtil/UUID.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_UUID_H -#define ICE_UTIL_UUID_H +#pragma once #include <IceUtil/Config.h> @@ -18,5 +17,3 @@ namespace IceUtil ICE_UTIL_API std::string generateUUID(); } - -#endif diff --git a/cpp/include/IceUtil/Unicode.h b/cpp/include/IceUtil/Unicode.h index d88d04f9583..6bd5232c065 100644 --- a/cpp/include/IceUtil/Unicode.h +++ b/cpp/include/IceUtil/Unicode.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_UTIL_UNICODE_H -#define ICE_UTIL_UNICODE_H +#pragma once #include <IceUtil/Config.h> #include <IceUtil/Exception.h> @@ -91,5 +90,3 @@ convertUTF8ToUTFWstring(const IceUtil::Byte*& sourceStart, const IceUtil::Byte* std::wstring& target, IceUtil::ConversionFlags flags); } - -#endif diff --git a/cpp/include/IceXML/Parser.h b/cpp/include/IceXML/Parser.h index 59c8c64fc35..e32993aa207 100644 --- a/cpp/include/IceXML/Parser.h +++ b/cpp/include/IceXML/Parser.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef ICE_XML_PARSER_H -#define ICE_XML_PARSER_H +#pragma once #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -153,5 +152,3 @@ public: }; } - -#endif diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h index c751dba88f0..74b339e15c1 100644 --- a/cpp/include/Slice/CPlusPlusUtil.h +++ b/cpp/include/Slice/CPlusPlusUtil.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef C_PLUS_PLUS_UTIL_H -#define C_PLUS_PLUS_UTIL_H +#pragma once #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -65,5 +64,3 @@ SLICE_API std::string findMetaData(const StringList&, int = 0); SLICE_API bool inWstringModule(const SequencePtr&); } - -#endif diff --git a/cpp/include/Slice/Checksum.h b/cpp/include/Slice/Checksum.h index 0a758f5c8a4..c874595512f 100644 --- a/cpp/include/Slice/Checksum.h +++ b/cpp/include/Slice/Checksum.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef SLICE_CHECKSUM_H -#define SLICE_CHECKSUM_H +#pragma once #include <Slice/Parser.h> #include <map> @@ -22,5 +21,3 @@ typedef std::map<std::string, std::vector<unsigned char> > ChecksumMap; SLICE_API ChecksumMap createChecksums(const UnitPtr&); } - -#endif diff --git a/cpp/include/Slice/CsUtil.h b/cpp/include/Slice/CsUtil.h index 46dae821ad9..39b8ac9bbae 100644 --- a/cpp/include/Slice/CsUtil.h +++ b/cpp/include/Slice/CsUtil.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef CS_UTIL_H -#define CS_UTIL_H +#pragma once #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -80,5 +79,3 @@ private: }; } - -#endif diff --git a/cpp/include/Slice/DotNetNames.h b/cpp/include/Slice/DotNetNames.h index 88e74c378be..43bab7155c0 100644 --- a/cpp/include/Slice/DotNetNames.h +++ b/cpp/include/Slice/DotNetNames.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef DOTNETNAMES_H -#define DOTNETNAMES_H +#pragma once #include <string> @@ -30,5 +29,3 @@ std::string mangleName(const std::string&, int baseTypes = 0); } } - -#endif diff --git a/cpp/include/Slice/FileTracker.h b/cpp/include/Slice/FileTracker.h index e59ae79bf9c..3fb45799e8c 100644 --- a/cpp/include/Slice/FileTracker.h +++ b/cpp/include/Slice/FileTracker.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef FILE_TRACKER_H -#define FILE_TRACKER_H +#pragma once #include <IceUtil/Shared.h> #include <Slice/Parser.h> @@ -67,5 +66,3 @@ private: }; } - -#endif diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h index 46a6d6648e6..b6f43517f51 100644 --- a/cpp/include/Slice/JavaUtil.h +++ b/cpp/include/Slice/JavaUtil.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef JAVA_UTIL_H -#define JAVA_UTIL_H +#pragma once #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -239,5 +238,3 @@ private: }; } - -#endif diff --git a/cpp/include/Slice/PHPUtil.h b/cpp/include/Slice/PHPUtil.h index 8e0322ffaee..200cdf57e86 100644 --- a/cpp/include/Slice/PHPUtil.h +++ b/cpp/include/Slice/PHPUtil.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef SLICE_PHP_UTIL_H -#define SLICE_PHP_UTIL_H +#pragma once #include <Slice/Parser.h> @@ -46,5 +45,3 @@ SLICE_API std::string escapeName(const std::string&); } } - -#endif diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h index 16e5f8bae91..1075caa7e1a 100644 --- a/cpp/include/Slice/Parser.h +++ b/cpp/include/Slice/Parser.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef SLICE_PARSER_H -#define SLICE_PARSER_H +#pragma once #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -1034,5 +1033,3 @@ private: extern SLICE_API Unit* unit; // The current parser for bison/flex } - -#endif diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h index 6848464e25e..444ee12d967 100644 --- a/cpp/include/Slice/Preprocessor.h +++ b/cpp/include/Slice/Preprocessor.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef PREPROCESSOR_H -#define PREPROCESSOR_H +#pragma once #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> @@ -67,5 +66,3 @@ private: }; } - -#endif diff --git a/cpp/include/Slice/PythonUtil.h b/cpp/include/Slice/PythonUtil.h index 91501cb7f50..5201b7f1c49 100644 --- a/cpp/include/Slice/PythonUtil.h +++ b/cpp/include/Slice/PythonUtil.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef SLICE_PYTHON_UTIL_H -#define SLICE_PYTHON_UTIL_H +#pragma once #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -58,5 +57,3 @@ SLICE_API void printHeader(IceUtilInternal::Output&); } } - -#endif diff --git a/cpp/include/Slice/RubyUtil.h b/cpp/include/Slice/RubyUtil.h index d8cd8ead8b8..acf93455fed 100644 --- a/cpp/include/Slice/RubyUtil.h +++ b/cpp/include/Slice/RubyUtil.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef SLICE_RUBY_UTIL_H -#define SLICE_RUBY_UTIL_H +#pragma once #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -48,5 +47,3 @@ SLICE_API void printHeader(IceUtilInternal::Output&); } } - -#endif diff --git a/cpp/include/Slice/Util.h b/cpp/include/Slice/Util.h index 3807647d59f..0a755157b02 100644 --- a/cpp/include/Slice/Util.h +++ b/cpp/include/Slice/Util.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef SLICE_UTIL_H -#define SLICE_UTIL_H +#pragma once #include <Slice/Parser.h> #include <IceUtil/OutputUtil.h> @@ -28,5 +27,3 @@ SLICE_API void emitRaw(const char*); SLICE_API std::vector<std::string> filterMcppWarnings(const std::string&); SLICE_API void printGeneratedHeader(IceUtilInternal::Output& out, const std::string&, const std::string& commentStyle = "//"); } - -#endif |