Eric Newton's changes

12 files changed, 34 insertions, 9 deletions

diff --git a/ASNMP/examples/trap/Makefile b/ASNMP/examples/trap/Makefile
index 1f11bdad45e..9a8bdfd280a 100644
--- a/ASNMP/examples/trap/Makefile
+++ b/ASNMP/examples/trap/Makefile
@@ -14,7 +14,7 @@ BIN   = trap
 CCFLAGS = -I$(ACE_ROOT)/ASNMP/
 LSRC   = $(addsuffix .cpp,$(BIN))
 
-VLDLIBS = -R$(ACE_ROOT)/ASNMP/asnmp -L$(ACE_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
+LDLIBS := -L$(ACE_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
 
 BUILD = $(VBIN)
 
diff --git a/ASNMP/examples/walk/Makefile b/ASNMP/examples/walk/Makefile
index b40adef5769..5de4959da60 100644
--- a/ASNMP/examples/walk/Makefile
+++ b/ASNMP/examples/walk/Makefile
@@ -14,7 +14,7 @@ BIN   = walk
 CCFLAGS = -I$(ACE_ROOT)/ASNMP/
 LSRC   = $(addsuffix .cpp,$(BIN))
 
-VLDLIBS = -L$(ACE_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
+LDLIBS := -L$(ACE_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
 
 BUILD = $(VBIN)
 
diff --git a/ASNMP/tests/Address_Test.cpp b/ASNMP/tests/Address_Test.cpp
index 1a212e78bf0..a10705ce78b 100644
--- a/ASNMP/tests/Address_Test.cpp
+++ b/ASNMP/tests/Address_Test.cpp
@@ -550,3 +550,7 @@ main (int, char *[])
   ACE_END_TEST;
   return 0;
 }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Unbounded_Set<ACE_Log_Msg*>;
+#endif
diff --git a/ASNMP/tests/Counter64_Test.cpp b/ASNMP/tests/Counter64_Test.cpp
index b3bbaa3920a..506c8a85873 100644
--- a/ASNMP/tests/Counter64_Test.cpp
+++ b/ASNMP/tests/Counter64_Test.cpp
@@ -79,12 +79,7 @@ ACE_Unbounded_Set<ACE_Log_Msg*> x;
 
 static void TestCounter64()
 {
-  static long l = LONG_MAX, nl = LONG_MIN;  // limits.h
-  static unsigned long ul = ULONG_MAX, def = 0;
-  static int i = INT_MAX, ni = INT_MIN;
-  static unsigned int ui = UINT_MAX;
-  static unsigned short us = 10;
-  static short si = 65535;
+  static unsigned long ul = ULONG_MAX;
   LLONG ll =  (LLONG) 0x7fffffffffffffff; 
   LLONG mll =  (LLONG) ((-ll) - 1); 
   ULLONG ull =  (ULLONG) 0xffffffffffffffff; 
@@ -161,3 +156,7 @@ main (int, char *[])
   return 0;
 }
 
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Unbounded_Set<ACE_Log_Msg *>;
+#endif
diff --git a/ASNMP/tests/Counter_Test.cpp b/ASNMP/tests/Counter_Test.cpp
index d4c78414b1c..061f469f6a5 100644
--- a/ASNMP/tests/Counter_Test.cpp
+++ b/ASNMP/tests/Counter_Test.cpp
@@ -139,3 +139,7 @@ main (int, char *[])
   return 0;
 }
 
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Unbounded_Set<ACE_Log_Msg*>;
+#endif
diff --git a/ASNMP/tests/Gauge_Test.cpp b/ASNMP/tests/Gauge_Test.cpp
index ad1d4fa2912..9594f9b3b4d 100644
--- a/ASNMP/tests/Gauge_Test.cpp
+++ b/ASNMP/tests/Gauge_Test.cpp
@@ -130,3 +130,6 @@ main (int, char *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Unbounded_Set<ACE_Log_Msg*>;
+#endif
diff --git a/ASNMP/tests/Integer_Test.cpp b/ASNMP/tests/Integer_Test.cpp
index 02758fb8705..c42afdc42ef 100644
--- a/ASNMP/tests/Integer_Test.cpp
+++ b/ASNMP/tests/Integer_Test.cpp
@@ -196,3 +196,6 @@ main (int, char *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Unbounded_Set<ACE_Log_Msg *>;
+#endif
diff --git a/ASNMP/tests/Makefile b/ASNMP/tests/Makefile
index 6e211364ef9..bb262771b08 100644
--- a/ASNMP/tests/Makefile
+++ b/ASNMP/tests/Makefile
@@ -22,7 +22,7 @@ BIN = 	Oid_Test \
 CCFLAGS = -I$(ACE_ROOT)/ASNMP/
 
 LSRC   = $(addsuffix .cpp,$(BIN))
-VLDLIBS = -L$(ACE_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
+LDLIBS := -L$(ACE_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
 
 BUILD = $(VBIN)
 
diff --git a/ASNMP/tests/Octet_Test.cpp b/ASNMP/tests/Octet_Test.cpp
index b32b112f64e..d5dd7a9d440 100644
--- a/ASNMP/tests/Octet_Test.cpp
+++ b/ASNMP/tests/Octet_Test.cpp
@@ -158,3 +158,6 @@ main (int, char *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Unbounded_Set<ACE_Log_Msg*>;
+#endif
diff --git a/ASNMP/tests/Oid_Test.cpp b/ASNMP/tests/Oid_Test.cpp
index 1ea785ac69c..56af2271b3f 100644
--- a/ASNMP/tests/Oid_Test.cpp
+++ b/ASNMP/tests/Oid_Test.cpp
@@ -183,3 +183,6 @@ main (int, char *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Unbounded_Set<ACE_Log_Msg*>;
+#endif
diff --git a/ASNMP/tests/Target_Test.cpp b/ASNMP/tests/Target_Test.cpp
index 49e7b0fff8b..d843057215d 100644
--- a/ASNMP/tests/Target_Test.cpp
+++ b/ASNMP/tests/Target_Test.cpp
@@ -149,3 +149,6 @@ main (int, char *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Unbounded_Set<ACE_Log_Msg*>;
+#endif
diff --git a/ASNMP/tests/Varbind_Test.cpp b/ASNMP/tests/Varbind_Test.cpp
index 319b2634c04..a4d9c77113a 100644
--- a/ASNMP/tests/Varbind_Test.cpp
+++ b/ASNMP/tests/Varbind_Test.cpp
@@ -198,3 +198,6 @@ main (int, char *[])
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Unbounded_Set<ACE_Log_Msg*>;
+#endif