[Guessnet-devel] [svn] r184 - in trunk: . src

[Enrico Zini]

Author: enrico
Date: Mon Mar 19 14:54:59 2007
New Revision: 184

Modified:
   trunk/   (props changed)
   trunk/src/NetSender.cc
   trunk/src/NetWatcher.cc
   trunk/src/ProcessRunner.cc
   trunk/src/guessnet.cc
Log:
 r467 at viaza:  enrico | 2007-03-19 14:58:08 +0000
 Removed throw() on thread main functions to allow funky nameless uncatchable cancelation exceptions to pass through (some eplanation is here: http://groups.google.com/group/comp.programming.threads/browse_thread/thread/652bcf186fbbf697/f63757846514e5e5)
 


Modified: trunk/src/NetSender.cc
==============================================================================
--- trunk/src/NetSender.cc	(original)
+++ trunk/src/NetSender.cc	Mon Mar 19 14:54:59 2007
@@ -66,7 +66,7 @@
 	// Libnet context
 	libnet_t* ln_context;
 
-	virtual void* main() throw ();
+	virtual void* main();
 
 	Buffer nextPacket() throw ();
 
@@ -222,7 +222,7 @@
 	}
 }
 
-void* NetSenderImpl::main() throw ()
+void* NetSenderImpl::main()
 {
 	// Let the signals be caught by some other process
 		DEBUG("NS-Main-Start\n");

Modified: trunk/src/NetWatcher.cc
==============================================================================
--- trunk/src/NetWatcher.cc	(original)
+++ trunk/src/NetWatcher.cc	Mon Mar 19 14:54:59 2007
@@ -59,7 +59,7 @@
 
 	struct libnet_link_int* link_interface;
 
-	virtual void* main() throw ();
+	virtual void* main();
 
 public:
 	NetWatcherImpl(const string& iface) throw (wibble::exception::System, wibble::exception::Pcap)
@@ -125,7 +125,7 @@
 }
 */
 
-void* NetWatcherImpl::main() throw ()
+void* NetWatcherImpl::main()
 {
 	struct pcap_pkthdr pcap_header;
 

Modified: trunk/src/ProcessRunner.cc
==============================================================================
--- trunk/src/ProcessRunner.cc	(original)
+++ trunk/src/ProcessRunner.cc	Mon Mar 19 14:54:59 2007
@@ -55,10 +55,10 @@
 		: tag(tag), iface(iface), cmdline(cmdline) {}
 	virtual ~Script() throw () {}
 
-	virtual int main() throw ();
+	virtual int main();
 };
 
-int Script::main() throw ()
+int Script::main()
 {
 	try {
 		ShellCommand cmd(cmdline);
@@ -99,7 +99,7 @@
 	bool requested_shutdown;
 	bool running;
 
-	virtual void* main() throw ();
+	virtual void* main();
 
 public:
 	ProcessRunnerImpl() throw () : _ref(0), requested_shutdown(false), running(true) {}
@@ -160,7 +160,7 @@
 	//kill(SIGCHLD);
 }
 
-void* ProcessRunnerImpl::main() throw ()
+void* ProcessRunnerImpl::main()
 {
 	// FIXME: Whatever the man pages tell about wait, it seems that  all
 	// process handling needs to be done in the same thread.  With the bad

Modified: trunk/src/guessnet.cc
==============================================================================
--- trunk/src/guessnet.cc	(original)
+++ trunk/src/guessnet.cc	Mon Mar 19 14:54:59 2007
@@ -142,7 +142,7 @@
 protected:
 	bool _canceled;
 	
-	virtual void* main() throw ()
+	virtual void* main()
 	{
 		interact();
 		return 0;