← Back to branch summary

~ubuntu-branches/ubuntu/quantal/zeroc-ice/quantal

« back to all changes in this revision

Viewing changes to cpp/src/IcePatch2/Client.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Cleto Martin Angelina
  • Date: 2011-04-25 18:44:24 UTC
  • mfrom: (6.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110425184424-sep9i9euu434vq4c
Tags: 3.4.1-7
http://bugs.debian.org/623555
* Bug fix: "libdb5.1-java.jar was renamed to db.jar", thanks to Ondřej
  Surý (Closes: #623555).
* Bug fix: "causes noise in php5", thanks to Jayen Ashar (Closes:
  #623533).

Show diffs side-by-side

added added

removed removed

Lines of Context:
cpp/src/IcePatch2/Client.cpp
1
1
// **********************************************************************
2
2
//
3
 
// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
 
3
// Copyright (c) 2003-2010 ZeroC, Inc. All rights reserved.
4
4
//
5
5
// This copy of Ice is licensed to you under the terms described in the
6
6
// ICE_LICENSE file included in this distribution.
170
170
    keyPressed()
171
171
    {
172
172
        bool pressed = false;
173
 
#ifdef __BCPLUSPLUS__
174
 
        while(kbhit())
175
 
#else
176
173
        while(_kbhit())
177
 
#endif
178
174
        {
179
175
            pressed = true;
180
176
            _getch();
246
242
    vector<string> args;
247
243
    try
248
244
    {
249
 
#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
250
 
        IceUtil::DummyBCC dummy;
251
 
#endif
252
245
        args = opts.parse(argc, (const char**)argv);
253
246
    }
254
247
    catch(const IceUtilInternal::BadOptException& e)
333
326
    cerr << options << endl;
334
327
}
335
328
 
 
329
//COMPILERFIX: Borland C++ 2010 doesn't support wmain for console applications.
 
330
#if defined(_WIN32 ) && !defined(__BCPLUSPLUS__)
 
331
 
 
332
int
 
333
wmain(int argc, wchar_t* argv[])
 
334
 
 
335
#else
 
336
 
336
337
int
337
338
main(int argc, char* argv[])
 
339
 
 
340
#endif
338
341
{
339
342
    Client app;
340
343
    return app.main(argc, argv);