diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-09-08 04:49:54 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-09-08 04:49:54 +0000 |
| commit | cd0faa395fd2eacbecd5871a4d8fdfc15ac80447 (patch) | |
| tree | ed8a7d2c0f90b15352d7f37f7fcc05b635da0ebd | |
| parent | 3f9f5a4af3d3306273c893292fcdec08f0edd657 (diff) | |
| download | ATCD-cd0faa395fd2eacbecd5871a4d8fdfc15ac80447.tar.gz | |
ChangeLogTag:Tue Sep 7 21:48:40 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/Utils/Server_Main.cpp | 13 |
2 files changed, 14 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6e8f2d2509d..e6b798960e9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Sep 7 21:48:40 2004 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tao/Utils/Server_Main.cpp: + + Removed redundant include guards around ace/Time_Value.h include + directive. + Tue Sep 7 16:31:25 2004 J.T. Conklin <jtc@acorntoolworks.com> * orbsvcs/tests/Notify/lib/EventChannel_Command.h: diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp index 79870a0ca8d..bdbc1f0ad8c 100644 --- a/TAO/tao/Utils/Server_Main.cpp +++ b/TAO/tao/Utils/Server_Main.cpp @@ -1,4 +1,5 @@ -/* -*- C++ -*- */ +// -*- C++ -*- + //============================================================================= /** * @file Server_Main.cpp @@ -10,7 +11,7 @@ * @author Dale Wilson <wilson_d@ociweb.com> */ //============================================================================= -// + #ifndef TAO_UTILS_SERVER_MAIN_T_CPP #define TAO_UTILS_SERVER_MAIN_T_CPP @@ -19,18 +20,18 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ + ACE_RCSID (Utils, Server_Main, "$Id$") +#include "tao/ORB.h" + #include "ace/Argv_Type_Converter.h" #include "ace/Log_Msg.h" -#include "tao/ORB.h" +#include "ace/Time_Value.h" -#ifndef ACE_TIME_VALUE_H -# include "ace/Time_Value.h" // Required for ACE_Time_Value -#endif template <typename SERVANT> TAO::Utils::Server_Main<SERVANT>::Server_Main (const char * name) |