[asterisk-scf-commits] asterisk-scf/integration/ice.git branch "use-pragma-once" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Fri Feb 18 12:43:04 CST 2011
branch "use-pragma-once" has been created
at 6d264a87d35de09a3f471b9c3dd05dad848dbae3 (commit)
- Log -----------------------------------------------------------------
commit 6d264a87d35de09a3f471b9c3dd05dad848dbae3
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 16 14:28:32 2010 -0500
remove stray #endif
diff --git a/slice/IceBox/IceBox.ice b/slice/IceBox/IceBox.ice
index 638defe..37d4a9f 100644
--- a/slice/IceBox/IceBox.ice
+++ b/slice/IceBox/IceBox.ice
@@ -189,5 +189,3 @@ interface ServiceManager
};
};
-
-#endif
commit 3aa7bb5484cdb715f077f363ef26865cdf374d72
Author: Kevin P. Fleming <kpfleming at digium.com>
Date: Wed Jun 16 13:43:27 2010 -0500
use #pragma once in standard slice files
diff --git a/slice/Freeze/BackgroundSaveEvictor.ice b/slice/Freeze/BackgroundSaveEvictor.ice
index 074f31f..ba5356d 100644
--- a/slice/Freeze/BackgroundSaveEvictor.ice
+++ b/slice/Freeze/BackgroundSaveEvictor.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef FREEZE_BACKGROUND_SAVE_EVICTOR_ICE
-#define FREEZE_BACKGROUND_SAVE_EVICTOR_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -109,5 +108,4 @@ local interface BackgroundSaveEvictor extends Evictor
};
-#endif
diff --git a/slice/Freeze/CatalogData.ice b/slice/Freeze/CatalogData.ice
index c1af94f..9430882 100644
--- a/slice/Freeze/CatalogData.ice
+++ b/slice/Freeze/CatalogData.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef FREEZE_CATALOG_DATA_ICE
-#define FREEZE_CATALOG_DATA_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -31,4 +30,3 @@ struct CatalogData
};
-#endif
diff --git a/slice/Freeze/Connection.ice b/slice/Freeze/Connection.ice
index 0ab0a45..5ca9bcd 100644
--- a/slice/Freeze/Connection.ice
+++ b/slice/Freeze/Connection.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef FREEZE_CONNECTION_ICE
-#define FREEZE_CONNECTION_ICE
+#pragma once
#include <Freeze/Transaction.ice>
#include <Ice/CommunicatorF.ice>
@@ -102,4 +101,3 @@ local interface Connection
};
-#endif
diff --git a/slice/Freeze/ConnectionF.ice b/slice/Freeze/ConnectionF.ice
index 30b7510..6ddc07f 100644
--- a/slice/Freeze/ConnectionF.ice
+++ b/slice/Freeze/ConnectionF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef FREEZE_CONNECTION_F_ICE
-#define FREEZE_CONNECTION_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -19,4 +18,3 @@ local interface Connection;
};
-#endif
diff --git a/slice/Freeze/DB.ice b/slice/Freeze/DB.ice
index 742da90..734191e 100644
--- a/slice/Freeze/DB.ice
+++ b/slice/Freeze/DB.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef FREEZE_DB_ICE
-#define FREEZE_DB_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -36,4 +35,3 @@ sequence<byte> Value;
};
-#endif
diff --git a/slice/Freeze/Evictor.ice b/slice/Freeze/Evictor.ice
index 21ec689..9218422 100644
--- a/slice/Freeze/Evictor.ice
+++ b/slice/Freeze/Evictor.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef FREEZE_EVICTOR_ICE
-#define FREEZE_EVICTOR_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -338,4 +337,3 @@ local interface Evictor extends Ice::ServantLocator
};
-#endif
diff --git a/slice/Freeze/EvictorF.ice b/slice/Freeze/EvictorF.ice
index dbce63d..26b4f81 100644
--- a/slice/Freeze/EvictorF.ice
+++ b/slice/Freeze/EvictorF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef FREEZE_EVICTOR_F_ICE
-#define FREEZE_EVICTOR_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -21,4 +20,3 @@ local interface TransactionalEvictor;
};
-#endif
diff --git a/slice/Freeze/EvictorStorage.ice b/slice/Freeze/EvictorStorage.ice
index c59293b..d0d1dad 100644
--- a/slice/Freeze/EvictorStorage.ice
+++ b/slice/Freeze/EvictorStorage.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef FREEZE_EVICTOR_STORAGE_ICE
-#define FREEZE_EVICTOR_STORAGE_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -71,4 +70,3 @@ struct ObjectRecord
};
-#endif
diff --git a/slice/Freeze/Exception.ice b/slice/Freeze/Exception.ice
index 96459c5..33e3240 100644
--- a/slice/Freeze/Exception.ice
+++ b/slice/Freeze/Exception.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef FREEZE_EXCEPTION_ICE
-#define FREEZE_EXCEPTION_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -79,4 +78,3 @@ local exception IndexNotFoundException
};
-#endif
diff --git a/slice/Freeze/Transaction.ice b/slice/Freeze/Transaction.ice
index 666fd5f..f409ff7 100644
--- a/slice/Freeze/Transaction.ice
+++ b/slice/Freeze/Transaction.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef FREEZE_TRANSACTION_ICE
-#define FREEZE_TRANSACTION_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -56,4 +55,3 @@ local interface Transaction
};
-#endif
diff --git a/slice/Freeze/TransactionalEvictor.ice b/slice/Freeze/TransactionalEvictor.ice
index c85765a..935ff89 100644
--- a/slice/Freeze/TransactionalEvictor.ice
+++ b/slice/Freeze/TransactionalEvictor.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef FREEZE_TRANSACTIONAL_EVICTOR_ICE
-#define FREEZE_TRANSACTIONAL_EVICTOR_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -48,5 +47,4 @@ local interface TransactionalEvictor extends Evictor
};
-#endif
diff --git a/slice/Glacier2/PermissionsVerifier.ice b/slice/Glacier2/PermissionsVerifier.ice
index e9bc843..64b1ab8 100644
--- a/slice/Glacier2/PermissionsVerifier.ice
+++ b/slice/Glacier2/PermissionsVerifier.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef GLACIER2_PERMISSIONS_VERIFIER_ICE
-#define GLACIER2_PERMISSIONS_VERIFIER_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -72,4 +71,3 @@ interface SSLPermissionsVerifier
};
-#endif
diff --git a/slice/Glacier2/PermissionsVerifierF.ice b/slice/Glacier2/PermissionsVerifierF.ice
index 8a9933a..828b924 100644
--- a/slice/Glacier2/PermissionsVerifierF.ice
+++ b/slice/Glacier2/PermissionsVerifierF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef GLACIER2_PERMISSIONS_VERIFIER_F_ICE
-#define GLACIER2_PERMISSIONS_VERIFIER_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -20,4 +19,3 @@ interface SSLPermissionsVerifier;
};
-#endif
diff --git a/slice/Glacier2/Router.ice b/slice/Glacier2/Router.ice
index b8e8d69..a7e4a0c 100644
--- a/slice/Glacier2/Router.ice
+++ b/slice/Glacier2/Router.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef GLACIER2_ROUTER_ICE
-#define GLACIER2_ROUTER_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -197,4 +196,3 @@ interface Admin
};
-#endif
diff --git a/slice/Glacier2/RouterF.ice b/slice/Glacier2/RouterF.ice
index 7929237..04b6e26 100644
--- a/slice/Glacier2/RouterF.ice
+++ b/slice/Glacier2/RouterF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef GLACIER2_ROUTER_F_ICE
-#define GLACIER2_ROUTER_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -19,4 +18,3 @@ interface Router;
};
-#endif
diff --git a/slice/Glacier2/SSLInfo.ice b/slice/Glacier2/SSLInfo.ice
index 6bf7d51..17b8e40 100644
--- a/slice/Glacier2/SSLInfo.ice
+++ b/slice/Glacier2/SSLInfo.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef GLACIER2_SSL_INFO_ICE
-#define GLACIER2_SSL_INFO_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -48,4 +47,3 @@ struct SSLInfo
};
-#endif
diff --git a/slice/Glacier2/Session.ice b/slice/Glacier2/Session.ice
index cc80223..00b2f3b 100644
--- a/slice/Glacier2/Session.ice
+++ b/slice/Glacier2/Session.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef GLACIER2_SESSION_ICE
-#define GLACIER2_SESSION_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -268,4 +267,3 @@ interface SSLSessionManager
};
-#endif
diff --git a/slice/Ice/BuiltinSequences.ice b/slice/Ice/BuiltinSequences.ice
index f24a17e..3165346 100644
--- a/slice/Ice/BuiltinSequences.ice
+++ b/slice/Ice/BuiltinSequences.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_BUILTIN_SEQUENCES_ICE
-#define ICE_BUILTIN_SEQUENCES_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -47,4 +46,3 @@ sequence<Object*> ObjectProxySeq;
};
-#endif
diff --git a/slice/Ice/Communicator.ice b/slice/Ice/Communicator.ice
index fac6d7e..07515dc 100644
--- a/slice/Ice/Communicator.ice
+++ b/slice/Ice/Communicator.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_COMMUNICATOR_ICE
-#define ICE_COMMUNICATOR_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -508,4 +507,3 @@ local interface Communicator
};
-#endif
diff --git a/slice/Ice/CommunicatorF.ice b/slice/Ice/CommunicatorF.ice
index 297f9cd..b08cfca 100644
--- a/slice/Ice/CommunicatorF.ice
+++ b/slice/Ice/CommunicatorF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_COMMUNICATOR_F_ICE
-#define ICE_COMMUNICATOR_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -19,4 +18,3 @@ local interface Communicator;
};
-#endif
diff --git a/slice/Ice/Connection.ice b/slice/Ice/Connection.ice
index 1c9cfa6..f54ea84 100644
--- a/slice/Ice/Connection.ice
+++ b/slice/Ice/Connection.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_CONNECTION_ICE
-#define ICE_CONNECTION_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -219,4 +218,3 @@ local class UDPConnectionInfo extends IPConnectionInfo
};
-#endif
diff --git a/slice/Ice/ConnectionF.ice b/slice/Ice/ConnectionF.ice
index 7f1dcf0..9d67d42 100644
--- a/slice/Ice/ConnectionF.ice
+++ b/slice/Ice/ConnectionF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_CONNECTION_F_ICE
-#define ICE_CONNECTION_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -20,4 +19,3 @@ local interface Connection;
};
-#endif
diff --git a/slice/Ice/Current.ice b/slice/Ice/Current.ice
index ccdede7..09f5359 100644
--- a/slice/Ice/Current.ice
+++ b/slice/Ice/Current.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_CURRENT_ICE
-#define ICE_CURRENT_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -151,4 +150,3 @@ local struct Current
};
-#endif
diff --git a/slice/Ice/Endpoint.ice b/slice/Ice/Endpoint.ice
index 2271860..b89b989 100644
--- a/slice/Ice/Endpoint.ice
+++ b/slice/Ice/Endpoint.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_ENDPOINT_ICE
-#define ICE_ENDPOINT_ICE
+#pragma once
#include <Ice/BuiltinSequences.ice>
#include <Ice/EndpointF.ice>
@@ -186,4 +185,3 @@ local class OpaqueEndpointInfo extends EndpointInfo
};
-#endif
diff --git a/slice/Ice/EndpointF.ice b/slice/Ice/EndpointF.ice
index be233be..0a54b47 100644
--- a/slice/Ice/EndpointF.ice
+++ b/slice/Ice/EndpointF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_ENDPOINT_F_ICE
-#define ICE_ENDPOINT_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -22,4 +21,3 @@ local sequence<Endpoint> EndpointSeq;
};
-#endif
diff --git a/slice/Ice/EndpointTypes.ice b/slice/Ice/EndpointTypes.ice
index 1417fd9..3eeccc1 100644
--- a/slice/Ice/EndpointTypes.ice
+++ b/slice/Ice/EndpointTypes.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_ENDPOINT_TYPES_ICE
-#define ICE_ENDPOINT_TYPES_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -37,4 +36,3 @@ enum EndpointSelectionType
};
-#endif
diff --git a/slice/Ice/FacetMap.ice b/slice/Ice/FacetMap.ice
index 0fe27b9..1d2bbe0 100644
--- a/slice/Ice/FacetMap.ice
+++ b/slice/Ice/FacetMap.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_FACET_MAP_ICE
-#define ICE_FACET_MAP_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -24,4 +23,3 @@ local dictionary<string, Object> FacetMap;
};
-#endif
diff --git a/slice/Ice/Identity.ice b/slice/Ice/Identity.ice
index e353b7d..858566c 100644
--- a/slice/Ice/Identity.ice
+++ b/slice/Ice/Identity.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_IDENTITY_ICE
-#define ICE_IDENTITY_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -58,4 +57,3 @@ sequence<Identity> IdentitySeq;
};
-#endif
diff --git a/slice/Ice/ImplicitContext.ice b/slice/Ice/ImplicitContext.ice
index 5d72013..925215d 100644
--- a/slice/Ice/ImplicitContext.ice
+++ b/slice/Ice/ImplicitContext.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_IMPLICIT_CONTEXT_ICE
-#define ICE_IMPLICIT_CONTEXT_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -108,4 +107,3 @@ local interface ImplicitContext
};
};
-#endif
diff --git a/slice/Ice/ImplicitContextF.ice b/slice/Ice/ImplicitContextF.ice
index 5945426..f48ec04 100644
--- a/slice/Ice/ImplicitContextF.ice
+++ b/slice/Ice/ImplicitContextF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_IMPLICIT_CONTEXT_F_ICE
-#define ICE_IMPLICIT_CONTEXT_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -19,4 +18,3 @@ local interface ImplicitContext;
};
-#endif
diff --git a/slice/Ice/LocalException.ice b/slice/Ice/LocalException.ice
index 5216736..9998501 100644
--- a/slice/Ice/LocalException.ice
+++ b/slice/Ice/LocalException.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_LOCAL_EXCEPTION_ICE
-#define ICE_LOCAL_EXCEPTION_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -912,4 +911,3 @@ local exception ResponseSentException
};
-#endif
diff --git a/slice/Ice/Locator.ice b/slice/Ice/Locator.ice
index 20396ef..a813294 100644
--- a/slice/Ice/Locator.ice
+++ b/slice/Ice/Locator.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_LOCATOR_ICE
-#define ICE_LOCATOR_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -203,4 +202,3 @@ interface LocatorRegistry
};
-#endif
diff --git a/slice/Ice/LocatorF.ice b/slice/Ice/LocatorF.ice
index 9ddc7fd..a050f6b 100644
--- a/slice/Ice/LocatorF.ice
+++ b/slice/Ice/LocatorF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_LOCATOR_F_ICE
-#define ICE_LOCATOR_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -20,4 +19,3 @@ interface LocatorRegistry;
};
-#endif
diff --git a/slice/Ice/Logger.ice b/slice/Ice/Logger.ice
index 2cf6d17..113d633 100644
--- a/slice/Ice/Logger.ice
+++ b/slice/Ice/Logger.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_LOGGER_ICE
-#define ICE_LOGGER_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -76,4 +75,3 @@ local interface Logger
};
-#endif
diff --git a/slice/Ice/LoggerF.ice b/slice/Ice/LoggerF.ice
index 2c14d0b..0ac8878 100644
--- a/slice/Ice/LoggerF.ice
+++ b/slice/Ice/LoggerF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_LOGGER_F_ICE
-#define ICE_LOGGER_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -19,4 +18,3 @@ local interface Logger;
};
-#endif
diff --git a/slice/Ice/ObjectAdapter.ice b/slice/Ice/ObjectAdapter.ice
index 9e22049..f7f6d35 100644
--- a/slice/Ice/ObjectAdapter.ice
+++ b/slice/Ice/ObjectAdapter.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_OBJECT_ADAPTER_ICE
-#define ICE_OBJECT_ADAPTER_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -660,4 +659,3 @@ local interface ObjectAdapter
};
-#endif
diff --git a/slice/Ice/ObjectAdapterF.ice b/slice/Ice/ObjectAdapterF.ice
index a5e7153..9e00568 100644
--- a/slice/Ice/ObjectAdapterF.ice
+++ b/slice/Ice/ObjectAdapterF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_OBJECT_ADAPTER_F_ICE
-#define ICE_OBJECT_ADAPTER_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -19,4 +18,3 @@ local interface ObjectAdapter;
};
-#endif
diff --git a/slice/Ice/ObjectFactory.ice b/slice/Ice/ObjectFactory.ice
index 2a9933b..2ebe7ea 100644
--- a/slice/Ice/ObjectFactory.ice
+++ b/slice/Ice/ObjectFactory.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_OBJECT_FACTORY_ICE
-#define ICE_OBJECT_FACTORY_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -59,4 +58,3 @@ local interface ObjectFactory
};
-#endif
diff --git a/slice/Ice/ObjectFactoryF.ice b/slice/Ice/ObjectFactoryF.ice
index c4d4c05..af2d89a 100644
--- a/slice/Ice/ObjectFactoryF.ice
+++ b/slice/Ice/ObjectFactoryF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_OBJECT_FACTORY_F_ICE
-#define ICE_OBJECT_FACTORY_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -19,4 +18,3 @@ local interface ObjectFactory;
};
-#endif
diff --git a/slice/Ice/Plugin.ice b/slice/Ice/Plugin.ice
index 30ca127..efeec77 100644
--- a/slice/Ice/Plugin.ice
+++ b/slice/Ice/Plugin.ice
@@ -8,8 +8,7 @@
//
// **********************************************************************
-#ifndef ICE_PLUGIN_ICE
-#define ICE_PLUGIN_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -116,4 +115,3 @@ local interface PluginManager
};
-#endif
diff --git a/slice/Ice/PluginF.ice b/slice/Ice/PluginF.ice
index 723af22..7a0e029 100644
--- a/slice/Ice/PluginF.ice
+++ b/slice/Ice/PluginF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_PLUGIN_F_ICE
-#define ICE_PLUGIN_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -20,4 +19,3 @@ local interface PluginManager;
};
-#endif
diff --git a/slice/Ice/Process.ice b/slice/Ice/Process.ice
index 63ca939..44ffd5d 100644
--- a/slice/Ice/Process.ice
+++ b/slice/Ice/Process.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_PROCESS_ICE
-#define ICE_PROCESS_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -53,4 +52,3 @@ interface Process
};
-#endif
diff --git a/slice/Ice/ProcessF.ice b/slice/Ice/ProcessF.ice
index 7206175..f327268 100644
--- a/slice/Ice/ProcessF.ice
+++ b/slice/Ice/ProcessF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_PROCESS_F_ICE
-#define ICE_PROCESS_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -19,4 +18,3 @@ interface Process;
};
-#endif
diff --git a/slice/Ice/Properties.ice b/slice/Ice/Properties.ice
index a07972c..bf86b96 100644
--- a/slice/Ice/Properties.ice
+++ b/slice/Ice/Properties.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_PROPERTIES_ICE
-#define ICE_PROPERTIES_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -269,4 +268,3 @@ interface PropertiesAdmin
};
-#endif
diff --git a/slice/Ice/PropertiesF.ice b/slice/Ice/PropertiesF.ice
index 5da6bfd..693daed 100644
--- a/slice/Ice/PropertiesF.ice
+++ b/slice/Ice/PropertiesF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_PROPERTIES_F_ICE
-#define ICE_PROPERTIES_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -20,4 +19,3 @@ interface PropertiesAdmin;
};
-#endif
diff --git a/slice/Ice/Router.ice b/slice/Ice/Router.ice
index e19dda5..d1529ac 100644
--- a/slice/Ice/Router.ice
+++ b/slice/Ice/Router.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_ROUTER_ICE
-#define ICE_ROUTER_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -73,4 +72,3 @@ interface Router
};
-#endif
diff --git a/slice/Ice/RouterF.ice b/slice/Ice/RouterF.ice
index 976945d..d488051 100644
--- a/slice/Ice/RouterF.ice
+++ b/slice/Ice/RouterF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_ROUTER_F_ICE
-#define ICE_ROUTER_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -19,4 +18,3 @@ interface Router;
};
-#endif
diff --git a/slice/Ice/ServantLocator.ice b/slice/Ice/ServantLocator.ice
index 99bda15..a4f7f1f 100644
--- a/slice/Ice/ServantLocator.ice
+++ b/slice/Ice/ServantLocator.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_SERVANT_LOCATOR_ICE
-#define ICE_SERVANT_LOCATOR_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -116,4 +115,3 @@ local interface ServantLocator
};
-#endif
diff --git a/slice/Ice/ServantLocatorF.ice b/slice/Ice/ServantLocatorF.ice
index f815a10..8eb5535 100644
--- a/slice/Ice/ServantLocatorF.ice
+++ b/slice/Ice/ServantLocatorF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_SERVANT_LOCATOR_F_ICE
-#define ICE_SERVANT_LOCATOR_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -19,4 +18,3 @@ local interface ServantLocator;
};
-#endif
diff --git a/slice/Ice/SliceChecksumDict.ice b/slice/Ice/SliceChecksumDict.ice
index db2acd8..a42d5ae 100644
--- a/slice/Ice/SliceChecksumDict.ice
+++ b/slice/Ice/SliceChecksumDict.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_SLICE_CHECKSUM_DICT_ICE
-#define ICE_SLICE_CHECKSUM_DICT_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -24,4 +23,3 @@ dictionary<string, string> SliceChecksumDict;
};
-#endif
diff --git a/slice/Ice/Stats.ice b/slice/Ice/Stats.ice
index 6c68de3..f0b6750 100644
--- a/slice/Ice/Stats.ice
+++ b/slice/Ice/Stats.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_STATS_ICE
-#define ICE_STATS_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -51,4 +50,3 @@ local interface Stats
};
-#endif
diff --git a/slice/Ice/StatsF.ice b/slice/Ice/StatsF.ice
index 16fd043..04e629d 100644
--- a/slice/Ice/StatsF.ice
+++ b/slice/Ice/StatsF.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_STATS_F_ICE
-#define ICE_STATS_F_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -19,4 +18,3 @@ local interface Stats;
};
-#endif
diff --git a/slice/IceBox/IceBox.ice b/slice/IceBox/IceBox.ice
index eb6d044..638defe 100644
--- a/slice/IceBox/IceBox.ice
+++ b/slice/IceBox/IceBox.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_BOX_ICE_BOX_ICE
-#define ICE_BOX_ICE_BOX_ICE
+#pragma once
[["cpp:header-ext:h"]]
diff --git a/slice/IceGrid/Admin.ice b/slice/IceGrid/Admin.ice
index de38fe5..ca62b41 100644
--- a/slice/IceGrid/Admin.ice
+++ b/slice/IceGrid/Admin.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_GRID_ADMIN_ICE
-#define ICE_GRID_ADMIN_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -1515,4 +1514,3 @@ interface AdminSession extends Glacier2::Session
};
-#endif
diff --git a/slice/IceGrid/Descriptor.ice b/slice/IceGrid/Descriptor.ice
index 1fab335..b2f7664 100644
--- a/slice/IceGrid/Descriptor.ice
+++ b/slice/IceGrid/Descriptor.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_GRID_DESCRIPTOR_ICE
-#define ICE_GRID_DESCRIPTOR_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -1049,4 +1048,3 @@ struct ApplicationUpdateDescriptor
};
-#endif
diff --git a/slice/IceGrid/Exception.ice b/slice/IceGrid/Exception.ice
index b9bd836..b7f5a91 100644
--- a/slice/IceGrid/Exception.ice
+++ b/slice/IceGrid/Exception.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_GRID_EXCEPTION_ICE
-#define ICE_GRID_EXCEPTION_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -373,4 +372,3 @@ exception FileNotAvailableException
};
-#endif
diff --git a/slice/IceGrid/FileParser.ice b/slice/IceGrid/FileParser.ice
index d85d615..24be14c 100644
--- a/slice/IceGrid/FileParser.ice
+++ b/slice/IceGrid/FileParser.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_GRID_FILE_PARSER_ICE
-#define ICE_GRID_FILE_PARSER_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -59,4 +58,3 @@ interface FileParser
};
-#endif
diff --git a/slice/IceGrid/Locator.ice b/slice/IceGrid/Locator.ice
index 70ddd90..85ce030 100644
--- a/slice/IceGrid/Locator.ice
+++ b/slice/IceGrid/Locator.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_GRID_LOCATOR_ICE
-#define ICE_GRID_LOCATOR_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -54,4 +53,3 @@ interface Locator extends Ice::Locator
};
-#endif
diff --git a/slice/IceGrid/Observer.ice b/slice/IceGrid/Observer.ice
index bb6095f..5daaa65 100644
--- a/slice/IceGrid/Observer.ice
+++ b/slice/IceGrid/Observer.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_GRID_OBSERVER_ICE
-#define ICE_GRID_OBSERVER_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -392,4 +391,3 @@ interface RegistryObserver
};
-#endif
diff --git a/slice/IceGrid/Query.ice b/slice/IceGrid/Query.ice
index 7808e92..ad324f3 100644
--- a/slice/IceGrid/Query.ice
+++ b/slice/IceGrid/Query.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_GRID_QUERY_ICE
-#define ICE_GRID_QUERY_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -128,4 +127,3 @@ enum LoadSample
};
-#endif
diff --git a/slice/IceGrid/Registry.ice b/slice/IceGrid/Registry.ice
index 35de4b3..f39d6e3 100644
--- a/slice/IceGrid/Registry.ice
+++ b/slice/IceGrid/Registry.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_GRID_REGISTRY_ICE
-#define ICE_GRID_REGISTRY_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -123,4 +122,3 @@ interface Registry
};
-#endif
diff --git a/slice/IceGrid/Session.ice b/slice/IceGrid/Session.ice
index e545e43..f35c8b7 100644
--- a/slice/IceGrid/Session.ice
+++ b/slice/IceGrid/Session.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_GRID_SESSION_ICE
-#define ICE_GRID_SESSION_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -122,4 +121,3 @@ interface Session extends Glacier2::Session
};
-#endif
diff --git a/slice/IceGrid/UserAccountMapper.ice b/slice/IceGrid/UserAccountMapper.ice
index 638c960..a1f9609 100644
--- a/slice/IceGrid/UserAccountMapper.ice
+++ b/slice/IceGrid/UserAccountMapper.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_GRID_USERACCOUNTMAPPER_ICE
-#define ICE_GRID_USERACCOUNTMAPPER_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -56,4 +55,3 @@ interface UserAccountMapper
};
-#endif
diff --git a/slice/IcePatch2/FileInfo.ice b/slice/IcePatch2/FileInfo.ice
index d54e042..7e602aa 100644
--- a/slice/IcePatch2/FileInfo.ice
+++ b/slice/IcePatch2/FileInfo.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_PATCH2_FILE_INFO_ICE
-#define ICE_PATCH2_FILE_INFO_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -46,5 +45,4 @@ sequence<FileInfo> FileInfoSeq;
};
-#endif
diff --git a/slice/IcePatch2/FileServer.ice b/slice/IcePatch2/FileServer.ice
index 78826c0..4977519 100644
--- a/slice/IcePatch2/FileServer.ice
+++ b/slice/IcePatch2/FileServer.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_PATCH2_FILE_SERVER_ICE
-#define ICE_PATCH2_FILE_SERVER_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -143,4 +142,3 @@ interface Admin
};
-#endif
diff --git a/slice/IceSSL/ConnectionInfo.ice b/slice/IceSSL/ConnectionInfo.ice
index 30b291b..1da4893 100644
--- a/slice/IceSSL/ConnectionInfo.ice
+++ b/slice/IceSSL/ConnectionInfo.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_SSL_CONNECTION_INFO_ICE
-#define ICE_SSL_CONNECTION_INFO_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -33,4 +32,3 @@ local class ConnectionInfo extends Ice::IPConnectionInfo
};
-#endif
diff --git a/slice/IceSSL/EndpointInfo.ice b/slice/IceSSL/EndpointInfo.ice
index e9e80c8..4e20650 100644
--- a/slice/IceSSL/EndpointInfo.ice
+++ b/slice/IceSSL/EndpointInfo.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_SSL_ENDPOINT_INFO_ICE
-#define ICE_SSL_ENDPOINT_INFO_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -35,4 +34,3 @@ local class EndpointInfo extends Ice::IPEndpointInfo
};
-#endif
diff --git a/slice/IceStorm/IceStorm.ice b/slice/IceStorm/IceStorm.ice
index cbb645d..b28a20f 100644
--- a/slice/IceStorm/IceStorm.ice
+++ b/slice/IceStorm/IceStorm.ice
@@ -7,8 +7,7 @@
//
// **********************************************************************
-#ifndef ICE_STORM_ICE
-#define ICE_STORM_ICE
+#pragma once
[["cpp:header-ext:h"]]
@@ -373,4 +372,3 @@ interface TopicManager
};
-#endif
-----------------------------------------------------------------------
--
asterisk-scf/integration/ice.git
More information about the asterisk-scf-commits
mailing list