summaryrefslogtreecommitdiff
path: root/cpp/src/Slice/JavaUtil.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2008-11-20 10:22:31 -0330
committerDwayne Boone <dwayne@zeroc.com>2008-11-20 10:22:31 -0330
commitaa4f3340e17e227a26659a75a8f60d24c2dd5323 (patch)
treec118d1d651d48f236c911d25f8a3f3b34320783f /cpp/src/Slice/JavaUtil.cpp
parentBug 3550 - slice compiler not able to open tmp file on Vista (diff)
downloadice-aa4f3340e17e227a26659a75a8f60d24c2dd5323.tar.bz2
ice-aa4f3340e17e227a26659a75a8f60d24c2dd5323.tar.xz
ice-aa4f3340e17e227a26659a75a8f60d24c2dd5323.zip
Refactored CtrlCHandler usage in slice compilers
Diffstat (limited to 'cpp/src/Slice/JavaUtil.cpp')
-rw-r--r--cpp/src/Slice/JavaUtil.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 2a2aac1ca0d..1c9675f087c 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -8,7 +8,6 @@
// **********************************************************************
#include <Slice/JavaUtil.h>
-#include <Slice/SignalHandler.h>
#include <IceUtil/Functional.h>
#include <sys/types.h>
@@ -27,19 +26,6 @@ using namespace Slice;
using namespace IceUtil;
using namespace IceUtilInternal;
-//
-// Callback for Crtl-C signal handling
-//
-static Slice::JavaGenerator* _javaGen = 0;
-
-static void closeCallback()
-{
- if(_javaGen != 0)
- {
- _javaGen->close();
- }
-}
-
Slice::JavaOutput::JavaOutput()
{
}
@@ -123,7 +109,6 @@ Slice::JavaOutput::openClass(const string& cls, const string& prefix)
path += "/";
}
path += file;
- SignalHandler::addFileForCleanup(path);
open(path.c_str());
if(isOpen())
@@ -173,7 +158,6 @@ Slice::JavaGenerator::JavaGenerator(const string& dir) :
_dir(dir),
_out(0)
{
- SignalHandler::setCloseCallback(closeCallback);
}
Slice::JavaGenerator::JavaGenerator(const string& dir, Slice::FeatureProfile profile) :
@@ -186,8 +170,6 @@ Slice::JavaGenerator::JavaGenerator(const string& dir, Slice::FeatureProfile pro
Slice::JavaGenerator::~JavaGenerator()
{
assert(_out == 0);
-
- SignalHandler::setCloseCallback(0);
}
bool
@@ -199,7 +181,6 @@ Slice::JavaGenerator::open(const string& absolute)
if(out->openClass(absolute, _dir))
{
_out = out;
- _javaGen = this; // For Ctrl-C handling
}
else
{
@@ -214,7 +195,6 @@ Slice::JavaGenerator::close()
{
assert(_out != 0);
*_out << nl;
- _javaGen = this; // For Ctrl-C handling
delete _out;
_out = 0;
}