summaryrefslogtreecommitdiff
path: root/TAO/examples/Simple/grid/Grid_i.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2023-01-18 10:14:13 +0100
committerGitHub <noreply@github.com>2023-01-18 10:14:13 +0100
commitdfc5c60f27c6ea1f566b1819ebbc3d979c19ffad (patch)
tree8ed59abfe6eaabafec257cda3b99bd617ec5d18c /TAO/examples/Simple/grid/Grid_i.cpp
parent956dcabf4bdd4fb3ec1be53c392398b495af27cf (diff)
parentd97b6edbeeb9a007f65e10e069a753bc087e998f (diff)
downloadATCD-dfc5c60f27c6ea1f566b1819ebbc3d979c19ffad.tar.gz
Merge pull request #2035 from jwillemsen/jwi-cleanupsolaris
Cleanup Solaris support
Diffstat (limited to 'TAO/examples/Simple/grid/Grid_i.cpp')
-rw-r--r--TAO/examples/Simple/grid/Grid_i.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index 3fa4a1fcd6c..6906f8585d7 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -1,7 +1,7 @@
// -*- C++ -*-
#include "Grid_i.h"
-// Solaris and some Windows compilers don't have min in std namespaces
+// Some Windows compilers don't have min in std namespaces
// moreover on Windows 'min' is a macro, so we have to avoid using it literally.
CORBA::UShort
Grid_i::ushort_min (CORBA::UShort a, CORBA::UShort b)