diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-02-24 09:18:36 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-02-24 09:18:36 +0000 |
| commit | a5a6df2e979b88368d4985cb0f9d756108f21dba (patch) | |
| tree | 5da9dd58fb5b1e022916df2c59cffa6ba960bcfb | |
| parent | f868c7e4a49636b7178faa7fd54203dcc4150166 (diff) | |
| download | ATCD-a5a6df2e979b88368d4985cb0f9d756108f21dba.tar.gz | |
Fri Feb 24 09:18:00 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/orbconf.h:
If ZIOP is not defined and we have messaging, set it to 0
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/tao/orbconf.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e0f346974e3..4359f3c7393 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Fri Feb 24 09:18:00 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/orbconf.h: + If ZIOP is not defined and we have messaging, set it to 0 + Thu Feb 23 19:08:43 UTC 2012 Phil Mesnier <mesnier_p@ociweb.com> * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp: diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h index 259b61f7c6c..d6c56dfb51e 100644 --- a/TAO/tao/orbconf.h +++ b/TAO/tao/orbconf.h @@ -252,6 +252,8 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128; # if (TAO_HAS_CORBA_MESSAGING == 1) // ZIOP needs corba messaging to work # define TAO_HAS_ZIOP 1 +#else +# define TAO_HAS_ZIOP 0 # endif #endif |