diff --git a/builds/win32/msvc15/empbuild.vcxproj b/builds/win32/msvc15/empbuild.vcxproj
index 6bc976139c9..59421f73607 100644
--- a/builds/win32/msvc15/empbuild.vcxproj
+++ b/builds/win32/msvc15/empbuild.vcxproj
@@ -282,7 +282,10 @@
{4fe03933-98cd-4879-a135-fd9430087a6b}
+
+
+
-
+
\ No newline at end of file
diff --git a/builds/win32/msvc15/empbuild.vcxproj.filters b/builds/win32/msvc15/empbuild.vcxproj.filters
index 8680873c23c..8a93a7e2832 100644
--- a/builds/win32/msvc15/empbuild.vcxproj.filters
+++ b/builds/win32/msvc15/empbuild.vcxproj.filters
@@ -13,10 +13,18 @@
{307f31db-efbf-4c9c-9aa6-dbda2d6d8484}
ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe
+
+ {dbcdcdf8-efc8-4106-b609-1e490745e955}
+
Source Files
-
+
+
+ GPRE files
+
+
+
\ No newline at end of file
diff --git a/examples/dbcrypt/CryptKeyHolder.cpp b/examples/dbcrypt/CryptKeyHolder.cpp
index 00d6f764f83..ee5737571a3 100644
--- a/examples/dbcrypt/CryptKeyHolder.cpp
+++ b/examples/dbcrypt/CryptKeyHolder.cpp
@@ -273,7 +273,7 @@ int CryptKeyHolder::keyCallback(CheckStatusWrapper* status, ICryptKeyCallback* c
confEntry = getEntry(status, "Key");
if (confEntry)
{
- key = confEntry->getIntValue();
+ key = static_cast(confEntry->getIntValue());
confEntry->release();
}
else
@@ -311,7 +311,7 @@ ICryptKeyCallback* CryptKeyHolder::keyHandle(CheckStatusWrapper* status, const c
IConfigEntry* confEntry = getEntry(status, kn);
if (confEntry)
{
- int k = confEntry->getIntValue();
+ int k = static_cast(confEntry->getIntValue());
confEntry->release();
if (k > 0 && k < 256)
{
diff --git a/examples/dbcrypt/DbCrypt.cpp b/examples/dbcrypt/DbCrypt.cpp
index 0180cdc2dd5..dcca8c2a833 100644
--- a/examples/dbcrypt/DbCrypt.cpp
+++ b/examples/dbcrypt/DbCrypt.cpp
@@ -119,7 +119,7 @@ class DbCrypt : public IDbCryptPluginImpl
private:
IPluginConfig* config;
- char savedKeyName[32];
+ char savedKeyName[32]{};
ISC_UCHAR key;
std::atomic_int refCounter;
@@ -218,7 +218,7 @@ void DbCrypt::setKey(CheckStatusWrapper* status, unsigned int length, IKeyHolder
def->release();
if (confEntry)
{
- v = confEntry->getIntValue();
+ v = static_cast(confEntry->getIntValue());
confEntry->release();
if (v)
{
diff --git a/examples/dbcrypt/msvc/.gitignore b/examples/dbcrypt/msvc/.gitignore
new file mode 100644
index 00000000000..8b95cebeb0f
--- /dev/null
+++ b/examples/dbcrypt/msvc/.gitignore
@@ -0,0 +1 @@
+*.user
\ No newline at end of file
diff --git a/examples/empbuild/empbuild.epp b/examples/empbuild/empbuild.epp
index e534b5fcf5f..ce4ddef73ef 100644
--- a/examples/empbuild/empbuild.epp
+++ b/examples/empbuild/empbuild.epp
@@ -287,7 +287,7 @@ while (fgets (line, 100, Fp) != NULL)
if (*line == '\n')
break;
- len = strlen (line);
+ len = static_cast(strlen(line));
EXEC SQL INSERT CURSOR be VALUES (:line INDICATOR :len);
}
@@ -365,7 +365,7 @@ while (fgets (line, 100, Fp) != NULL)
if (*line == '\n')
break;
- len = strlen (line);
+ len = static_cast(strlen(line));
EXEC SQL INSERT CURSOR bd VALUES (:line INDICATOR :len);
}
diff --git a/examples/extauth/ExtAuth.cpp b/examples/extauth/ExtAuth.cpp
index 56926575f6e..1e2b24d52e3 100644
--- a/examples/extauth/ExtAuth.cpp
+++ b/examples/extauth/ExtAuth.cpp
@@ -32,9 +32,9 @@
#define HANDSHAKE_DEBUG(A)
-const unsigned LOGINSIZE = 128u;
-const unsigned RANDSIZE = 32u;
-const unsigned SALTLEN = 8u;
+constexpr unsigned LOGINSIZE = 128u;
+constexpr unsigned RANDSIZE = 32u;
+constexpr unsigned SALTLEN = 8u;
typedef unsigned int ULong;
@@ -138,7 +138,7 @@ class PluginData
PseudoRandom pseudoRand;
HashSha256 hash;
- rsa_key privateKey;
+ rsa_key privateKey{};
int iniLvl;
};
@@ -253,7 +253,7 @@ int ExtAuthClient::authenticate(ThrowStatusWrapper* status, IClientBlock* cBlock
error(status, "Malformed data from server - missing random block");
// next append login to random block
- unsigned len = strlen(login);
+ unsigned len = static_cast(strlen(login));
if (len > LOGINSIZE)
len = LOGINSIZE;
memcpy(&bytes[RANDSIZE], login, len);
@@ -340,7 +340,7 @@ class ExtAuthServer : public IServerImpl, pub
}
private:
- unsigned char msg[RANDSIZE + LOGINSIZE];
+ unsigned char msg[RANDSIZE + LOGINSIZE]{};
bool sentData;
};
@@ -377,7 +377,7 @@ int ExtAuthServer::authenticate(ThrowStatusWrapper* status, IServerBlock* sBlock
// decompose message
const char* login = reinterpret_cast(data);
- unsigned len = strnlen(login, dl);
+ unsigned len = static_cast(strnlen(login, dl));
if (len == dl)
error(status, "Wrong data from client - no signature in a message");
if (len == 0)
diff --git a/examples/extauth/Makefile b/examples/extauth/Makefile
index 9da7bbd357f..b48026fccf0 100644
--- a/examples/extauth/Makefile
+++ b/examples/extauth/Makefile
@@ -61,7 +61,7 @@ KEYGEN_objects=$(INTERMED)/keygen.o
TCWRAP_objects=$(INTERMED)/TcWrapper.o
KEY_AUTH_objects=$(INTERMED)/ExtAuth.o
-CXXFLAGS=-std=c++11 -pthread -I$(ROOT)/include -fPIC $(TOMCRYPT_COMPILE)
+CXXFLAGS=-std=c++20 -pthread -I$(ROOT)/include -fPIC $(TOMCRYPT_COMPILE)
LDFLAGS=-pthread -L$(LIB) -Wl,-rpath,'$$ORIGIN/../lib' $(TOMCRYPT_LINK)
LINK_LIBS=-lfbclient -ltomcrypt -ltommath
diff --git a/examples/extauth/TcWrapper.cpp b/examples/extauth/TcWrapper.cpp
index 9428f5c462c..825f639be1e 100644
--- a/examples/extauth/TcWrapper.cpp
+++ b/examples/extauth/TcWrapper.cpp
@@ -81,7 +81,7 @@ unsigned readHexKey(ThrowStatusWrapper* status, const char* hex, unsigned char*
error(status, "Key format error");
*k++ = static_cast(c);
}
- return k - key;
+ return static_cast(k - key);
}
void PseudoRandom::init(ThrowStatusWrapper* status)
diff --git a/examples/extauth/msvc/.gitignore b/examples/extauth/msvc/.gitignore
new file mode 100644
index 00000000000..8b95cebeb0f
--- /dev/null
+++ b/examples/extauth/msvc/.gitignore
@@ -0,0 +1 @@
+*.user
\ No newline at end of file
diff --git a/examples/extauth/msvc/ExtAuth_MSVC15.vcxproj b/examples/extauth/msvc/ExtAuth_MSVC15.vcxproj
index f959e99ad83..e6cd9aded98 100644
--- a/examples/extauth/msvc/ExtAuth_MSVC15.vcxproj
+++ b/examples/extauth/msvc/ExtAuth_MSVC15.vcxproj
@@ -165,6 +165,7 @@
false
..\..\..\src\include\;..\..\..\extern\libtomcrypt\src\headers\
_CRT_SECURE_NO_WARNINGS;LTM_DESC;WIN32
+ stdcpp20
Console
@@ -219,6 +220,7 @@
false
..\..\..\src\include\;..\..\..\extern\libtomcrypt\src\headers\
_CRT_SECURE_NO_WARNINGS;LTM_DESC;WIN32
+ stdcpp20
Console
@@ -259,4 +261,4 @@
-
+
\ No newline at end of file
diff --git a/examples/extauth/msvc/KeyGen_MSVC15.vcxproj b/examples/extauth/msvc/KeyGen_MSVC15.vcxproj
index 63495cdcf85..28e9fc82ac9 100644
--- a/examples/extauth/msvc/KeyGen_MSVC15.vcxproj
+++ b/examples/extauth/msvc/KeyGen_MSVC15.vcxproj
@@ -164,6 +164,7 @@
false
..\..\..\src\include\;..\..\..\extern\libtomcrypt\src\headers\
_CRT_SECURE_NO_WARNINGS;LTM_DESC;WIN32
+ stdcpp20
Console
@@ -215,6 +216,7 @@
false
..\..\..\src\include\;..\..\..\extern\libtomcrypt\src\headers\
_CRT_SECURE_NO_WARNINGS;LTM_DESC;WIN32
+ stdcpp20
Console
@@ -253,4 +255,4 @@
-
+
\ No newline at end of file
diff --git a/examples/udr/Triggers.cpp b/examples/udr/Triggers.cpp
index 581b1aa3c68..7e952a2852e 100644
--- a/examples/udr/Triggers.cpp
+++ b/examples/udr/Triggers.cpp
@@ -104,7 +104,7 @@ FB_UDR_BEGIN_TRIGGER(replicate)
SQL_DIALECT_CURRENT, inSqlDa), status, statusVector);
inSqlDa->sqlvar[0].sqldata = new char[sizeof(short) + inSqlDa->sqlvar[0].sqllen];
strncpy(inSqlDa->sqlvar[0].sqldata + sizeof(short), info, inSqlDa->sqlvar[0].sqllen);
- *reinterpret_cast(inSqlDa->sqlvar[0].sqldata) = strlen(info);
+ *reinterpret_cast(inSqlDa->sqlvar[0].sqldata) = static_cast(strlen(info));
XSQLDA* outSqlDa = reinterpret_cast(new char[(XSQLDA_LENGTH(1))]);
outSqlDa->version = SQLDA_VERSION1;
@@ -136,7 +136,7 @@ FB_UDR_BEGIN_TRIGGER(replicate)
strcat(buffer, " p");
const size_t buflen = strlen(buffer);
- snprintf(buffer + buflen, sizeof(buffer) - buflen, "%d type of column \"%s\".\"%s\" = ?", i, table, name);
+ snprintf(buffer + buflen, sizeof(buffer) - buflen, "%u type of column \"%s\".\"%s\" = ?", i, table, name);
}
strcat(buffer,
@@ -177,7 +177,7 @@ FB_UDR_BEGIN_TRIGGER(replicate)
strcat(buffer, ", ");
strcat(buffer, ":p");
const size_t buflen = strlen(buffer);
- snprintf(buffer + buflen, sizeof(buffer) - buflen, "%d", i);
+ snprintf(buffer + buflen, sizeof(buffer) - buflen, "%u", i);
}
strcat(buffer, ")\n on external data source '");
@@ -255,7 +255,7 @@ FB_UDR_BEGIN_TRIGGER(replicate_persons)
statusVector, &stmtHandle, SQL_DIALECT_CURRENT, inSqlDa), status, statusVector);
inSqlDa->sqlvar[0].sqldata = new char[sizeof(short) + inSqlDa->sqlvar[0].sqllen];
strncpy(inSqlDa->sqlvar[0].sqldata + sizeof(short), info, inSqlDa->sqlvar[0].sqllen);
- *reinterpret_cast(inSqlDa->sqlvar[0].sqldata) = strlen(info);
+ *reinterpret_cast(inSqlDa->sqlvar[0].sqldata) = static_cast(strlen(info));
XSQLDA* outSqlDa = reinterpret_cast(new char[(XSQLDA_LENGTH(1))]);
outSqlDa->version = SQLDA_VERSION1;