diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html index 59bf2d2..70a2f0f 100644 --- a/documentation/RELEASE_NOTES.html +++ b/documentation/RELEASE_NOTES.html @@ -34,8 +34,8 @@ For example:

is replaced by

  PVDoublePtr pvValue;
-  cout << pvValue=>dumpValue(cout) << endl
-  cout << pvValue->getField()->dump(cout) << endl;
+  cout << *pvValue << endl
+  cout << *pvValue->getField() << endl;
 

union is a new basic type.

There are two new basic types: union_t and unionArray.

@@ -55,4 +55,4 @@ only on pvData, i. e. it no longer has any knowledge of PVRecord.

This is for is for use by code that implements pvAccess monitors. This is prototype and is subject to debate.

Release 3.0.2

-

This was the starting point for RELEASE_NOTES

\ No newline at end of file +

This was the starting point for RELEASE_NOTES

diff --git a/documentation/RELEASE_NOTES.md b/documentation/RELEASE_NOTES.md index 5a66e64..760892c 100644 --- a/documentation/RELEASE_NOTES.md +++ b/documentation/RELEASE_NOTES.md @@ -53,8 +53,8 @@ For example: is replaced by PVDoublePtr pvValue; - cout << pvValue=>dumpValue(cout) << endl - cout << pvValue->getField()->dump(cout) << endl; + cout << *pvValue << endl + cout << *pvValue->getField() << endl; union is a new basic type. diff --git a/src/factory/Convert.cpp b/src/factory/Convert.cpp index ffeff40..ce00129 100644 --- a/src/factory/Convert.cpp +++ b/src/factory/Convert.cpp @@ -50,7 +50,8 @@ void Convert::getString(string *buf,PVField const *pvField,int /*indentLevel*/) { // TODO indextLevel ignored std::ostringstream strm; - strm << pvField->dumpValue(strm) << std::endl; + pvField->dumpValue(strm); + strm << std::endl; // PrinterPlain p; // p.setStream(strm); // p.print(*pvField); diff --git a/src/misc/parseToPOD.cpp b/src/misc/parseToPOD.cpp index 8180a6f..fa9bc85 100644 --- a/src/misc/parseToPOD.cpp +++ b/src/misc/parseToPOD.cpp @@ -27,7 +27,7 @@ using std::string; #endif #if EPICS_VERSION_INT < VERSION_INT(3,15,0,1) -/* integer conversion primatives added to epicsStdlib.c in 3.15.0.1 */ +/* integer conversion primitives added to epicsStdlib.c in 3.15.0.1 */ #define S_stdlib_noConversion 1 /* No digits to convert */ #define S_stdlib_extraneous 2 /* Extraneous characters */ @@ -249,7 +249,18 @@ epicsParseFloat(const char *str, float *to, char **units) } #endif -#if defined(NEED_LONGLONG) && (defined(__vxworks) || defined (_WIN32)) +// MS Visual Studio 2013 defines strtoll, etc. +#if defined(_WIN32) +# if (_MSC_VER >= 1800) +# define WIN_NEEDS_OLL_FUNC 0 +# else +# define WIN_NEEDS_OLL_FUNC 1 +# endif +#else +# define WIN_NEEDS_OLL_FUNC 0 +#endif + +#if defined(NEED_LONGLONG) && (defined(__vxworks) || WIN_NEEDS_OLL_FUNC) static long long strtoll(const char *ptr, char ** endp, int base) { diff --git a/testApp/copy/testPVCopy.cpp b/testApp/copy/testPVCopy.cpp index fc2fc63..8a7d886 100644 --- a/testApp/copy/testPVCopy.cpp +++ b/testApp/copy/testPVCopy.cpp @@ -214,7 +214,7 @@ static void scalarTest() CreateRequest::shared_pointer createRequest = CreateRequest::create(); pvRequest = createRequest->createRequest(request); if(debug) { cout << "request " << request << endl; } - if(debug) { cout << "pvRequest\n" << pvRequest->dumpValue(cout) << endl; } + if(debug) { cout << "pvRequest\n" << *pvRequest << endl; } pvCopy = PVCopy::create(pvMaster,pvRequest,""); valueNameCopy = "value"; testPVScalar(valueNameMaster,valueNameCopy,pvMaster,pvCopy); @@ -222,7 +222,7 @@ static void scalarTest() valueNameMaster = "value"; pvRequest = createRequest->createRequest(request); if(debug) { cout << "request " << request << endl; } - if(debug) { cout << "pvRequest\n" << pvRequest->dumpValue(cout) << endl; } + if(debug) { cout << "pvRequest\n" << *pvRequest << endl; } pvCopy = PVCopy::create(pvMaster,pvRequest,""); valueNameCopy = "value"; testPVScalar(valueNameMaster,valueNameCopy,pvMaster,pvCopy); @@ -230,7 +230,7 @@ static void scalarTest() valueNameMaster = "value"; pvRequest = createRequest->createRequest(request); if(debug) { cout << "request " << request << endl; } - if(debug) { cout << "pvRequest\n" << pvRequest->dumpValue(cout) << endl; } + if(debug) { cout << "pvRequest\n" << *pvRequest << endl; } pvCopy = PVCopy::create(pvMaster,pvRequest,""); valueNameCopy = "value"; testPVScalar(valueNameMaster,valueNameCopy,pvMaster,pvCopy); @@ -253,7 +253,7 @@ static void arrayTest() valueNameMaster = request = "value"; pvRequest = createRequest->createRequest(request); if(debug) { cout << "request " << request << endl; } - if(debug) { cout << "pvRequest\n" << pvRequest->dumpValue(cout) << endl; } + if(debug) { cout << "pvRequest\n" << *pvRequest << endl; } pvCopy = PVCopy::create(pvMaster,pvRequest,""); valueNameCopy = "value"; testPVScalarArray(pvDouble,valueNameMaster,valueNameCopy,pvMaster,pvCopy); @@ -261,7 +261,7 @@ static void arrayTest() valueNameMaster = "value"; pvRequest = createRequest->createRequest(request); if(debug) { cout << "request " << request << endl; } - if(debug) { cout << "pvRequest\n" << pvRequest->dumpValue(cout) << endl; } + if(debug) { cout << "pvRequest\n" << *pvRequest << endl; } pvCopy = PVCopy::create(pvMaster,pvRequest,""); valueNameCopy = "value"; testPVScalarArray(pvDouble,valueNameMaster,valueNameCopy,pvMaster,pvCopy); @@ -269,7 +269,7 @@ static void arrayTest() valueNameMaster = "value"; pvRequest = createRequest->createRequest(request); if(debug) { cout << "request " << request << endl; } - if(debug) { cout << "pvRequest\n" << pvRequest->dumpValue(cout) << endl; } + if(debug) { cout << "pvRequest\n" << *pvRequest << endl; } pvCopy = PVCopy::create(pvMaster,pvRequest,""); valueNameCopy = "value"; testPVScalarArray(pvDouble,valueNameMaster,valueNameCopy,pvMaster,pvCopy); @@ -320,7 +320,7 @@ static void powerSupplyTest() valueNameMaster = request = "power.value"; pvRequest = createRequest->createRequest(request); if(debug) { cout << "request " << request << endl; } - if(debug) { cout << "pvRequest\n" << pvRequest->dumpValue(cout) << endl; } + if(debug) { cout << "pvRequest\n" << *pvRequest << endl; } pvCopy = PVCopy::create(pvMaster,pvRequest,""); valueNameCopy = "power.value"; testPVScalar(valueNameMaster,valueNameCopy,pvMaster,pvCopy); @@ -328,7 +328,7 @@ static void powerSupplyTest() valueNameMaster = "power.value"; pvRequest = createRequest->createRequest(request); if(debug) { cout << "request " << request << endl; } - if(debug) { cout << "pvRequest\n" << pvRequest->dumpValue(cout) << endl; } + if(debug) { cout << "pvRequest\n" << *pvRequest << endl; } pvCopy = PVCopy::create(pvMaster,pvRequest,""); valueNameCopy = "power.value"; testPVScalar(valueNameMaster,valueNameCopy,pvMaster,pvCopy); @@ -336,7 +336,7 @@ static void powerSupplyTest() valueNameMaster = "power.value"; pvRequest = createRequest->createRequest(request); if(debug) { cout << "request " << request << endl; } - if(debug) { cout << "pvRequest\n" << pvRequest->dumpValue(cout) << endl; } + if(debug) { cout << "pvRequest\n" << *pvRequest << endl; } pvCopy = PVCopy::create(pvMaster,pvRequest,""); valueNameCopy = "power.value"; testPVScalar(valueNameMaster,valueNameCopy,pvMaster,pvCopy); @@ -344,7 +344,7 @@ static void powerSupplyTest() valueNameMaster = "power.value"; pvRequest = createRequest->createRequest(request); if(debug) { cout << "request " << request << endl; } - if(debug) { cout << "pvRequest\n" << pvRequest->dumpValue(cout) << endl; } + if(debug) { cout << "pvRequest\n" << *pvRequest << endl; } pvCopy = PVCopy::create(pvMaster,pvRequest,""); valueNameCopy = "power.value"; testPVScalar(valueNameMaster,valueNameCopy,pvMaster,pvCopy);