Commits

C. Enrique Garcia Dabo authored and Ville Suoranta committed 7db80e9910d Merge
Pull request #5: Add X11 headers to be removed from casa6 (CAS-13868)

Merge in CASA/casatablebrowser from CAS-13868 to master * commit 'f8471ce9391f232972d5aee6f7dfe37d79d7d1de': Add X11 headers to be removed from casa6

src/code/graphics/X11/X_enter.h

Added
1 +//# X_enter.h: Include file to enter X name space
2 +//# Copyright (C) 1999
3 +//# Associated Universities, Inc. Washington DC, USA.
4 +//#
5 +//# This library is free software; you can redistribute it and/or modify it
6 +//# under the terms of the GNU Library General Public License as published by
7 +//# the Free Software Foundation; either version 2 of the License, or (at your
8 +//# option) any later version.
9 +//#
10 +//# This library is distributed in the hope that it will be useful, but WITHOUT
11 +//# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12 +//# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
13 +//# License for more details.
14 +//#
15 +//# You should have received a copy of the GNU Library General Public License
16 +//# along with this library; if not, write to the Free Software Foundation,
17 +//# Inc., 675 Massachusetts Ave, Cambridge, MA 02139, USA.
18 +//#
19 +//# Correspondence concerning AIPS++ should be addressed as follows:
20 +//# Internet email: aips2-request@nrao.edu.
21 +//# Postal address: AIPS++ Project Office
22 +//# National Radio Astronomy Observatory
23 +//# 520 Edgemont Road
24 +//# Charlottesville, VA 22903-2475 USA
25 +//#
26 +//# $Id$
27 +
28 +// <summary>
29 +// Include file to enter X name space
30 +// </summary>
31 +//
32 +// <motivation>
33 +// Need to avoid conflicts between X11 and aips++ classes
34 +// </motivation>
35 +//
36 +// <synopsis>
37 +// Xlib.h issues the following statements:
38 +// <ul>
39 +// <li> #define casacore::Bool int
40 +// <li> #define true 1
41 +// <li> #define false 0
42 +// </ul>
43 +// X.h issues the following statements:
44 +// <ul>
45 +// <li> #define casacore::Complex 0 /* paths may intersect */
46 +// <li> typedef unsigned long casacore::Time;
47 +// </ul>
48 +// </synopsis>
49 +//
50 +// <group name="Definitions for Enter X Namespace">
51 +
52 +/*
53 +
54 +#ifndef X_NameSpace
55 +#define X_NameSpace
56 +
57 +#ifdef String
58 +#undef String
59 +#endif
60 +#define casacore::String XString
61 +
62 +#ifdef Time
63 +#undef Time
64 +#endif
65 +#define casacore::Time XTime
66 +
67 +#ifdef Display
68 +#undef Display
69 +#endif
70 +#define Display XDisplay
71 +
72 +#ifdef Colormap
73 +#undef Colormap
74 +#endif
75 +#define Colormap XColormap
76 +
77 +#undef Bool
78 +#undef true
79 +#undef false
80 +
81 +#undef Complex
82 +
83 +#define XFalse 0
84 +#define XTrue 1
85 +#endif
86 +*/
87 +// </group>

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut