revisied with api change

9 files changed, 47 insertions, 428 deletions

diff --git a/ASNMP/examples/get/Makefile b/ASNMP/examples/get/Makefile
index 04146ebbd8b..669015aa115 100644
--- a/ASNMP/examples/get/Makefile
+++ b/ASNMP/examples/get/Makefile
@@ -11,9 +11,9 @@
  
 # ACE+SNMP 
 BIN   = get
-CCFLAGS = -I$(ACE_ROOT)/ASNMP/
+CCFLAGS = -I$(WRAPPER_ROOT)/ASNMP/
 LSRC   = $(addsuffix .cpp,$(BIN))
-VLDLIBS = -R$(ACE_ROOT)/ASNMP/asnmp -L$(WRAPPER_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
+VLDLIBS = -R$(WRAPPER_ROOT)/ASNMP/asnmp -L$(WRAPPER_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
 
 BUILD = $(VBIN)
 
@@ -21,12 +21,12 @@ BUILD = $(VBIN)
 #	Include macros and targets
 #----------------------------------------------------------------------------
 
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/wrapper_macros.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/macros.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.common.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
 
 #----------------------------------------------------------------------------
 #	Local targets
@@ -38,79 +38,3 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-get.o: get.cpp /home/cs/guest/mrm/ASNMP/asnmp/snmp.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Reactor.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Handle_Set.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Priority.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Handle_Set.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Complex.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Simple.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Simple.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Complex.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch_T.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Event_Handler.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Event_Handler.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch_T.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Thread.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Thread.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Atomic_Op.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue_T.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Time_Value.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Free_List.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Free_List.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue_T.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Signal.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Signal.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Token.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Token.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Pipe.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Pipe.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Stream.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_IO.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Addr.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Addr.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/IPC_SAP.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/IPC_SAP.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_IO.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/INET_Addr.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/INET_Addr.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Stream.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Reactor.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Dgram.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Dgram.i \
- /home/cs/guest/mrm/ASNMP/asnmp/oid.h \
- /home/cs/guest/mrm/ASNMP/asnmp/smival.h \
- /home/cs/guest/mrm/ASNMP/asnmp/smi.h \
- /home/cs/guest/mrm/ASNMP/asnmp/vb.h \
- /home/cs/guest/mrm/ASNMP/asnmp/snmperrs.h \
- /home/cs/guest/mrm/ASNMP/asnmp/timetick.h \
- /home/cs/guest/mrm/ASNMP/asnmp/integer.h \
- /home/cs/guest/mrm/ASNMP/asnmp/counter.h \
- /home/cs/guest/mrm/ASNMP/asnmp/gauge.h \
- /home/cs/guest/mrm/ASNMP/asnmp/ctr64.h \
- /home/cs/guest/mrm/ASNMP/asnmp/octet.h \
- /home/cs/guest/mrm/ASNMP/asnmp/address.h \
- /home/cs/guest/mrm/ASNMP/asnmp/target.h \
- /home/cs/guest/mrm/ASNMP/asnmp/pdu.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Get_Opt.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Get_Opt.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ASNMP/examples/get/get.cpp b/ASNMP/examples/get/get.cpp
index 7b639a73d5e..5df6adfbf48 100644
--- a/ASNMP/examples/get/get.cpp
+++ b/ASNMP/examples/get/get.cpp
@@ -86,7 +86,7 @@ getapp::getapp(int argc, char *argv[]): valid_(0)
       return;
    }
 
-   ACE_Get_Opt get_opt (argc, argv, "o:c:r:t:");
+   ACE_Get_Opt get_opt (argc, argv, "o:c:r:t:p:");
    for (int c; (c = get_opt ()) != -1; )
      switch (c)
        {
@@ -156,7 +156,7 @@ int getapp::run()
        " GET SAMPLE PROGRAM \nOID: " << oid_.to_string() << "\n";
    target_.get_address(address_); // target updates port used
    int rc;
-   char *name = address_.friendly_name(rc);
+   char *name = address_.resolve_hostname(rc);
    if (rc)
       name = "<< did not resolve via gethostbyname() >>";
 
@@ -184,7 +184,8 @@ int getapp::run()
     char *ptr = snmp_.error_string();
     cout << "ASNMP:ERROR: get command failed reason: " << ptr << endl;
   }
-  cout << "ASNMP:INFO:command completed normally. ACE RULES!\n"<< endl;
+
+  cout << "\nASNMP:INFO: command completed normally.\n"<< endl;
   return 0;
 } 
 
diff --git a/ASNMP/examples/next/Makefile b/ASNMP/examples/next/Makefile
index 102cb1152d8..100b72da689 100644
--- a/ASNMP/examples/next/Makefile
+++ b/ASNMP/examples/next/Makefile
@@ -11,10 +11,10 @@
  
 # ACE+SNMP 
 BIN   = next
-CCFLAGS = -I$(ACE_ROOT)/ASNMP/
+CCFLAGS = -I$(WRAPPER_ROOT)/ASNMP/
 LSRC   = $(addsuffix .cpp,$(BIN))
 
-VLDLIBS = -R$(ACE_ROOT)/ASNMP/asnmp -L$(WRAPPER_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
+VLDLIBS = -R$(WRAPPER_ROOT)/ASNMP/asnmp -L$(WRAPPER_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
 
 BUILD = $(VBIN)
 
@@ -22,12 +22,12 @@ BUILD = $(VBIN)
 #	Include macros and targets
 #----------------------------------------------------------------------------
 
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/wrapper_macros.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/macros.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.common.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
 
 #----------------------------------------------------------------------------
 #	Local targets
@@ -39,79 +39,3 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-next.o: next.cpp /home/cs/guest/mrm/ASNMP/asnmp/snmp.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Reactor.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Handle_Set.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Priority.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Handle_Set.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Complex.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Simple.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Simple.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Complex.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch_T.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Event_Handler.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Event_Handler.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch_T.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Thread.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Thread.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Atomic_Op.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue_T.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Time_Value.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Free_List.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Free_List.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue_T.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Signal.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Signal.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Token.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Token.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Pipe.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Pipe.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Stream.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_IO.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Addr.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Addr.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/IPC_SAP.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/IPC_SAP.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_IO.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/INET_Addr.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/INET_Addr.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Stream.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Reactor.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Dgram.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Dgram.i \
- /home/cs/guest/mrm/ASNMP/asnmp/oid.h \
- /home/cs/guest/mrm/ASNMP/asnmp/smival.h \
- /home/cs/guest/mrm/ASNMP/asnmp/smi.h \
- /home/cs/guest/mrm/ASNMP/asnmp/vb.h \
- /home/cs/guest/mrm/ASNMP/asnmp/snmperrs.h \
- /home/cs/guest/mrm/ASNMP/asnmp/timetick.h \
- /home/cs/guest/mrm/ASNMP/asnmp/integer.h \
- /home/cs/guest/mrm/ASNMP/asnmp/counter.h \
- /home/cs/guest/mrm/ASNMP/asnmp/gauge.h \
- /home/cs/guest/mrm/ASNMP/asnmp/ctr64.h \
- /home/cs/guest/mrm/ASNMP/asnmp/octet.h \
- /home/cs/guest/mrm/ASNMP/asnmp/address.h \
- /home/cs/guest/mrm/ASNMP/asnmp/target.h \
- /home/cs/guest/mrm/ASNMP/asnmp/pdu.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Get_Opt.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Get_Opt.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ASNMP/examples/next/next.cpp b/ASNMP/examples/next/next.cpp
index 75bb39a3c46..66687f1c648 100644
--- a/ASNMP/examples/next/next.cpp
+++ b/ASNMP/examples/next/next.cpp
@@ -156,7 +156,7 @@ int nextapp::run()
        " GET_NEXT SAMPLE PROGRAM \nOID: " << oid_.to_string() << "\n";
    target_.get_address(address_); // target updates port used
    int rc;
-   char *name = address_.friendly_name(rc);
+   char *name = address_.resolve_hostname(rc);
    if (rc)
       name = "<< did not resolve via gethostbyname() >>";
 
diff --git a/ASNMP/examples/set/Makefile b/ASNMP/examples/set/Makefile
index 2bfbea7f2c4..eb38a22520b 100644
--- a/ASNMP/examples/set/Makefile
+++ b/ASNMP/examples/set/Makefile
@@ -11,10 +11,10 @@
  
 # ACE+SNMP 
 BIN   = set
-CCFLAGS = -I$(ACE_ROOT)/ASNMP/
+CCFLAGS = -I$(WRAPPER_ROOT)/ASNMP/
 LSRC   = $(addsuffix .cpp,$(BIN))
 
-VLDLIBS = -R$(ACE_ROOT)/ASNMP/asnmp -L$(WRAPPER_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
+VLDLIBS = -R$(WRAPPER_ROOT)/ASNMP/asnmp -L$(WRAPPER_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
 
 BUILD = $(VBIN)
 
@@ -22,12 +22,12 @@ BUILD = $(VBIN)
 #	Include macros and targets
 #----------------------------------------------------------------------------
 
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/wrapper_macros.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/macros.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.common.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
 
 #----------------------------------------------------------------------------
 #	Local targets
@@ -39,79 +39,3 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-set.o: set.cpp /home/cs/guest/mrm/ASNMP/asnmp/snmp.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Reactor.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Handle_Set.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Priority.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Handle_Set.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Complex.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Simple.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Simple.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Complex.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch_T.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Event_Handler.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Event_Handler.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch_T.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Thread.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Thread.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Atomic_Op.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue_T.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Time_Value.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Free_List.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Free_List.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue_T.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Signal.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Signal.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Token.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Token.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Pipe.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Pipe.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Stream.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_IO.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Addr.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Addr.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/IPC_SAP.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/IPC_SAP.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_IO.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/INET_Addr.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/INET_Addr.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Stream.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Reactor.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Dgram.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Dgram.i \
- /home/cs/guest/mrm/ASNMP/asnmp/oid.h \
- /home/cs/guest/mrm/ASNMP/asnmp/smival.h \
- /home/cs/guest/mrm/ASNMP/asnmp/smi.h \
- /home/cs/guest/mrm/ASNMP/asnmp/vb.h \
- /home/cs/guest/mrm/ASNMP/asnmp/snmperrs.h \
- /home/cs/guest/mrm/ASNMP/asnmp/timetick.h \
- /home/cs/guest/mrm/ASNMP/asnmp/integer.h \
- /home/cs/guest/mrm/ASNMP/asnmp/counter.h \
- /home/cs/guest/mrm/ASNMP/asnmp/gauge.h \
- /home/cs/guest/mrm/ASNMP/asnmp/ctr64.h \
- /home/cs/guest/mrm/ASNMP/asnmp/octet.h \
- /home/cs/guest/mrm/ASNMP/asnmp/address.h \
- /home/cs/guest/mrm/ASNMP/asnmp/target.h \
- /home/cs/guest/mrm/ASNMP/asnmp/pdu.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Get_Opt.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Get_Opt.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ASNMP/examples/set/set.cpp b/ASNMP/examples/set/set.cpp
index f0522cbff8d..402881f7962 100644
--- a/ASNMP/examples/set/set.cpp
+++ b/ASNMP/examples/set/set.cpp
@@ -226,7 +226,7 @@ int set::run()
        " SET SAMPLE PROGRAM \nOID: " << oid_.to_string() << "\n";
    target_.get_address(address_); // target updates port used
    int rc;
-   char *name = address_.friendly_name(rc);
+   char *name = address_.resolve_hostname(rc);
    if (rc)
       name = "<< did not resolve via gethostbyname() >>";
 
diff --git a/ASNMP/examples/trap/Makefile b/ASNMP/examples/trap/Makefile
index b99fed7b368..09523f48940 100644
--- a/ASNMP/examples/trap/Makefile
+++ b/ASNMP/examples/trap/Makefile
@@ -11,10 +11,10 @@
  
 # ACE+SNMP 
 BIN   = trap
-CCFLAGS = -I$(ACE_ROOT)/ASNMP/
+CCFLAGS = -I$(WRAPPER_ROOT)/ASNMP/
 LSRC   = $(addsuffix .cpp,$(BIN))
 
-VLDLIBS = -R$(ACE_ROOT)/ASNMP/asnmp -L$(WRAPPER_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
+VLDLIBS = -R$(WRAPPER_ROOT)/ASNMP/asnmp -L$(WRAPPER_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
 
 BUILD = $(VBIN)
 
@@ -22,12 +22,12 @@ BUILD = $(VBIN)
 #	Include macros and targets
 #----------------------------------------------------------------------------
 
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/wrapper_macros.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/macros.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.common.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
 
 #----------------------------------------------------------------------------
 #	Local targets
@@ -39,81 +39,3 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-trap.o: trap.cpp /home/cs/guest/mrm/ASNMP/asnmp/snmp.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Reactor.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Handle_Set.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Priority.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Handle_Set.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Complex.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Simple.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Simple.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Complex.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch_T.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Event_Handler.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Event_Handler.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch_T.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Thread.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Thread.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Atomic_Op.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue_T.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Time_Value.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Free_List.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Free_List.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue_T.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Signal.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Signal.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Token.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Token.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Pipe.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Pipe.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Stream.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_IO.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Addr.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Addr.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/IPC_SAP.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/IPC_SAP.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_IO.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/INET_Addr.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/INET_Addr.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Stream.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Reactor.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Dgram.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Dgram.i \
- /home/cs/guest/mrm/ASNMP/asnmp/oid.h \
- /home/cs/guest/mrm/ASNMP/asnmp/smival.h \
- /home/cs/guest/mrm/ASNMP/asnmp/smi.h \
- /home/cs/guest/mrm/ASNMP/asnmp/vb.h \
- /home/cs/guest/mrm/ASNMP/asnmp/snmperrs.h \
- /home/cs/guest/mrm/ASNMP/asnmp/timetick.h \
- /home/cs/guest/mrm/ASNMP/asnmp/integer.h \
- /home/cs/guest/mrm/ASNMP/asnmp/counter.h \
- /home/cs/guest/mrm/ASNMP/asnmp/gauge.h \
- /home/cs/guest/mrm/ASNMP/asnmp/ctr64.h \
- /home/cs/guest/mrm/ASNMP/asnmp/octet.h \
- /home/cs/guest/mrm/ASNMP/asnmp/address.h \
- /home/cs/guest/mrm/ASNMP/asnmp/target.h \
- /home/cs/guest/mrm/ASNMP/asnmp/pdu.h \
- /home/cs/guest/mrm/ASNMP/asnmp/enttraps.h \
- /home/cs/guest/mrm/ASNMP/asnmp/asn1.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Get_Opt.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Get_Opt.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ASNMP/examples/walk/Makefile b/ASNMP/examples/walk/Makefile
index 82b7ab079e2..bde5a38a5a6 100644
--- a/ASNMP/examples/walk/Makefile
+++ b/ASNMP/examples/walk/Makefile
@@ -11,10 +11,10 @@
  
 # ACE+SNMP 
 BIN   = walk
-CCFLAGS = -I$(ACE_ROOT)/ASNMP/
+CCFLAGS = -I$(WRAPPER_ROOT)/ASNMP/
 LSRC   = $(addsuffix .cpp,$(BIN))
 
-VLDLIBS = -L$(ACE_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
+VLDLIBS = -L$(WRAPPER_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
 
 BUILD = $(VBIN)
 
@@ -22,12 +22,12 @@ BUILD = $(VBIN)
 #	Include macros and targets
 #----------------------------------------------------------------------------
 
-include		$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/macros.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/wrapper_macros.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/macros.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.common.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.nonested.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.bin.GNU
+include		$(WRAPPER_ROOT)/include/makeinclude/rules.local.GNU
 
 #----------------------------------------------------------------------------
 #	Local targets
@@ -39,79 +39,3 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-walk.o: walk.cpp /home/cs/guest/mrm/ASNMP/asnmp/snmp.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Reactor.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Handle_Set.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/config.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/stdcpp.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/OS.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Trace.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Msg.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Priority.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Log_Record.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/ACE.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Handle_Set.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Complex.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Simple.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Simple.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SV_Semaphore_Complex.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch_T.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Event_Handler.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Event_Handler.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Synch_T.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Thread.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Thread.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Atomic_Op.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue_T.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Time_Value.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Free_List.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Free_List.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Timer_Queue_T.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Signal.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Containers.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Signal.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Token.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Token.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Pipe.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Pipe.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Stream.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_IO.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Addr.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Addr.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/IPC_SAP.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/IPC_SAP.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_IO.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/INET_Addr.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/INET_Addr.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Stream.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Reactor.i \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Dgram.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/SOCK_Dgram.i \
- /home/cs/guest/mrm/ASNMP/asnmp/oid.h \
- /home/cs/guest/mrm/ASNMP/asnmp/smival.h \
- /home/cs/guest/mrm/ASNMP/asnmp/smi.h \
- /home/cs/guest/mrm/ASNMP/asnmp/vb.h \
- /home/cs/guest/mrm/ASNMP/asnmp/snmperrs.h \
- /home/cs/guest/mrm/ASNMP/asnmp/timetick.h \
- /home/cs/guest/mrm/ASNMP/asnmp/integer.h \
- /home/cs/guest/mrm/ASNMP/asnmp/counter.h \
- /home/cs/guest/mrm/ASNMP/asnmp/gauge.h \
- /home/cs/guest/mrm/ASNMP/asnmp/ctr64.h \
- /home/cs/guest/mrm/ASNMP/asnmp/octet.h \
- /home/cs/guest/mrm/ASNMP/asnmp/address.h \
- /home/cs/guest/mrm/ASNMP/asnmp/target.h \
- /home/cs/guest/mrm/ASNMP/asnmp/pdu.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Get_Opt.h \
- /project/adaptive/ACE_wrappers/build/SunOS5.5/ace/Get_Opt.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ASNMP/examples/walk/walk.cpp b/ASNMP/examples/walk/walk.cpp
index 6f6ba1e2463..ec5fe803cfb 100644
--- a/ASNMP/examples/walk/walk.cpp
+++ b/ASNMP/examples/walk/walk.cpp
@@ -227,7 +227,7 @@ int walkapp::run()
        " WALK SAMPLE PROGRAM \nOID: " << oid_.to_string() << "\n";
    target_.get_address(address_); // target updates port used
    int rc;
-   char *name = address_.friendly_name(rc);
+   char *name = address_.resolve_hostname(rc);
    if (rc)
       name = "<< did not resolve via gethostbyname() >>";