Changeset 4eba3ad in git for dyn_modules/syzextra/singularxx_defs.h

Timestamp:

Apr 28, 2014, 8:49:00 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

c7d29b194535c9015230fc587b2ae178c075ef3e

Parents:

92992c08c2f387188f53d5f874a342fb60dccc06

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-04-28 20:49:00+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-07 04:41:46+02:00

Message:

introduced SchreyerSyzygyComputationFlags for storing and passing ring attributes within SchreyerSyzygyComputatio

chg: renamed internal functions to avoid name conflicts
chg: better namespace handling

File:

• dyn_modules/syzextra/singularxx_defs.h (modified) (2 diffs)

dyn_modules/syzextra/singularxx_defs.h

@@ -23 +23 @@
 #define SINGULAR_singular_defs_h_
 
+
+#ifdef HAVE_NAMESPACES
+
 #define BEGIN_NAMESPACE(a) namespace a {
 #define END_NAMESPACE }
+
 #define USING_NAMESPACE(a) using namespace a;
+#define FROM_NAMESPACE(a, s) a :: s
+
+#else
+
+#define BEGIN_NAMESPACE(a) 
+#define END_NAMESPACE 
+
+#define USING_NAMESPACE(a)
+#define FROM_NAMESPACE(a, s) s
+
+#endif
+
 
 #define SINGULARXXNAME Singular
@@ -31 +47 @@
 #define BEGIN_NAMESPACE_SINGULARXX BEGIN_NAMESPACE(SINGULARXXNAME)
 #define END_NAMESPACE_SINGULARXX END_NAMESPACE
+
 #define USING_NAMESPACE_SINGULARXX USING_NAMESPACE(SINGULARXXNAME)
-
-#define FROM_NAMESPACE_SINGULARXXNAME(s) SINGULARXXNAME :: s
+#define FROM_NAMESPACE_SINGULARXXNAME(s) FROM_NAMESPACE(SINGULARXXNAME, s)
 
 #define BEGIN_NAMESPACE_NONAME BEGIN_NAMESPACE()