From c123f3086314f0f9eb53f4eb4721d00e5b7aceb1 Mon Sep 17 00:00:00 2001
From: Chris Cleeland <chris.cleeland@gmail.com>
Date: Wed, 27 Dec 2006 17:22:11 +0000
Subject: Merged in this part of the change from r75957 which didn't get pulled
 in with the en-masse merges.  I hope I'm simply doing something wrong with
 the en-masse merges and this isn't really a significant limitation of svn. A 
   TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff

---
 TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff | 46 ++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff

diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff
new file mode 100644
index 00000000000..d7ae0c457cd
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp.diff
@@ -0,0 +1,46 @@
+--- Constraint_l.cpp.orig	2006-12-11 08:23:38.000000000 -0600
++++ Constraint_l.cpp	2006-12-11 08:23:19.000000000 -0600
+@@ -11,6 +11,7 @@
+ 
+ #include "ace/os_include/os_stdio.h"
+ #include "ace/OS_NS_unistd.h"
++#include /**/ "tao/Versioned_Namespace.h"
+ 
+ 
+ /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
+@@ -94,6 +95,8 @@
+ /* Size of default input buffer. */
+ #define YY_BUF_SIZE 16384
+ 
++TAO_BEGIN_VERSIONED_NAMESPACE_DECL
++
+ typedef struct yy_buffer_state *YY_BUFFER_STATE;
+ 
+ extern int yyleng;
+@@ -499,6 +502,8 @@
+ #define YY_NO_TOP_STATE 1
+ #endif
+ 
++TAO_END_VERSIONED_NAMESPACE_DECL
++
+ #ifdef YY_MALLOC_DECL
+ YY_MALLOC_DECL
+ #else
+@@ -589,6 +594,8 @@
+ #define YY_RULE_SETUP \
+ 	YY_USER_ACTION
+ 
++TAO_BEGIN_VERSIONED_NAMESPACE_DECL
++
+ YY_DECL
+ 	{
+ 	register yy_state_type yy_current_state;
+@@ -837,7 +844,7 @@
+ case 31:
+ YY_RULE_SETUP
+ TAO_TRADER_ECHO;
+-	YY_BREAK
++	break;
+ case YY_STATE_EOF(INITIAL):
+ 	yyterminate();
+ 
-- 
cgit v1.2.1