Skip to content

Commit 04a5404

Browse files
starseekerstarseeker
committed
Move cldai headers
1 parent c85720f commit 04a5404

16 files changed

Lines changed: 32 additions & 22 deletions

‎include/core/attrDescriptor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "typeDescriptor.h"
55

6-
#include "sdaiEnum.h"
6+
#include "dai/sdaiEnum.h"
77

88
#include "sc_export.h"
99

‎include/core/sdai.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,10 @@ typedef char * SDAI_Schema_name;
157157

158158
#include <sdaiString.h>
159159

160-
#include <sdaiBinary.h>
160+
#include "dai/sdaiBinary.h"
161161

162162
// define Object which I am calling sdaiObject for now - DAS
163-
#include <sdaiObject.h>
163+
#include "dai/sdaiObject.h"
164164

165165
/******************************************************************************
166166
ENUMERATION
@@ -172,7 +172,7 @@ ENUMERATION
172172
* the value ENUM_NULL is used to represent NULL for all enumerated types
173173
*****************************************************************************/
174174

175-
#include <sdaiEnum.h>
175+
#include "dai/sdaiEnum.h"
176176

177177
/******************************************************************************
178178
BOOLEAN and LOGICAL
@@ -185,11 +185,11 @@ BOOLEAN and LOGICAL
185185

186186
// ***note*** this file needs classes from sdaiEnum.h
187187
// define DAObjectID and classes PID, PID_DA, PID_SDAI, DAObject, DAObject_SDAI
188-
#include <sdaiDaObject.h>
188+
#include "dai/sdaiDaObject.h"
189189

190190

191191
#include "core/sdaiApplication_instance.h"
192-
#include <sdaiApplication_instance_set.h>
192+
#include "dai/sdaiApplication_instance_set.h"
193193

194194
/******************************************************************************
195195
SELECT
@@ -204,12 +204,12 @@ class SDAI_Model_contents;
204204
typedef SDAI_Model_contents * SDAI_Model_contents_ptr;
205205
typedef SDAI_Model_contents_ptr SDAI_Model_contents_var;
206206

207-
#include <sdaiModel_contents_list.h>
207+
#include "dai/sdaiModel_contents_list.h"
208208

209-
#include <sdaiSession_instance.h>
210-
#include <sdaiEntity_extent.h>
211-
#include <sdaiEntity_extent_set.h>
212-
#include <sdaiModel_contents.h>
209+
#include "dai/sdaiSession_instance.h"
210+
#include "dai/sdaiEntity_extent.h"
211+
#include "dai/sdaiEntity_extent_set.h"
212+
#include "dai/sdaiModel_contents.h"
213213

214214
// ENTITY
215215
extern SC_CORE_EXPORT SDAI_Application_instance NilSTEPentity;

‎include/core/sdaiApplication_instance.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <iostream>
1717

1818
#include <sc_export.h>
19-
#include <sdaiDaObject.h>
19+
#include "dai/sdaiDaObject.h"
2020

2121
class EntityAggregate;
2222
class Inverse_attribute;

‎include/dai/CMakeLists.txt‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
set(DAI_HDRS
2-
2+
sdaiApplication_instance_set.h
3+
sdaiBinary.h
4+
sdaiDaObject.h
5+
sdaiEntity_extent.h
6+
sdaiEntity_extent_set.h
7+
sdaiEnum.h
8+
sdaiModel_contents.h
9+
sdaiModel_contents_list.h
10+
sdaiObject.h
11+
sdaiSession_instance.h
12+
sdaiString.h
313
)
414

515
install(FILES ${DAI_HDRS}

src/cldai/sdaiApplication_instance_set.h renamed to include/dai/sdaiApplication_instance_set.h

File renamed without changes.

src/cldai/sdaiBinary.h renamed to include/dai/sdaiBinary.h

File renamed without changes.

src/cldai/sdaiDaObject.h renamed to include/dai/sdaiDaObject.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#ifndef SDAIDAOBJECT_H
22
#define SDAIDAOBJECT_H 1
33

4-
#include <sdaiObject.h>
4+
#include "dai/sdaiObject.h"
55
#include <sdaiString.h>
6-
#include <sdaiEnum.h>
6+
#include "dai/sdaiEnum.h"
77

88
#include <sc_export.h>
99

src/cldai/sdaiEntity_extent.h renamed to include/dai/sdaiEntity_extent.h

File renamed without changes.

src/cldai/sdaiEntity_extent_set.h renamed to include/dai/sdaiEntity_extent_set.h

File renamed without changes.

src/cldai/sdaiEnum.h renamed to include/dai/sdaiEnum.h

File renamed without changes.

0 commit comments

Comments
 (0)