diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-03-16 10:43:25 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-03-16 10:43:25 +0000 |
| commit | 9c9e192843317880052ada586d5e6b045d3b9685 (patch) | |
| tree | 934fea6e5b51dba69d88839b8147302f477150bc | |
| parent | cae5f6b72d27659030bcd39f10feca40836be5a3 (diff) | |
| download | ATCD-9c9e192843317880052ada586d5e6b045d3b9685.tar.gz | |
Fri Mar 16 10:45:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com>
* tests/ZIOP/common.h:
* tests/ZIOP/client.cpp:
* tests/ZIOP/server.cpp:
Remove scoreboard warnings.
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/ZIOP/client.cpp | 1 | ||||
| -rw-r--r-- | TAO/tests/ZIOP/common.h | 3 | ||||
| -rw-r--r-- | TAO/tests/ZIOP/server.cpp | 1 |
4 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 0cfb0723e8c..b26707f9d23 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Mar 16 10:45:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com> + + * tests/ZIOP/common.h: + * tests/ZIOP/client.cpp: + * tests/ZIOP/server.cpp: + Remove scoreboard warnings. + Thu Mar 15 10:35:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com> * bin/tao_orb_tests.lst diff --git a/TAO/tests/ZIOP/client.cpp b/TAO/tests/ZIOP/client.cpp index 1135429fd31..87472ce14f7 100644 --- a/TAO/tests/ZIOP/client.cpp +++ b/TAO/tests/ZIOP/client.cpp @@ -8,6 +8,7 @@ #include "TestCompressor/TestCompressor_Factory.h" #include "common.h" +static const ACE_TCHAR *ior = ACE_TEXT("file://") DEFAULT_IOR_FILENAME; static ::Compression::CompressionManager_var compression_manager = 0; diff --git a/TAO/tests/ZIOP/common.h b/TAO/tests/ZIOP/common.h index 95efa9e9b86..f896f7650da 100644 --- a/TAO/tests/ZIOP/common.h +++ b/TAO/tests/ZIOP/common.h @@ -5,6 +5,5 @@ #define LEAST_COMPRESSION_LEVEL ((CLIENT_COMPRESSION_LEVEL < SERVER_COMPRESSION_LEVEL) ?\ CLIENT_COMPRESSION_LEVEL : SERVER_COMPRESSION_LEVEL) -static const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); -static const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); +#define DEFAULT_IOR_FILENAME ACE_TEXT("test.ior"); static int test = 1; diff --git a/TAO/tests/ZIOP/server.cpp b/TAO/tests/ZIOP/server.cpp index b863cf0dd2a..cdce279b1dc 100644 --- a/TAO/tests/ZIOP/server.cpp +++ b/TAO/tests/ZIOP/server.cpp @@ -12,6 +12,7 @@ #include "tao/Transport.h" #include "common.h" +static const ACE_TCHAR *ior_output_file = DEFAULT_IOR_FILENAME; int parse_args (int argc, ACE_TCHAR *argv[]) |