Rename ICE_GRID/ICE_STORM => ICEGRID/ICESTORM

zeroc-ice · Oct 17, 2024 · a50bd9f · a50bd9f
1 parent b631a08
commit a50bd9f
Show file tree

Hide file tree

Showing 51 changed files with 6,836 additions and 6,111 deletions.
diff --git a/cpp/include/IceGrid/Config.h b/cpp/include/IceGrid/Config.h
@@ -15,11 +15,11 @@
 #    endif
 #endif
 
-#if !defined(ICE_BUILDING_ICE_GRID) && defined(ICEGRID_API_EXPORTS)
-#    define ICE_BUILDING_ICE_GRID
+#if !defined(ICE_BUILDING_ICEGRID) && defined(ICEGRID_API_EXPORTS)
+#    define ICE_BUILDING_ICEGRID
 #endif
 
-#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICE_GRID)
+#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICEGRID)
 #    pragma comment(lib, ICE_LIBNAME("IceGrid")) // Automatically link with IceGrid[D].lib
 #endif
 

diff --git a/cpp/include/IceStorm/Config.h b/cpp/include/IceStorm/Config.h
@@ -2,20 +2,20 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_STORM_CONFIG_H
-#define ICE_STORM_CONFIG_H
+#ifndef ICESTORM_CONFIG_H
+#define ICESTORM_CONFIG_H
 
 #include "Ice/Config.h"
 
 //
 // Automatically link with IceStorm[D].lib
 //
 
-#if !defined(ICE_BUILDING_ICE_STORM_LIB) && defined(ICESTORM_API_EXPORTS)
-#    define ICE_BUILDING_ICE_STORM_LIB
+#if !defined(ICE_BUILDING_ICESTORM_LIB) && defined(ICESTORM_API_EXPORTS)
+#    define ICE_BUILDING_ICESTORM_LIB
 #endif
 
-#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICE_STORM_LIB)
+#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICESTORM_LIB)
 #    pragma comment(lib, ICE_LIBNAME("IceStorm"))
 #endif
 

diff --git a/cpp/src/IceGrid/Activator.h b/cpp/src/IceGrid/Activator.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_GRID_ACTIVATOR_H
-#define ICE_GRID_ACTIVATOR_H
+#ifndef ICEGRID_ACTIVATOR_H
+#define ICEGRID_ACTIVATOR_H
 
 #include "Internal.h"
 

diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_GRID_ADAPTERCACHE_H
-#define ICE_GRID_ADAPTERCACHE_H
+#ifndef ICEGRID_ADAPTERCACHE_H
+#define ICEGRID_ADAPTERCACHE_H
 
 #include "Cache.h"
 #include "IceGrid/Registry.h"

diff --git a/cpp/src/IceGrid/AdminCallbackRouter.h b/cpp/src/IceGrid/AdminCallbackRouter.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_GRID_ADMIN_CALLBACK_ROUTER_H
-#define ICE_GRID_ADMIN_CALLBACK_ROUTER_H
+#ifndef ICEGRID_ADMIN_CALLBACK_ROUTER_H
+#define ICEGRID_ADMIN_CALLBACK_ROUTER_H
 
 #include "Ice/Ice.h"
 #include <map>

diff --git a/cpp/src/IceGrid/AdminI.h b/cpp/src/IceGrid/AdminI.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_GRID_ADMIN_I_H
-#define ICE_GRID_ADMIN_I_H
+#ifndef ICEGRID_ADMIN_I_H
+#define ICEGRID_ADMIN_I_H
 
 #include "IceGrid/Admin.h"
 

diff --git a/cpp/src/IceGrid/AdminRouter.h b/cpp/src/IceGrid/AdminRouter.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_GRID_ADMIN_ROUTER_H
-#define ICE_GRID_ADMIN_ROUTER_H
+#ifndef ICEGRID_ADMIN_ROUTER_H
+#define ICEGRID_ADMIN_ROUTER_H
 
 #include "Ice/Ice.h"
 #include "TraceLevels.h"

diff --git a/cpp/src/IceGrid/Allocatable.h b/cpp/src/IceGrid/Allocatable.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_GRID_ALLOCATABLE_H
-#define ICE_GRID_ALLOCATABLE_H
+#ifndef ICEGRID_ALLOCATABLE_H
+#define ICEGRID_ALLOCATABLE_H
 
 #include "Ice/Timer.h"
 

diff --git a/cpp/src/IceGrid/AllocatableObjectCache.h b/cpp/src/IceGrid/AllocatableObjectCache.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_GRID_ALLOCATABLEOBJECTCACHE_H
-#define ICE_GRID_ALLOCATABLEOBJECTCACHE_H
+#ifndef ICEGRID_ALLOCATABLEOBJECTCACHE_H
+#define ICEGRID_ALLOCATABLEOBJECTCACHE_H
 
 #include "Allocatable.h"
 #include "Cache.h"

diff --git a/cpp/src/IceGrid/Cache.h b/cpp/src/IceGrid/Cache.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_GRID_CACHE_H
-#define ICE_GRID_CACHE_H
+#ifndef ICEGRID_CACHE_H
+#define ICEGRID_CACHE_H
 
 #include "TraceLevels.h"
 #include "Util.h"

diff --git a/cpp/src/IceGrid/Database.h b/cpp/src/IceGrid/Database.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_GRID_DATABASE_H
-#define ICE_GRID_DATABASE_H
+#ifndef ICEGRID_DATABASE_H
+#define ICEGRID_DATABASE_H
 
 #include "../Ice/FileUtil.h"
 #include "AdapterCache.h"

diff --git a/cpp/src/IceGrid/DescriptorBuilder.h b/cpp/src/IceGrid/DescriptorBuilder.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_GRID_DESCRIPTOR_BUILDER_H
-#define ICE_GRID_DESCRIPTOR_BUILDER_H
+#ifndef ICEGRID_DESCRIPTOR_BUILDER_H
+#define ICEGRID_DESCRIPTOR_BUILDER_H
 
 #include "../IceXML/Parser.h"
 #include "Ice/Logger.h"

diff --git a/cpp/src/IceGrid/DescriptorHelper.h b/cpp/src/IceGrid/DescriptorHelper.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_GRID_DESCRIPTOR_HELPER_H
-#define ICE_GRID_DESCRIPTOR_HELPER_H
+#ifndef ICEGRID_DESCRIPTOR_HELPER_H
+#define ICEGRID_DESCRIPTOR_HELPER_H
 
 #include "../Ice/OutputUtil.h"
 #include "../IceXML/Parser.h"

diff --git a/cpp/src/IceGrid/FileCache.h b/cpp/src/IceGrid/FileCache.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_GRID_FILE_CACHE_H
-#define ICE_GRID_FILE_CACHE_H
+#ifndef ICEGRID_FILE_CACHE_H
+#define ICEGRID_FILE_CACHE_H
 
 #include "Ice/BuiltinSequences.h"
 #include "Ice/CommunicatorF.h"

diff --git a/cpp/src/IceGrid/FileParserI.h b/cpp/src/IceGrid/FileParserI.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_GRID_FILE_PARSERI_H
-#define ICE_GRID_FILE_PARSERI_H
+#ifndef ICEGRID_FILE_PARSERI_H
+#define ICEGRID_FILE_PARSERI_H
 
 #include "IceGrid/FileParser.h"
 

diff --git a/cpp/src/IceGrid/FileUserAccountMapperI.h b/cpp/src/IceGrid/FileUserAccountMapperI.h
@@ -2,8 +2,8 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-#ifndef ICE_GRID_FILEUSERACCOUNTMAPPERI_H
-#define ICE_GRID_FILEUSERACCOUNTMAPPERI_H
+#ifndef ICEGRID_FILEUSERACCOUNTMAPPERI_H
+#define ICEGRID_FILEUSERACCOUNTMAPPERI_H
 
 #include "IceGrid/UserAccountMapper.h"