diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-08-26 08:25:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-26 08:25:33 +0200 |
| commit | 838e3dd53360b6b1574913d004d2e77e1e2e37d6 (patch) | |
| tree | a06a933fb5789a8fd5940c84e090fddbc0e9b239 | |
| parent | b4840dd0504121a633774fae167c59c85103a5f9 (diff) | |
| parent | 5ca07d231ac7a8d839a02ef9bf8b8baac990556a (diff) | |
| download | ATCD-838e3dd53360b6b1574913d004d2e77e1e2e37d6.tar.gz | |
Merge pull request #1222 from jwillemsen/master
Enable windows ci on push
| -rw-r--r-- | .github/workflows/windows.yml | 1 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SCIOP_Acceptor.h | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9e43a5802c8..2beeca00bcf 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -1,6 +1,7 @@ name: windows on: + push: pull_request: schedule: - cron: '0 7 * * SUN' diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h index d386e78f29e..ed76fe47c55 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.h +++ b/TAO/tao/Strategies/SCIOP_Acceptor.h @@ -11,7 +11,6 @@ */ // =================================================================== - #ifndef TAO_SCIOP_ACCEPTOR_H #define TAO_SCIOP_ACCEPTOR_H #include /**/ "ace/pre.h" @@ -109,7 +108,6 @@ public: char *&host); protected: - /** * Implement the common part of the open*() methods. This method is * virtual to allow a derived class implementation to be invoked @@ -204,7 +202,6 @@ protected: TAO_ORB_Core *orb_core_; private: - /// the concrete acceptor, as a pointer to it's base class. TAO_SCIOP_BASE_ACCEPTOR base_acceptor_; @@ -212,7 +209,6 @@ private: TAO_SCIOP_CREATION_STRATEGY *creation_strategy_; TAO_SCIOP_CONCURRENCY_STRATEGY *concurrency_strategy_; TAO_SCIOP_ACCEPT_STRATEGY *accept_strategy_; - }; TAO_END_VERSIONED_NAMESPACE_DECL |