summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rwxr-xr-xcpp/demo/Database/Oracle/occi/Database.Oracle.occi.client.vcproj77
-rwxr-xr-xcpp/demo/Database/Oracle/occi/Database.Oracle.occi.server.vcproj75
-rw-r--r--cpp/demo/Database/Oracle/occi/Makefile.mak7
-rw-r--r--cpp/demo/Database/Oracle/occi/README18
-rw-r--r--cpp/demo/Database/Oracle/occi/config.client2
-rw-r--r--cpp/demo/Database/Oracle/occi/config.server5
-rw-r--r--[-rwxr-xr-x]cpp/demo/Database/Oracle/occi/createTypes.sql0
-rw-r--r--cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc24
-rwxr-xr-xcpp/demo/Database/Oracle/proc/Database.Oracle.proc.client.vcproj80
-rwxr-xr-xcpp/demo/Database/Oracle/proc/Database.Oracle.proc.server.vcproj77
-rw-r--r--cpp/demo/Database/Oracle/proc/config.client2
-rw-r--r--cpp/demo/Database/Oracle/proc/config.server2
12 files changed, 145 insertions, 224 deletions
diff --git a/cpp/demo/Database/Oracle/occi/Database.Oracle.occi.client.vcproj b/cpp/demo/Database/Oracle/occi/Database.Oracle.occi.client.vcproj
index bcd4d21f173..1fa673ffc36 100755
--- a/cpp/demo/Database/Oracle/occi/Database.Oracle.occi.client.vcproj
+++ b/cpp/demo/Database/Oracle/occi/Database.Oracle.occi.client.vcproj
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
- Name="Database.Oracle.occi.client"
+ Version="9,00"
+ Name="Database.Oracle.occi"
ProjectGUID="{8DC8367E-FC55-4BDC-AAC0-85DFA76E0074}"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -43,7 +44,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport"
+ AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport ; . ; ..\..\..\..\..\cpp\include"
PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"
StringPooling="true"
RuntimeLibrary="2"
@@ -75,8 +76,10 @@
OutputFile="client.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../../../../lib"
+ AdditionalLibraryDirectories="../../../../lib ; ..\..\..\..\..\cpp\lib"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -100,9 +103,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -135,7 +135,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport"
+ AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport ; . ; ..\..\..\..\..\cpp\include"
PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -168,10 +168,12 @@
OutputFile="client.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../../../../lib"
+ AdditionalLibraryDirectories="../../../../lib ; ..\..\..\..\..\cpp\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/client.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -195,9 +197,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -232,26 +231,8 @@
</FileConfiguration>
</File>
<File
- RelativePath="HR.cpp"
+ RelativePath=".\HR.cpp"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
</Filter>
<Filter
@@ -259,7 +240,7 @@
Filter="h;hpp;hxx;hm;inl"
>
<File
- RelativePath="HR.h"
+ RelativePath=".\HR.h"
>
</File>
</Filter>
@@ -270,26 +251,6 @@
<File
RelativePath="HR.ice"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="..\..\..\..\bin\slice2cpp.exe HR.ice&#x0D;&#x0A;"
- AdditionalDependencies="..\..\..\..\bin\slice2cpp.exe;..\..\..\..\lib\slice.lib;"
- Outputs="HR.h;HR.cpp"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="..\..\..\..\bin\slice2cpp.exe HR.ice&#x0D;&#x0A;"
- AdditionalDependencies="..\..\..\..\bin\slice2cpp.exe;..\..\..\..\lib\sliced.lib;"
- Outputs="HR.h;HR.cpp"
- />
- </FileConfiguration>
</File>
</Filter>
<File
@@ -298,5 +259,17 @@
</File>
</Files>
<Globals>
+ <Global
+ Name="ZerocIce_Enabled"
+ Value="True"
+ />
+ <Global
+ Name="ZerocIce_Home"
+ Value="..\..\..\..\.."
+ />
+ <Global
+ Name="ZerocIce_HomeExpanded"
+ Value="..\..\..\..\.."
+ />
</Globals>
</VisualStudioProject>
diff --git a/cpp/demo/Database/Oracle/occi/Database.Oracle.occi.server.vcproj b/cpp/demo/Database/Oracle/occi/Database.Oracle.occi.server.vcproj
index a2179b8ac03..372a16c3ead 100755
--- a/cpp/demo/Database/Oracle/occi/Database.Oracle.occi.server.vcproj
+++ b/cpp/demo/Database/Oracle/occi/Database.Oracle.occi.server.vcproj
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
- Name="Database.Oracle.occi.server"
+ Version="9,00"
+ Name="Database.Oracle.occi"
ProjectGUID="{C234B2E6-EE0A-44BD-AA82-CFBF3E47239D}"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -44,7 +45,7 @@
AdditionalOptions="/wd4101 /wd4291 "
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport"
+ AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport ; . ; ..\..\..\..\..\cpp\include"
PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"
StringPooling="true"
RuntimeLibrary="2"
@@ -76,8 +77,10 @@
OutputFile="server.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../../../../lib"
+ AdditionalLibraryDirectories="../../../../lib ; ..\..\..\..\..\cpp\lib"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -101,9 +104,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -137,7 +137,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/wd4101 /wd4291 "
Optimization="0"
- AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport"
+ AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport ; . ; ..\..\..\..\..\cpp\include"
PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -170,10 +170,12 @@
OutputFile="server.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../../../../lib"
+ AdditionalLibraryDirectories="../../../../lib ; ..\..\..\..\..\cpp\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/server.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -197,9 +199,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -322,26 +321,8 @@
</FileConfiguration>
</File>
<File
- RelativePath="HR.cpp"
+ RelativePath=".\HR.cpp"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="OCCIServantLocator.cpp"
@@ -435,7 +416,7 @@
>
</File>
<File
- RelativePath="HR.h"
+ RelativePath=".\HR.h"
>
</File>
<File
@@ -476,24 +457,6 @@
<File
RelativePath="HR.ice"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="..\..\..\..\bin\slice2cpp.exe $(InputPath)&#x0D;&#x0A;"
- Outputs="$(InputName).h;$(InputName).cpp"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="..\..\..\..\bin\slice2cpp.exe $(InputPath)&#x0D;&#x0A;"
- Outputs="$(InputName).h;$(InputName).cpp"
- />
- </FileConfiguration>
</File>
</Filter>
<File
@@ -506,5 +469,17 @@
</File>
</Files>
<Globals>
+ <Global
+ Name="ZerocIce_Enabled"
+ Value="True"
+ />
+ <Global
+ Name="ZerocIce_Home"
+ Value="..\..\..\..\.."
+ />
+ <Global
+ Name="ZerocIce_HomeExpanded"
+ Value="..\..\..\..\.."
+ />
</Globals>
</VisualStudioProject>
diff --git a/cpp/demo/Database/Oracle/occi/Makefile.mak b/cpp/demo/Database/Oracle/occi/Makefile.mak
index 98c5c2a0990..57281e08389 100644
--- a/cpp/demo/Database/Oracle/occi/Makefile.mak
+++ b/cpp/demo/Database/Oracle/occi/Makefile.mak
@@ -48,11 +48,12 @@ SPDBFLAGS = /pdb:$(SERVER:.exe=.pdb)
#
# OCCI first
#
-!if "$(CPP_COMPILER)" == "VC80" || "$(CPP_COMPILER)" == "VC80_EXPRESS"
+!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS"
+
#
-# oraocci10$(LIBSUFFIX).lib with Oracle 10
+# OCCI libraries default location, adjust to match your setup.
#
-ORACLE_LIBS = -LIBPATH:"$(ORACLE_HOME)\oci\lib\msvc\vc8" oraocci11$(LIBSUFFIX).lib
+ORACLE_LIBS = -LIBPATH:"$(ORACLE_HOME)\oci\lib\msvc\vc9" oraocci11$(LIBSUFFIX).lib
!else
!error "$(CPP_COMPILER) is not supported by this demo"
!endif
diff --git a/cpp/demo/Database/Oracle/occi/README b/cpp/demo/Database/Oracle/occi/README
index 2adfac9716f..9c4472a6812 100644
--- a/cpp/demo/Database/Oracle/occi/README
+++ b/cpp/demo/Database/Oracle/occi/README
@@ -18,8 +18,12 @@ Building the demo
OCCI is only available for some C++ compilers. Make sure to select a
platform and C++ compiler supported by both Ice and OCCI.
+OCCI oracle drivers are available at:
+
+ http://www.oracle.com/technology/tech/oci/occi/occidownloads.html
+
- Setup an Oracle database with the traditional EMP/DEPT schema.
- With Oracle server 10.2 and 11.1, the corresponding SQL script is
+ With Oracle server 11.1, the corresponding SQL script is
$ORACLE_HOME/rdbms/admin/utlsampl.sql.
- Ensure that your user (by default, scott) has the CREATE VIEW
@@ -44,19 +48,23 @@ platform and C++ compiler supported by both Ice and OCCI.
- Set the environment variable ORACLE_HOME to point to your Oracle
installation home directory.
-- On Windows with Visual Studio 2005 Project Files, add the
+- On Windows with Visual Studio 2008 Project Files, add the
following directories to your Visual C++ environment:
- Include files: $(ORACLE_HOME)\oci\include
- - Library files: $(ORACLE_HOME)\oci\lib\msvc\vc8
+ - Library files: $(ORACLE_HOME)\oci\lib\msvc\vc9
$(ORACLE_HOME)\oci\lib\msvc
- (make sure to list msvc\vc8 before msvc)
+ (make sure to list the driver folder before lib\msvc)
- Executable files:
- $(ORACLE_HOME)\oci\lib\msvc\vc8;$(ORACLE_HOME)\bin
+ $(ORACLE_HOME)\oci\lib\msvc\vc9;$(ORACLE_HOME)\bin
+
+ - If OCCI driver isn't installed in the standard location,
+ update Library and Executable files to match your installation
+ directories
- On Windows, when using nmake Makefiles, please review
Makefile.mak.
diff --git a/cpp/demo/Database/Oracle/occi/config.client b/cpp/demo/Database/Oracle/occi/config.client
index be8c63ec65c..0d3ec36413f 100644
--- a/cpp/demo/Database/Oracle/occi/config.client
+++ b/cpp/demo/Database/Oracle/occi/config.client
@@ -1 +1 @@
-HR.DeptFactory=DeptFactory:tcp -p 10000
+HR.DeptFactory=DeptFactory:tcp -p 12000
diff --git a/cpp/demo/Database/Oracle/occi/config.server b/cpp/demo/Database/Oracle/occi/config.server
index 0b627b50ba0..214c27de1d0 100644
--- a/cpp/demo/Database/Oracle/occi/config.server
+++ b/cpp/demo/Database/Oracle/occi/config.server
@@ -1,10 +1,7 @@
-HR.Endpoints=tcp -p 10000
+HR.Endpoints=tcp -p 12000
Ice.ThreadPool.Server.Size=5
Oracle.Username=scott
Oracle.Password=tiger
Oracle.ConnectString=orcl
-
-
-
diff --git a/cpp/demo/Database/Oracle/occi/createTypes.sql b/cpp/demo/Database/Oracle/occi/createTypes.sql
index 82fdc0fc025..82fdc0fc025 100755..100644
--- a/cpp/demo/Database/Oracle/occi/createTypes.sql
+++ b/cpp/demo/Database/Oracle/occi/createTypes.sql
diff --git a/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc b/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc
index 35e27fc3749..4bac89163a7 100644
--- a/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc
+++ b/cpp/demo/Database/Oracle/proc/CurrentSqlContext.pc
@@ -86,11 +86,33 @@ private:
}
+namespace
+{
+IceUtil::Mutex* _globalMutex = 0;
+class Init
+{
+public:
+
+ Init()
+ {
+ _globalMutex = new IceUtil::Mutex();
+ }
+
+ ~Init()
+ {
+ delete _globalMutex;
+ _globalMutex = 0;
+ }
+};
+
+Init init;
+}
+
CurrentSqlContext::CurrentSqlContext(const string& connectInfo) :
_connectInfo(connectInfo)
{
{
- IceUtil::StaticMutex::Lock lock(IceUtil::globalMutex);
+ IceUtil::Mutex::Lock lock(*_globalMutex);
_index = _currentIndex++;
}
_hook = new Notification(_index);
diff --git a/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.client.vcproj b/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.client.vcproj
index 5630f3d94d6..d4a17edbe38 100755
--- a/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.client.vcproj
+++ b/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.client.vcproj
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
- Name="Database.Oracle.proc.client"
+ Version="9,00"
+ Name="Database.Oracle.proc"
ProjectGUID="{D92187DE-BAA2-4A40-B3FA-7CFC97DD3147}"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -42,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport"
+ AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport ; . ; ..\..\..\..\..\cpp\include"
PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -75,10 +76,12 @@
OutputFile="client.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../../../../lib"
+ AdditionalLibraryDirectories="../../../../lib ; ..\..\..\..\..\cpp\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/client.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -102,9 +105,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -138,7 +138,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport"
+ AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport ; . ; ..\..\..\..\..\cpp\include"
PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"
StringPooling="true"
RuntimeLibrary="2"
@@ -170,8 +170,10 @@
OutputFile="client.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../../../../lib"
+ AdditionalLibraryDirectories="../../../../lib ; ..\..\..\..\..\cpp\lib"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -195,9 +197,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -232,26 +231,8 @@
</FileConfiguration>
</File>
<File
- RelativePath="HR.cpp"
+ RelativePath=".\HR.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
</Filter>
<Filter
@@ -259,7 +240,7 @@
Filter="h;hpp;hxx;hm;inl"
>
<File
- RelativePath="HR.h"
+ RelativePath=".\HR.h"
>
</File>
</Filter>
@@ -268,28 +249,7 @@
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
>
<File
- RelativePath="HR.ice"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="..\..\..\..\bin\slice2cpp.exe HR.ice&#x0D;&#x0A;"
- AdditionalDependencies="..\..\..\..\bin\slice2cpp.exe;..\..\..\..\lib\sliced.lib;"
- Outputs="HR.h;HR.cpp"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="..\..\..\..\bin\slice2cpp.exe HR.ice&#x0D;&#x0A;"
- AdditionalDependencies="..\..\..\..\bin\slice2cpp.exe;..\..\..\..\lib\slice.lib;"
- Outputs="HR.h;HR.cpp"
- />
- </FileConfiguration>
+ RelativePath="HR.ice">
</File>
</Filter>
<File
@@ -298,5 +258,17 @@
</File>
</Files>
<Globals>
+ <Global
+ Name="ZerocIce_Enabled"
+ Value="True"
+ />
+ <Global
+ Name="ZerocIce_Home"
+ Value="..\..\..\..\.."
+ />
+ <Global
+ Name="ZerocIce_HomeExpanded"
+ Value="..\..\..\..\.."
+ />
</Globals>
</VisualStudioProject>
diff --git a/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.server.vcproj b/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.server.vcproj
index 23728192318..071d8f9450c 100755
--- a/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.server.vcproj
+++ b/cpp/demo/Database/Oracle/proc/Database.Oracle.proc.server.vcproj
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
- Name="Database.Oracle.proc.server"
+ Version="9,00"
+ Name="Database.Oracle.proc"
ProjectGUID="{135D833C-4166-4073-8DD0-B4DCC96C9A4E}"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -43,7 +44,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport"
+ AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport ; . ; ..\..\..\..\..\cpp\include"
PreprocessorDefinitions="_CONSOLE;NDEBUG;WIN32_LEAN_AND_MEAN"
StringPooling="true"
RuntimeLibrary="2"
@@ -75,8 +76,10 @@
OutputFile="server.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../../../../lib"
+ AdditionalLibraryDirectories="../../../../lib ; ..\..\..\..\..\cpp\lib"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -100,9 +103,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -135,7 +135,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport"
+ AdditionalIncludeDirectories=".,../../../../include,../../../../include/stlport ; . ; ..\..\..\..\..\cpp\include"
PreprocessorDefinitions="_CONSOLE;_DEBUG;WIN32_LEAN_AND_MEAN"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -168,10 +168,12 @@
OutputFile="server.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
- AdditionalLibraryDirectories="../../../../lib"
+ AdditionalLibraryDirectories="../../../../lib ; ..\..\..\..\..\cpp\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/server.pdb"
SubSystem="1"
+ RandomizedBaseAddress="1"
+ DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
@@ -195,9 +197,6 @@
Name="VCAppVerifierTool"
/>
<Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -298,26 +297,8 @@
</FileConfiguration>
</File>
<File
- RelativePath="HR.cpp"
+ RelativePath=".\HR.cpp"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
</File>
<File
RelativePath="Server.cpp"
@@ -385,7 +366,7 @@
>
</File>
<File
- RelativePath="HR.h"
+ RelativePath=".\HR.h"
>
</File>
<File
@@ -488,26 +469,6 @@
<File
RelativePath="HR.ice"
>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="..\..\..\..\bin\slice2cpp.exe HR.ice&#x0D;&#x0A;"
- AdditionalDependencies="..\..\..\..\bin\slice2cpp.exe;..\..\..\..\lib\slice.lib;"
- Outputs="HR.h;HR.cpp"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="..\..\..\..\bin\slice2cpp.exe HR.ice&#x0D;&#x0A;"
- AdditionalDependencies="..\..\..\..\bin\slice2cpp.exe;..\..\..\..\lib\sliced.lib;"
- Outputs="HR.h;HR.cpp"
- />
- </FileConfiguration>
</File>
<File
RelativePath="Server.pc"
@@ -560,5 +521,17 @@
</File>
</Files>
<Globals>
+ <Global
+ Name="ZerocIce_Enabled"
+ Value="True"
+ />
+ <Global
+ Name="ZerocIce_Home"
+ Value="..\..\..\..\.."
+ />
+ <Global
+ Name="ZerocIce_HomeExpanded"
+ Value="..\..\..\..\.."
+ />
</Globals>
</VisualStudioProject>
diff --git a/cpp/demo/Database/Oracle/proc/config.client b/cpp/demo/Database/Oracle/proc/config.client
index be8c63ec65c..0d3ec36413f 100644
--- a/cpp/demo/Database/Oracle/proc/config.client
+++ b/cpp/demo/Database/Oracle/proc/config.client
@@ -1 +1 @@
-HR.DeptFactory=DeptFactory:tcp -p 10000
+HR.DeptFactory=DeptFactory:tcp -p 12000
diff --git a/cpp/demo/Database/Oracle/proc/config.server b/cpp/demo/Database/Oracle/proc/config.server
index 735c720adc8..570921bf8fa 100644
--- a/cpp/demo/Database/Oracle/proc/config.server
+++ b/cpp/demo/Database/Oracle/proc/config.server
@@ -1,4 +1,4 @@
-HR.Endpoints=tcp -p 10000
+HR.Endpoints=tcp -p 12000
Ice.ThreadPool.Server.Size=5
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 06:02:12 +0000