Renamed namespace back to Ice

1 files changed, 10 insertions, 10 deletions

diff --git a/cppe/test/Common/TestCommon.cpp b/cppe/test/Common/TestCommon.cpp
index 5ee9aa451d6..2ef6379c910 100755
--- a/cppe/test/Common/TestCommon.cpp
+++ b/cppe/test/Common/TestCommon.cpp
@@ -18,10 +18,10 @@
 
 #include <stdarg.h>
 
-using namespace IceE;

+using namespace Ice;

 using namespace std;
 
-class LoggerI : public IceE::Logger
+class LoggerI : public Ice::Logger
 {
 public:
 

@@ -40,7 +40,7 @@ public:
 	sprintf(buf, "%ld", GetTickCount());
 	s += buf;

 #else
- 	s += IceE::Time::now().toString();
+ 	s += Ice::Time::now().toString();
 #endif
 	s += ' ';

 	
@@ -87,7 +87,7 @@ public:
 static FILE* _tprintfp = 0;
 static HWND hEdit;
 static HWND mainWnd;
-static IceE::ThreadControl mainThread;
+static Ice::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(IceE::ThreadControl() != mainThread)
+	if(Ice::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(IceE::ThreadControl() == mainThread)
+    if(Ice::ThreadControl() == mainThread)
     {
 	MSG Msg;
 	while(PeekMessage(&Msg, NULL, 0, 0, PM_REMOVE))
@@ -334,12 +334,12 @@ TestApplication::main(HINSTANCE hInstance)
 }
 #else
 

-static IceE::StaticMutex tprintMutex = ICEE_STATIC_MUTEX_INITIALIZER;

+static Ice::StaticMutex tprintMutex = ICEE_STATIC_MUTEX_INITIALIZER;

 

 void
 tprintf(const char* fmt, ...)
 {
-    IceE::StaticMutex::Lock sync(tprintMutex);
+    Ice::StaticMutex::Lock sync(tprintMutex);
 
     va_list va;
     va_start(va, fmt);
@@ -407,7 +407,7 @@ TestApplication::TestApplication(const std::string& name)
 }

 
 void
-TestApplication::setCommunicator(const IceE::CommunicatorPtr& communicator)
+TestApplication::setCommunicator(const Ice::CommunicatorPtr& communicator)
 {
     _communicator = communicator;
     _communicator->setLogger(new LoggerI);

@@ -415,7 +415,7 @@ TestApplication::setCommunicator(const IceE::CommunicatorPtr& communicator)
     //_tprintfp = fopen(("log-" + _name + ".txt").c_str(), "w");

 }
 
-IceE::CommunicatorPtr
+Ice::CommunicatorPtr
 TestApplication::communicator()
 {
     return _communicator;