Skip to content

Commit b319e8e

Browse files
committed
[GEN] Upgrate to c++20 (#484)
1 parent cd22458 commit b319e8e

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

Generals/Code/GameEngine/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,6 +1083,7 @@ target_link_libraries(g_gameengine PUBLIC
10831083
g_compression
10841084
g_wwvegas
10851085
gz_config
1086+
gz_utility
10861087
gamespy::gamespy
10871088
stlport
10881089
)

Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
#include <Common/GameMemory.h>
5252
#include "EABrowserDispatch/BrowserDispatch.h"
5353
#include "FEBDispatch.h"
54+
#include <Utility/CppMacros.h>
5455

5556
class GameWindow;
5657

@@ -112,9 +113,9 @@ class WebBrowser :
112113
// IUnknown methods
113114
//---------------------------------------------------------------------------
114115
protected:
115-
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
116-
ULONG STDMETHODCALLTYPE AddRef(void);
117-
ULONG STDMETHODCALLTYPE Release(void);
116+
HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) NOEXCEPT_17;
117+
ULONG STDMETHODCALLTYPE AddRef(void) NOEXCEPT_17;
118+
ULONG STDMETHODCALLTYPE Release(void) NOEXCEPT_17;
118119

119120
//---------------------------------------------------------------------------
120121
// IBrowserDispatch methods

Generals/Code/GameEngine/Source/GameNetwork/WOLBrowser/WebBrowser.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ WebBrowserURL * WebBrowser::makeNewURL(AsciiString tag)
237237
*
238238
******************************************************************************/
239239

240-
STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv)
240+
STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv) NOEXCEPT_17
241241
{
242242
*ppv = NULL;
243243

@@ -270,7 +270,7 @@ STDMETHODIMP WebBrowser::QueryInterface(REFIID iid, void** ppv)
270270
*
271271
******************************************************************************/
272272

273-
ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void)
273+
ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void) NOEXCEPT_17
274274
{
275275
return ++mRefCount;
276276
}
@@ -290,7 +290,7 @@ ULONG STDMETHODCALLTYPE WebBrowser::AddRef(void)
290290
*
291291
******************************************************************************/
292292

293-
ULONG STDMETHODCALLTYPE WebBrowser::Release(void)
293+
ULONG STDMETHODCALLTYPE WebBrowser::Release(void) NOEXCEPT_17
294294
{
295295
DEBUG_ASSERTCRASH(mRefCount > 0, ("Negative reference count"));
296296
--mRefCount;

Generals/Code/Libraries/Source/WWVegas/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ add_library(g_wwcommon INTERFACE)
44
target_link_libraries(g_wwcommon INTERFACE
55
d3d8lib
66
gz_config
7+
gz_utility
78
milesstub
89
stlport
910
)

0 commit comments

Comments
 (0)