From 02f24a74e7bd4368c42f03edd6758c2233fd5e33 Mon Sep 17 00:00:00 2001
From: Klemen Vodopivec <klemen@vodopivec.org>
Date: Wed, 15 Apr 2020 16:58:27 -0700
Subject: [PATCH] Made it build on EPICS 3.14.12.6, all unit tests pass.

---
 example/ticker.cpp  |  2 +-
 src/client.cpp      |  2 +-
 src/evhelper.cpp    |  6 +++---
 src/pvxs/log.h      |  1 +
 test/testconfig.cpp |  6 +++---
 test/testget.cpp    |  8 ++++----
 test/testinfo.cpp   |  8 ++++----
 test/testmon.cpp    |  4 ++--
 test/testput.cpp    | 12 ++++++------
 test/testrpc.cpp    |  2 +-
 tools/call.cpp      |  2 +-
 tools/get.cpp       |  2 +-
 tools/info.cpp      |  2 +-
 tools/monitor.cpp   |  2 +-
 tools/put.cpp       |  2 +-
 tools/pvxvct.cpp    |  2 +-
 16 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/example/ticker.cpp b/example/ticker.cpp
index 0eb8e2c..e0ba39c 100644
--- a/example/ticker.cpp
+++ b/example/ticker.cpp
@@ -85,7 +85,7 @@ int main(int argc, char* argv[])
 
     // connect to SIGINT/SIGTERM to break from main loop
     SigInt handle([&done]() {
-        done.trigger();
+        done.signal();
     });
 
     // Start server in background
diff --git a/src/client.cpp b/src/client.cpp
index c1c79bd..d4915c4 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -157,7 +157,7 @@ void ResultWaiter::complete(Result&& result, bool interrupt)
         }
     }
     if(wakeup)
-        notify.trigger();
+        notify.signal();
 }
 
 OperationBase::OperationBase(operation_t op, const std::shared_ptr<Channel>& chan)
diff --git a/src/evhelper.cpp b/src/evhelper.cpp
index 40477dd..58b7d82 100644
--- a/src/evhelper.cpp
+++ b/src/evhelper.cpp
@@ -129,7 +129,7 @@ struct evbase::Pvt : public epicsThreadRunable
             if(event_add(keepalive.get(), &tick))
                 throw std::runtime_error("Can't start keepalive timer");
 
-            start_sync.trigger();
+            start_sync.signal();
 
             log_info_printf(logerr, "Enter loop worker for %p\n", base.get());
 
@@ -141,7 +141,7 @@ struct evbase::Pvt : public epicsThreadRunable
         }catch(std::exception& e){
             log_exc_printf(logerr, "Unhandled exception in event_base run : %s\n",
                             e.what());
-            start_sync.trigger();
+            start_sync.signal();
         }
     }
 
@@ -165,7 +165,7 @@ struct evbase::Pvt : public epicsThreadRunable
                 }
             }
             if(work.notify)
-                work.notify->trigger();
+                work.notify->signal();
         }
     }
     static
diff --git a/src/pvxs/log.h b/src/pvxs/log.h
index 19321db..a1c5afc 100644
--- a/src/pvxs/log.h
+++ b/src/pvxs/log.h
@@ -8,6 +8,7 @@
 
 #include <atomic>
 
+#include <cstddef>
 #include <stdarg.h>
 
 #include <compilerDependencies.h>
diff --git a/test/testconfig.cpp b/test/testconfig.cpp
index 0114db8..2e7ce11 100644
--- a/test/testconfig.cpp
+++ b/test/testconfig.cpp
@@ -39,9 +39,9 @@ void testParse()
         testEq(conf.addressList[1], "5.6.7.8:9876");
     }
 
-    epicsEnvUnset("EPICS_PVA_ADDR_LIST");
-    epicsEnvUnset("EPICS_PVA_AUTO_ADDR_LIST");
-    epicsEnvUnset("EPICS_PVA_BROADCAST_PORT");
+    //epicsEnvUnset("EPICS_PVA_ADDR_LIST");
+    //epicsEnvUnset("EPICS_PVA_AUTO_ADDR_LIST");
+    //epicsEnvUnset("EPICS_PVA_BROADCAST_PORT");
 }
 
 }
diff --git a/test/testget.cpp b/test/testget.cpp
index c22b677..4f1b0dc 100644
--- a/test/testget.cpp
+++ b/test/testget.cpp
@@ -73,7 +73,7 @@ struct Tester {
         auto op = cli.get("mailbox")
                 .result([&actual, &done](client::Result&& result) {
                     actual = std::move(result);
-                    done.trigger();
+                    done.signal();
                 })
                 .exec();
 
@@ -140,7 +140,7 @@ struct Tester {
         auto op = cli.info("mailbox")
                 .result([&actual, &done](client::Result&& result) {
                     actual = std::move(result);
-                    done.trigger();
+                    done.signal();
                 })
                 .exec();
 
@@ -162,7 +162,7 @@ struct Tester {
         cli.info("mailbox")
                 .result([&actual, &done](client::Result&& result) {
                     actual = std::move(result);
-                    done.trigger();
+                    done.signal();
                 })
                 .exec();
 
@@ -221,7 +221,7 @@ void testError(bool phase)
     auto op = cli.get("mailbox")
             .result([&actual, &done](client::Result&& result) {
                 actual = std::move(result);
-                done.trigger();
+                done.signal();
             })
             .exec();
 
diff --git a/test/testinfo.cpp b/test/testinfo.cpp
index d60c249..fef0e4b 100644
--- a/test/testinfo.cpp
+++ b/test/testinfo.cpp
@@ -49,7 +49,7 @@ struct Tester {
         auto op = cli.info("mailbox")
                 .result([&actual, &done](client::Result&& result) {
                     actual = std::move(result);
-                    done.trigger();
+                    done.signal();
                 })
                 .exec();
 
@@ -116,7 +116,7 @@ struct Tester {
         auto op = cli.info("mailbox")
                 .result([&actual, &done](client::Result&& result) {
                     actual = std::move(result);
-                    done.trigger();
+                    done.signal();
                 })
                 .exec();
 
@@ -138,7 +138,7 @@ struct Tester {
         cli.info("mailbox")
                 .result([&actual, &done](client::Result&& result) {
                     actual = std::move(result);
-                    done.trigger();
+                    done.signal();
                 })
                 .exec();
 
@@ -183,7 +183,7 @@ void testError()
     auto op = cli.info("mailbox")
             .result([&actual, &done](client::Result&& result) {
                 actual = std::move(result);
-                done.trigger();
+                done.signal();
             })
             .exec();
 
diff --git a/test/testmon.cpp b/test/testmon.cpp
index 855bbb8..5fa15ad 100644
--- a/test/testmon.cpp
+++ b/test/testmon.cpp
@@ -59,7 +59,7 @@ struct BasicTest {
                 .maskDisconnected(false)
                 .event([this](client::Subscription& sub) {
                     testDiag("Event evt");
-                    evt.trigger();
+                    evt.signal();
                 })
                 .exec();
     }
@@ -165,7 +165,7 @@ struct TestLifeCycle : public BasicTest
                         .maskDisconnected(false)
                         .event([&evt2](client::Subscription& sub) {
                             testDiag("Event evt2");
-                            evt2.trigger();
+                            evt2.signal();
                         })
                         .exec();
 
diff --git a/test/testput.cpp b/test/testput.cpp
index eaefb32..81dc568 100644
--- a/test/testput.cpp
+++ b/test/testput.cpp
@@ -65,7 +65,7 @@ struct Tester : public TesterBase
                 })
                 .result([&actual, &done](client::Result&& result) {
                     actual = std::move(result);
-                    done.trigger();
+                    done.signal();
                 })
                 .exec();
 
@@ -141,7 +141,7 @@ struct Tester : public TesterBase
         auto op = cli.info("mailbox")
                 .result([&actual, &done](client::Result&& result) {
                     actual = std::move(result);
-                    done.trigger();
+                    done.signal();
                 })
                 .exec();
 
@@ -163,7 +163,7 @@ struct Tester : public TesterBase
         cli.info("mailbox")
                 .result([&actual, &done](client::Result&& result) {
                     actual = std::move(result);
-                    done.trigger();
+                    done.signal();
                 })
                 .exec();
 
@@ -192,7 +192,7 @@ struct TestPutBuilder : public TesterBase
                 .set("nonexistant", "nope", false)
                 .result([&actual, &done](client::Result&& result) {
                     actual = std::move(result);
-                    done.trigger();
+                    done.signal();
                 })
                 .exec();
 
@@ -242,7 +242,7 @@ void testRO()
             })
             .result([&actual, &done](client::Result&& result) {
                 actual = std::move(result);
-                done.trigger();
+                done.signal();
             })
             .exec();
 
@@ -294,7 +294,7 @@ void testError()
     auto op = cli.get("mailbox")
             .result([&actual, &done](client::Result&& result) {
                 actual = std::move(result);
-                done.trigger();
+                done.signal();
             })
             .exec();
 
diff --git a/test/testrpc.cpp b/test/testrpc.cpp
index 13b513f..89a30ff 100644
--- a/test/testrpc.cpp
+++ b/test/testrpc.cpp
@@ -59,7 +59,7 @@ struct Tester {
         auto op = cli.rpc("mailbox", std::move(arg))
                 .result([this](client::Result&& result) {
                     actual = std::move(result);
-                    done.trigger();
+                    done.signal();
                 })
                 .exec();
 
diff --git a/tools/call.cpp b/tools/call.cpp
index bc643f7..dd3ab5b 100644
--- a/tools/call.cpp
+++ b/tools/call.cpp
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
                 std::cerr<<"Error "<<typeid(e).name()<<" : "<<e.what()<<"\n";
                 ret=1;
             }
-            done.trigger();
+            done.signal();
         })
                 .exec();
 
diff --git a/tools/get.cpp b/tools/get.cpp
index d22ac6f..c248f79 100644
--- a/tools/get.cpp
+++ b/tools/get.cpp
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
                                          .arrayLimit(arrLimit);
 
                               if(remaining.fetch_sub(1)==1)
-                                  done.trigger();
+                                  done.signal();
                           })
                           .exec());
         }
diff --git a/tools/info.cpp b/tools/info.cpp
index 65cdf21..52ef431 100644
--- a/tools/info.cpp
+++ b/tools/info.cpp
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
                               }
 
                               if(remaining.fetch_sub(1)==1)
-                                  done.trigger();
+                                  done.signal();
                           })
                           .exec());
         }
diff --git a/tools/monitor.cpp b/tools/monitor.cpp
index bb0329c..d4d4578 100644
--- a/tools/monitor.cpp
+++ b/tools/monitor.cpp
@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
                     if(verbose)
                         std::cerr<<argv[n]<<" Finished\n";
                     if(remaining.fetch_sub(1)==1)
-                        done.trigger();
+                        done.signal();
 
                 }catch(client::Connected& conn) {
                     std::cerr<<argv[n]<<" Connected to "<<conn.peerName<<"\n";
diff --git a/tools/put.cpp b/tools/put.cpp
index 4bded31..2e6f5d4 100644
--- a/tools/put.cpp
+++ b/tools/put.cpp
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
                         std::cerr<<"Error "<<typeid(e).name()<<" : "<<e.what()<<"\n";
                         ret=1;
                     }
-                    done.trigger();
+                    done.signal();
                 })
                 .exec();
 
diff --git a/tools/pvxvct.cpp b/tools/pvxvct.cpp
index e72f179..0c8c559 100644
--- a/tools/pvxvct.cpp
+++ b/tools/pvxvct.cpp
@@ -254,7 +254,7 @@ int main(int argc, char *argv[])
 
         epicsEvent done;
         pva::SigInt handle([&done](){
-            done.trigger();
+            done.signal();
         });
 
         done.wait();