summaryrefslogtreecommitdiff
path: root/ACE/ASNMP
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/ASNMP')
-rw-r--r--ACE/ASNMP/Makefile.am2
-rw-r--r--ACE/ASNMP/agent/Makefile.am3
-rw-r--r--ACE/ASNMP/asnmp/Makefile.am2
-rw-r--r--ACE/ASNMP/examples/Makefile.am2
-rw-r--r--ACE/ASNMP/examples/get/Makefile.am4
-rw-r--r--ACE/ASNMP/examples/next/Makefile.am3
-rw-r--r--ACE/ASNMP/examples/set/Makefile.am3
-rw-r--r--ACE/ASNMP/examples/trap/Makefile.am3
-rw-r--r--ACE/ASNMP/examples/walk/Makefile.am3
-rw-r--r--ACE/ASNMP/tests/Makefile.am11
-rw-r--r--ACE/ASNMP/tests/test_config.h38
11 files changed, 40 insertions, 34 deletions
diff --git a/ACE/ASNMP/Makefile.am b/ACE/ASNMP/Makefile.am
index 7ff1160c8a3..fa06f83a3c9 100644
--- a/ACE/ASNMP/Makefile.am
+++ b/ACE/ASNMP/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
SUBDIRS = \
asnmp \
diff --git a/ACE/ASNMP/agent/Makefile.am b/ACE/ASNMP/agent/Makefile.am
index afb76da40ed..b37fe7aec9e 100644
--- a/ACE/ASNMP/agent/Makefile.am
+++ b/ACE/ASNMP/agent/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
ACE_BUILDDIR = $(top_builddir)
ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
## Makefile.asnmp_agent.am
if !BUILD_USES_WCHAR
-
noinst_PROGRAMS = agent
agent_CPPFLAGS = \
diff --git a/ACE/ASNMP/asnmp/Makefile.am b/ACE/ASNMP/asnmp/Makefile.am
index 7b117dab9f6..71347a6d858 100644
--- a/ACE/ASNMP/asnmp/Makefile.am
+++ b/ACE/ASNMP/asnmp/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
ACE_BUILDDIR = $(top_builddir)
ACE_ROOT = $(top_srcdir)
diff --git a/ACE/ASNMP/examples/Makefile.am b/ACE/ASNMP/examples/Makefile.am
index ba48f01c667..1855938d914 100644
--- a/ACE/ASNMP/examples/Makefile.am
+++ b/ACE/ASNMP/examples/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
SUBDIRS = \
get \
diff --git a/ACE/ASNMP/examples/get/Makefile.am b/ACE/ASNMP/examples/get/Makefile.am
index 0c3a6e4ea95..c691338b998 100644
--- a/ACE/ASNMP/examples/get/Makefile.am
+++ b/ACE/ASNMP/examples/get/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
ACE_BUILDDIR = $(top_builddir)
ACE_ROOT = $(top_srcdir)
@@ -16,7 +16,6 @@ noinst_PROGRAMS =
## Makefile.asnmp_example_get.am
if !BUILD_USES_WCHAR
-
noinst_PROGRAMS += get
get_CPPFLAGS = \
@@ -36,7 +35,6 @@ endif !BUILD_USES_WCHAR
## Makefile.asnmp_example_get_async.am
if !BUILD_USES_WCHAR
-
noinst_PROGRAMS += get_async
get_async_CPPFLAGS = \
diff --git a/ACE/ASNMP/examples/next/Makefile.am b/ACE/ASNMP/examples/next/Makefile.am
index a7b4c2a1256..dae95eaeaba 100644
--- a/ACE/ASNMP/examples/next/Makefile.am
+++ b/ACE/ASNMP/examples/next/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
ACE_BUILDDIR = $(top_builddir)
ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
## Makefile.asnmp_example_next.am
if !BUILD_USES_WCHAR
-
noinst_PROGRAMS = next
next_CPPFLAGS = \
diff --git a/ACE/ASNMP/examples/set/Makefile.am b/ACE/ASNMP/examples/set/Makefile.am
index 94f708ec8e1..7810a658eed 100644
--- a/ACE/ASNMP/examples/set/Makefile.am
+++ b/ACE/ASNMP/examples/set/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
ACE_BUILDDIR = $(top_builddir)
ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
## Makefile.asnmp_example_set.am
if !BUILD_USES_WCHAR
-
noinst_PROGRAMS = set
set_CPPFLAGS = \
diff --git a/ACE/ASNMP/examples/trap/Makefile.am b/ACE/ASNMP/examples/trap/Makefile.am
index a60adce7d30..52307634b67 100644
--- a/ACE/ASNMP/examples/trap/Makefile.am
+++ b/ACE/ASNMP/examples/trap/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
ACE_BUILDDIR = $(top_builddir)
ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
## Makefile.asnmp_example_trap.am
if !BUILD_USES_WCHAR
-
noinst_PROGRAMS = trap
trap_CPPFLAGS = \
diff --git a/ACE/ASNMP/examples/walk/Makefile.am b/ACE/ASNMP/examples/walk/Makefile.am
index 9cff32a49de..f0bc64a36cf 100644
--- a/ACE/ASNMP/examples/walk/Makefile.am
+++ b/ACE/ASNMP/examples/walk/Makefile.am
@@ -6,7 +6,7 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
ACE_BUILDDIR = $(top_builddir)
ACE_ROOT = $(top_srcdir)
@@ -15,7 +15,6 @@ ACE_ROOT = $(top_srcdir)
## Makefile.asnmp_example_walk.am
if !BUILD_USES_WCHAR
-
noinst_PROGRAMS = walk
walk_CPPFLAGS = \
diff --git a/ACE/ASNMP/tests/Makefile.am b/ACE/ASNMP/tests/Makefile.am
index b8ac30972bf..0b9ae3d1ce7 100644
--- a/ACE/ASNMP/tests/Makefile.am
+++ b/ACE/ASNMP/tests/Makefile.am
@@ -6,13 +6,12 @@
## this file will be lost the next time it is generated.
##
## MPC Command:
-## ./bin/mwc.pl -type automake -noreldefs ACE.mwc
+## /acebuilds/ACE_wrappers-repository/bin/mwc.pl -include /acebuilds/MPC/config -include /acebuilds/MPC/templates -feature_file /acebuilds/ACE_wrappers-repository/local.features -noreldefs -type automake -exclude build,Kokyu
ACE_BUILDDIR = $(top_builddir)
ACE_ROOT = $(top_srcdir)
## Makefile.asnmp_tests_Address_Test.am
-
noinst_PROGRAMS = Address_Test
Address_Test_CPPFLAGS = \
@@ -29,7 +28,6 @@ Address_Test_LDADD = \
$(ACE_BUILDDIR)/ace/libACE.la
## Makefile.asnmp_tests_Counter64_Test.am
-
noinst_PROGRAMS += Counter64_Test
Counter64_Test_CPPFLAGS = \
@@ -46,7 +44,6 @@ Counter64_Test_LDADD = \
$(ACE_BUILDDIR)/ace/libACE.la
## Makefile.asnmp_tests_Counter_Test.am
-
noinst_PROGRAMS += Counter_Test
Counter_Test_CPPFLAGS = \
@@ -63,7 +60,6 @@ Counter_Test_LDADD = \
$(ACE_BUILDDIR)/ace/libACE.la
## Makefile.asnmp_tests_Gauge_Test.am
-
noinst_PROGRAMS += Gauge_Test
Gauge_Test_CPPFLAGS = \
@@ -80,7 +76,6 @@ Gauge_Test_LDADD = \
$(ACE_BUILDDIR)/ace/libACE.la
## Makefile.asnmp_tests_Integer_Test.am
-
noinst_PROGRAMS += Integer_Test
Integer_Test_CPPFLAGS = \
@@ -97,7 +92,6 @@ Integer_Test_LDADD = \
$(ACE_BUILDDIR)/ace/libACE.la
## Makefile.asnmp_tests_Octet_Test.am
-
noinst_PROGRAMS += Octet_Test
Octet_Test_CPPFLAGS = \
@@ -114,7 +108,6 @@ Octet_Test_LDADD = \
$(ACE_BUILDDIR)/ace/libACE.la
## Makefile.asnmp_tests_Oid_Test.am
-
noinst_PROGRAMS += Oid_Test
Oid_Test_CPPFLAGS = \
@@ -131,7 +124,6 @@ Oid_Test_LDADD = \
$(ACE_BUILDDIR)/ace/libACE.la
## Makefile.asnmp_tests_Target_Test.am
-
noinst_PROGRAMS += Target_Test
Target_Test_CPPFLAGS = \
@@ -148,7 +140,6 @@ Target_Test_LDADD = \
$(ACE_BUILDDIR)/ace/libACE.la
## Makefile.asnmp_tests_Varbind_Test.am
-
noinst_PROGRAMS += Varbind_Test
Varbind_Test_CPPFLAGS = \
diff --git a/ACE/ASNMP/tests/test_config.h b/ACE/ASNMP/tests/test_config.h
index a0d2bab7aa8..887fa5cec8a 100644
--- a/ACE/ASNMP/tests/test_config.h
+++ b/ACE/ASNMP/tests/test_config.h
@@ -25,6 +25,32 @@
// FUZZ: disable check_for_streams_include
#include "ace/streams.h"
+#if !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
+class KEY
+// ============================================================================
+// = TITLE
+// Define a key for use with the Map_Manager_Test.
+//
+// = DESCRIPTION
+// This class is put into the test_config.h header file to work
+// around AIX C++ compiler "features" related to template
+// instantiation... It is only used by Map_Manager_Test.cpp
+// ============================================================================
+{
+public:
+ KEY (size_t v = 0): value_ (v)
+ { }
+
+ size_t hash (void) const { return this->value_; }
+ operator size_t () const { return this->value_; }
+
+private:
+ size_t value_;
+};
+#else
+typedef size_t KEY;
+#endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
+
#if defined (ACE_WIN32)
#define ACE_DEFAULT_TEST_FILE ACE_TEXT ("C:\\temp\\ace_test_file")
@@ -41,20 +67,16 @@
#endif /* ACE_WIN32 */
-#ifndef ACE_START_TEST
#define ACE_START_TEST(NAME) \
const ACE_TCHAR *program = NAME; \
ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM); \
if (ace_file_stream.set_output (program) != 0) \
ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("set_output failed")), -1); \
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) starting %s test at %D\n"), program));
-#endif /* ACE_START_TEST */
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) starting %s test at %T\n"), program));
-#ifndef ACE_END_TEST
#define ACE_END_TEST \
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %D\n"), program)); \
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %T\n"), program)); \
ace_file_stream.close ();
-#endif /* ACE_END_TEST */
#define ACE_NEW_THREAD \
do {\
@@ -68,10 +90,10 @@ do {\
ACE_LOG_MSG->open (program, ACE_Log_Msg::OSTREAM); \
if (ace_file_stream.set_output (program, 1) != 0) \
ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("set_output failed")), -1); \
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Starting %s test at %D\n"), program));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Starting %s test at %T\n"), program));
#define ACE_END_LOG \
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %D\n\n"), program)); \
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Ending %s test at %T\n\n"), program)); \
ace_file_stream.close ();
#define ACE_INIT_LOG(NAME) \
View Lorry Controller Status