summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2007-01-08 13:50:58 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2007-01-08 13:50:58 +0000
commit1a7d8af58c35b65b414ba2c9e9c91bd0a96d670e (patch)
tree4d33661c9d791b5631db426be3fd1ab31dc4c102
parent68fbd9f48d647b4f55655ad38df55a6e9eed062e (diff)
downloadATCD-1a7d8af58c35b65b414ba2c9e9c91bd0a96d670e.tar.gz
ChangeLogTag: Mon Jan 8 13:50:31 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--TAO/ChangeLog6
-rw-r--r--TAO/tests/OBV/Truncatable/client.cpp4
2 files changed, 10 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 87d45c80018..7c891f9b9c0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 8 13:50:31 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
+
+ * tests/OBV/Truncatable/client.cpp:
+
+ Undefine VERIFY if it's defined to avoid warnings from vc71.
+
Mon Jan 8 13:36:37 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
* tests/TransportCurrent/IIOP/IIOP.mpc:
diff --git a/TAO/tests/OBV/Truncatable/client.cpp b/TAO/tests/OBV/Truncatable/client.cpp
index c372ce85579..4f75c2cd7c8 100644
--- a/TAO/tests/OBV/Truncatable/client.cpp
+++ b/TAO/tests/OBV/Truncatable/client.cpp
@@ -12,6 +12,10 @@ int fail = 0;
int pretest = 0;
int verbose = 0;
+#if defined (VERIFY)
+#undef VERIFY
+#endif /* VERIFY */
+
#define VERIFY(Condition) \
{ \
if ((Condition)==0) \