summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1999-10-31 21:36:07 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1999-10-31 21:36:07 +0000
commit62b5ffc2feafef12c80aa64624f98de9256c58ff (patch)
treefcaae0c458bf847f6bd955669bfb6eb77c701e98
parent4319dd05b48bd894f40ace95f06b089419311aba (diff)
downloadATCD-62b5ffc2feafef12c80aa64624f98de9256c58ff.tar.gz
ChangeLogTag:Sun Oct 31 15:29:08 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
-rw-r--r--ace/Capabilities.cpp4
-rw-r--r--tests/Capabilities_Test.cpp6
-rw-r--r--tests/Makefile2
3 files changed, 8 insertions, 4 deletions
diff --git a/ace/Capabilities.cpp b/ace/Capabilities.cpp
index 163add04c32..245b7609633 100644
--- a/ace/Capabilities.cpp
+++ b/ace/Capabilities.cpp
@@ -3,6 +3,10 @@
#include "ace/Map_Manager.h"
#include "ace/Capabilities.h"
+#if !defined (__ACE_INLINE__)
+#include "ace/Capabilities.i"
+#endif /* !__ACE_INLINE__ */
+
#define ACE_ESC ((char)0x1b)
ACE_Capabilities::ACE_Capabilities (void)
diff --git a/tests/Capabilities_Test.cpp b/tests/Capabilities_Test.cpp
index 9b788193c37..d872993ad14 100644
--- a/tests/Capabilities_Test.cpp
+++ b/tests/Capabilities_Test.cpp
@@ -17,6 +17,8 @@
//
// ============================================================================
+#include "ace/Capabilities.h"
+
ACE_RCSID(tests, Capabilities_Test, "$Id$")
#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
@@ -24,12 +26,10 @@ USELIB("..\ace\aced.lib");
//---------------------------------------------------------------------------
#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-#include "ace/Capabilities.h"
-
static int
load_config (void)
{
- char *config = "captest.cfg";
+ const char *config = "captest.cfg";
ACE_Capabilities caps;
if (caps.getent (config,
diff --git a/tests/Makefile b/tests/Makefile
index 2cff7e470eb..be4c34f9491 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -17,7 +17,7 @@ BIN = Aio_Platform_Test \
Cache_Map_Manager_Test \
Cached_Accept_Conn_Test \
Cached_Conn_Test \
- Capabilities \
+ Capabilities_Test \
CDR_File_Test \
CDR_Test \
Collection_Test \