diff options
| author | Joe George <joe@zeroc.com> | 2017-06-07 12:43:11 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-06-07 12:43:11 -0400 |
| commit | 6f3029de953939a230bb5f124bc123e30b867884 (patch) | |
| tree | 015363ddb83f38bd18bb11dcdc4a00e6569306dc /cpp | |
| parent | Fix (ICE-7984) - C++ dist testing script error (diff) | |
| download | ice-6f3029de953939a230bb5f124bc123e30b867884.tar.bz2 ice-6f3029de953939a230bb5f124bc123e30b867884.tar.xz ice-6f3029de953939a230bb5f124bc123e30b867884.zip | |
Fix some whitespace and typo in Proxy.h
Diffstat (limited to 'cpp')
4 files changed, 4 insertions, 4 deletions
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h index 25fed633a05..c50d9fa8b28 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -24,7 +24,7 @@ #include <Ice/BatchRequestQueueF.h> #include <Ice/AsyncResult.h> //#include <Ice/RouterF.h> // Can't include RouterF.h here, otherwise we have cyclic includes -//#include <Ice/LocatorF.h> // Can't include RouterF.h here, otherwise we have cyclic includes +//#include <Ice/LocatorF.h> // Can't include LocatorF.h here, otherwise we have cyclic includes #include <Ice/Current.h> #include <Ice/CommunicatorF.h> #include <Ice/OutgoingAsync.h> diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win64 b/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win64 index d4da12a908d..9d2502aaa55 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win64 +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-vc140.Win64 @@ -1,4 +1,4 @@ 0 IceUtil::Exception::Exception at 1 IceUtil::ExceptionHelper<IceUtil::NullHandleException>::ExceptionHelper<IceUtil::NullHandleException> at 2 IceUtil::NullHandleException::NullHandleException at - 3 main at
\ No newline at end of file + 3 main at diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release-vc141.Win32 b/cpp/test/IceUtil/stacktrace/StackTrace.release-vc141.Win32 index 16013585b48..2ddbaad2677 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release-vc141.Win32 +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-vc141.Win32 @@ -4,4 +4,4 @@ 3 `anonymous namespace'::Thrower::third at 4 `anonymous namespace'::Thrower::second at 5 `anonymous namespace'::Thrower::first at - 6 main at
\ No newline at end of file + 6 main at diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release-vc141.Win64 b/cpp/test/IceUtil/stacktrace/StackTrace.release-vc141.Win64 index 16013585b48..2ddbaad2677 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release-vc141.Win64 +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-vc141.Win64 @@ -4,4 +4,4 @@ 3 `anonymous namespace'::Thrower::third at 4 `anonymous namespace'::Thrower::second at 5 `anonymous namespace'::Thrower::first at - 6 main at
\ No newline at end of file + 6 main at |