summaryrefslogtreecommitdiff
path: root/TAO/tao/ETCL
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-04-29 19:57:15 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-04-29 19:57:15 +0000
commitae3bdd64e18a5037d1512b7fe3d483267a4b348d (patch)
treee32d5bf4c304ac4800efce11acd085f6db0281ab /TAO/tao/ETCL
parent737a546af8575a4b59d445901c6b4db18efa702d (diff)
downloadATCD-ae3bdd64e18a5037d1512b7fe3d483267a4b348d.tar.gz
ChangeLogTag: Tue Apr 29 19:55:12 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO/tao/ETCL')
-rw-r--r--TAO/tao/ETCL/TAO_ETCL.mpc11
-rw-r--r--TAO/tao/ETCL/TAO_ETCL_Constraint.cpp2
-rw-r--r--TAO/tao/ETCL/TAO_ETCL_Constraint.h4
3 files changed, 8 insertions, 9 deletions
diff --git a/TAO/tao/ETCL/TAO_ETCL.mpc b/TAO/tao/ETCL/TAO_ETCL.mpc
index f8f8df03aca..8f6769ea9b7 100644
--- a/TAO/tao/ETCL/TAO_ETCL.mpc
+++ b/TAO/tao/ETCL/TAO_ETCL.mpc
@@ -4,7 +4,6 @@
project(TAO_ETCL) : dynamicany, ace_etcl, install, tao_output {
sharedname = TAO_ETCL
dynamicflags = TAO_ETCL_BUILD_DLL
- includes += $(ACE_ROOT)/ETCL
IDL_Files {
}
@@ -36,14 +35,14 @@ project(TAO_ETCL_Parser) : taolib, tao_etcl, install, tao_output {
includes += $(TAO_ROOT)/tao/ETCL/ETCL_include
Source_Files {
- $(ACE_ROOT)/ETCL/ETCL_Interpreter.cpp
- $(ACE_ROOT)/ETCL/ETCL_l.cpp
- $(ACE_ROOT)/ETCL/ETCL_y.cpp
+ $(ACE_ROOT)/ace/ETCL/ETCL_Interpreter.cpp
+ $(ACE_ROOT)/ace/ETCL/ETCL_l.cpp
+ $(ACE_ROOT)/ace/ETCL/ETCL_y.cpp
}
Header_Files {
- $(ACE_ROOT)/ETCL/ETCL_Interpreter.h
- $(ACE_ROOT)/ETCL/ETCL_y.h
+ $(ACE_ROOT)/ace/ETCL/ETCL_Interpreter.h
+ $(ACE_ROOT)/ace/ETCL/ETCL_y.h
$(TAO_ROOT)/tao/ETCL/ETCL_include/ETCL_macros.h
$(TAO_ROOT)/tao/ETCL/ETCL_include/ETCL_include.h
$(TAO_ROOT)/tao/ETCL/ETCL_include/etcl_parser_export.h
diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp
index ba4a2ea4023..0f3a0b8bc15 100644
--- a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp
+++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp
@@ -1,7 +1,7 @@
// -*- C++ -*-
// $Id$
-#include "ETCL_Constraint_Visitor.h"
+#include "ace/ETCL/ETCL_Constraint_Visitor.h"
#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.h b/TAO/tao/ETCL/TAO_ETCL_Constraint.h
index 9e046365913..43ad49effb4 100644
--- a/TAO/tao/ETCL/TAO_ETCL_Constraint.h
+++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.h
@@ -14,13 +14,13 @@
#ifndef TAO_ETCL_CONSTRAINT_H
#define TAO_ETCL_CONSTRAINT_H
-#include "tao/AnyTypeCode/Any_Impl.h"
+#include "ace/ETCL/ETCL_Constraint.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "ETCL_Constraint.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
#include "tao_etcl_export.h"