summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-08-21 18:13:59 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-08-21 18:13:59 +0000
commit7e8648ac2d53b73760d6d0066942451f0d8f3da8 (patch)
treeae65e39b5ac00fd394214a6d0640d2284cbae14c /apps
parent08848eaff75a515460a7065191d1b8a9d509a524 (diff)
downloadATCD-7e8648ac2d53b73760d6d0066942451f0d8f3da8.tar.gz
ChangeLogTag:Thu Aug 21 13:08:43 1997 Carlos O'Ryan <coryan@swarm.cs.wustl.edu>
Diffstat (limited to 'apps')
-rw-r--r--apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp2
-rw-r--r--apps/Gateway/Gateway/Makefile1
-rw-r--r--apps/JAWS/clients/Blobby/Blob_Handler.cpp2
-rw-r--r--apps/JAWS/server/HTTP_Server.cpp20
-rw-r--r--apps/JAWS/server/Makefile1
5 files changed, 5 insertions, 21 deletions
diff --git a/apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp b/apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp
index d0fe542b299..fb24265b6f5 100644
--- a/apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp
+++ b/apps/Gateway/Gateway/Concrete_Proxy_Handlers.cpp
@@ -591,7 +591,7 @@ Thr_Supplier_Proxy::svc (void)
ACE_OS::sleep (tv);
}
}
- return 0;
+ ACE_NOTREACHED(return 0);
}
#endif /* ACE_HAS_THREADS */
diff --git a/apps/Gateway/Gateway/Makefile b/apps/Gateway/Gateway/Makefile
index 9b19f89b16e..5e4560a0170 100644
--- a/apps/Gateway/Gateway/Makefile
+++ b/apps/Gateway/Gateway/Makefile
@@ -27,7 +27,6 @@ LOBJ = $(addsuffix .o,$(FILES))
SHOBJ = $(addsuffix .so,$(FILES))
LDLIBS = -lGateway
-LIBS = -lACE
VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/apps/JAWS/clients/Blobby/Blob_Handler.cpp
index 34130d4f4ed..4a166ad1ff6 100644
--- a/apps/JAWS/clients/Blobby/Blob_Handler.cpp
+++ b/apps/JAWS/clients/Blobby/Blob_Handler.cpp
@@ -330,7 +330,7 @@ ACE_Blob_Writer::receive_reply (void)
char *description = ACE_OS::strtok_r (NULL, "\n\r", &lasts);
ACE_ERROR_RETURN((LM_ERROR, "%p\n", description), -1);
}
- return 0;
+ ACE_NOTREACHED(return 0);
}
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/apps/JAWS/server/HTTP_Server.cpp b/apps/JAWS/server/HTTP_Server.cpp
index 9523bb87d51..4fd60d00677 100644
--- a/apps/JAWS/server/HTTP_Server.cpp
+++ b/apps/JAWS/server/HTTP_Server.cpp
@@ -129,7 +129,7 @@ HTTP_Server::init (int argc, char *argv[])
default:
return this->synch_thread_pool ();
}
- return 0;
+ ACE_NOTREACHED(return 0);
}
int
@@ -205,14 +205,7 @@ Synch_Thread_Pool_Task::svc (void)
" (%t) in Synch_Thread_Pool_Task::svc, recycling\n"));
}
- // This stinks, because I am afraid that if I remove this line, some
- // compiler will issue a warning that this routine could exit
- // without returning a value. But, leaving it in makes the VXWORKS
- // compiler complain about an unreachable statement.
-
-#if ! defined(VXWORKS)
- return 0;
-#endif /* VXWORKS */
+ ACE_NOTREACHED(return 0);
}
int
@@ -254,14 +247,7 @@ HTTP_Server::thread_per_request (void)
this->tm_.wait (&wait_time);
}
- // This stinks, because I am afraid that if I remove this line, some
- // compiler will issue a warning that this routine could exit
- // without returning a value. But, leaving it in makes the VXWORKS
- // compiler complain about an unreachable statement.
-
-#if ! defined(VXWORKS)
- return 0;
-#endif /* VXWORKS */
+ ACE_NOTREACHED(return 0);
}
Thread_Per_Request_Task::Thread_Per_Request_Task (ACE_HANDLE handle,
diff --git a/apps/JAWS/server/Makefile b/apps/JAWS/server/Makefile
index b32ad05f13c..a87b7f2eda0 100644
--- a/apps/JAWS/server/Makefile
+++ b/apps/JAWS/server/Makefile
@@ -28,7 +28,6 @@ LOBJ = $(addsuffix .o,$(FILES))
VLDLIBS = $(LDLIBS:%=%$(VAR))
LDLIBS = -lJAWS
-LIBS = -lACE
BUILD = $(VOBJS) $(VLIB) $(VBIN)