Skip to content

Commit c69355f

Browse files
ritchiecarrollritchiecarroll
committed
Updated source code to reflect common code location change
1 parent 637bf9d commit c69355f

35 files changed

Lines changed: 76 additions & 103 deletions

‎src/CMakeLists.txt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY Libraries)
3030
set (CMAKE_LIBRARY_OUTPUT_DIRECTORY Libraries)
3131

3232
set (STTP_HEADER_FILES
33-
"lib/common/CommonTypes.h"
34-
"lib/common/Convert.h"
35-
"lib/common/EndianConverter.h"
36-
"lib/common/Nullable.h"
37-
"lib/common/pugixml.hpp"
38-
"lib/common/ThreadSafeQueue.h"
39-
"lib/common/Timer.h"
33+
"lib/CommonTypes.h"
34+
"lib/Convert.h"
35+
"lib/EndianConverter.h"
36+
"lib/Nullable.h"
37+
"lib/pugixml.hpp"
38+
"lib/ThreadSafeQueue.h"
39+
"lib/Timer.h"
4040
"lib/data/DataColumn.h"
4141
"lib/data/DataRow.h"
4242
"lib/data/DataSet.h"
@@ -214,10 +214,10 @@ set (STTP_HEADER_FILES
214214
)
215215

216216
set (STTP_SOURCE_FILES
217-
"lib/common/CommonTypes.cpp"
218-
"lib/common/Convert.cpp"
219-
"lib/common/EndianConverter.cpp"
220-
"lib/common/pugixml.cpp"
217+
"lib/CommonTypes.cpp"
218+
"lib/Convert.cpp"
219+
"lib/EndianConverter.cpp"
220+
"lib/pugixml.cpp"
221221
"lib/data/DataColumn.cpp"
222222
"lib/data/DataRow.cpp"
223223
"lib/data/DataSet.cpp"

‎src/lib/data/DataColumn.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#ifndef __DATA_COLUMN_H
2525
#define __DATA_COLUMN_H
2626

27-
#include "../common/CommonTypes.h"
27+
#include "../CommonTypes.h"
2828

2929
namespace sttp {
3030
namespace data

‎src/lib/data/DataRow.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#ifndef __DATA_ROW_H
2525
#define __DATA_ROW_H
2626

27-
#include "../common/CommonTypes.h"
28-
#include "../common/Nullable.h"
27+
#include "../CommonTypes.h"
28+
#include "../Nullable.h"
2929
#include "DataColumn.h"
3030

3131
namespace sttp {

‎src/lib/data/DataSet.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
//******************************************************************************************************
2323

2424
#include "DataSet.h"
25-
#include "../common/pugixml.hpp"
25+
#include "../pugixml.hpp"
2626

2727
using namespace std;
2828
using namespace pugi;

‎src/lib/data/DataSet.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#ifndef __DATA_SET_H
2525
#define __DATA_SET_H
2626

27-
#include "../common/CommonTypes.h"
27+
#include "../CommonTypes.h"
2828
#include "DataTable.h"
2929

3030
namespace pugi

‎src/lib/data/DataTable.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#ifndef __DATA_TABLE_H
2525
#define __DATA_TABLE_H
2626

27-
#include "../common/CommonTypes.h"
27+
#include "../CommonTypes.h"
2828
#include "DataColumn.h"
2929
#include "DataRow.h"
3030

‎src/lib/filterexpressions/ExpressionTree.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#ifndef __EXPRESSION_TREE_H
2525
#define __EXPRESSION_TREE_H
2626

27-
#include "../../common/CommonTypes.h"
27+
#include "../../CommonTypes.h"
2828
#include "../../data/DataSet.h"
2929

3030
namespace sttp {

‎src/lib/filterexpressions/FilterExpressionParser.cpp‎

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

2424
#include "FilterExpressionParser.h"
2525
#include "tree/ParseTreeWalker.h"
26-
#include "../common/Nullable.h"
26+
#include "../Nullable.h"
2727

2828
using namespace std;
2929
using namespace sttp;

‎src/lib/filterexpressions/FilterExpressionParser.h‎

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

2727
#include "FilterExpressions.h"
2828
#include "FilterExpressionSyntaxLexer.h"
29-
#include "../../common/CommonTypes.h"
29+
#include "../../CommonTypes.h"
3030
#include "../../data/DataSet.h"
3131
#include "ExpressionTree.h"
3232

‎src/lib/sttp.cpp.vcxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
</ProjectConfiguration>
2020
</ItemGroup>
2121
<ItemGroup>
22-
<ClInclude Include="common\CommonTypes.h" />
23-
<ClCompile Include="common\CommonTypes.cpp" />
24-
<ClInclude Include="common\Convert.h" />
25-
<ClCompile Include="common\Convert.cpp" />
26-
<ClInclude Include="common\EndianConverter.h" />
27-
<ClCompile Include="common\EndianConverter.cpp" />
28-
<ClInclude Include="common\Nullable.h" />
29-
<ClInclude Include="common\pugiconfig.hpp" />
30-
<ClInclude Include="common\pugixml.hpp" />
31-
<ClCompile Include="common\pugixml.cpp" />
32-
<ClInclude Include="common\ThreadSafeQueue.h" />
33-
<ClInclude Include="common\Timer.h" />
22+
<ClInclude Include="CommonTypes.h" />
23+
<ClCompile Include="CommonTypes.cpp" />
24+
<ClInclude Include="Convert.h" />
25+
<ClCompile Include="Convert.cpp" />
26+
<ClInclude Include="EndianConverter.h" />
27+
<ClCompile Include="EndianConverter.cpp" />
28+
<ClInclude Include="Nullable.h" />
29+
<ClInclude Include="pugiconfig.hpp" />
30+
<ClInclude Include="pugixml.hpp" />
31+
<ClCompile Include="pugixml.cpp" />
32+
<ClInclude Include="ThreadSafeQueue.h" />
33+
<ClInclude Include="Timer.h" />
3434
<ClInclude Include="filterexpressions\antlr4-runtime\atn\AbstractPredicateTransition.h" />
3535
<ClInclude Include="filterexpressions\antlr4-runtime\atn\ActionTransition.h" />
3636
<ClInclude Include="filterexpressions\antlr4-runtime\atn\AmbiguityInfo.h" />

0 commit comments

Comments
 (0)