From 59949e82eac1bb5fcc48944a4773c7a56f9aa9e3 Mon Sep 17 00:00:00 2001 From: Jose Date: Wed, 16 Oct 2024 10:52:09 +0200 Subject: [PATCH] Additional Windows build fixes --- cpp/msbuild/ice.test.sln | 166 ++++++++++++++++++ cpp/src/dsnode/Node.cpp | 7 +- .../api/msbuild/writer/packages.config | 3 +- .../api/msbuild/writer/writer.vcxproj | 22 +-- .../api/msbuild/writer/writer.vcxproj.filters | 24 +-- .../callbacks/msbuild/reader/packages.config | 3 +- .../callbacks/msbuild/reader/reader.vcxproj | 14 +- .../callbacks/msbuild/writer/packages.config | 3 +- .../callbacks/msbuild/writer/writer.vcxproj | 14 +- .../config/msbuild/reader/packages.config | 3 +- .../config/msbuild/reader/reader.vcxproj | 14 +- .../config/msbuild/writer/packages.config | 3 +- .../config/msbuild/writer/writer.vcxproj | 14 +- .../events/msbuild/reader/packages.config | 3 +- .../events/msbuild/reader/reader.vcxproj | 14 +- .../events/msbuild/writer/packages.config | 3 +- .../events/msbuild/writer/writer.vcxproj | 14 +- .../partial/msbuild/reader/packages.config | 3 +- .../partial/msbuild/reader/reader.vcxproj | 14 +- .../partial/msbuild/writer/packages.config | 3 +- .../partial/msbuild/writer/writer.vcxproj | 14 +- .../msbuild/reader/packages.config | 3 +- .../reliability/msbuild/reader/reader.vcxproj | 14 +- .../msbuild/writer/packages.config | 3 +- .../reliability/msbuild/writer/writer.vcxproj | 14 +- .../types/msbuild/reader/packages.config | 3 +- .../types/msbuild/reader/reader.vcxproj | 14 +- .../types/msbuild/writer/packages.config | 3 +- .../types/msbuild/writer/writer.vcxproj | 14 +- 29 files changed, 264 insertions(+), 162 deletions(-) diff --git a/cpp/msbuild/ice.test.sln b/cpp/msbuild/ice.test.sln index a69827b3b4b..0d1146f54b2 100644 --- a/cpp/msbuild/ice.test.sln +++ b/cpp/msbuild/ice.test.sln @@ -1143,6 +1143,48 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "..\test\Ice\maxCo {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} = {C7223CC8-0AAA-470B-ACB3-12B9DE75525C} EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataStorm", "DataStorm", "{8050D625-A26F-4EA0-A74D-6095A1F13B92}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "api", "api", "{834A92DD-5964-4F16-8A9B-77F764620F55}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "callbacks", "callbacks", "{4564A657-073F-470E-A4AD-A5D947DFFEE3}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{C5A4D258-2623-42C0-95AB-8CF48ACECE56}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "events", "events", "{3A4E17C2-28FB-46AF-BE15-E1D8DBC232C9}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "partial", "partial", "{7D50B677-D295-4CAF-B555-9C87FAF4E8D6}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "reliability", "reliability", "{E435395E-2CFB-4933-941D-69EE60805093}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "types", "types", "{2618669B-54B1-4013-B6EC-C1389391E3AA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writer", "..\test\DataStorm\api\msbuild\writer\writer.vcxproj", "{85F74421-2B78-448B-91F0-496526EB365F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reader", "..\test\DataStorm\callbacks\msbuild\reader\reader.vcxproj", "{783EE047-9119-4412-960A-600729D1A0F1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writer", "..\test\DataStorm\callbacks\msbuild\writer\writer.vcxproj", "{8ADD3C14-F6A9-4683-94BE-EB87C60078F1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reader", "..\test\DataStorm\config\msbuild\reader\reader.vcxproj", "{735292B7-70CB-43B2-B7BB-D123B7497CC7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writer", "..\test\DataStorm\config\msbuild\writer\writer.vcxproj", "{1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reader", "..\test\DataStorm\events\msbuild\reader\reader.vcxproj", "{5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writer", "..\test\DataStorm\events\msbuild\writer\writer.vcxproj", "{A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reader", "..\test\DataStorm\partial\msbuild\reader\reader.vcxproj", "{3EAAF1DE-8673-4D16-AA36-F522C5C21F79}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writer", "..\test\DataStorm\partial\msbuild\writer\writer.vcxproj", "{71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reader", "..\test\DataStorm\reliability\msbuild\reader\reader.vcxproj", "{18B9E886-A355-4CCC-8E27-84900C516DA8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writer", "..\test\DataStorm\reliability\msbuild\writer\writer.vcxproj", "{71A33CBC-71F6-434B-BB90-620710269310}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reader", "..\test\DataStorm\types\msbuild\reader\reader.vcxproj", "{924B7545-4B49-41E6-9FAC-30F7BAB7A518}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "writer", "..\test\DataStorm\types\msbuild\writer\writer.vcxproj", "{6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -2663,6 +2705,110 @@ Global {2750A8E9-34AB-4A5E-ABC4-78CE41328A12}.Release|Win32.Build.0 = Release|Win32 {2750A8E9-34AB-4A5E-ABC4-78CE41328A12}.Release|x64.ActiveCfg = Release|x64 {2750A8E9-34AB-4A5E-ABC4-78CE41328A12}.Release|x64.Build.0 = Release|x64 + {85F74421-2B78-448B-91F0-496526EB365F}.Debug|Win32.ActiveCfg = Debug|Win32 + {85F74421-2B78-448B-91F0-496526EB365F}.Debug|Win32.Build.0 = Debug|Win32 + {85F74421-2B78-448B-91F0-496526EB365F}.Debug|x64.ActiveCfg = Debug|x64 + {85F74421-2B78-448B-91F0-496526EB365F}.Debug|x64.Build.0 = Debug|x64 + {85F74421-2B78-448B-91F0-496526EB365F}.Release|Win32.ActiveCfg = Release|Win32 + {85F74421-2B78-448B-91F0-496526EB365F}.Release|Win32.Build.0 = Release|Win32 + {85F74421-2B78-448B-91F0-496526EB365F}.Release|x64.ActiveCfg = Release|x64 + {85F74421-2B78-448B-91F0-496526EB365F}.Release|x64.Build.0 = Release|x64 + {783EE047-9119-4412-960A-600729D1A0F1}.Debug|Win32.ActiveCfg = Debug|Win32 + {783EE047-9119-4412-960A-600729D1A0F1}.Debug|Win32.Build.0 = Debug|Win32 + {783EE047-9119-4412-960A-600729D1A0F1}.Debug|x64.ActiveCfg = Debug|x64 + {783EE047-9119-4412-960A-600729D1A0F1}.Debug|x64.Build.0 = Debug|x64 + {783EE047-9119-4412-960A-600729D1A0F1}.Release|Win32.ActiveCfg = Release|Win32 + {783EE047-9119-4412-960A-600729D1A0F1}.Release|Win32.Build.0 = Release|Win32 + {783EE047-9119-4412-960A-600729D1A0F1}.Release|x64.ActiveCfg = Release|x64 + {783EE047-9119-4412-960A-600729D1A0F1}.Release|x64.Build.0 = Release|x64 + {8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Debug|Win32.ActiveCfg = Debug|Win32 + {8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Debug|Win32.Build.0 = Debug|Win32 + {8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Debug|x64.ActiveCfg = Debug|x64 + {8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Debug|x64.Build.0 = Debug|x64 + {8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Release|Win32.ActiveCfg = Release|Win32 + {8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Release|Win32.Build.0 = Release|Win32 + {8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Release|x64.ActiveCfg = Release|x64 + {8ADD3C14-F6A9-4683-94BE-EB87C60078F1}.Release|x64.Build.0 = Release|x64 + {735292B7-70CB-43B2-B7BB-D123B7497CC7}.Debug|Win32.ActiveCfg = Debug|Win32 + {735292B7-70CB-43B2-B7BB-D123B7497CC7}.Debug|Win32.Build.0 = Debug|Win32 + {735292B7-70CB-43B2-B7BB-D123B7497CC7}.Debug|x64.ActiveCfg = Debug|x64 + {735292B7-70CB-43B2-B7BB-D123B7497CC7}.Debug|x64.Build.0 = Debug|x64 + {735292B7-70CB-43B2-B7BB-D123B7497CC7}.Release|Win32.ActiveCfg = Release|Win32 + {735292B7-70CB-43B2-B7BB-D123B7497CC7}.Release|Win32.Build.0 = Release|Win32 + {735292B7-70CB-43B2-B7BB-D123B7497CC7}.Release|x64.ActiveCfg = Release|x64 + {735292B7-70CB-43B2-B7BB-D123B7497CC7}.Release|x64.Build.0 = Release|x64 + {1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Debug|Win32.Build.0 = Debug|Win32 + {1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Debug|x64.ActiveCfg = Debug|x64 + {1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Debug|x64.Build.0 = Debug|x64 + {1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Release|Win32.ActiveCfg = Release|Win32 + {1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Release|Win32.Build.0 = Release|Win32 + {1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Release|x64.ActiveCfg = Release|x64 + {1C5D0A06-731C-4FBB-8250-0B09E7D5BF55}.Release|x64.Build.0 = Release|x64 + {5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Debug|Win32.ActiveCfg = Debug|Win32 + {5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Debug|Win32.Build.0 = Debug|Win32 + {5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Debug|x64.ActiveCfg = Debug|x64 + {5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Debug|x64.Build.0 = Debug|x64 + {5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Release|Win32.ActiveCfg = Release|Win32 + {5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Release|Win32.Build.0 = Release|Win32 + {5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Release|x64.ActiveCfg = Release|x64 + {5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00}.Release|x64.Build.0 = Release|x64 + {A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Debug|Win32.ActiveCfg = Debug|Win32 + {A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Debug|Win32.Build.0 = Debug|Win32 + {A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Debug|x64.ActiveCfg = Debug|x64 + {A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Debug|x64.Build.0 = Debug|x64 + {A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Release|Win32.ActiveCfg = Release|Win32 + {A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Release|Win32.Build.0 = Release|Win32 + {A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Release|x64.ActiveCfg = Release|x64 + {A368BD9C-2CBC-4302-9A7F-C96BA11D62BB}.Release|x64.Build.0 = Release|x64 + {3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Debug|Win32.ActiveCfg = Debug|Win32 + {3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Debug|Win32.Build.0 = Debug|Win32 + {3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Debug|x64.ActiveCfg = Debug|x64 + {3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Debug|x64.Build.0 = Debug|x64 + {3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Release|Win32.ActiveCfg = Release|Win32 + {3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Release|Win32.Build.0 = Release|Win32 + {3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Release|x64.ActiveCfg = Release|x64 + {3EAAF1DE-8673-4D16-AA36-F522C5C21F79}.Release|x64.Build.0 = Release|x64 + {71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Debug|Win32.ActiveCfg = Debug|Win32 + {71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Debug|Win32.Build.0 = Debug|Win32 + {71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Debug|x64.ActiveCfg = Debug|x64 + {71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Debug|x64.Build.0 = Debug|x64 + {71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Release|Win32.ActiveCfg = Release|Win32 + {71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Release|Win32.Build.0 = Release|Win32 + {71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Release|x64.ActiveCfg = Release|x64 + {71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C}.Release|x64.Build.0 = Release|x64 + {18B9E886-A355-4CCC-8E27-84900C516DA8}.Debug|Win32.ActiveCfg = Debug|Win32 + {18B9E886-A355-4CCC-8E27-84900C516DA8}.Debug|Win32.Build.0 = Debug|Win32 + {18B9E886-A355-4CCC-8E27-84900C516DA8}.Debug|x64.ActiveCfg = Debug|x64 + {18B9E886-A355-4CCC-8E27-84900C516DA8}.Debug|x64.Build.0 = Debug|x64 + {18B9E886-A355-4CCC-8E27-84900C516DA8}.Release|Win32.ActiveCfg = Release|Win32 + {18B9E886-A355-4CCC-8E27-84900C516DA8}.Release|Win32.Build.0 = Release|Win32 + {18B9E886-A355-4CCC-8E27-84900C516DA8}.Release|x64.ActiveCfg = Release|x64 + {18B9E886-A355-4CCC-8E27-84900C516DA8}.Release|x64.Build.0 = Release|x64 + {71A33CBC-71F6-434B-BB90-620710269310}.Debug|Win32.ActiveCfg = Debug|Win32 + {71A33CBC-71F6-434B-BB90-620710269310}.Debug|Win32.Build.0 = Debug|Win32 + {71A33CBC-71F6-434B-BB90-620710269310}.Debug|x64.ActiveCfg = Debug|x64 + {71A33CBC-71F6-434B-BB90-620710269310}.Debug|x64.Build.0 = Debug|x64 + {71A33CBC-71F6-434B-BB90-620710269310}.Release|Win32.ActiveCfg = Release|Win32 + {71A33CBC-71F6-434B-BB90-620710269310}.Release|Win32.Build.0 = Release|Win32 + {71A33CBC-71F6-434B-BB90-620710269310}.Release|x64.ActiveCfg = Release|x64 + {71A33CBC-71F6-434B-BB90-620710269310}.Release|x64.Build.0 = Release|x64 + {924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Debug|Win32.ActiveCfg = Debug|Win32 + {924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Debug|Win32.Build.0 = Debug|Win32 + {924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Debug|x64.ActiveCfg = Debug|x64 + {924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Debug|x64.Build.0 = Debug|x64 + {924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Release|Win32.ActiveCfg = Release|Win32 + {924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Release|Win32.Build.0 = Release|Win32 + {924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Release|x64.ActiveCfg = Release|x64 + {924B7545-4B49-41E6-9FAC-30F7BAB7A518}.Release|x64.Build.0 = Release|x64 + {6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Debug|Win32.ActiveCfg = Debug|Win32 + {6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Debug|Win32.Build.0 = Debug|Win32 + {6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Debug|x64.ActiveCfg = Debug|x64 + {6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Debug|x64.Build.0 = Debug|x64 + {6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Release|Win32.ActiveCfg = Release|Win32 + {6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Release|Win32.Build.0 = Release|Win32 + {6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Release|x64.ActiveCfg = Release|x64 + {6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2944,6 +3090,26 @@ Global {286A7273-091A-4C8A-84ED-8CBB52D790A6} = {2CAF9731-CB18-498C-A3EF-24F3D8A334AC} {9A7E939A-DE60-431B-ABD2-5A44EE2CABD6} = {286A7273-091A-4C8A-84ED-8CBB52D790A6} {2750A8E9-34AB-4A5E-ABC4-78CE41328A12} = {286A7273-091A-4C8A-84ED-8CBB52D790A6} + {834A92DD-5964-4F16-8A9B-77F764620F55} = {8050D625-A26F-4EA0-A74D-6095A1F13B92} + {4564A657-073F-470E-A4AD-A5D947DFFEE3} = {8050D625-A26F-4EA0-A74D-6095A1F13B92} + {C5A4D258-2623-42C0-95AB-8CF48ACECE56} = {8050D625-A26F-4EA0-A74D-6095A1F13B92} + {3A4E17C2-28FB-46AF-BE15-E1D8DBC232C9} = {8050D625-A26F-4EA0-A74D-6095A1F13B92} + {7D50B677-D295-4CAF-B555-9C87FAF4E8D6} = {8050D625-A26F-4EA0-A74D-6095A1F13B92} + {E435395E-2CFB-4933-941D-69EE60805093} = {8050D625-A26F-4EA0-A74D-6095A1F13B92} + {2618669B-54B1-4013-B6EC-C1389391E3AA} = {8050D625-A26F-4EA0-A74D-6095A1F13B92} + {85F74421-2B78-448B-91F0-496526EB365F} = {834A92DD-5964-4F16-8A9B-77F764620F55} + {783EE047-9119-4412-960A-600729D1A0F1} = {4564A657-073F-470E-A4AD-A5D947DFFEE3} + {8ADD3C14-F6A9-4683-94BE-EB87C60078F1} = {4564A657-073F-470E-A4AD-A5D947DFFEE3} + {735292B7-70CB-43B2-B7BB-D123B7497CC7} = {C5A4D258-2623-42C0-95AB-8CF48ACECE56} + {1C5D0A06-731C-4FBB-8250-0B09E7D5BF55} = {C5A4D258-2623-42C0-95AB-8CF48ACECE56} + {5EE1FFB1-A9CF-4737-A1FA-575B51F8AE00} = {3A4E17C2-28FB-46AF-BE15-E1D8DBC232C9} + {A368BD9C-2CBC-4302-9A7F-C96BA11D62BB} = {3A4E17C2-28FB-46AF-BE15-E1D8DBC232C9} + {3EAAF1DE-8673-4D16-AA36-F522C5C21F79} = {7D50B677-D295-4CAF-B555-9C87FAF4E8D6} + {71506AF2-B7C4-48D7-AE6E-4ADA8B72A87C} = {7D50B677-D295-4CAF-B555-9C87FAF4E8D6} + {18B9E886-A355-4CCC-8E27-84900C516DA8} = {E435395E-2CFB-4933-941D-69EE60805093} + {71A33CBC-71F6-434B-BB90-620710269310} = {E435395E-2CFB-4933-941D-69EE60805093} + {924B7545-4B49-41E6-9FAC-30F7BAB7A518} = {2618669B-54B1-4013-B6EC-C1389391E3AA} + {6CFEBEB6-88C6-4A41-847E-E02CFDCD12C8} = {2618669B-54B1-4013-B6EC-C1389391E3AA} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {E6FDB68A-64BA-4577-ABCD-40A01257F8AB} diff --git a/cpp/src/dsnode/Node.cpp b/cpp/src/dsnode/Node.cpp index a59a34c935d..4eb815d2d57 100644 --- a/cpp/src/dsnode/Node.cpp +++ b/cpp/src/dsnode/Node.cpp @@ -1,13 +1,14 @@ // // Copyright (c) ZeroC, Inc. All rights reserved. // -#include + +#include "DataStorm/DataStorm.h" #include using namespace std; -void +static void usage(const string& n) { cerr << "Usage: " << n << " [options]\n"; @@ -29,7 +30,7 @@ main(int argc, char* argv[]) string arg = argv[i]; if (arg == "-v" || arg == "--version") { - cout << DATASTORM_STRING_VERSION << endl; + cout << ICE_STRING_VERSION << endl; return 0; } else if (arg == "-h" || arg == "--help") diff --git a/cpp/test/DataStorm/api/msbuild/writer/packages.config b/cpp/test/DataStorm/api/msbuild/writer/packages.config index 26eaca3450c..d67b054a90d 100644 --- a/cpp/test/DataStorm/api/msbuild/writer/packages.config +++ b/cpp/test/DataStorm/api/msbuild/writer/packages.config @@ -1,6 +1,5 @@  - - \ No newline at end of file + diff --git a/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj b/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj index 60d1db5fd3e..309bf9ac738 100644 --- a/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj +++ b/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj @@ -1,7 +1,6 @@  - - + @@ -23,13 +22,13 @@ - + true true true ..\..\Test.ice - + true true true @@ -55,13 +54,13 @@ - + true true true ..\..\Test.ice - + true true true @@ -105,11 +104,10 @@ $(DefaultPlatformToolset) - + - - + @@ -157,10 +155,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + diff --git a/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj.filters b/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj.filters index 58e1d1122c9..7a2ec951b94 100644 --- a/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj.filters +++ b/cpp/test/DataStorm/api/msbuild/writer/writer.vcxproj.filters @@ -52,18 +52,18 @@ Source Files - - Source Files\Win32\Debug - Source Files\x64\Debug - - Source Files\Win32\Release - Source Files\x64\Release + + Source Files\Win32\Debug + + + Source Files\Win32\Release + @@ -74,17 +74,17 @@ - - Header Files\Win32\Debug - Header Files\x64\Debug - - Header Files\Win32\Release - Header Files\x64\Release + + Header Files\Win32\Debug + + + Header Files\Win32\Release + \ No newline at end of file diff --git a/cpp/test/DataStorm/callbacks/msbuild/reader/packages.config b/cpp/test/DataStorm/callbacks/msbuild/reader/packages.config index 933aaa1ac5e..9a5f7b2c74a 100644 --- a/cpp/test/DataStorm/callbacks/msbuild/reader/packages.config +++ b/cpp/test/DataStorm/callbacks/msbuild/reader/packages.config @@ -1,5 +1,4 @@  - - \ No newline at end of file + diff --git a/cpp/test/DataStorm/callbacks/msbuild/reader/reader.vcxproj b/cpp/test/DataStorm/callbacks/msbuild/reader/reader.vcxproj index 9a256f22c32..2281cf47cd3 100644 --- a/cpp/test/DataStorm/callbacks/msbuild/reader/reader.vcxproj +++ b/cpp/test/DataStorm/callbacks/msbuild/reader/reader.vcxproj @@ -1,7 +1,6 @@  - - + Debug @@ -51,10 +50,9 @@ $(DefaultPlatformToolset) - + - - + @@ -98,9 +96,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + diff --git a/cpp/test/DataStorm/callbacks/msbuild/writer/packages.config b/cpp/test/DataStorm/callbacks/msbuild/writer/packages.config index 933aaa1ac5e..9a5f7b2c74a 100644 --- a/cpp/test/DataStorm/callbacks/msbuild/writer/packages.config +++ b/cpp/test/DataStorm/callbacks/msbuild/writer/packages.config @@ -1,5 +1,4 @@  - - \ No newline at end of file + diff --git a/cpp/test/DataStorm/callbacks/msbuild/writer/writer.vcxproj b/cpp/test/DataStorm/callbacks/msbuild/writer/writer.vcxproj index 556a629f3f9..f9d91232844 100644 --- a/cpp/test/DataStorm/callbacks/msbuild/writer/writer.vcxproj +++ b/cpp/test/DataStorm/callbacks/msbuild/writer/writer.vcxproj @@ -1,7 +1,6 @@  - - + Debug @@ -51,10 +50,9 @@ $(DefaultPlatformToolset) - + - - + @@ -98,9 +96,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + diff --git a/cpp/test/DataStorm/config/msbuild/reader/packages.config b/cpp/test/DataStorm/config/msbuild/reader/packages.config index 933aaa1ac5e..9a5f7b2c74a 100644 --- a/cpp/test/DataStorm/config/msbuild/reader/packages.config +++ b/cpp/test/DataStorm/config/msbuild/reader/packages.config @@ -1,5 +1,4 @@  - - \ No newline at end of file + diff --git a/cpp/test/DataStorm/config/msbuild/reader/reader.vcxproj b/cpp/test/DataStorm/config/msbuild/reader/reader.vcxproj index 8a5b817e6eb..4279ae9109e 100644 --- a/cpp/test/DataStorm/config/msbuild/reader/reader.vcxproj +++ b/cpp/test/DataStorm/config/msbuild/reader/reader.vcxproj @@ -1,7 +1,6 @@  - - + Debug @@ -51,10 +50,9 @@ $(DefaultPlatformToolset) - + - - + @@ -98,9 +96,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + diff --git a/cpp/test/DataStorm/config/msbuild/writer/packages.config b/cpp/test/DataStorm/config/msbuild/writer/packages.config index 933aaa1ac5e..9a5f7b2c74a 100644 --- a/cpp/test/DataStorm/config/msbuild/writer/packages.config +++ b/cpp/test/DataStorm/config/msbuild/writer/packages.config @@ -1,5 +1,4 @@  - - \ No newline at end of file + diff --git a/cpp/test/DataStorm/config/msbuild/writer/writer.vcxproj b/cpp/test/DataStorm/config/msbuild/writer/writer.vcxproj index 5e3f644b8a7..4bfc57888e7 100644 --- a/cpp/test/DataStorm/config/msbuild/writer/writer.vcxproj +++ b/cpp/test/DataStorm/config/msbuild/writer/writer.vcxproj @@ -1,7 +1,6 @@  - - + Debug @@ -51,10 +50,9 @@ $(DefaultPlatformToolset) - + - - + @@ -98,9 +96,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + diff --git a/cpp/test/DataStorm/events/msbuild/reader/packages.config b/cpp/test/DataStorm/events/msbuild/reader/packages.config index 26eaca3450c..d67b054a90d 100644 --- a/cpp/test/DataStorm/events/msbuild/reader/packages.config +++ b/cpp/test/DataStorm/events/msbuild/reader/packages.config @@ -1,6 +1,5 @@  - - \ No newline at end of file + diff --git a/cpp/test/DataStorm/events/msbuild/reader/reader.vcxproj b/cpp/test/DataStorm/events/msbuild/reader/reader.vcxproj index d2ba5f08327..09c79fe95da 100644 --- a/cpp/test/DataStorm/events/msbuild/reader/reader.vcxproj +++ b/cpp/test/DataStorm/events/msbuild/reader/reader.vcxproj @@ -1,7 +1,6 @@  - - + @@ -105,11 +104,10 @@ $(DefaultPlatformToolset) - + - - + @@ -157,10 +155,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + diff --git a/cpp/test/DataStorm/events/msbuild/writer/packages.config b/cpp/test/DataStorm/events/msbuild/writer/packages.config index 26eaca3450c..d67b054a90d 100644 --- a/cpp/test/DataStorm/events/msbuild/writer/packages.config +++ b/cpp/test/DataStorm/events/msbuild/writer/packages.config @@ -1,6 +1,5 @@  - - \ No newline at end of file + diff --git a/cpp/test/DataStorm/events/msbuild/writer/writer.vcxproj b/cpp/test/DataStorm/events/msbuild/writer/writer.vcxproj index 8d4dd0abf5d..d532ffc4bb1 100644 --- a/cpp/test/DataStorm/events/msbuild/writer/writer.vcxproj +++ b/cpp/test/DataStorm/events/msbuild/writer/writer.vcxproj @@ -1,7 +1,6 @@  - - + @@ -105,11 +104,10 @@ $(DefaultPlatformToolset) - + - - + @@ -157,10 +155,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + diff --git a/cpp/test/DataStorm/partial/msbuild/reader/packages.config b/cpp/test/DataStorm/partial/msbuild/reader/packages.config index 26eaca3450c..d67b054a90d 100644 --- a/cpp/test/DataStorm/partial/msbuild/reader/packages.config +++ b/cpp/test/DataStorm/partial/msbuild/reader/packages.config @@ -1,6 +1,5 @@  - - \ No newline at end of file + diff --git a/cpp/test/DataStorm/partial/msbuild/reader/reader.vcxproj b/cpp/test/DataStorm/partial/msbuild/reader/reader.vcxproj index 94ba1c45117..f58636d4119 100644 --- a/cpp/test/DataStorm/partial/msbuild/reader/reader.vcxproj +++ b/cpp/test/DataStorm/partial/msbuild/reader/reader.vcxproj @@ -1,7 +1,6 @@  - - + @@ -105,11 +104,10 @@ $(DefaultPlatformToolset) - + - - + @@ -157,10 +155,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + diff --git a/cpp/test/DataStorm/partial/msbuild/writer/packages.config b/cpp/test/DataStorm/partial/msbuild/writer/packages.config index 26eaca3450c..d67b054a90d 100644 --- a/cpp/test/DataStorm/partial/msbuild/writer/packages.config +++ b/cpp/test/DataStorm/partial/msbuild/writer/packages.config @@ -1,6 +1,5 @@  - - \ No newline at end of file + diff --git a/cpp/test/DataStorm/partial/msbuild/writer/writer.vcxproj b/cpp/test/DataStorm/partial/msbuild/writer/writer.vcxproj index 0a673630ad1..e237415ba9a 100644 --- a/cpp/test/DataStorm/partial/msbuild/writer/writer.vcxproj +++ b/cpp/test/DataStorm/partial/msbuild/writer/writer.vcxproj @@ -1,7 +1,6 @@  - - + @@ -105,11 +104,10 @@ $(DefaultPlatformToolset) - + - - + @@ -157,10 +155,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + diff --git a/cpp/test/DataStorm/reliability/msbuild/reader/packages.config b/cpp/test/DataStorm/reliability/msbuild/reader/packages.config index 933aaa1ac5e..9a5f7b2c74a 100644 --- a/cpp/test/DataStorm/reliability/msbuild/reader/packages.config +++ b/cpp/test/DataStorm/reliability/msbuild/reader/packages.config @@ -1,5 +1,4 @@  - - \ No newline at end of file + diff --git a/cpp/test/DataStorm/reliability/msbuild/reader/reader.vcxproj b/cpp/test/DataStorm/reliability/msbuild/reader/reader.vcxproj index 39c72c741f7..0d530ff4695 100644 --- a/cpp/test/DataStorm/reliability/msbuild/reader/reader.vcxproj +++ b/cpp/test/DataStorm/reliability/msbuild/reader/reader.vcxproj @@ -1,7 +1,6 @@  - - + Debug @@ -51,10 +50,9 @@ $(DefaultPlatformToolset) - + - - + @@ -98,9 +96,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + diff --git a/cpp/test/DataStorm/reliability/msbuild/writer/packages.config b/cpp/test/DataStorm/reliability/msbuild/writer/packages.config index 933aaa1ac5e..9a5f7b2c74a 100644 --- a/cpp/test/DataStorm/reliability/msbuild/writer/packages.config +++ b/cpp/test/DataStorm/reliability/msbuild/writer/packages.config @@ -1,5 +1,4 @@  - - \ No newline at end of file + diff --git a/cpp/test/DataStorm/reliability/msbuild/writer/writer.vcxproj b/cpp/test/DataStorm/reliability/msbuild/writer/writer.vcxproj index 1707c2609d9..f743ec72d15 100644 --- a/cpp/test/DataStorm/reliability/msbuild/writer/writer.vcxproj +++ b/cpp/test/DataStorm/reliability/msbuild/writer/writer.vcxproj @@ -1,7 +1,6 @@  - - + Debug @@ -51,10 +50,9 @@ $(DefaultPlatformToolset) - + - - + @@ -98,9 +96,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + diff --git a/cpp/test/DataStorm/types/msbuild/reader/packages.config b/cpp/test/DataStorm/types/msbuild/reader/packages.config index 26eaca3450c..d67b054a90d 100644 --- a/cpp/test/DataStorm/types/msbuild/reader/packages.config +++ b/cpp/test/DataStorm/types/msbuild/reader/packages.config @@ -1,6 +1,5 @@  - - \ No newline at end of file + diff --git a/cpp/test/DataStorm/types/msbuild/reader/reader.vcxproj b/cpp/test/DataStorm/types/msbuild/reader/reader.vcxproj index ee364804d60..35164ca2eb6 100644 --- a/cpp/test/DataStorm/types/msbuild/reader/reader.vcxproj +++ b/cpp/test/DataStorm/types/msbuild/reader/reader.vcxproj @@ -1,7 +1,6 @@  - - + @@ -105,11 +104,10 @@ $(DefaultPlatformToolset) - + - - + @@ -157,10 +155,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + diff --git a/cpp/test/DataStorm/types/msbuild/writer/packages.config b/cpp/test/DataStorm/types/msbuild/writer/packages.config index 26eaca3450c..d67b054a90d 100644 --- a/cpp/test/DataStorm/types/msbuild/writer/packages.config +++ b/cpp/test/DataStorm/types/msbuild/writer/packages.config @@ -1,6 +1,5 @@  - - \ No newline at end of file + diff --git a/cpp/test/DataStorm/types/msbuild/writer/writer.vcxproj b/cpp/test/DataStorm/types/msbuild/writer/writer.vcxproj index 4bd5beb9930..be01c0fb374 100644 --- a/cpp/test/DataStorm/types/msbuild/writer/writer.vcxproj +++ b/cpp/test/DataStorm/types/msbuild/writer/writer.vcxproj @@ -1,7 +1,6 @@  - - + @@ -105,11 +104,10 @@ $(DefaultPlatformToolset) - + - - + @@ -157,10 +155,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + +