Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bring DataStorm into Ice 3.8 #2902

Merged
merged 13 commits into from
Oct 17, 2024
Merged

Bring DataStorm into Ice 3.8 #2902

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ce85e2e
Integrate DataStorm into Ice 3.8
pepone Oct 15, 2024
afa87b9
GCC build fixes
pepone Oct 15, 2024
4bd1bbd
Windows build fixes
pepone Oct 15, 2024
59949e8
Additional Windows build fixes
pepone Oct 16, 2024
2b4c22d
Formatting fixes
pepone Oct 16, 2024
ac5a485
whitespace cleanup
pepone Oct 16, 2024
f596327
Doxygen fixes
pepone Oct 16, 2024
5e67e61
Clang format
pepone Oct 16, 2024
1b55935
Run DataStorm tests on main thread
pepone Oct 16, 2024
c515751
Remove workaround for using "regex.h" with old GCC versions
pepone Oct 16, 2024
8765229
Fix Win32 build
pepone Oct 16, 2024
efc3163
Do not use fixed ports for DataStorm tests
pepone Oct 16, 2024
c09b0cb
Avoid using fixed ports with DataStorm/reliability test
pepone Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions cpp/include/DataStorm/Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// Copyright (c) ZeroC, Inc. All rights reserved.
//

#ifndef DATASTORM_CONFIG_H
#define DATASTORM_CONFIG_H

#include "Ice/Config.h"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Simplified this file to align with other Xxx/Config.h in this repository.


#if !defined(ICE_BUILDING_DATASTORM) && defined(DATASTORM_API_EXPORTS)
# define ICE_BUILDING_DATASTORM
#endif

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

#ifndef DATASTORM_API
# if defined(DATASTORM_API_EXPORTS)
# define DATASTORM_API ICE_DECLSPEC_EXPORT
# else
# define DATASTORM_API ICE_DECLSPEC_IMPORT
# endif
#endif

#endif
Loading
Loading