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

Add support for default property values #2100

Merged
merged 19 commits into from
May 2, 2024
Merged

Add support for default property values #2100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2a49349
Add new property functions
externl May 1, 2024
fbf16f2
Restore from main
externl May 1, 2024
91abf10
.NET format
externl May 1, 2024
905aa8b
Remove some files
externl May 1, 2024
aefbcc4
Settings fix
externl May 1, 2024
149dbe5
test, not assert
externl May 1, 2024
a6a3aed
Fixes
externl May 1, 2024
71397aa
Merge branch 'main' into 2072-default-props
externl May 2, 2024
821a84d
Review fixes
externl May 2, 2024
7657f74
Update cpp/src/Ice/Properties.cpp
externl May 2, 2024
1e4d07b
Update cpp/src/Ice/Properties.cpp
externl May 2, 2024
6519355
Merge remote-tracking branch 'origin/main' into 2072-default-props
externl May 2, 2024
41bebb1
Fix property gen
externl May 2, 2024
b4fe264
Use string_view in PHP
externl May 2, 2024
ff4c917
Fix MATLAB
externl May 2, 2024
8d4138a
Fix build
externl May 2, 2024
1da54f8
Fix doc comment
externl May 2, 2024
d9413d8
Merge branch 'main' into 2072-default-props
externl May 2, 2024
121f555
.NET format
externl May 2, 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
1 change: 1 addition & 0 deletions .vscode/cspell.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"words": [
"decoratee",
"ICESTORM",
"nullopt",
"unmarshal",
"unmarshaling"
],
Expand Down
4 changes: 3 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"--rcfile=tox.ini"
],
"files.associations": {
"Make.*": "makefile",
"vector": "cpp",
"__bit_reference": "cpp",
"__config": "cpp",
Expand Down Expand Up @@ -79,7 +80,8 @@
"cassert": "cpp",
"span": "cpp",
"functional": "cpp",
"__memory": "cpp"
"__memory": "cpp",
"queue": "cpp"
},
"C_Cpp.default.cppStandard": "c++20",
}
17 changes: 9 additions & 8 deletions config/PropertyNames.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,11 +249,11 @@ generated from the section label.
</class>

<class name="connection" prefix-only="false">
<suffix name="CloseTimeout" />
<suffix name="ConnectTimeout" />
<suffix name="EnableIdleCheck" />
<suffix name="IdleTimeout" />
<suffix name="InactivityTimeout" />
<suffix name="CloseTimeout" default="10" />
<suffix name="ConnectTimeout" default="10" />
<suffix name="EnableIdleCheck" default="1" />
<suffix name="IdleTimeout" default="60" />
<suffix name="InactivityTimeout" default="300" />
</class>

<class name="threadpool" prefix-only="true">
Expand All @@ -267,7 +267,8 @@ generated from the section label.
</class>

<class name="objectadapter" prefix-only="true">
<suffix name="ACM" class="acm"/> <!-- Getting replaced by Connection -->
<!-- ACM is getting replaced by Connection -->
<suffix name="ACM" class="acm"/>
<suffix name="AdapterId" />
<suffix name="Connection" class="connection"/>
<suffix name="Endpoints" />
Expand Down Expand Up @@ -372,7 +373,7 @@ generated from the section label.
<property name="PrintProcessId" />
<property name="PrintStackTraces" />
<property name="ProgramName" />
<property name="RetryIntervals" />
<property name="RetryIntervals" default="0" />
<property name="ServerIdleTime" />
<property name="SOCKSProxyHost" />
<property name="SOCKSProxyPort" />
Expand All @@ -382,7 +383,7 @@ generated from the section label.
<property name="ThreadPool.Client" class="threadpool" />
<property name="ThreadPool.Server" class="threadpool" />
<property name="ThreadPriority"/>
<property name="ToStringMode" />
<property name="ToStringMode" default="Unicode" />
<property name="Trace.Admin.Properties" />
<property name="Trace.Admin.Logger" />
<property name="Trace.Locator" />
Expand Down
Loading