TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Disallow misnesting for d1x+d2x, not for dsx

Browse source 
Future work will introduce uses of d1x/d2x in the other game when the
types can be usefully shared.  Extend the anti-nesting guards to cover
mistakes that might arise when referring to the namespaces by their
real name, rather than the alias name dsx.
This commit is contained in:
Kp 2017-07-26 03:15:58 +00:00
parent 8b713978fc
commit 2d430596c5
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
common/include/dsx-ns.h
View file

@ -43,10 +43,18 @@
* the output shows the comment, which explains which type of mistake is
* being reported.
*/
namespace dsx { /* Force type mismatch on attempted nesting */
namespace d1x { /* Force type mismatch on attempted nesting */
# ifdef DXX_HAVE_CXX_DISAMBIGUATE_USING_NAMESPACE
class dcx; /* dcx declared inside dsx */
class dsx; /* dsx declared inside dsx */
class dcx; /* dcx declared inside d1x */
class d1x; /* d1x declared inside d1x */
class d2x; /* d2x declared inside d1x */
# endif
}
namespace d2x { /* Force type mismatch on attempted nesting */
# ifdef DXX_HAVE_CXX_DISAMBIGUATE_USING_NAMESPACE
class dcx; /* dcx declared inside d2x */
class d1x; /* d1x declared inside d2x */
class d2x; /* d2x declared inside d2x */
# endif
}
#ifndef DXX_NO_USING_DSX
@ -68,17 +76,21 @@ using namespace dsx; // deprecated
* the compiler to resolve.
*/
class dsx; /* dsx declared in common-only code */
class d1x; /* d1x declared in common-only code */
class d2x; /* d2x declared in common-only code */
#endif
#ifdef DXX_HAVE_CXX_DISAMBIGUATE_USING_NAMESPACE
namespace dcx { /* Force type mismatch on attempted nesting */
class dcx; /* dcx declared inside dcx */
class dsx; /* dsx declared inside dcx */
class d1x; /* d1x declared inside dcx */
class d2x; /* d2x declared inside dcx */
}
namespace {
class dcx; /* dcx declared inside anonymous */
class dsx; /* dsx declared inside anonymous */
class d1x; /* d1x declared inside anonymous */
class d2x; /* d2x declared inside anonymous */
}
#else
/* This empty namespace is required because, if