9 Commits

Author SHA1 Message Date
c6bd63efce Merge branch 'master' into PSI 2026-01-06 14:56:11 +01:00
Andrew Johnson
f66492ce4b Update version numbers after tagging 2025-12-15 12:01:17 -06:00
2be3bc40e0 Merge branch 'master' into PSI 2025-02-24 14:20:14 +01:00
7c10c29c33 Merge branch 'master' into PSI 2024-04-15 16:19:15 +02:00
4c9b294e2b Merge branch 'master' into PSI 2023-12-01 16:32:56 +01:00
3efc4e3fd8 Merge branch 'master' into PSI 2023-03-01 08:16:53 +01:00
763e39d435 disable test for invalid field names 2023-02-24 14:10:42 +01:00
155e8f078e Merge branch 'master' into PSI 2023-01-23 11:30:51 +01:00
865840ec0c allow all chars in field names 2021-08-26 15:38:09 +02:00
5 changed files with 18 additions and 6 deletions

View File

@@ -38,7 +38,7 @@ PROJECT_NAME = "PVData C++"
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = 8.0.7
PROJECT_NUMBER = 8.0.8-dev
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a

View File

@@ -2,11 +2,11 @@
EPICS_PVD_MAJOR_VERSION = 8
EPICS_PVD_MINOR_VERSION = 0
EPICS_PVD_MAINTENANCE_VERSION = 7
EPICS_PVD_MAINTENANCE_VERSION = 8
# Development flag, set to zero for release versions
EPICS_PVD_DEVELOPMENT_FLAG = 0
EPICS_PVD_DEVELOPMENT_FLAG = 1
# Immediately after a release the MAINTENANCE_VERSION
# will be incremented and the DEVELOPMENT_FLAG set to 1

View File

@@ -38,7 +38,7 @@ PROJECT_NAME = "PVData C++"
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = 8.0.7
PROJECT_NUMBER = 8.0.8-dev
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a

View File

@@ -1302,6 +1302,17 @@ void validateFieldName(const std::string& n)
msg<<"Field name \""<<n<<"\" must begin with A-Z, a-z, or '_'";
throw std::invalid_argument(msg.str());
}
/*
size_t i = n.find_first_of("\"' ./");
if (i != std::string::npos)
{
std::cerr << "Warning: character '" << n[i] << "' ("
<< (unsigned int)(unsigned char)n[i]
<< ") in field name \"" << n
<< "\" may have undesired side effects." << std::endl;
}
*/
/*
for(size_t i=0, N=n.size(); i<N; i++)
{
char c = n[i];
@@ -1320,6 +1331,7 @@ void validateFieldName(const std::string& n)
}
}
}
*/
}
void validateFieldNames(const StringArray& l)

View File

@@ -768,7 +768,7 @@ static void testSubField()
MAIN(testPVData)
{
testPlan(271);
testPlan(270);
try{
fieldCreate = getFieldCreate();
pvDataCreate = getPVDataCreate();
@@ -777,7 +777,7 @@ MAIN(testPVData)
convert = getConvert();
testSizes();
testCreatePVStructure();
testCreatePVStructureWithInvalidName();
// testCreatePVStructureWithInvalidName();
testPVScalar();
testScalarArray();
testRequest();