summaryrefslogtreecommitdiff
path: root/cppe/test
diff options
context:
space:
mode:
Diffstat (limited to 'cppe/test')
-rwxr-xr-xcppe/test/Common/TestCommon.cpp12
-rw-r--r--cppe/test/IceE/adapterDeactivation/TestI.cpp2
-rwxr-xr-xcppe/test/IceE/adapterDeactivation/adapterdeactivationC.dsp8
-rw-r--r--cppe/test/IceE/exceptions/AllTests.cpp8
-rwxr-xr-xcppe/test/IceE/exceptions/exceptionsC.dsp8
-rwxr-xr-xcppe/test/IceE/exceptions/exceptionsCOL.dsp8
-rwxr-xr-xcppe/test/IceE/facets/facetsCOL.dsp8
-rwxr-xr-xcppe/test/IceE/facets/facetsS.dsp8
-rw-r--r--cppe/test/IceE/faultTolerance/AllTests.cpp8
-rwxr-xr-xcppe/test/IceE/faultTolerance/faulttoleranceS.dsp8
-rwxr-xr-xcppe/test/IceE/inheritance/inheritanceC.dsp8
-rwxr-xr-xcppe/test/IceE/inheritance/inheritanceCOL.dsp8
-rwxr-xr-xcppe/test/IceE/inheritance/inheritanceS.dsp8
-rw-r--r--cppe/test/IceE/operations/TestI.h2
-rw-r--r--cppe/test/IceE/slicing/AllTests.cpp8
-rw-r--r--cppe/test/IceE/thread/AliveTest.cpp12
-rw-r--r--cppe/test/IceE/thread/CreateTest.cpp2
-rw-r--r--cppe/test/IceE/thread/MonitorMutexTest.cpp2
-rw-r--r--cppe/test/IceE/thread/MonitorRecMutexTest.cpp2
-rw-r--r--cppe/test/IceE/thread/MutexTest.cpp4
-rw-r--r--cppe/test/IceE/thread/RWRecMutexTest.cpp2
-rw-r--r--cppe/test/IceE/thread/RecMutexTest.cpp2
-rw-r--r--cppe/test/IceE/thread/StartTest.cpp10
-rw-r--r--cppe/test/IceE/thread/StaticMutexTest.cpp4
-rw-r--r--cppe/test/IceE/thread/TestBase.cpp2
-rw-r--r--cppe/test/IceE/thread/TestBase.h4
-rw-r--r--cppe/test/IceE/uuid/Client.cpp2
27 files changed, 80 insertions, 80 deletions
diff --git a/cppe/test/Common/TestCommon.cpp b/cppe/test/Common/TestCommon.cpp
index 570e03a2b7c..9b2ba5322fb 100755
--- a/cppe/test/Common/TestCommon.cpp
+++ b/cppe/test/Common/TestCommon.cpp
@@ -40,7 +40,7 @@ public:
sprintf(buf, "%ld", GetTickCount());
s += buf;
#else
- s += Ice::Time::now().toMilliSeconds();
+ s += IceUtil::Time::now().toMilliSeconds();
#endif
s += ' ';
@@ -87,7 +87,7 @@ public:
static FILE* _tprintfp = 0;
static HWND hEdit;
static HWND mainWnd;
-static Ice::ThreadControl mainThread;
+static IceUtil::ThreadControl mainThread;
void
tprintf(const char* fmt, ...)
@@ -130,7 +130,7 @@ tprintf(const char* fmt, ...)
// to the main thread to do the EM_REPLACESEL. Calling SendMessage
// from a thread other than main is not permitted.
//
- if(Ice::ThreadControl() != mainThread)
+ if(IceUtil::ThreadControl() != mainThread)
{
wchar_t* wtext = new wchar_t[sizeof(wchar_t) * (curr - start)+1];
mbstowcs(wtext, start, (curr - start) + 1);
@@ -159,7 +159,7 @@ tprintf(const char* fmt, ...)
//
// Process pending events.
//
- if(Ice::ThreadControl() == mainThread)
+ if(IceUtil::ThreadControl() == mainThread)
{
MSG Msg;
while(PeekMessage(&Msg, NULL, 0, 0, PM_REMOVE))
@@ -334,12 +334,12 @@ TestApplication::main(HINSTANCE hInstance)
}
#else
-static Ice::StaticMutex tprintMutex = ICEE_STATIC_MUTEX_INITIALIZER;
+static IceUtil::StaticMutex tprintMutex = ICEE_STATIC_MUTEX_INITIALIZER;
void
tprintf(const char* fmt, ...)
{
- Ice::StaticMutex::Lock sync(tprintMutex);
+ IceUtil::StaticMutex::Lock sync(tprintMutex);
va_list va;
va_start(va, fmt);
diff --git a/cppe/test/IceE/adapterDeactivation/TestI.cpp b/cppe/test/IceE/adapterDeactivation/TestI.cpp
index 1f28e15cb0d..4d8ee7030bf 100644
--- a/cppe/test/IceE/adapterDeactivation/TestI.cpp
+++ b/cppe/test/IceE/adapterDeactivation/TestI.cpp
@@ -29,7 +29,7 @@ void
TestI::deactivate(const Current& current)
{
current.adapter->deactivate();
- Ice::ThreadControl::sleep(Ice::Time::seconds(1));
+ IceUtil::ThreadControl::sleep(IceUtil::Time::seconds(1));
}
string
diff --git a/cppe/test/IceE/adapterDeactivation/adapterdeactivationC.dsp b/cppe/test/IceE/adapterDeactivation/adapterdeactivationC.dsp
index b6f7e4cb75e..e8ff034719f 100755
--- a/cppe/test/IceE/adapterDeactivation/adapterdeactivationC.dsp
+++ b/cppe/test/IceE/adapterDeactivation/adapterdeactivationC.dsp
@@ -186,7 +186,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -202,7 +202,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -218,7 +218,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -234,7 +234,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cppe/test/IceE/exceptions/AllTests.cpp b/cppe/test/IceE/exceptions/AllTests.cpp
index 8e4da6a46a7..916799366bc 100644
--- a/cppe/test/IceE/exceptions/AllTests.cpp
+++ b/cppe/test/IceE/exceptions/AllTests.cpp
@@ -18,7 +18,7 @@ class EmptyI : virtual public Empty
{
};
-class CallbackBase : public Ice::Monitor<Ice::Mutex>
+class CallbackBase : public IceUtil::Monitor<IceUtil::Mutex>
{
public:
@@ -33,10 +33,10 @@ public:
bool check()
{
- Ice::Monitor<Ice::Mutex>::Lock sync(*this);
+ IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
while(!_called)
{
- if(!timedWait(Ice::Time::seconds(5)))
+ if(!timedWait(IceUtil::Time::seconds(5)))
{
return false;
}
@@ -49,7 +49,7 @@ protected:
void called()
{
- Ice::Monitor<Ice::Mutex>::Lock sync(*this);
+ IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
assert(!_called);
_called = true;
notify();
diff --git a/cppe/test/IceE/exceptions/exceptionsC.dsp b/cppe/test/IceE/exceptions/exceptionsC.dsp
index ab22ad6d5fd..e69e01b8dd2 100755
--- a/cppe/test/IceE/exceptions/exceptionsC.dsp
+++ b/cppe/test/IceE/exceptions/exceptionsC.dsp
@@ -186,7 +186,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -202,7 +202,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -218,7 +218,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -234,7 +234,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cppe/test/IceE/exceptions/exceptionsCOL.dsp b/cppe/test/IceE/exceptions/exceptionsCOL.dsp
index 3c4f8545185..3a24f6d12dd 100755
--- a/cppe/test/IceE/exceptions/exceptionsCOL.dsp
+++ b/cppe/test/IceE/exceptions/exceptionsCOL.dsp
@@ -194,7 +194,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -210,7 +210,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -226,7 +226,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -242,7 +242,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cppe/test/IceE/facets/facetsCOL.dsp b/cppe/test/IceE/facets/facetsCOL.dsp
index 1fe4c26836b..9b6704cb744 100755
--- a/cppe/test/IceE/facets/facetsCOL.dsp
+++ b/cppe/test/IceE/facets/facetsCOL.dsp
@@ -194,7 +194,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -210,7 +210,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -226,7 +226,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -242,7 +242,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cppe/test/IceE/facets/facetsS.dsp b/cppe/test/IceE/facets/facetsS.dsp
index f6195c5eed1..f4e6d9b49a2 100755
--- a/cppe/test/IceE/facets/facetsS.dsp
+++ b/cppe/test/IceE/facets/facetsS.dsp
@@ -190,7 +190,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -206,7 +206,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -222,7 +222,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -238,7 +238,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cppe/test/IceE/faultTolerance/AllTests.cpp b/cppe/test/IceE/faultTolerance/AllTests.cpp
index 9b43d0893ca..6280d509af5 100644
--- a/cppe/test/IceE/faultTolerance/AllTests.cpp
+++ b/cppe/test/IceE/faultTolerance/AllTests.cpp
@@ -14,7 +14,7 @@
using namespace std;
using namespace Test;
-class CallbackBase : public Ice::Monitor<Ice::Mutex>
+class CallbackBase : public IceUtil::Monitor<IceUtil::Mutex>
{
public:
@@ -29,10 +29,10 @@ public:
bool check()
{
- Ice::Monitor<Ice::Mutex>::Lock sync(*this);
+ IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
while(!_called)
{
- if(!timedWait(Ice::Time::seconds(30)))
+ if(!timedWait(IceUtil::Time::seconds(30)))
{
return false;
}
@@ -45,7 +45,7 @@ protected:
void called()
{
- Ice::Monitor<Ice::Mutex>::Lock sync(*this);
+ IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
assert(!_called);
_called = true;
notify();
diff --git a/cppe/test/IceE/faultTolerance/faulttoleranceS.dsp b/cppe/test/IceE/faultTolerance/faulttoleranceS.dsp
index 6192f3e891c..25c51d4861a 100755
--- a/cppe/test/IceE/faultTolerance/faulttoleranceS.dsp
+++ b/cppe/test/IceE/faultTolerance/faulttoleranceS.dsp
@@ -190,7 +190,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -206,7 +206,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -222,7 +222,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -238,7 +238,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cppe/test/IceE/inheritance/inheritanceC.dsp b/cppe/test/IceE/inheritance/inheritanceC.dsp
index 853dac174b4..dc81c97674f 100755
--- a/cppe/test/IceE/inheritance/inheritanceC.dsp
+++ b/cppe/test/IceE/inheritance/inheritanceC.dsp
@@ -186,7 +186,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -202,7 +202,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -218,7 +218,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -234,7 +234,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cppe/test/IceE/inheritance/inheritanceCOL.dsp b/cppe/test/IceE/inheritance/inheritanceCOL.dsp
index 94ccfd5952b..d78e5f3d301 100755
--- a/cppe/test/IceE/inheritance/inheritanceCOL.dsp
+++ b/cppe/test/IceE/inheritance/inheritanceCOL.dsp
@@ -194,7 +194,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -210,7 +210,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -226,7 +226,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -242,7 +242,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cppe/test/IceE/inheritance/inheritanceS.dsp b/cppe/test/IceE/inheritance/inheritanceS.dsp
index 0b2c38520bf..f5622405b5e 100755
--- a/cppe/test/IceE/inheritance/inheritanceS.dsp
+++ b/cppe/test/IceE/inheritance/inheritanceS.dsp
@@ -190,7 +190,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -206,7 +206,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -222,7 +222,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\sliced.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -238,7 +238,7 @@ USERDEP__TEST_="$(ICE_HOME)\bin\slice2cppe.exe" "$(ICE_HOME)\lib\slice.lib"
InputPath=.\Test.ice
BuildCmds= \
- $(ICE_HOME)\bin\slice2cppe.exe Test.ice
+ slice2cppe.exe Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
diff --git a/cppe/test/IceE/operations/TestI.h b/cppe/test/IceE/operations/TestI.h
index a18e382f12d..184002e2ce2 100644
--- a/cppe/test/IceE/operations/TestI.h
+++ b/cppe/test/IceE/operations/TestI.h
@@ -172,6 +172,6 @@ private:
Ice::Context _ctx;
};
-typedef Ice::Handle<TestCheckedCastI> TestCheckedCastIPtr;
+typedef IceUtil::Handle<TestCheckedCastI> TestCheckedCastIPtr;
#endif
diff --git a/cppe/test/IceE/slicing/AllTests.cpp b/cppe/test/IceE/slicing/AllTests.cpp
index 481789f8d85..85887f0ba47 100644
--- a/cppe/test/IceE/slicing/AllTests.cpp
+++ b/cppe/test/IceE/slicing/AllTests.cpp
@@ -14,7 +14,7 @@
using namespace std;
using namespace Test;
-class CallbackBase : public Ice::Monitor<Ice::Mutex>
+class CallbackBase : public IceUtil::Monitor<IceUtil::Mutex>
{
public:
@@ -29,10 +29,10 @@ public:
bool check()
{
- Ice::Monitor<Ice::Mutex>::Lock sync(*this);
+ IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
while(!_called)
{
- if(!timedWait(Ice::Time::seconds(5)))
+ if(!timedWait(IceUtil::Time::seconds(5)))
{
return false;
}
@@ -45,7 +45,7 @@ protected:
void called()
{
- Ice::Monitor<Ice::Mutex>::Lock sync(*this);
+ IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
assert(!_called);
_called = true;
notify();
diff --git a/cppe/test/IceE/thread/AliveTest.cpp b/cppe/test/IceE/thread/AliveTest.cpp
index 15a878e3a36..0c3840ab4b4 100644
--- a/cppe/test/IceE/thread/AliveTest.cpp
+++ b/cppe/test/IceE/thread/AliveTest.cpp
@@ -12,11 +12,11 @@
#include <TestCommon.h>
using namespace std;
-using namespace Ice;
+using namespace IceUtil;
static const string createTestName("thread alive");
-class CondVar : public Ice::Monitor<Ice::RecMutex>
+class CondVar : public IceUtil::Monitor<IceUtil::RecMutex>
{
public:
@@ -27,7 +27,7 @@ public:
void waitForSignal()
{
- Ice::Monitor<Ice::RecMutex>::Lock lock(*this);
+ IceUtil::Monitor<IceUtil::RecMutex>::Lock lock(*this);
while(!_done)
{
wait();
@@ -36,7 +36,7 @@ public:
void signal()
{
- Ice::Monitor<Ice::RecMutex>::Lock lock(*this);
+ IceUtil::Monitor<IceUtil::RecMutex>::Lock lock(*this);
_done = true;
notify();
}
@@ -62,7 +62,7 @@ public:
_childCreated.signal();
_parentReady.waitForSignal();
}
- catch(Ice::ThreadLockedException &)
+ catch(IceUtil::ThreadLockedException &)
{
}
}
@@ -90,7 +90,7 @@ AliveTest::run()
CondVar childCreated;
CondVar parentReady;
AliveTestThreadPtr t = new AliveTestThread(childCreated, parentReady);
- Ice::ThreadControl c = t->start();
+ IceUtil::ThreadControl c = t->start();
childCreated.waitForSignal();
test(c.isAlive());
parentReady.signal();
diff --git a/cppe/test/IceE/thread/CreateTest.cpp b/cppe/test/IceE/thread/CreateTest.cpp
index 409c6f1eeba..d080aacd708 100644
--- a/cppe/test/IceE/thread/CreateTest.cpp
+++ b/cppe/test/IceE/thread/CreateTest.cpp
@@ -15,7 +15,7 @@
#include <TestCommon.h>
using namespace std;
-using namespace Ice;
+using namespace IceUtil;
static const string createTestName("thread create");
diff --git a/cppe/test/IceE/thread/MonitorMutexTest.cpp b/cppe/test/IceE/thread/MonitorMutexTest.cpp
index 74c9ff51f7b..38332d61df5 100644
--- a/cppe/test/IceE/thread/MonitorMutexTest.cpp
+++ b/cppe/test/IceE/thread/MonitorMutexTest.cpp
@@ -13,7 +13,7 @@
#include <TestCommon.h>
using namespace std;
-using namespace Ice;
+using namespace IceUtil;
class MonitorMutexTestThread : public Thread
{
diff --git a/cppe/test/IceE/thread/MonitorRecMutexTest.cpp b/cppe/test/IceE/thread/MonitorRecMutexTest.cpp
index b87a3063b3f..198a39837f1 100644
--- a/cppe/test/IceE/thread/MonitorRecMutexTest.cpp
+++ b/cppe/test/IceE/thread/MonitorRecMutexTest.cpp
@@ -13,7 +13,7 @@
#include <TestCommon.h>
using namespace std;
-using namespace Ice;
+using namespace IceUtil;
class MonitorRecMutexTestThread : public Thread
{
diff --git a/cppe/test/IceE/thread/MutexTest.cpp b/cppe/test/IceE/thread/MutexTest.cpp
index 06a7e3a0194..7d3cc784fc8 100644
--- a/cppe/test/IceE/thread/MutexTest.cpp
+++ b/cppe/test/IceE/thread/MutexTest.cpp
@@ -13,7 +13,7 @@
#include <TestCommon.h>
using namespace std;
-using namespace Ice;
+using namespace IceUtil;
static const string mutexTestName("mutex");
@@ -124,7 +124,7 @@ MutexTest::run()
{
test(lock.tryAcquire() == false);
}
- catch(const Ice::ThreadSyscallException& ex)
+ catch(const IceUtil::ThreadSyscallException& ex)
{
//
// pthread_mutex_trylock returns EDEADLK in FreeBSD's new threading implementation.
diff --git a/cppe/test/IceE/thread/RWRecMutexTest.cpp b/cppe/test/IceE/thread/RWRecMutexTest.cpp
index 17538e09884..ccf9d05cd86 100644
--- a/cppe/test/IceE/thread/RWRecMutexTest.cpp
+++ b/cppe/test/IceE/thread/RWRecMutexTest.cpp
@@ -14,7 +14,7 @@
#include <TestCommon.h>
using namespace std;
-using namespace Ice;
+using namespace IceUtil;
static const std::string rwRecMutexTestName("read/write recursive mutex");
diff --git a/cppe/test/IceE/thread/RecMutexTest.cpp b/cppe/test/IceE/thread/RecMutexTest.cpp
index 1b774040004..996e7d90f82 100644
--- a/cppe/test/IceE/thread/RecMutexTest.cpp
+++ b/cppe/test/IceE/thread/RecMutexTest.cpp
@@ -13,7 +13,7 @@
#include <TestCommon.h>
using namespace std;
-using namespace Ice;
+using namespace IceUtil;
static const string recMutexTestName("recursive mutex");
diff --git a/cppe/test/IceE/thread/StartTest.cpp b/cppe/test/IceE/thread/StartTest.cpp
index 9b5f6d3291e..c64e72ae0c5 100644
--- a/cppe/test/IceE/thread/StartTest.cpp
+++ b/cppe/test/IceE/thread/StartTest.cpp
@@ -15,11 +15,11 @@
#include <TestCommon.h>
using namespace std;
-using namespace Ice;
+using namespace IceUtil;
static const string createTestName("thread start");
-static Ice::Mutex threadCountMutex;
+static IceUtil::Mutex threadCountMutex;
static int threadCount = 0;
class StartTestThread : public Thread
@@ -32,7 +32,7 @@ public:
virtual void run()
{
- Ice::Mutex::Lock sync(threadCountMutex);
+ IceUtil::Mutex::Lock sync(threadCountMutex);
--threadCount;
}
};
@@ -72,7 +72,7 @@ StartTest::run()
for(int j = 0; j < 5; j++)
{
{
- Ice::Mutex::Lock sync(threadCountMutex);
+ IceUtil::Mutex::Lock sync(threadCountMutex);
++threadCount;
}
Thread* t = new StartTestThread;
@@ -84,7 +84,7 @@ StartTest::run()
while(true)
{
{
- Ice::Mutex::Lock sync(threadCountMutex);
+ IceUtil::Mutex::Lock sync(threadCountMutex);
if(threadCount == 0)
{
break;
diff --git a/cppe/test/IceE/thread/StaticMutexTest.cpp b/cppe/test/IceE/thread/StaticMutexTest.cpp
index a596928445b..712c2057004 100644
--- a/cppe/test/IceE/thread/StaticMutexTest.cpp
+++ b/cppe/test/IceE/thread/StaticMutexTest.cpp
@@ -14,7 +14,7 @@
#include <TestCommon.h>
using namespace std;
-using namespace Ice;
+using namespace IceUtil;
static const string mutexTestName("static mutex");
@@ -128,7 +128,7 @@ StaticMutexTest::run()
{
test(lock.tryAcquire() == false);
}
- catch(const Ice::ThreadSyscallException& ex)
+ catch(const IceUtil::ThreadSyscallException& ex)
{
//
// pthread_mutex_trylock returns EDEADLK in FreeBSD's new threading implementation.
diff --git a/cppe/test/IceE/thread/TestBase.cpp b/cppe/test/IceE/thread/TestBase.cpp
index d257f719a64..af7973ca019 100644
--- a/cppe/test/IceE/thread/TestBase.cpp
+++ b/cppe/test/IceE/thread/TestBase.cpp
@@ -40,7 +40,7 @@ TestBase::start()
{
run();
}
- catch(const Ice::Exception& e)
+ catch(const IceUtil::Exception& e)
{
tprintf("%s failed\n", e.toString().c_str());
throw TestFailed(_name);
diff --git a/cppe/test/IceE/thread/TestBase.h b/cppe/test/IceE/thread/TestBase.h
index e62f8457c17..7cb89266685 100644
--- a/cppe/test/IceE/thread/TestBase.h
+++ b/cppe/test/IceE/thread/TestBase.h
@@ -22,7 +22,7 @@ public:
const std::string name;
};
-class TestBase : public Ice::Shared
+class TestBase : public IceUtil::Shared
{
public:
@@ -38,6 +38,6 @@ protected:
const std::string _name;
};
-typedef Ice::Handle<TestBase> TestBasePtr;
+typedef IceUtil::Handle<TestBase> TestBasePtr;
#endif
diff --git a/cppe/test/IceE/uuid/Client.cpp b/cppe/test/IceE/uuid/Client.cpp
index cc060772310..fd3c1c44010 100644
--- a/cppe/test/IceE/uuid/Client.cpp
+++ b/cppe/test/IceE/uuid/Client.cpp
@@ -15,7 +15,7 @@
#include <set>
#include <vector>
-using namespace Ice;
+using namespace IceUtil;
using namespace std;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 14:32:12 +0000