diff --git a/LSString.sln b/LSFramework.sln
similarity index 85%
rename from LSString.sln
rename to LSFramework.sln
index 4a005a0..9d54065 100644
--- a/LSString.sln
+++ b/LSFramework.sln
@@ -1,9 +1,9 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31624.102
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.1778
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LSString", "LSString\LSString.vcxproj", "{5FE98B77-3558-4384-BDAF-82AC8B69B752}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LSFramework", "LSFramework\LSFramework.vcxproj", "{5FE98B77-3558-4384-BDAF-82AC8B69B752}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/LSString/LSString.vcxproj b/LSFramework/LSFramework.vcxproj
similarity index 96%
rename from LSString/LSString.vcxproj
rename to LSFramework/LSFramework.vcxproj
index db6de7f..9da70c8 100644
--- a/LSString/LSString.vcxproj
+++ b/LSFramework/LSFramework.vcxproj
@@ -23,33 +23,33 @@
{5FE98B77-3558-4384-BDAF-82AC8B69B752}
Win32Proj
String
- 10.0.18362.0
- LSString
+ 10.0.19041.0
+ LSFramework
Application
true
- v142
+ v141
Unicode
Application
false
- v142
+ v141
true
Unicode
Application
true
- v142
+ v141
Unicode
Application
false
- v142
+ v141
true
Unicode
diff --git a/LSString/LSString.vcxproj.user b/LSFramework/LSFramework.vcxproj.user
similarity index 100%
rename from LSString/LSString.vcxproj.user
rename to LSFramework/LSFramework.vcxproj.user
diff --git a/LSString/LSList.h b/LSFramework/LSList.h
similarity index 100%
rename from LSString/LSList.h
rename to LSFramework/LSList.h
diff --git a/LSString/LSListItem.h b/LSFramework/LSListItem.h
similarity index 100%
rename from LSString/LSListItem.h
rename to LSFramework/LSListItem.h
diff --git a/LSString/LSMacros.h b/LSFramework/LSMacros.h
similarity index 100%
rename from LSString/LSMacros.h
rename to LSFramework/LSMacros.h
diff --git a/LSString/LSString.cpp b/LSFramework/LSString.cpp
similarity index 95%
rename from LSString/LSString.cpp
rename to LSFramework/LSString.cpp
index c8db3ca..81b8dc6 100644
--- a/LSString/LSString.cpp
+++ b/LSFramework/LSString.cpp
@@ -6,11 +6,9 @@ LSString::LSString(const char* pData)
: m_uiLength(StringLength(pData))
, m_uiCapacity(StringLength(pData))
{
- if (!pData) return;
-
m_pData = new char[m_uiLength + 1];
memset(m_pData, 0, m_uiLength + 1);
- memcpy(m_pData, pData, m_uiLength);
+ if(pData) memcpy(m_pData, pData, m_uiLength);
}
//-----------------------------------------------------------------------------------------------------------------------------
@@ -54,21 +52,21 @@ void LSString::Insert(const char* pData, size_t uiPos)
{
if (!pData) return;
- size_t uilength = StringLength(pData);
- size_t uiNewLength = m_uiLength + uilength;
+ size_t zLength = StringLength(pData);
+ size_t zNewLength = m_uiLength + zLength;
- while (uiNewLength > m_uiCapacity)
+ while (zNewLength > m_uiCapacity)
{
- IncreaseCapacity(uiNewLength);
+ IncreaseCapacity(zNewLength);
}
char* pLeft = m_pData + uiPos;
- char* pRight = m_pData + uiPos + uilength;
+ char* pRight = m_pData + uiPos + zLength;
memcpy(pRight, m_pData + uiPos, m_uiLength - uiPos);
- memcpy(pLeft, pData, uilength);
+ memcpy(pLeft, pData, zLength);
- m_uiLength = uiNewLength;
+ m_uiLength = zNewLength;
}
//-----------------------------------------------------------------------------------------------------------------------------
@@ -86,7 +84,7 @@ void LSString::Append(const std::string& sRhs)
//-----------------------------------------------------------------------------------------------------------------------------
void LSString::Append(const char* pData)
{
- Insert(pData, StringLength(pData));
+ Insert(pData, m_uiLength);
}
//-----------------------------------------------------------------------------------------------------------------------------
diff --git a/LSString/LSString.h b/LSFramework/LSString.h
similarity index 100%
rename from LSString/LSString.h
rename to LSFramework/LSString.h
diff --git a/LSString/LSVector.h b/LSFramework/LSVector.h
similarity index 100%
rename from LSString/LSVector.h
rename to LSFramework/LSVector.h
diff --git a/LSString/Timer.cpp b/LSFramework/Timer.cpp
similarity index 78%
rename from LSString/Timer.cpp
rename to LSFramework/Timer.cpp
index 14eac06..3065d8d 100644
--- a/LSString/Timer.cpp
+++ b/LSFramework/Timer.cpp
@@ -16,5 +16,6 @@ Timer::~Timer()
auto end = std::chrono::time_point_cast(endTimePoint).time_since_epoch().count();
auto duration = end - start;
- std::cout << "Duration in Microseconds: " << duration << " (" << duration * 0.001 << " ms)" << std::endl;
+ printf("Duration in Microseconds: %2d (%.3f ms)\n", duration, (duration * 0.001));
+ //std::cout << "Duration in Microseconds: " << duration << " (" << duration * 0.001 << " ms)" << std::endl;
}
\ No newline at end of file
diff --git a/LSString/Timer.h b/LSFramework/Timer.h
similarity index 100%
rename from LSString/Timer.h
rename to LSFramework/Timer.h
diff --git a/LSString/main.cpp b/LSFramework/main.cpp
similarity index 73%
rename from LSString/main.cpp
rename to LSFramework/main.cpp
index 6d0b308..41a4bd0 100644
--- a/LSString/main.cpp
+++ b/LSFramework/main.cpp
@@ -4,21 +4,21 @@
#include "Timer.h"
#define RUNS 50U
-#define PAYLOAD "187"
+#define PAYLOAD "1873612578869"
int main()
{
// - STRING
{
- printf("LSString:\n");
- printf("Number of runs: %d:\n", (int)RUNS);
+ printf("---LSString---\n");
+ printf("Number of runs: %d\n", (int)RUNS);
Timer ttt;
for (size_t zRun = 1; zRun <= RUNS; zRun++)
{
- printf("Run: %2d: ", (int)zRun);
+ printf("Run: %2d: ", static_cast(zRun));
Timer tt;
- LSString s("361");
+ LSString s(nullptr);
for (size_t z = 0; z < RUNS * 187; z++)
{
@@ -29,6 +29,9 @@ int main()
// - LIST
{
+ printf("---LSList---\n");
+ printf("Number of runs: %d\n", (int) RUNS);
+ Timer ttt;
int i1 = 1187;
int i2 = 2361;
int i3 = 3257;