Changeset b38cd93 in git


Ignore:
Timestamp:
01/07/10 11:15:38 (9 years ago)
Author:
Olly Betts <olly@…>
Branches:
add-show-splays, line_contents, master, stereo, svn/github/master, svn/origin/master, svn/tags/1.1.14, svn/tags/1.1.15, svn/tags/1.1.16, svn/tags/1.2.0, svn/tags/1.2.1, svn/tags/1.2.2, svn/tags/1.2.3, svn/tags/1.2.4, svn/tags/1.2.5, svn/trunk, travis-osx
Children:
2d5edf4
Parents:
ecb7f9f
Message:

src/gfxcore.h: Work around Mac OS X polluting the global namespace
with a "Point" class.

git-svn-id: file:///home/survex-svn/survex/trunk@3475 4b37db11-9a0c-4f06-9ece-9ab7cdaee568

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    recb7f9f rb38cd93  
     1Thu Jul 01 10:15:06 GMT 2010  Olly Betts <olly@survex.com>
     2
     3        * src/gfxcore.h: Work around Mac OS X polluting the global namespace
     4          with a "Point" class.
     5
    16Thu Jul 01 10:10:45 GMT 2010  Olly Betts <olly@survex.com>
    27
  • src/gfxcore.h

    recb7f9f rb38cd93  
    4545
    4646extern const int NUM_DEPTH_COLOURS;
     47
     48// Mac OS X headers pollute the global namespace with generic names like
     49// "class Point", which clashes with our "class Point".  So for __WXMAC__
     50// put our class in a namespace and pull it in from that with "using".
     51#ifdef __WXMAC__
     52namespace svx {
     53#endif
    4754
    4855class Point : public Vector3 {
     
    5764    bool IsValid() const { return x != DBL_MAX; }
    5865};
     66
     67#ifdef __WXMAC__
     68}
     69using svx::Point;
     70#endif
    5971
    6072class XSect;
Note: See TracChangeset for help on using the changeset viewer.