diff options
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/PI_Server/PI_Server_include.pidl | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6a2766af046..c94b39623d1 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Oct 27 12:13:40 UTC 2011 Simon Massey <sma at prismtech dot com> + + * tao/PI_Server/PI_Server_include.pidl: + Was duplicating the tao/PortableServer/PortableServer_include.pidl + #define guard name. + Tue Oct 25 08:10:00 UTC 2011 Marijke Hengstmengel <mhengstmengel@remedy.nl> * tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp: diff --git a/TAO/tao/PI_Server/PI_Server_include.pidl b/TAO/tao/PI_Server/PI_Server_include.pidl index 3dcf73ad27a..f2647f27f85 100644 --- a/TAO/tao/PI_Server/PI_Server_include.pidl +++ b/TAO/tao/PI_Server/PI_Server_include.pidl @@ -6,8 +6,8 @@ * @brief Include file for use in applications that need PI_Server.pidl. */ -#ifndef _PORTABLESERVER_INCLUDE_IDL_ -#define _PORTABLESERVER_INCLUDE_IDL_ +#ifndef _PI_SERVER_INCLUDE_IDL_ +#define _PI_SERVER_INCLUDE_IDL_ // This pragma is here to make the Visual Age preprocessor generate #line // output for this file before the files it includes. @@ -16,4 +16,4 @@ ///FUZZ: disable check_for_include/ #include "tao/PI_Server/ServerRequestInterceptor.pidl" -#endif /* _PORTABLESERVER_INCLUDE_IDL_ */ +#endif /* _PI_SERVER_INCLUDE_IDL_ */ |