Skip to content

Commit

Permalink
Revert updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@bernardnormier
bernardnormier committed Jan 21, 2025
1 parent 58213ac commit eb425b8
Show file tree
Hide file tree
Showing 21 changed files with 61 additions and 15 deletions.
14 changes: 14 additions & 0 deletions cpp/include/Glacier2/Config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright (c) ZeroC, Inc.

#ifndef GLACIER2_CONFIG_H
#define GLACIER2_CONFIG_H

// This header is included in all Glacier generated headers.

#include "Ice/Config.h"

#if defined(_MSC_VER) && !defined(GLACIER2_API_EXPORTS)
# pragma comment(lib, ICE_LIBNAME("Glacier2")) // Automatically link with Glacier2[D].lib
#endif

#endif
4 changes: 0 additions & 4 deletions cpp/include/Glacier2/Glacier2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,4 @@
#include "Glacier2/SSLInfo.h"
#include "Glacier2/Session.h"

#if defined(_MSC_VER) && !defined(GLACIER2_API_EXPORTS)
# pragma comment(lib, ICE_LIBNAME("Glacier2")) // Automatically link with Glacier2[D].lib
#endif

#endif
14 changes: 14 additions & 0 deletions cpp/include/IceBox/Config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright (c) ZeroC, Inc.

#ifndef ICEBOX_CONFIG_H
#define ICEBOX_CONFIG_H

// This header is included in all IceBox generated headers.

#include "Ice/Config.h"

#if defined(_MSC_VER) && !defined(ICEBOX_API_EXPORTS)
# pragma comment(lib, ICE_LIBNAME("IceBox")) // Automatically link with IceBox[D].lib
#endif

#endif
4 changes: 0 additions & 4 deletions cpp/include/IceBox/IceBox.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,4 @@
#include "IceBox/ServiceManager.h"
#include "Service.h"

#if defined(_MSC_VER) && !defined(ICEBOX_API_EXPORTS)
# pragma comment(lib, ICE_LIBNAME("IceBox")) // Automatically link with IceBox[D].lib
#endif

#endif
14 changes: 14 additions & 0 deletions cpp/include/IceGrid/Config.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright (c) ZeroC, Inc.

#ifndef ICEGRID_CONFIG_H
#define ICEGRID_CONFIG_H

// This header is included in all IceGrid generated headers.

#include "Ice/Config.h"

#if defined(_MSC_VER) && !defined(ICEGRID_API_EXPORTS)
# pragma comment(lib, ICE_LIBNAME("IceGrid")) // Automatically link with IceGrid[D].lib
#endif

#endif
4 changes: 0 additions & 4 deletions cpp/include/IceGrid/IceGrid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,4 @@
#include "IceGrid/UserAccountMapper.h"
#include "PluginFacade.h"

#if defined(_MSC_VER) && !defined(ICEGRID_API_EXPORTS)
# pragma comment(lib, ICE_LIBNAME("IceGrid")) // Automatically link with IceGrid[D].lib
#endif

#endif
2 changes: 2 additions & 0 deletions cpp/include/IceStorm/Config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
#ifndef ICESTORM_CONFIG_H
#define ICESTORM_CONFIG_H

// This header is included in the IceStorm generated header.

#include "Ice/Config.h"

#if defined(_MSC_VER) && !defined(ICESTORM_API_EXPORTS)
Expand Down
1 change: 0 additions & 1 deletion cpp/src/Glacier2Lib/NullPermissionsVerifier.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#define GLACIER2_NULL_PERMISSIONS_VERIFIER_H

#include "Glacier2/Glacier2.h"
#include "Ice/Ice.h"

#include <string>
#include <vector>
Expand Down
1 change: 1 addition & 0 deletions slice/Glacier2/Metrics.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[["cpp:dll-export:GLACIER2_API"]]
[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
[["cpp:header-ext:h"]]
[["cpp:include:Glacier2/Config.h"]]

[["js:module:ice"]]

Expand Down
1 change: 1 addition & 0 deletions slice/Glacier2/PermissionsVerifier.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[["cpp:dll-export:GLACIER2_API"]]
[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
[["cpp:header-ext:h"]]
[["cpp:include:Glacier2/Config.h"]]

[["js:module:ice"]]

Expand Down
1 change: 1 addition & 0 deletions slice/Glacier2/Router.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[["cpp:dll-export:GLACIER2_API"]]
[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
[["cpp:header-ext:h"]]
[["cpp:include:Glacier2/Config.h"]]

[["js:module:ice"]]

Expand Down
1 change: 1 addition & 0 deletions slice/Glacier2/SSLInfo.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[["cpp:dll-export:GLACIER2_API"]]
[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
[["cpp:header-ext:h"]]
[["cpp:include:Glacier2/Config.h"]]

[["js:module:ice"]]

Expand Down
1 change: 1 addition & 0 deletions slice/Glacier2/Session.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[["cpp:dll-export:GLACIER2_API"]]
[["cpp:doxygen:include:Glacier2/Glacier2.h"]]
[["cpp:header-ext:h"]]
[["cpp:include:Glacier2/Config.h"]]

[["js:module:ice"]]

Expand Down
1 change: 1 addition & 0 deletions slice/IceBox/ServiceManager.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[["cpp:dll-export:ICEBOX_API"]]
[["cpp:doxygen:include:IceBox/IceBox.h"]]
[["cpp:header-ext:h"]]
[["cpp:include:IceBox/Config.h"]]

[["js:module:ice"]]

Expand Down
1 change: 1 addition & 0 deletions slice/IceGrid/Admin.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[["cpp:dll-export:ICEGRID_API"]]
[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
[["cpp:header-ext:h"]]
[["cpp:include:IceGrid/Config.h"]]

[["js:module:ice"]]

Expand Down
4 changes: 3 additions & 1 deletion slice/IceGrid/Descriptor.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@

#pragma once

[["cpp:dll-export:ICEGRID_API"]]
[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
[["cpp:header-ext:h"]]
[["cpp:include:IceGrid/Config.h"]]

[["js:module:ice"]]

[["python:pkgdir:IceGrid"]]

[["cpp:dll-export:ICEGRID_API"]]

#include "Ice/Identity.ice"
#include "Ice/BuiltinSequences.ice"

Expand Down
4 changes: 3 additions & 1 deletion slice/IceGrid/Exception.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@

#pragma once

[["cpp:dll-export:ICEGRID_API"]]
[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
[["cpp:header-ext:h"]]
[["cpp:include:IceGrid/Config.h"]]

[["js:module:ice"]]

[["python:pkgdir:IceGrid"]]

[["cpp:dll-export:ICEGRID_API"]]

#include "Ice/Identity.ice"
#include "Ice/BuiltinSequences.ice"

Expand Down
1 change: 1 addition & 0 deletions slice/IceGrid/FileParser.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[["cpp:dll-export:ICEGRID_API"]]
[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
[["cpp:header-ext:h"]]
[["cpp:include:IceGrid/Config.h"]]

[["js:module:ice"]]

Expand Down
1 change: 1 addition & 0 deletions slice/IceGrid/Registry.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[["cpp:dll-export:ICEGRID_API"]]
[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
[["cpp:header-ext:h"]]
[["cpp:include:IceGrid/Config.h"]]

[["js:module:ice"]]

Expand Down
1 change: 1 addition & 0 deletions slice/IceGrid/Session.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[["cpp:dll-export:ICEGRID_API"]]
[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
[["cpp:header-ext:h"]]
[["cpp:include:IceGrid/Config.h"]]

[["js:module:ice"]]

Expand Down
1 change: 1 addition & 0 deletions slice/IceGrid/UserAccountMapper.ice
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[["cpp:dll-export:ICEGRID_API"]]
[["cpp:doxygen:include:IceGrid/IceGrid.h"]]
[["cpp:header-ext:h"]]
[["cpp:include:IceGrid/Config.h"]]

[["js:module:ice"]]

Expand Down

0 comments on commit eb425b8

Please sign in to comment.